Version bump; remove obsolete non-stable versions; add patch to fix ldflags handling (bug #335955); fix symlinked autotools.

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

6 files changed, 68 insertions, 53 deletions

diff --git a/sys-fs/quotatool/ChangeLog b/sys-fs/quotatool/ChangeLog
index 7844fd7b8cd8..c9bda171bfe1 100644
--- a/sys-fs/quotatool/ChangeLog
+++ b/sys-fs/quotatool/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-fs/quotatool
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quotatool/ChangeLog,v 1.8 2007/06/04 18:04:01 robbat2 Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quotatool/ChangeLog,v 1.9 2011/01/13 13:51:25 flameeyes Exp $
+
+*quotatool-1.4.11 (13 Jan 2011)
+
+  13 Jan 2011; Diego E. Pettenò <flameeyes@gentoo.org>
+  -quotatool-1.4.7.ebuild, -quotatool-1.4.8.ebuild, -quotatool-1.4.9.ebuild,
+  +quotatool-1.4.11.ebuild, +files/quotatool-1.4.11-ldflags.patch:
+  Version bump; remove obsolete non-stable versions; add patch to fix ldflags
+  handling (bug #335955); fix symlinked autotools.
 
 *quotatool-1.4.9 (04 Jun 2007)
 
diff --git a/sys-fs/quotatool/Manifest b/sys-fs/quotatool/Manifest
index cac4545fad68..0cada76356e9 100644
--- a/sys-fs/quotatool/Manifest
+++ b/sys-fs/quotatool/Manifest
@@ -1,10 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX quotatool-1.4.11-ldflags.patch 830 RMD160 1f3d1c882bf0b744d138eac36c4b28583b8c12d1 SHA1 922d9de1dd6bd819d7caef2c69b3a3222c88b691 SHA256 a0a0c38eaf4095b23a49480232b692cd7f8386ae50eda19fe14d9e61f2ca53b0
+DIST quotatool-1.4.11.tar.gz 113856 RMD160 d2a88aa75b53b41d24eb61d2c084cb5fb9824837 SHA1 75e9956131a75020931fca0aa2c06789105d840a SHA256 75d83d2d47e41a5e0d9f3792e94926e2f49d70ed768df83ca521e96c007ab01c
 DIST quotatool-1.4.6.tar.gz 114836 RMD160 daa2763d2d37742e41b968cba12c84f61131d2ba SHA1 2d70b1754cf7f07664ea6f49c2f2d183a2c40e11 SHA256 7aed92f5691cd61b1291417a0eddc39a668426977d297bc4a6f912ede3662758
-DIST quotatool-1.4.7.tar.gz 113102 RMD160 6431d0941121e546c291af64b5cbbd40bd89f333 SHA1 c252aea29acfe7e95cdad086a770c122e6e9131c SHA256 58ad3e60ac209deed7919e0e347facef43461f5c4740b993af16e8184c60cb42
-DIST quotatool-1.4.8.tar.gz 113187 RMD160 c92059834e76205713ec0a30dd719ba2f2cb112f SHA1 814d87649ed8d0a68e5de067b8cf22f7fe8b446a SHA256 7ce1cf9eb84cd8eda1ee6b47bb2af049824696c3b583961d8f8e11dfaa704537
-DIST quotatool-1.4.9.tar.gz 113541 RMD160 c6a1e818ae5fc1c3826a51ee34527d41983cd95f SHA1 18954ed66e09a9c918e94014c783e0d71bf4baf9 SHA256 37ee535221ff5cfa67f2562bdffe586615fb007e55bacc3bbd8281357687a6fc
+EBUILD quotatool-1.4.11.ebuild 792 RMD160 466a071cdc6f22f57c44f8876b5c558d01efda83 SHA1 b2afc85a43af4318d9eec5951dec2d9772a31859 SHA256 d48974cc1a1b331d41365f20018ae8fd1cc35f71358be2a194a2ff974965119d
 EBUILD quotatool-1.4.6.ebuild 552 RMD160 cfd0ed9eeccc4ed050a187a5c03c4796f1d066cf SHA1 cc075ded89c5f237ed9f5c3370e45ddb3fcee6df SHA256 b6b296afbbab1f71c005d32809c836c910e7fdbbcbae4c3f1b563d57fa884c7c
-EBUILD quotatool-1.4.7.ebuild 561 RMD160 173fd7e3e5323f2a7b2243906b11b392e6a6771c SHA1 36f20225c82fa53dbaaefc5f92c88014376e4178 SHA256 5e7f7e5149514009ee7dca1ae032f2e0587b4bee45deaec1a9a0f9b524cb96f5
-EBUILD quotatool-1.4.8.ebuild 561 RMD160 00586a5b5e29689135bf348a2a1f90bb68f95271 SHA1 8d906cc5429229d987d3791b1c615c3c7e91cd58 SHA256 b579fdf424be7ee5fdc0ffa1be8da76cc2e5e6e8000deb2fd803e641b01f8577
-EBUILD quotatool-1.4.9.ebuild 562 RMD160 5859f24fdc471bc5d712096018b4b4a732c08064 SHA1 64bbd9e90191bd472741367bf8bc4b5bbba8610b SHA256 5d19a91c8e856e5e7453a0144e1cbed70b836e225e7a6675fe45d0ce8edbe45c
-MISC ChangeLog 1072 RMD160 efeab1b749670b01bd7ad44364b11c4cc97ce98e SHA1 f4f7eabfa7ae5ae7cc4afc69e5658896f0651011 SHA256 aaa06dc3cfc5ea81b0f7c498e8d0b0720c16e59bb1e6ae1d6d19c95db42e7fc9
+MISC ChangeLog 1437 RMD160 50fd042df1254959c69ee5e19d083c5238bea513 SHA1 bec0419b842041cd760747c0ce9e46fdab72c20d SHA256 7c636303393a3f5956cb401c181abe531e323d0526af18fe4b9d660f7b6d1555
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAk0vAzIACgkQAiZjviIA2Xhn9wCfQ1EydB+XO1upTbdWuknc5JHA
+ItgAn3LjizdwC2+o3wFqdW/O09UdsHGj
+=Vz2p
+-----END PGP SIGNATURE-----
diff --git a/sys-fs/quotatool/files/quotatool-1.4.11-ldflags.patch b/sys-fs/quotatool/files/quotatool-1.4.11-ldflags.patch
new file mode 100644
index 000000000000..4f028227db7b
--- /dev/null
+++ b/sys-fs/quotatool/files/quotatool-1.4.11-ldflags.patch
@@ -0,0 +1,27 @@
+Index: quotatool-1.4.11/local.mk.in
+===================================================================
+--- quotatool-1.4.11.orig/local.mk.in
++++ quotatool-1.4.11/local.mk.in
+@@ -17,7 +17,8 @@ SHELL           :=   /bin/sh
+ 
+ CC              :=   @CC@
+ CFLAGS          :=   @CFLAGS@
+-CPPFLAGS         =   $(inc) @DEFS@
++LDFLAGS         :=   @LDFLAGS@
++CPPFLAGS         =   @CPPFLAGS@ $(inc) @DEFS@
+ 
+ 
+ INSTALL         :=   @INSTALL@
+Index: quotatool-1.4.11/Makefile
+===================================================================
+--- quotatool-1.4.11.orig/Makefile
++++ quotatool-1.4.11/Makefile
+@@ -58,7 +58,7 @@ subdirs    :=   src
+ # compile the program (and the objects)
+ all: $(prog)
+ $(prog): $(objs) 
+-	$(CC) -o $(prog) $(objs) $(libs) $(CFLAGS)
++	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) -o $(prog) $(objs) $(libs)
+ 
+ 
+ 
diff --git a/sys-fs/quotatool/quotatool-1.4.7.ebuild b/sys-fs/quotatool/quotatool-1.4.11.ebuild
index 10a2575903f2..526d899a0591 100644
--- a/sys-fs/quotatool/quotatool-1.4.7.ebuild
+++ b/sys-fs/quotatool/quotatool-1.4.11.ebuild
@@ -1,6 +1,10 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quotatool/quotatool-1.4.7.ebuild,v 1.1 2005/07/17 13:29:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/quotatool/quotatool-1.4.11.ebuild,v 1.1 2011/01/13 13:51:25 flameeyes Exp $
+
+EAPI=2
+
+inherit autotools eutils
 
 DESCRIPTION="command-line utility for filesystem quotas"
 HOMEPAGE="http://quotatool.ekenberg.se/"
@@ -12,9 +16,18 @@ KEYWORDS="~amd64 ~ppc ~x86"
 IUSE=""
 
 RDEPEND="sys-fs/quota"
+DEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-ldflags.patch"
+
+	# rebuild autotools since it uses symlinked copies of support files
+	# that we can't rely on.
+	eautoreconf
+}
 
 src_install () {
 	dobin quotatool || die
-	doman man/quotatool.8
-	dodoc AUTHORS ChangeLog README TODO
+	doman man/quotatool.8 || die
+	dodoc AUTHORS ChangeLog README TODO || die
 }
diff --git a/sys-fs/quotatool/quotatool-1.4.8.ebuild b/sys-fs/quotatool/quotatool-1.4.8.ebuild
deleted file mode 100644
index 3b9c821338b8..000000000000
--- a/sys-fs/quotatool/quotatool-1.4.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quotatool/quotatool-1.4.8.ebuild,v 1.1 2006/01/26 01:09:48 vapier Exp $
-
-DESCRIPTION="command-line utility for filesystem quotas"
-HOMEPAGE="http://quotatool.ekenberg.se/"
-SRC_URI="http://quotatool.ekenberg.se/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/quota"
-
-src_install () {
-	dobin quotatool || die
-	doman man/quotatool.8
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/sys-fs/quotatool/quotatool-1.4.9.ebuild b/sys-fs/quotatool/quotatool-1.4.9.ebuild
deleted file mode 100644
index 337f1110ed4a..000000000000
--- a/sys-fs/quotatool/quotatool-1.4.9.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/quotatool/quotatool-1.4.9.ebuild,v 1.1 2007/06/04 18:04:01 robbat2 Exp $
-
-DESCRIPTION="command-line utility for filesystem quotas"
-HOMEPAGE="http://quotatool.ekenberg.se/"
-SRC_URI="http://quotatool.ekenberg.se/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="sys-fs/quota"
-
-src_install () {
-	dobin quotatool || die
-	doman man/quotatool.8
-	dodoc AUTHORS ChangeLog README TODO
-}