Version bump. Fixing build with as-needed wrt bug 248552. Thanks Diego for report

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

6 files changed, 162 insertions, 10 deletions

diff --git a/x11-misc/bbppp/ChangeLog b/x11-misc/bbppp/ChangeLog
index a588da6de751..843c1e163d5a 100644
--- a/x11-misc/bbppp/ChangeLog
+++ b/x11-misc/bbppp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/bbppp
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/ChangeLog,v 1.13 2008/12/27 23:11:55 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/ChangeLog,v 1.14 2010/05/30 18:29:20 xarthisius Exp $
+
+*bbppp-0.2.5 (30 May 2010)
+
+  30 May 2010; Kacper Kowalik <xarthisius@gentoo.org> bbppp-0.2.3.ebuild,
+  +bbppp-0.2.5.ebuild, +files/bbppp-0.2.5-gcc3-multiline.patch,
+  +files/bbppp-asneeded.patch:
+  Version bump. Fixing build with as-needed wrt bug 248552. Thanks Diego for
+  report
 
   27 Dec 2008; Santiago M. Mola <coldwind@gentoo.org>
   -bbppp-0.2.2-r1.ebuild, -bbppp-0.2.2-r2.ebuild, bbppp-0.2.3.ebuild:
diff --git a/x11-misc/bbppp/Manifest b/x11-misc/bbppp/Manifest
index a985dd820918..21c29bc2a28b 100644
--- a/x11-misc/bbppp/Manifest
+++ b/x11-misc/bbppp/Manifest
@@ -1,5 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bbppp-0.2.5-gcc3-multiline.patch 2749 RMD160 6755c29943f395b2420178ba2ebf64dc434be364 SHA1 dc6e12f92a82ab34ea5e6247c07769d0f97c2406 SHA256 0fbbce4d4c626c423c6312a6167c3109a6e2ffc5b44b787ed6cc2503c5512b31
+AUX bbppp-asneeded.patch 1054 RMD160 74569d50c4d400a6fc4d2fe6f51fc434e810b665 SHA1 8421e1d6caf9431ee1dfc1c95cd0819849c2e776 SHA256 273aba912d01274f62fc5fa1f7e77bb69d87c96efb6a31973b7559164f0ea67b
 AUX bbppp-gcc3-multiline.diff 2884 RMD160 00f097a1bc49e310fa8d80a10abbbbe20cacb01e SHA1 16a88a33a1b092c934cb3e331b1dcfe716585260 SHA256 0c2f154ccee3223280ef9d2b195f35af9b2ecd5bcb27cb54c040b9df360671a8
 DIST bbppp-0.2.3.tar.gz 80846 RMD160 0de13ef8ddfb9f4c4f0fdfe2458abdb31a07e270 SHA1 c1630556e398ceb31dcda87c6dc3b3c4712c801e SHA256 bbf17532424e963224b2577ff212bce9e122e19b271bb4b009b6baef0ea1a9a2
-EBUILD bbppp-0.2.3.ebuild 1007 RMD160 f33e721b6c9cd85fac625d7f69bc62fda3475e18 SHA1 4c1aaaaeef253356db4fcd12ea46df6f73c28b52 SHA256 7522da1c088532326ec245c8827b73b1e2af889193708bc63940d0ba6fdbfa8a
-MISC ChangeLog 1864 RMD160 022b6c688bb2c750c98093e67bbedded36176d95 SHA1 c036c5da9ded4879ba15111da8ec3a47d2b02354 SHA256 a918e1d039dc64fb76757a39ee35f326948495b396150805d701a482e03d7dab
+DIST bbppp-0.2.5.tar.gz 83421 RMD160 68b631ada0eae65cd9eafdbd55429e5b232f0faa SHA1 b0b90375e0a033d92fbe0623038f32fb5a9f4f0d SHA256 6d606f2e269574b61ad2a223ef38dfe3469cfa7518f5d114f2349545747173b4
+EBUILD bbppp-0.2.3.ebuild 1148 RMD160 bfe4d1a51f47efec0fe3ce14b1ae7297720491a8 SHA1 66978e883567949bfc9a359e299dcb79e57ea207 SHA256 8166aa5a83bb4463882c4210c4db0741e5c1840c38bd12fba9a9ff8c5baa1107
+EBUILD bbppp-0.2.5.ebuild 1145 RMD160 713654b8f1dc8ae01bc1f417b059004fd2483c41 SHA1 850f517f2487807ed12dc4ce257042badb699edb SHA256 27b51a29696b1b219883a99f47c758414c862b1a89a0daf288034272ec2c112e
+MISC ChangeLog 2150 RMD160 24333ad09ad20c8bbd37ba424ab64214e507e129 SHA1 0d36b2b802de6007e6cb56442752832c10efcd76 SHA256 58f70a7e6f5a3cb38a90e33a0c452a42cd35f8b3d39b9e6fc689f278bc2c726e
 MISC metadata.xml 245 RMD160 5dc40ab5a4a6900db3f2af0bf4a5d3ec453b894e SHA1 1da78ab1272ca8e77add1704b5335f0e67b91fc9 SHA256 da1edfee36805a912acf9c67c5518bc67f487c5788be400180f6e7c7f1f4805e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwCrooACgkQIiMqcbOVdxTfBQP+LxGliQZYcyUmYJKTnYW2hgqo
+j2sBquiXypFZHyvNaloE7GDPXPzxEUpV8TvD7CDHufbF8AhNSR8d6TZ4PdN/FLg0
+q24ffcoh6T0y+PLFW8pfrEJPC6wuETCQhgXpnbllqmPkgOP/jb+xQc0F3G4oN2RY
+FfxwimH1wU5p6CTwUvs=
+=wxi5
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/bbppp/bbppp-0.2.3.ebuild b/x11-misc/bbppp/bbppp-0.2.3.ebuild
index 8ae9ac182f40..0bc6e78ee920 100644
--- a/x11-misc/bbppp/bbppp-0.2.3.ebuild
+++ b/x11-misc/bbppp/bbppp-0.2.3.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/bbppp/bbppp-0.2.3.ebuild,v 1.7 2008/12/27 23:11:55 coldwind Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.3.ebuild,v 1.8 2010/05/30 18:29:20 xarthisius Exp $
 
-inherit eutils
+inherit autotools eutils
 
 DESCRIPTION="blackbox ppp frontend/monitor"
 HOMEPAGE="http://bbtools.windsofstorm.net/sources/available.phtml#bbppp"
@@ -13,17 +13,22 @@ SLOT="0"
 KEYWORDS="ppc sparc x86"
 IUSE=""
 
-DEPEND="virtual/blackbox"
+DEPEND="x11-libs/libX11"
+DEPEND="${DEPEND}
+	virtual/blackbox"
 
 src_unpack() {
 	unpack ${A}
 	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-gcc3-multiline.diff
+	epatch "${FILESDIR}"/${PN}-gcc3-multiline.diff \
+		"${FILESDIR}"/${PN}-asneeded.patch
+	eautoreconf
 }
 
 src_install () {
 	make DESTDIR="${D}" install || die
-	dodoc README AUTHORS BUGS INSTALL ChangeLog NEWS TODO data/README.bbppp
+	dodoc README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbppp || die
+	rm "${D}"/usr/share/bbtools/README.bbppp
 }
 
 pkg_postinst() {
diff --git a/x11-misc/bbppp/bbppp-0.2.5.ebuild b/x11-misc/bbppp/bbppp-0.2.5.ebuild
new file mode 100644
index 000000000000..c396f41cd80b
--- /dev/null
+++ b/x11-misc/bbppp/bbppp-0.2.5.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbppp/bbppp-0.2.5.ebuild,v 1.1 2010/05/30 18:29:20 xarthisius Exp $
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox ppp frontend/monitor"
+HOMEPAGE="http://bbtools.windsofstorm.net/sources/available.phtml#bbppp"
+SRC_URI="mirror://sourceforge/bbtools/${PN}/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="x11-libs/libX11"
+RDEPEND="${DEPEND}
+	virtual/blackbox"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gcc3-multiline.patch \
+		"${FILESDIR}"/${PN}-asneeded.patch
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die
+	dodoc README AUTHORS BUGS ChangeLog NEWS TODO data/README.bbppp || die
+	rm "${D}"/usr/share/bbtools/README.bbppp
+}
+
+pkg_postinst() {
+	# don't assume blackbox exists because virtual/blackbox is installed
+	if [[ -x ${ROOT}/usr/bin/blackbox ]] ; then
+		if ! grep bbppp "${ROOT}"/usr/bin/blackbox &>/dev/null ; then
+			sed -e "s/.*blackbox/exec \/usr\/bin\/bbppp \&\n&/" blackbox | cat > blackbox
+		fi
+	fi
+}
diff --git a/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch
new file mode 100644
index 000000000000..ef2072faa9af
--- /dev/null
+++ b/x11-misc/bbppp/files/bbppp-0.2.5-gcc3-multiline.patch
@@ -0,0 +1,44 @@
+--- main.cc
++++ main.cc
+@@ -24,25 +24,24 @@
+ 
+ void Usage()
+ {
+-	char* usageOptions = {"Options:\n\
+-	                      -display <display name>     X server to connect to\n\
+-	                      -c[onfig] <filename>        Alternate config file\n\
+-	                      -n[obb]                     Fall back on default configuration\n\
+-	                      -v[ersion]                  Display version number\n\
+-	                      -h[elp]                     Display this help\n\
+-	                      -geom[etry] <geometry>      Set geometry of window\n\
+-	                      -d[ecorated]                Show 'normal' decorated window\n\
+-	                      -w[ithdrawn]                Place bbtool in the Slit\n\
+-	                      -s[hape]                    Don't display groundplate\n\
+-	                      -thru[put]                  Display throughput rate\n\
+-	                      -o[rient] <v|h>             Display window widgets horizontally or vertically\n\
+-	                      -com[pact]                  Display buttons in compact style\n\
+-	                      -notime                     Dont display time window\n\
+-	                      -nosecs                     Show uptime in old-style hh:mm format\n\n"};
++	char* usageOptions = {"Options:\n"
++	                     "-display <display name>     X server to connect to\n"
++	                     "-c[onfig] <filename>        Alternate config file\n"
++	                     "-n[obb]                     Fall back on default configuration\n"
++	                     "-v[ersion]                  Display version number\n"
++	                     "-h[elp]                     Display this help\n"
++	                     "-geom[etry] <geometry>      Set geometry of window\n"
++	                     "-d[ecorated]                Show 'normal' decorated window\n"
++	                     "-w[ithdrawn]                Place bbtool in the Slit\n"
++	                     "-s[hape]                    Don't display groundplate\n"
++	                     "-thru[put]                  Display throughput rate\n"
++	                     "-o[rient] <v|h>             Display window widgets horizontally or vertically\n"
++	                     "-com[pact]                  Display buttons in compact style\n"
++	                     "-notime                     Dont display time window\n"
++	                     "-nosecs                     Show uptime in old-style hh:mm format\n\n"};
+ 
+ 	fprintf(stdout,"\n%s version %s \n",BBTOOL,BBTOOL_VERSION);
+-	fprintf(stdout,"Usage:\n\
+-	        %s [options]\n",BBTOOL);
++	fprintf(stdout,"Usage:\n%s [options]\n",BBTOOL);
+ 	fprintf(stdout, "%s", usageOptions);
+ 	/*
+ 	fprintf(stdout,"-t[ype] <0|1|2|3>           0: 
diff --git a/x11-misc/bbppp/files/bbppp-asneeded.patch b/x11-misc/bbppp/files/bbppp-asneeded.patch
new file mode 100644
index 000000000000..7e8c2b8bcfd4
--- /dev/null
+++ b/x11-misc/bbppp/files/bbppp-asneeded.patch
@@ -0,0 +1,38 @@
+Fixing build with as-needed
+
+https://bugs.gentoo.org/show_bug.cgi?id=248552
+
+--- configure.in
++++ configure.in
+@@ -86,14 +86,9 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
+-             AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+-
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++AC_CHECK_LIB([X11], [XOpenDisplay], ,
++             AC_MSG_ERROR(XOpenDisplay not found in -lX11),)
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+--- Makefile.am
++++ Makefile.am
+@@ -1,4 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@ @INTERLACE@ @ISDN@\
++AM_CPPFLAGS =	 @INTERLACE@ @ISDN@\
+ 		-DGLOBAL_BB=\"$(datadir)/bbtools/bbppp.bb\" \
+ 		-DGLOBAL_NOBB=\"$(datadir)/bbtools/bbppp.nobb\"
+ 
+@@ -16,4 +16,5 @@
+ 		 Basewindow.cc Basewindow.hh \
+ 		 blackboxstyle.hh
+ EXTRA_DIST = BUGS TODO
+-bbppp_LDADD = @X_LIBS@
++bbppp_LDADD  = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
++bbppp_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@