net-ftp/pureadmin: Add fix for gold, #369103

Package-Manager: portage-2.2.0_alpha110/cvs/Linux x86_64

5 files changed, 71 insertions, 22 deletions

diff --git a/net-ftp/pureadmin/ChangeLog b/net-ftp/pureadmin/ChangeLog
index 4590d13d0841..8ebf2015c762 100644
--- a/net-ftp/pureadmin/ChangeLog
+++ b/net-ftp/pureadmin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/pureadmin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/ChangeLog,v 1.21 2012/05/03 05:37:18 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/ChangeLog,v 1.22 2012/06/21 11:25:00 jlec Exp $
+
+  21 Jun 2012; Justin Lecher <jlec@gentoo.org> pureadmin-0.4-r1.ebuild,
+  +files/pureadmin-0.4-gold.patch, metadata.xml:
+  Add fix for gold, #369103
 
   03 May 2012; Jeff Horelick <jdhore@gentoo.org> pureadmin-0.2.2.ebuild,
   pureadmin-0.3.ebuild, pureadmin-0.4-r1.ebuild:
diff --git a/net-ftp/pureadmin/Manifest b/net-ftp/pureadmin/Manifest
index 49d1564baa5a..d9ad71cde46f 100644
--- a/net-ftp/pureadmin/Manifest
+++ b/net-ftp/pureadmin/Manifest
@@ -1,8 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX pureadmin-0.4-gold.patch 842 RMD160 3594c35f5453e9957062166a4cf515df36f8881d SHA1 c4ec64eea4be4455aca45a1c9e7dfb2cf699c874 SHA256 59813b8d7e2855c002476538ddb979b36768f002887ab26ea580872351982795
 DIST pureadmin-0.2.2.tar.gz 274465 RMD160 dac8915c292372444b3afef9c100170ea039fc5e SHA1 5ab5b349da2d712d305f33a48473e3c638435a70 SHA256 518db8c0805657fa955bdcc74d7d42887d73dba5c36187927e6495a987ab9de1
 DIST pureadmin-0.3.tar.gz 298177 RMD160 80a81b75051d4d2ff29222883109d42f78bb2cf8 SHA1 44c19f16f5e2a4c5204c56a5feeeca52ef255ce2 SHA256 cec867194ee8c2e647dedf0d3d152c033a1bcdfaf3b1e83869b3ada8d9d3e866
 DIST pureadmin-0.4.tar.gz 386739 RMD160 6ce197bba054afa35c459818e92a553480d26821 SHA1 2ba6260bd13c03eecf7ef919fe826ffa5c256b3f SHA256 d7a43da0eb16ad5d57ac4ffe045004977186b2bacb244cb8c5239e2e0b3a2112
 EBUILD pureadmin-0.2.2.ebuild 1351 RMD160 57a13a4dd0b8510a883edcad153dfbc1c58f3071 SHA1 9647bd9a547b071267090a556097ec1427e784fd SHA256 4426d0d81f1d36caddc1ed3518c7a3f9bb3b8e1129768457b2aa4d0a7c2b9ca9
 EBUILD pureadmin-0.3.ebuild 1351 RMD160 2ba150df6a6bf258821abe39b4f4b4038d389550 SHA1 3e8f55dfee38d02f5926ecd3034791bab60ecb60 SHA256 1a34a2ba1317d4f013a2580e8fbc330f7ba87bfa14c5263f90197f9d858c971d
-EBUILD pureadmin-0.4-r1.ebuild 1522 RMD160 46776d08f06ad58df66453bf89ffda7c9bf70183 SHA1 c16830c756022d52f714f5d58e55f8a693891483 SHA256 b91c5a45fddba4f03147b05700cf28251523886ddc01af39df5961a94eabe5a1
-MISC ChangeLog 3090 RMD160 f953240754899d6bb9cb5b7014a4ee2f74d61f0d SHA1 a7d49159ea1bf199345d6ed449983fa97bce34af SHA256 fbb8d2fe6a6d77631fdebff1d89724553276d4484e2ee7a05b0958c3fc466ef3
-MISC metadata.xml 318 RMD160 4e00a641dc53c539f011dd1e90d4f1be0d05cec9 SHA1 9273fa8cef06de681df11464c5d368dfb858662a SHA256 3905a230a1985312bfedb95a1b4192e81eeefc69726a632fada609041a73d91b
+EBUILD pureadmin-0.4-r1.ebuild 1448 RMD160 cafcdaaa41f4f6db16edac3c40727dd211d3fcd2 SHA1 91cdda383e0280685666d7df26ec034f921c076c SHA256 c6533fb75984e6a6a6bf331a0268dd9164a56fe07220abf44a90fefad237da6f
+MISC ChangeLog 3238 RMD160 90ecec1949ea0244286972bed169c374a8e10fcf SHA1 2c941eeac248fb8f5062a7ea970e3b726a716d04 SHA256 125ffe900fc8a40524ca4f4eacd7bdc7ad60f0824aa64c735b57345e3b76b4a1
+MISC metadata.xml 322 RMD160 7bc0a5a5f271436c3ed557e71ec2a7fe4174eea1 SHA1 0a1bda86e30ca3cdd95f86e38cd5b509a9ae3c12 SHA256 8d2906539db8f9944a88c0fb42669789cf49b0ea58b2385901bdfc7f5e56040f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+Comment: GPGTools - http://gpgtools.org
+
+iEYEAREKAAYFAk/jBJEACgkQgAnW8HDreRYKJACgpkmnyS3W/Ad+cNDEl1bDspjp
+o5wAn33/fZ3y/RjLRK6Jt5nKg1CmRBLd
+=s0sF
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
new file mode 100644
index 000000000000..7b19565ac10a
--- /dev/null
+++ b/net-ftp/pureadmin/files/pureadmin-0.4-gold.patch
@@ -0,0 +1,28 @@
+ src/Makefile.am |    2 +-
+ src/Makefile.in |    2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 94f61e0..0ebb561 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -38,5 +38,5 @@ pureadmin_CFLAGS = -std=gnu99 -Wall
+ 
+ pureadmin_LDFLAGS = -export-dynamic
+ 
+-pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@
++pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@ -lm -lX11
+ 
+diff --git a/src/Makefile.in b/src/Makefile.in
+index b2ade45..dd9401c 100644
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -249,7 +249,7 @@ pureadmin_SOURCES = \
+ 
+ pureadmin_CFLAGS = -std=gnu99 -Wall 
+ pureadmin_LDFLAGS = -export-dynamic
+-pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@
++pureadmin_LDADD = @GTK_LIBS@ $(INTLLIBS) @BINRELOC_LIBS@ -lm -lX11
+ all: all-am
+ 
+ .SUFFIXES:
diff --git a/net-ftp/pureadmin/metadata.xml b/net-ftp/pureadmin/metadata.xml
index faed1db766e6..b82577c71988 100644
--- a/net-ftp/pureadmin/metadata.xml
+++ b/net-ftp/pureadmin/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer>
-	<email>maintainer-needed@gentoo.org</email>
-</maintainer>
-<longdescription>Graphical tool used to make the management of PureFTPd a little easier.</longdescription>
+	<maintainer>
+		<email>maintainer-needed@gentoo.org</email>
+	</maintainer>
+	<longdescription>Graphical tool used to make the management of PureFTPd a little easier.</longdescription>
 </pkgmetadata>
diff --git a/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild b/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
index c806ac1448a6..11dcda2ce7de 100644
--- a/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
+++ b/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild
@@ -1,11 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild,v 1.4 2012/05/03 05:37:18 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/pureadmin/pureadmin-0.4-r1.ebuild,v 1.5 2012/06/21 11:25:00 jlec Exp $
+
+EAPI=4
 
-EAPI=3
 inherit eutils
 
-DESCRIPTION="PureAdmin is a GUI tool used to make the management of Pure-FTPd a little easier."
+DESCRIPTION="GUI tool used to make the management of Pure-FTPd a little easier"
 HOMEPAGE="http://purify.sourceforge.net/"
 SRC_URI="mirror://sourceforge/purify/${P}.tar.gz"
 
@@ -14,17 +15,21 @@ SLOT="0"
 KEYWORDS="amd64 ~ppc x86"
 IUSE="debug doc"
 
-RDEPEND="gnome-base/libglade:2.0
-		sys-libs/zlib
-		virtual/fam
-		x11-libs/gtk+:2"
+RDEPEND="
+	gnome-base/libglade:2.0
+	sys-libs/zlib
+	virtual/fam
+	x11-libs/gtk+:2"
 DEPEND="${RDEPEND}
-		virtual/pkgconfig"
+	virtual/pkgconfig"
 
 src_prepare() {
-	echo src/eggstatusicon.c >> po/POTFILES.skip
-	echo src/eggtrayicon.c >> po/POTFILES.skip
-	echo src/prereq_usrmanager.c >> po/POTFILES.skip
+	cat >> po/POTFILES.skip <<- EOF
+	src/eggstatusicon.c
+	src/eggtrayicon.c
+	src/prereq_usrmanager.c
+	EOF
+	epatch "${FILESDIR}"/${P}-gold.patch
 }
 
 src_configure() {
@@ -36,13 +41,13 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
+	default
 
 	# Move the docs to the correct location, if we want the docs
 	if use doc ; then
-		dodoc "${D}"usr/share/pureadmin/docs/* || die
+		dodoc "${ED}"usr/share/pureadmin/docs/*
 	fi
-	rm -Rfv "${D}"usr/share/pureadmin/docs || die
+	rm -Rfv "${ED}"usr/share/pureadmin/docs || die
 
 	make_desktop_entry pureadmin "Pure-FTPd menu config" pureadmin
 }