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

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 89 insertions, 2 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/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@