version bump, remove broken version

(Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key E73C35B3)

4 files changed, 47 insertions, 32 deletions

diff --git a/x11-plugins/pidgin-opensteamworks/ChangeLog b/x11-plugins/pidgin-opensteamworks/ChangeLog
index 0469f4a76928..b47c3c73a09d 100644
--- a/x11-plugins/pidgin-opensteamworks/ChangeLog
+++ b/x11-plugins/pidgin-opensteamworks/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-plugins/pidgin-opensteamworks
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-opensteamworks/ChangeLog,v 1.18 2013/08/10 15:43:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-opensteamworks/ChangeLog,v 1.19 2013/08/18 23:01:36 hasufell Exp $
+
+*pidgin-opensteamworks-1.0_p68 (18 Aug 2013)
+
+  18 Aug 2013; Julian Ospald <hasufell@gentoo.org>
+  -pidgin-opensteamworks-1.0_p67.ebuild, +pidgin-opensteamworks-1.0_p68.ebuild,
+  -files/pidgin-opensteamworks-1.0_p67-Makefile,
+  +files/pidgin-opensteamworks-1.0_p68-Makefile:
+  version bump, remove broken version
 
 *pidgin-opensteamworks-1.0_p67 (10 Aug 2013)
 
diff --git a/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.0_p67-Makefile b/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.0_p67-Makefile
deleted file mode 100644
index 15beba3ed032..000000000000
--- a/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.0_p67-Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-CC ?= gcc
-
-PLUGINDIR ?= $(shell pkg-config --variable=plugindir purple)
-
-CFLAGS += -Wall -fPIC
-LDFLAGS += -shared
-CPPFLAGS += $(shell pkg-config --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
-LIBS += $(shell pkg-config --libs glib-2.0 json-glib-1.0 purple nss)
-
-TARGET = libsteam.so
-
-OBJS = libsteam.o steam_connection.o
-
-%.o: %.c %.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c
-
-$(TARGET): $(OBJS)
-	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-
-install: $(TARGET)
-	@install -Dm755 $(TARGET) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-
-uninstall:
-	@rm -f "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
-
-clean:
-	@rm -f $(OBJS) $(TARGET)
-
-.PHONY: uninstall clean
diff --git a/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.0_p68-Makefile b/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.0_p68-Makefile
new file mode 100644
index 000000000000..a71ece054234
--- /dev/null
+++ b/x11-plugins/pidgin-opensteamworks/files/pidgin-opensteamworks-1.0_p68-Makefile
@@ -0,0 +1,33 @@
+CC ?= gcc
+PKG_CONFIG ?= pkg-config
+INSTALL = install
+INSTALL_PROGRAM = $(INSTALL) -Dm755
+
+PLUGINDIR ?= $(shell $(PKG_CONFIG) --variable=plugindir purple)
+
+CFLAGS ?= -O2 -pipe
+CFLAGS += -Wall -fPIC
+LDFLAGS += -shared
+CPPFLAGS += $(shell $(PKG_CONFIG) --cflags glib-2.0 json-glib-1.0 purple nss gnome-keyring-1)
+LIBS += $(shell $(PKG_CONFIG) --libs glib-2.0 json-glib-1.0 purple nss)
+
+TARGET = libsteam.so
+
+OBJS = libsteam.o steam_connection.o
+
+%.o: %.c %.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -c $*.c
+
+$(TARGET): $(OBJS)
+	$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
+
+install: $(TARGET)
+	$(INSTALL_PROGRAM) $(TARGET) "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
+
+uninstall:
+	rm -f "$(DESTDIR)$(PLUGINDIR)/$(TARGET)"
+
+clean:
+	rm -f $(OBJS) $(TARGET)
+
+.PHONY: uninstall clean
diff --git a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.0_p67.ebuild b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.0_p68.ebuild
index 58a46126f91b..39dc9495b604 100644
--- a/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.0_p67.ebuild
+++ b/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.0_p68.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.0_p67.ebuild,v 1.1 2013/08/10 15:43:44 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-plugins/pidgin-opensteamworks/pidgin-opensteamworks-1.0_p68.ebuild,v 1.1 2013/08/18 23:01:36 hasufell Exp $
 
 EAPI=5
 
@@ -9,6 +9,7 @@ inherit toolchain-funcs
 DESCRIPTION="Steam protocol plugin for pidgin"
 HOMEPAGE="http://code.google.com/p/pidgin-opensteamworks/"
 SRC_URI="http://dev.gentoo.org/~mrueg/distfiles/${P}.tar.xz
+	http://dev.gentoo.org/~hasufell/distfiles/${P}.tar.xz
 	http://pidgin-opensteamworks.googlecode.com/files/icons.zip
 	-> ${PN}-icons.zip"
 
@@ -28,7 +29,9 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	tc-export CC
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		tc-export CC PKG_CONFIG
+	fi
 }
 
 src_prepare() {