Adding missing dependency and respect user flags. Thanks Patrick for the report and Andrew Brouwers for patch.

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

4 files changed, 41 insertions, 8 deletions

diff --git a/x11-misc/bbrun/ChangeLog b/x11-misc/bbrun/ChangeLog
index 9701cd1c07b2..de909e5d3a83 100644
--- a/x11-misc/bbrun/ChangeLog
+++ b/x11-misc/bbrun/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-misc/bbrun
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/ChangeLog,v 1.21 2008/01/13 02:52:07 drac Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/ChangeLog,v 1.22 2010/05/28 17:28:42 xarthisius Exp $
+
+  28 May 2010; Kacper Kowalik <xarthisius@gentoo.org> bbrun-1.6.ebuild,
+  +files/bbrun-1.6-respectflags.patch:
+  Adding missing dependency and respect user flags. Thanks Patrick for the
+  report and Andrew Brouwers for patch.
 
   13 Jan 2008; Samuli Suominen <drac@gentoo.org> bbrun-1.6.ebuild:
   toolchanify and stable on amd64.
diff --git a/x11-misc/bbrun/Manifest b/x11-misc/bbrun/Manifest
index 41e6aca26cc3..827165734f35 100644
--- a/x11-misc/bbrun/Manifest
+++ b/x11-misc/bbrun/Manifest
@@ -1,4 +1,5 @@
+AUX bbrun-1.6-respectflags.patch 624 RMD160 05123d9e6a2486b3a75b7b726bc7cbb2c976090a SHA1 8b89896eaf8fdfd14732090caee889397672c549 SHA256 5f7be0d080403aad32458835d22ab27a4dce42bf7e65aaa0b0b1524952051409
 DIST bbrun-1.6.tar.gz 21132 RMD160 65fc0d237655b1a8f3e6d45c4681ededaf988b83 SHA1 b2928ccbf3ba477b1b29ee106032e2389df5a373 SHA256 d0af57276ec9191a94f8d20a2da69dc1818f410f23478f041334aef2d707559a
-EBUILD bbrun-1.6.ebuild 804 RMD160 2d942a8ce587f17773b99938d781efe0f9ec2dc3 SHA1 291a774d7c3c8307cc217f0f0a373ad89fff7a1e SHA256 519257a10d2dfd4c3a6024a69e5aca46576f290a15bfb4546ab79ec4c9d3b01e
-MISC ChangeLog 3237 RMD160 57eb8cdd3b65bed91520842059bd26f923c96131 SHA1 1d3ce4777913633b6ef77b3ae5b5bd43c55cbc24 SHA256 25f9f632f56f88e1742e94013e4fcc59e60bd95a6a6dd569c421d14bbb8ec725
+EBUILD bbrun-1.6.ebuild 828 RMD160 d76662c2d6c449ba212b58ec646c887c861c636c SHA1 e0d969d3a15b69abbfe699362fd5f37ddd1d4304 SHA256 ab281bd715caa270236674a5c2d5d5698a6b6e2e5089c1351f1d02a59c2bd3ee
+MISC ChangeLog 3470 RMD160 925ee152548a1303dc8581e5e236fa7c69a158ae SHA1 7f912d41ca60bb69de81a9f9116d87cd2949139c SHA256 01d4ce4c29b7e6350cf787766750e17991a23afd33649b8e7d511a56c2d711a1
 MISC metadata.xml 163 RMD160 f3a3f66a62012d6c9635ae33abfe28f549471c0a SHA1 923ee2f9b457e2110de082bbe17302c70c81a1f2 SHA256 058ba1219e0871827744b5cde326ae73cc7d326079e21e492b84333190ff1b6a
diff --git a/x11-misc/bbrun/bbrun-1.6.ebuild b/x11-misc/bbrun/bbrun-1.6.ebuild
index ff0bd090e4e1..b66d457f9bda 100644
--- a/x11-misc/bbrun/bbrun-1.6.ebuild
+++ b/x11-misc/bbrun/bbrun-1.6.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/bbrun-1.6.ebuild,v 1.7 2008/01/13 02:52:07 drac Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/bbrun-1.6.ebuild,v 1.8 2010/05/28 17:28:42 xarthisius Exp $
 
-inherit multilib toolchain-funcs
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="blackbox program execution dialog box"
 HOMEPAGE="http://www.darkops.net/bbrun"
@@ -15,6 +15,7 @@ IUSE=""
 
 RDEPEND=">=x11-libs/gtk+-2"
 DEPEND="${RDEPEND}
+	x11-libs/libXpm
 	dev-util/pkgconfig"
 
 S=${WORKDIR}/${P}/${PN}
@@ -22,7 +23,7 @@ S=${WORKDIR}/${P}/${PN}
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	sed -e "s:-O2::" -e "s:-g:${CFLAGS}:g" -i Makefile
+	epatch "${FILESDIR}"/${P}-respectflags.patch
 }
 
 src_compile() {
diff --git a/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch b/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch
new file mode 100644
index 000000000000..d81824b0ed0f
--- /dev/null
+++ b/x11-misc/bbrun/files/bbrun-1.6-respectflags.patch
@@ -0,0 +1,26 @@
+Respect {C,LD}FLAGS
+
+--- bbrun/Makefile
++++ bbrun/Makefile
+@@ -1,7 +1,7 @@
+ CC     = gcc
+ LIBDIR = -L/usr/lib -L/usr/X11R6/lib
+ LIBS   = -lXpm `pkg-config --libs gtk+-2.0`
+-CFLAGS = `pkg-config --cflags gtk+-2.0`
++GTK_CFLAGS = `pkg-config --cflags gtk+-2.0`
+ 
+ OBJS   = bbrun.o \
+          ../wmgeneral/wmgeneral.o \
+@@ -11,10 +11,10 @@
+ all: bbrun
+ 
+ .c.o:
+-	$(CC) -g -c -O2 -Wall $< -o $*.o $(CFLAGS)
++	$(CC) $(CFLAGS) $(GTK_CFLAGS) -c -Wall $< -o $*.o
+ 
+ bbrun: $(OBJS)
+-	$(CC) -Wall -g -o bbrun $^ $(LIBDIR) $(LIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -Wall -o bbrun $^ $(LIBDIR) $(LIBS)
+ 
+ install:
+ 	cp bbrun /usr/local/bin/