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

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo-r1 x86_64

6 files changed, 73 insertions, 35 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/Manifest b/x11-misc/bbdate/Manifest
index 95cab564ec02..fdb6d5311393 100644
--- a/x11-misc/bbdate/Manifest
+++ b/x11-misc/bbdate/Manifest
@@ -1,6 +1,6 @@
-DIST bbdate-0.2.3.tar.gz 60140 RMD160 459ef23837d39fbb1c531b756027813240efe69c SHA1 63f209ea3b6ec9f9118cf32f144d54d27570236d SHA256 89c78594dc5ba270a15903c665405de9d75b11c12f414e88bf95c6a49d7b54ad
+AUX bbdate-0.2.4-as-needed.patch 619 RMD160 a1cb19419643ca4161466734fb874c2feeca841b SHA1 31d6d0370e9c100947dd4fd43fa467d01ca69d91 SHA256 ae5c652b46da14fbf09fe263cebb9807186f012496ca67d6ad570b0b15113065
 DIST bbdate-0.2.4.tar.gz 60644 RMD160 a6af9817069f09fe359679feb6128be8b7096d0d SHA1 c48052eec337dfdca5fdfe6b87cd2bccf3a03921 SHA256 a7957e8b8aa27b7d15d05ba19011311693d4ffd3bb53f023d1f2346f142bb802
-EBUILD bbdate-0.2.3.ebuild 778 RMD160 40ac625e4eadc0cc8fc148e56d79b83b5508f1fb SHA1 0d0aad011d613f9ea2860e487a1e2b42d45177d6 SHA256 1a74a15b50d6e53319a5c07c624c2465449b9a4bd2c4124acf2eb651da14c214
-EBUILD bbdate-0.2.4.ebuild 790 RMD160 92f7f496e95e3c50392557acfc561fa460c50ffa SHA1 3faab640080e476f38e2b45a1bce422bf7976a3b SHA256 0623322c4c745b2b0f3bdbef0dec69be1b52b5c129f154a67b65b26ee4572ca4
-MISC ChangeLog 1693 RMD160 1158ba6c9ea4c0644d0de86a725073bf5a3f52ce SHA1 bed3da4338982679db687fedaa62a98f9703aaf2 SHA256 92363379745bda5e532774b2e1b98034f6250e46af41a26ca2a6569f2ccf7310
+EBUILD bbdate-0.2.4-r1.ebuild 905 RMD160 bd27cee2aaaf630ecf83c8926d102dd95bd3e122 SHA1 2b59529396b6a295bada7d2ba03b4969a74a5c32 SHA256 886e0df8c34af21bd6f9a79348f9f8891eb159b69b6d425f76b1dbc8a2432fd1
+EBUILD bbdate-0.2.4.ebuild 786 RMD160 8bef050b597661b1646a28134f595e60ae809600 SHA1 5a93667f7d430256f5013ad58cc9071548891380 SHA256 02c50c656548b2887f86bc505749145c2a60a3d0ee568a7a9d0a8a1b7c6e4989
+MISC ChangeLog 1994 RMD160 161e14d27f2adccd5da07111876967b4795b5f13 SHA1 aa44e835a3afdc6191abc7145a2dc5507a33dbaf SHA256 cf3750422f8dbf90b0075d7afa26fb00c595e587623581f5d555f3f801a428fa
 MISC metadata.xml 228 RMD160 f027c0a7c3922b877d79176e336598ef224912af SHA1 e31d2b420b4fa61a18399ca65923bed34226c14f SHA256 bf80e57984c232077395bdba2d992a11bba5551f16bc0b103739a74a1a32e022
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