Fix linking with --as-needed, fix HOMEPAGE and SRC_URI, quotes, add ~amd64 keyword and remove old ebuild.

(Portage version: 2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64)

5 files changed, 69 insertions, 31 deletions

diff --git a/x11-misc/bbdate/ChangeLog b/x11-misc/bbdate/ChangeLog
index f1ab748bf3d7..9af0afcdd0cf 100644
--- a/x11-misc/bbdate/ChangeLog
+++ b/x11-misc/bbdate/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/bbdate
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/ChangeLog,v 1.16 2007/03/19 01:27:59 kloeri Exp $
+# Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/ChangeLog,v 1.17 2008/09/17 19:18:01 coldwind Exp $
+
+*bbdate-0.2.4-r1 (17 Sep 2008)
+
+  17 Sep 2008; Santiago M. Mola <coldwind@gentoo.org>
+  +files/bbdate-0.2.4-as-needed.patch, -bbdate-0.2.3.ebuild,
+  bbdate-0.2.4.ebuild, +bbdate-0.2.4-r1.ebuild:
+  Fix linking with --as-needed, fix HOMEPAGE and SRC_URI, quotes, add ~amd64
+  keyword and remove old.
 
   19 Mar 2007; Bryan Østergaard <kloeri@gentoo.org> metadata.xml:
   Remove ka0ttic from metadata.xml due to retirement.
diff --git a/x11-misc/bbdate/bbdate-0.2.3.ebuild b/x11-misc/bbdate/bbdate-0.2.3.ebuild
deleted file mode 100644
index 565dda0a4436..000000000000
--- a/x11-misc/bbdate/bbdate-0.2.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.3.ebuild,v 1.7 2005/01/18 15:46:33 ka0ttic Exp $
-
-DESCRIPTION="blackbox date display"
-HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml"
-SRC_URI="http://bbtools.windsofstorm.net/sources/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE=""
-
-DEPEND="virtual/blackbox"
-
-src_install () {
-	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog TODO
-
-	# 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/bbdate/bbdate-0.2.4-r1.ebuild b/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild
new file mode 100644
index 000000000000..112b6a021b94
--- /dev/null
+++ b/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.4-r1.ebuild,v 1.1 2008/09/17 19:18:01 coldwind Exp $
+
+inherit eutils autotools
+
+DESCRIPTION="blackbox date display"
+HOMEPAGE="http://sourceforge.net/projects/bbtools"
+SRC_URI="mirror://sourceforge/bbtools/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="virtual/blackbox"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-as-needed.patch
+	eautoreconf
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc README AUTHORS BUGS INSTALL ChangeLog TODO
+
+	# 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/bbdate/bbdate-0.2.4.ebuild b/x11-misc/bbdate/bbdate-0.2.4.ebuild
index 3a6ce8625f54..14090fff4c86 100644
--- a/x11-misc/bbdate/bbdate-0.2.4.ebuild
+++ b/x11-misc/bbdate/bbdate-0.2.4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.4.ebuild,v 1.9 2006/12/07 02:23:51 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bbdate/bbdate-0.2.4.ebuild,v 1.10 2008/09/17 19:18:01 coldwind Exp $
 
 DESCRIPTION="blackbox date display"
 HOMEPAGE="http://bbtools.windsofstorm.net/available.phtml"
@@ -15,10 +15,10 @@ DEPEND="virtual/blackbox"
 
 src_install () {
 	make DESTDIR="${D}" install || die "make install failed"
-	dodoc README COPYING AUTHORS BUGS INSTALL ChangeLog TODO
+	dodoc README AUTHORS BUGS INSTALL ChangeLog TODO
 
 	# 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
+	mv "${D}"/usr/share/bbtools/bbtoolsrc.in \
+		"${D}"/usr/share/doc/${PF}/bbtoolsrc.example
 }
diff --git a/x11-misc/bbdate/files/bbdate-0.2.4-as-needed.patch b/x11-misc/bbdate/files/bbdate-0.2.4-as-needed.patch
new file mode 100644
index 000000000000..38767a76443b
--- /dev/null
+++ b/x11-misc/bbdate/files/bbdate-0.2.4-as-needed.patch
@@ -0,0 +1,21 @@
+Reason: Correct lib and ldflags ordering, fixes --as-needed.
+Upstream: No.
+--- bbdate-0.2.4/configure.in
++++ bbdate-0.2.4/configure.in
+@@ -47,12 +47,13 @@
+ 
+ CFLAGS="$CFLAGS $X_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $X_CFLAGS"
+-LDFLAGS="$LDFLAGS $X_LIBS $X_PRE_LIBS"
++LDFLAGS="$LDFLAGS"
++LIBS="$X_LIBS $X_PRE_LIBS"
+ dnl Checks for X libraries.
+-AC_CHECK_LIB(X11, XOpenDisplay, LDFLAGS="$LDFLAGS -lX11",
++AC_CHECK_LIB(X11, XOpenDisplay, LIBS="$LIBS -lX11",
+              AC_MSG_ERROR(XOpenDisplay not found in -lX11))
+ 
+-LDFLAGS="$LDFLAGS $X_EXTRA_LIBS"
++LIBS="$LIBS $X_EXTRA_LIBS"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC