Fix linking with gold - bug #369563. EAPI bump

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

4 files changed, 94 insertions, 10 deletions

diff --git a/net-mail/gnubiff/ChangeLog b/net-mail/gnubiff/ChangeLog
index 44ebbb30ea68..976d013e729e 100644
--- a/net-mail/gnubiff/ChangeLog
+++ b/net-mail/gnubiff/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/gnubiff
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.32 2011/03/23 20:40:58 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/ChangeLog,v 1.33 2011/06/04 20:14:09 eras Exp $
+
+*gnubiff-2.2.13-r2 (04 Jun 2011)
+
+  04 Jun 2011; Eray Aslan <eras@gentoo.org> +gnubiff-2.2.13-r2.ebuild,
+  +files/gnubiff-2.2.13-gold.patch:
+  Fix linking with gold - bug #369563. EAPI bump
 
   23 Mar 2011; Tim Harder <radhermit@gentoo.org> gnubiff-2.2.13-r1.ebuild:
   Use slot dependency for gtk+.
diff --git a/net-mail/gnubiff/Manifest b/net-mail/gnubiff/Manifest
index 41a8a9dff0c9..217eacf13040 100644
--- a/net-mail/gnubiff/Manifest
+++ b/net-mail/gnubiff/Manifest
@@ -1,19 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX gnubiff-2.2.13-fix-nls.patch 462 RMD160 d651dc987be13c8f24b3d4ff412b70c836c15170 SHA1 1259715dbd69ae1853be77f475782c5f38ea6a3c SHA256 a3a61e93aeccbabfac6bc5e58373a002c1ed6fb2d4105182d12ad891a8b4b9b8
+AUX gnubiff-2.2.13-gold.patch 630 RMD160 1d35035d52b0cf6f9c39ffcfe254df2165608ed3 SHA1 50f11417f1bcb42ece22930c4a076c1a8f756901 SHA256 3c6d8aaf50e4e517789c590154f1530e543214920e1cc8da8137bb3853a9942a
 DIST gnubiff-2.2.13.tar.gz 848538 RMD160 30659e4e9ce9f232c6b79deae78f3900af745087 SHA1 693bd245b8aaccec74d3ada505dc7ceb4efdb8fc SHA256 42ef54b6add17e57603728fc08a53ecbdc2a9d9e35de7455d4c43dff1e1ca5f3
 EBUILD gnubiff-2.2.13-r1.ebuild 1216 RMD160 f3f2046359d55a0eae5f1e3b84744f11f6b98357 SHA1 a095e0fe393394f00d6050c7ae068d4a9479c9d7 SHA256 e0ce4b6b229e9079082c572cb222ec7863aeb94b6b023a489078b292888856a9
-MISC ChangeLog 4999 RMD160 e53c4b3784ce5830db8f2d0e7a00d60a6979908b SHA1 b45698e16cc4e90872a44001d0e1637441fa7be9 SHA256 ee3e6a18caab7e07fd5cc0ea2f050d7a4647389a53dd9f1cc17975ec3508b354
+EBUILD gnubiff-2.2.13-r2.ebuild 1246 RMD160 bb4908b04eb5460e7738f535f9b6ba1a3dcbd30c SHA1 1de9e72133fcc5b7134b93d83353731a0e811fe3 SHA256 c3f0a7e612871343e9163441652685168d24b2a17a1441b77162dfc239f8be82
+MISC ChangeLog 5185 RMD160 5c909df984301b3bbd47bff7eba9bb021a9d336a SHA1 2217435b632429f3aab04e01d13417c3a157cc1a SHA256 bbbb64de8d3169a0f2c073f3576013572c6d653c46e211f6ad801e96a2dbcd24
 MISC metadata.xml 273 RMD160 6f1255cdc5aca61d5dcb7443a82b7efc0d01d630 SHA1 14320ff253cdc06f0cf869720802f2f5cfbe3bfc SHA256 8ac6ca0ce9f35cd2aac5fbda074690cdfee7018157ce59475fdf3e2c522f796d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNilrjAAoJEEqz6FtPBkyjzCEH/AoFzO6bEA3mkZugb2hHlFXh
-Y2LYOE3Pfwoj08QqTzd0eaYidIW1BahLFLB/muIRjsF1rtV+IxPR5w3fpOcNeHUV
-4dgf5lBX1LKPNrRhgXYXUAycv/FkH7Z0cpr0Xj7k6XwodWSFl8JaGIi3mZZimYHg
-6FRtefwRCPyRh47gsS1WtZR9cXLuOQv59nnVMWCFYbmW1MPtl+4T5rfqrWaATCEb
-a8XqCt0MUtejRxucTVDXokfypUd/b5hZPgt8o/TphK7HnY+8BTXbJmMnIf40mQoJ
-LSCgm61P0lDfr2jxhW8eSOg6wtKhICRibBcYEbIohdxotN9WejoIC/RrbTzriFA=
-=GAUL
+iQIcBAEBCAAGBQJN6pIfAAoJEHfx8XVYajsfANkP/iBKVQex2ydA799Ex5cTN/af
+FN4ftkYuGVLq2iwFOUHpagwu8wV0AzKKCYGkLn0+L7mLLuUJkblau4xA+OdS2jhq
+MGYpWqIgAOwAGRtC0akOsEFEEWmLp5enKGv+rZzwxUm8qjGcLN9aNt5x5ps/nrJA
+amrXZRYiFCM8MahLzANu9aye4xQ7si71RbPg3G4HXUSdA7PaKFxorMGOZbPYvGaT
+D9yT+dEYRLpsyEFGCzo2lTOQrBCGH2Zl1QpNFzephCrkjKqAWeQ2eeDeshallTTM
+/pIZX25aNvAkiM7YqnNylOGdOZSi4qDU2u+OAzOQdqWCkPJyMhAENN2w0iJyZGGY
+ki5D8JWyL6rf0IqRrloqQJgjVlIynlf03+GoSzmNSeCvVAe9dOebCARNaVnxWnxp
+W0klMIjNlbDXnIa9i5IFhjn2C3dKKTcHnyrgfJ4f4eCBXB1MNRY1uEjKV5JneTK7
+rT8kCH8YM2AyYeaaDmELm/58PN/e2HOcHj5W3aHmqGHoOeR+q0DGaVsZtxbqqc4R
+fBNambxGb2Nu+iLn4nwlU5z4J1Y3KY+ZASumZh52pUY6AX98WeIAixllsb+khO5h
+s3H2/Nf9x8mtPWqbu0/z+gxeDgURYnVDFk4rOpFzdBGcdZPOgQuqqQcuLDj1ma6J
+KikUdDRj/jo+ovimb5dl
+=QCBe
 -----END PGP SIGNATURE-----
diff --git a/net-mail/gnubiff/files/gnubiff-2.2.13-gold.patch b/net-mail/gnubiff/files/gnubiff-2.2.13-gold.patch
new file mode 100644
index 000000000000..d19199051cce
--- /dev/null
+++ b/net-mail/gnubiff/files/gnubiff-2.2.13-gold.patch
@@ -0,0 +1,20 @@
+commit f8e7c9bc6c119a29df552f203f0b408d361ea79d
+Author: Eray Aslan <eras@gentoo.org>
+Date:   Sat Jun 4 19:54:16 2011 +0000
+
+    do not underlink - needed for gold
+
+diff --git a/configure.ac b/configure.ac
+index 373d5b9..e69eeb2 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -117,6 +117,9 @@ AC_CHECK_LIB(ssl, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1,
+ 			 Define to 1 if AES encryption is available), [
+ 	AC_CHECK_LIB(crypto, AES_encrypt, AC_DEFINE_UNQUOTED(HAVE_AES, 1))])
+ 
++dnl needed for gold
++AC_CHECK_LIB([X11],[XSync])
++
+ dnl GLIB, GTK, ...
+ GTK_REQUIRED="gtk+-2.0 >= 2.6"
+ GDK_PIXBUF_REQUIRED="gdk-pixbuf-2.0 >= 2.4"
diff --git a/net-mail/gnubiff/gnubiff-2.2.13-r2.ebuild b/net-mail/gnubiff/gnubiff-2.2.13-r2.ebuild
new file mode 100644
index 000000000000..dfa2d12a1821
--- /dev/null
+++ b/net-mail/gnubiff/gnubiff-2.2.13-r2.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/gnubiff/gnubiff-2.2.13-r2.ebuild,v 1.1 2011/06/04 20:14:09 eras Exp $
+
+EAPI=4
+
+inherit eutils autotools
+
+DESCRIPTION="A mail notification program"
+HOMEPAGE="http://gnubiff.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~x86"
+IUSE="debug fam gnome nls password"
+
+RDEPEND=">=x11-libs/gtk+-2.6:2
+	>=gnome-base/libglade-2.3
+	dev-libs/popt
+	gnome? (
+		|| ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 )
+		>=gnome-base/libgnome-2.2
+		>=gnome-base/libgnomeui-2.2 )
+	password? ( dev-libs/openssl )
+	fam? ( virtual/fam )
+	x11-proto/xproto"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-fix-nls.patch
+	epatch "${FILESDIR}"/${P}-gold.patch
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable debug) \
+		$(use_enable gnome) \
+		$(use_enable nls) \
+		$(use_enable fam) \
+		$(use_with password) \
+		$(use_with password password-string ${RANDOM}${RANDOM}${RANDOM}${RANDOM})
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog NEWS README THANKS TODO
+}