Version bump, also fixing build with as-needed wrt bug 248556. Thanks Diego for reporting

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

4 files changed, 105 insertions, 3 deletions

diff --git a/x11-misc/bbweather/ChangeLog b/x11-misc/bbweather/ChangeLog
index 6169ee238093..980b6d08d50c 100644
--- a/x11-misc/bbweather/ChangeLog
+++ b/x11-misc/bbweather/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/bbweather
-# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/ChangeLog,v 1.26 2008/12/27 23:06:43 coldwind Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/ChangeLog,v 1.27 2010/05/30 13:46:26 xarthisius Exp $
+
+*bbweather-0.6.3 (30 May 2010)
+
+  30 May 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  +bbweather-0.6.3.ebuild, +files/bbweather-asneeded.patch:
+  Version bump, also fixing build with as-needed wrt bug 248556. Thanks
+  Diego for reporting
 
   27 Dec 2008; Santiago M. Mola <coldwind@gentoo.org> -bbweather-0.5.ebuild,
   -bbweather-0.6.ebuild, bbweather-0.6.2.ebuild:
diff --git a/x11-misc/bbweather/Manifest b/x11-misc/bbweather/Manifest
index b04a9295c26c..7f60ff66c841 100644
--- a/x11-misc/bbweather/Manifest
+++ b/x11-misc/bbweather/Manifest
@@ -1,4 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX bbweather-asneeded.patch 1099 RMD160 78b1b9811d2bc3461b3b9e47c289ec7ed2e432c3 SHA1 d9cf9aab5069d3ba2dedd8d4886121b3794e91c6 SHA256 963a7a76ff0ec6e341f9b0f32a65eeb8e92be49aef67efa9e9d6f49adc35e6e2
 DIST bbweather-0.6.2.tar.bz2 80487 RMD160 3a93b7597af12f4001c3b61495e93ed079867cd4 SHA1 bdb3359876434a6d698a70a975312ca29b2116c4 SHA256 dac024c15df75cf8de29ae5e4a80e17771361e708ae45b772d1741fc926dc093
+DIST bbweather-0.6.3.tar.bz2 80631 RMD160 b216f048c91600c3eeeecf9fe68c7c1ff72e8292 SHA1 625c756548bd9ce1dd5cfa64838fda74545d926f SHA256 575e0f5dd1af770490bf0f3ef9c26de5245deb91f79caa3d5db3cd9dc23b8e1e
 EBUILD bbweather-0.6.2.ebuild 892 RMD160 613e8b89397af6ee7652d7cab55893c0942aa77b SHA1 df372ce167fc2239fdcaffc320ae962c788100f6 SHA256 039b9846f9ef2f01d91b1466481bcb5ff6d5d5473231d14acdd72e8121d04951
-MISC ChangeLog 3345 RMD160 ccbf4ef5468fb2dc794436b1b8c3e2686e912a96 SHA1 c2d1932f906a8cad00875c2aad793c4b6ffa006e SHA256 75d9ed9f13d9505da309acbfe3096ac7c0973e2755bb48b56bc643047b17bfde
+EBUILD bbweather-0.6.3.ebuild 1098 RMD160 0fa70e50b0f7c17f18e00385e3c98f546d5e887c SHA1 c00f679ff5894262c22b92e3380972bc36e14d7a SHA256 3b7162da39eaf4cd9fee745df1ae8bbcd01328f8d67c9f6fb8ad82180506779d
+MISC ChangeLog 3588 RMD160 75597d3992e19b1474f19f22e7c310ecc5c542da SHA1 76f1b8d0a0b5cdf3494546ffe494341ab5f24d3c SHA256 783fabe77a60a03acddcf743ed416e4f6d3938fb6f12f220031084decda5daa3
 MISC metadata.xml 234 RMD160 446739cfd5656468251fe5d905e8e2d3ff93738a SHA1 9632bb24f575a43a775ca702184fd72d1e217d9a SHA256 2a9f00e2ade856d7ce272371d705a03e158a9f5c42e75631ce7092d0c4247332
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iJwEAQECAAYFAkwCbDwACgkQIiMqcbOVdxTUTQQAm+dWuePvlZMNsUxvTcbZdkFy
+4T5GfI3YEM4FOueca1LWzFi7zLiFcPcen7bTfMg9cOke2O5kVPbTbXQgy5LBBJHa
+bQzWOoImkQadKXIITjdUDMBxCm/mwvNu8coa+DsPRxQc+X9bNrD/YJ3Tgb04yydW
+NjHaaRwySTHsngNH5CI=
+=mQiD
+-----END PGP SIGNATURE-----
diff --git a/x11-misc/bbweather/bbweather-0.6.3.ebuild b/x11-misc/bbweather/bbweather-0.6.3.ebuild
new file mode 100644
index 000000000000..652c1d49df13
--- /dev/null
+++ b/x11-misc/bbweather/bbweather-0.6.3.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbweather/bbweather-0.6.3.ebuild,v 1.1 2010/05/30 13:46:26 xarthisius Exp $
+
+EAPI=2
+
+inherit autotools eutils
+
+DESCRIPTION="blackbox weather monitor"
+HOMEPAGE="http://www.netmeister.org/apps/bbweather/"
+SRC_URI="http://www.netmeister.org/apps/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="dev-lang/perl
+	x11-libs/libX11"
+RDEPEND="${DEPEND}
+	net-misc/wget
+	x11-apps/xmessage
+	virtual/blackbox"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-asneeded.patch
+	sed -i -e "s/man_DATA/man1_MANS/" \
+		-e "/^mandir/d" doc/Makefile.am || die
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" docdir="/usr/share/doc/${PF}" install || die
+	dodoc README AUTHORS ChangeLog NEWS TODO data/README.bbweather || die
+
+	# since multiple bbtools packages provide this file, install
+	# it in /usr/share/doc/${PF}
+	mv "${D}"/usr/share/bbtools/bbtoolsrc.in \
+		"${D}"/usr/share/doc/${PF}/bbtoolsrc.example
+}
diff --git a/x11-misc/bbweather/files/bbweather-asneeded.patch b/x11-misc/bbweather/files/bbweather-asneeded.patch
new file mode 100644
index 000000000000..593e471641c8
--- /dev/null
+++ b/x11-misc/bbweather/files/bbweather-asneeded.patch
@@ -0,0 +1,40 @@
+Fixing build with as-needed
+
+https://bugs.gentoo.org/248556
+
+--- configure.in
++++ configure.in
+@@ -56,15 +56,10 @@
+ AC_PATH_X
+ AC_PATH_XTRA
+ 
+-CFLAGS="$CFLAGS $X_CFLAGS"
+-CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
+ DATADIR=$datadir
+ 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,5 +1,4 @@
+-CPPFLAGS =	@CPPFLAGS@ \
+-		-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
++AM_CPPFLAGS =	-DDEFAULT_CONF=\"$(datadir)/bbtools/bbweather.conf\" \
+ 		-DDEFAULT_NOBB=\"$(datadir)/bbtools/bbweather.nobb\"
+ 
+ 
+@@ -13,4 +12,5 @@
+ 		 Basewindow.cpp Basewindow.h \
+ 		 blackboxstyle.h
+ EXTRA_DIST = BUGS TODO
+-bbweather_LDADD = @X_LIBS@
++bbweather_LDADD = @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@
++bbweather_CFLAGS = @X_PRE_CFLAGS@ @X_CFLAGS@ @X_EXTRA_CFLAGS@