Fix underlinking wrt #367853. Remove multilib eclass, bump to EAPI4, simplify ebuild

Package-Manager: portage-2.2.0_alpha36/cvs/Linux x86_64

4 files changed, 79 insertions, 7 deletions

diff --git a/x11-misc/bbrun/ChangeLog b/x11-misc/bbrun/ChangeLog
index c7b9c45dcd83..166df9b8283a 100644
--- a/x11-misc/bbrun/ChangeLog
+++ b/x11-misc/bbrun/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/bbrun
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/ChangeLog,v 1.24 2011/04/10 07:55:56 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/ChangeLog,v 1.25 2011/06/11 09:12:38 xarthisius Exp $
+
+*bbrun-1.6-r1 (11 Jun 2011)
+
+  11 Jun 2011; Kacper Kowalik <xarthisius@gentoo.org> +bbrun-1.6-r1.ebuild,
+  +files/bbrun-1.6-makefile.patch:
+  Fix underlinking wrt #367853. Remove multilib eclass, bump to EAPI4, simplify
+  ebuild
 
   10 Apr 2011; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   Change herd from nonexisting commonbox to desktop-wm
diff --git a/x11-misc/bbrun/Manifest b/x11-misc/bbrun/Manifest
index ac37260ae3da..80a60974bc89 100644
--- a/x11-misc/bbrun/Manifest
+++ b/x11-misc/bbrun/Manifest
@@ -1,17 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX bbrun-1.6-makefile.patch 730 RMD160 3b2b51654cb3b3c53ea0d04e8d865d0d02b6d59b SHA1 f480c5b578e739ee682f167428bcafe5d7a19917 SHA256 9c5f3e7c6d3ec9f52f70918739ee5af656ce61ce67df342b96f03767698ff4d9
 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-r1.ebuild 739 RMD160 1a148b0c9ccef748e57918ddad9079a27cb0b850 SHA1 b36ccf17be31d21aa23ffecf3893d57b613a1ffb SHA256 547e5a08b1c3a9543bf6e399b171b74ee675c9d92008a5a83fc4cebb34e409e5
 EBUILD bbrun-1.6.ebuild 821 RMD160 3faef26d85c1459a18f6f60176e68a3240154ee3 SHA1 71e2ff1e5fd23928b3ffda75abbbbff27cf20988 SHA256 3d19af3b1e39311baa367624dde28e726c3b04fbc029b5456dab71c79ba7b41b
-MISC ChangeLog 3694 RMD160 a6035ef4e672e2b9c779bb2df9573dffa1f80ad6 SHA1 d560a7e13069233913949499216fc8e6afa8dfae SHA256 502a4ac5cda97ffd341ff7713337be00b5db6cdada52e5b6e9a86ce07cd48dcc
+MISC ChangeLog 3924 RMD160 c7ed05ad5944659d6e0b0d8b468bf4cbf4f3efa9 SHA1 69e1c54baac99a6ad7e849c8e3317e1a63600398 SHA256 ac414520a93cc8d22f8683469e42b071d8cf52edd63b4c9c7d518a1e891af94e
 MISC metadata.xml 164 RMD160 23268eae8516f64e7363a3689f829cc65f0fcfb8 SHA1 770506baf689455e0eb3861186483c8177e22216 SHA256 810ed71a717688d6f1aea13a6af28f7eefd9db2177e29c740511089752357263
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2hYpYACgkQIiMqcbOVdxQsdQP+N1icWIrmUmnxYd+AeBVEk2Rk
-z0s1dYQmG3Pg8s0DUOt9Z7wZCJE04X/+2sVFw0DIUMGx53YEtoATc4AFoUSd+e/R
-yzueuKPviRBnZoymb7FTvE5OPcIjEM1F/9k7F5xP0Unl+RPwNogTJrQXCxhsI8+l
-PqOUOeOlmlzV1sfQfGs=
-=Wr4D
+iJwEAQECAAYFAk3zMY4ACgkQIiMqcbOVdxRxQAP+KYHYgMYHIz8YqX+8E1btKE/U
+6hqD9V8ValzbWQIJ562z50Y9uhMzldAgurl1/Ogbv3K496nQeUQ8HSsrCwr1TGBI
+t09SK8zGHiteJf6luC35TfpoXMAAS2OLAk1eCkd9ym+sKLJIXewMF6SHSK/Iv489
+KWxAJ1qvqfxUPty9GR0=
+=pOWJ
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/bbrun/bbrun-1.6-r1.ebuild b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
new file mode 100644
index 000000000000..5c2191ba126e
--- /dev/null
+++ b/x11-misc/bbrun/bbrun-1.6-r1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbrun/bbrun-1.6-r1.ebuild,v 1.1 2011/06/11 09:12:38 xarthisius Exp $
+
+EAPI=4
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="blackbox program execution dialog box"
+HOMEPAGE="http://www.darkops.net/bbrun"
+SRC_URI="http://www.darkops.net/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	x11-libs/libXpm
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-makefile.patch
+}
+
+src_compile() {
+	emake -C ${PN} CC="$(tc-getCC)" || die
+}
+
+src_install() {
+	dobin ${PN}/${PN}
+	dodoc Changelog README
+}
diff --git a/x11-misc/bbrun/files/bbrun-1.6-makefile.patch b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
new file mode 100644
index 000000000000..cf89b96df6f3
--- /dev/null
+++ b/x11-misc/bbrun/files/bbrun-1.6-makefile.patch
@@ -0,0 +1,29 @@
+Respect {C,LD}FLAGS, fix underlinking
+
+http://bugs.gentoo.org/367853
+
+--- 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`
++LIBS   = `pkg-config --libs xext xpm gtk+-2.0`
++DEP_CFLAGS = `pkg-config --cflags xext xpm 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) $(DEP_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/