Bug #117900, rrdtool is optional, and the procmail interface is usable without procmail. Bug #125926, fix LDFLAGS.

Package-Manager: portage-2.1_pre6-r7

4 files changed, 48 insertions, 20 deletions

diff --git a/mail-filter/dcc/ChangeLog b/mail-filter/dcc/ChangeLog
index 8c620f5df8ea..46931f896c41 100644
--- a/mail-filter/dcc/ChangeLog
+++ b/mail-filter/dcc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for mail-filter/dcc
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.26 2006/03/14 01:20:10 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/ChangeLog,v 1.27 2006/03/26 10:07:28 robbat2 Exp $
+
+  26 Mar 2006; Robin H. Johnson <robbat2@gentoo.org> dcc-1.3.24.ebuild:
+  Bug #117900, rrdtool is optional, and the procmail interface is usable
+  without procmail. Bug #125926, fix LDFLAGS.
 
   14 Mar 2006; Gustavo Zacarias <gustavoz@gentoo.org> dcc-1.3.16.ebuild,
   dcc-1.3.24.ebuild:
diff --git a/mail-filter/dcc/Manifest b/mail-filter/dcc/Manifest
index 9301a414a33b..e1317d00bbf7 100644
--- a/mail-filter/dcc/Manifest
+++ b/mail-filter/dcc/Manifest
@@ -1,22 +1,36 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 df4b1e10d19f7d8af4e2bd5f37fb926c ChangeLog 3310
+MD5 b3d6880a749c4554d424ee01ee72d18a ChangeLog 3501
+RMD160 6baf67f7a9776795a24cfda889c0bba8153a16c2 ChangeLog 3501
+SHA256 20340a51e68463763552caf8ef97c41d97ee3fdd17f8809970df0d1d1f087aa6 ChangeLog 3501
 MD5 9820a1516eab5f987d0acc4937109f37 dcc-1.2.28-r1.ebuild 3468
+RMD160 e958315b9654cf7e5d7619950081ef476e1e8f8d dcc-1.2.28-r1.ebuild 3468
+SHA256 507ca243301c205015ca63876c80756e090c443756eaf12d3695040a35de90de dcc-1.2.28-r1.ebuild 3468
 MD5 088846b45a9f76ff360b59e162aa691b dcc-1.2.28.ebuild 3142
+RMD160 28ddd3eca40715e37096c23a2d53c45d81f62083 dcc-1.2.28.ebuild 3142
+SHA256 f43cb4990f0c671ae8aa4e2f1abb61e62f13224b7ccdb08feb16db636694085e dcc-1.2.28.ebuild 3142
 MD5 44316ec77134d08f57f6b7092d506758 dcc-1.2.74.ebuild 3558
+RMD160 76a9c011b18f941a8c5a6bd8b471bfd50965fa65 dcc-1.2.74.ebuild 3558
+SHA256 83c5442dd7e884c87ea085a9d7075b230a8b6586cafbc345d6d3559037589e8e dcc-1.2.74.ebuild 3558
 MD5 75ab14e5347b8297758ab9fcdbf4419f dcc-1.3.16.ebuild 3546
-MD5 781d9cb53a407d6078fa09dfac23b08d dcc-1.3.24.ebuild 3642
+RMD160 1195752487ba73e82cc5e3efc97410afed8e4dc6 dcc-1.3.16.ebuild 3546
+SHA256 5b01ec8e443cf18d090a584f44cc52fd94e7a7fe5aaef0ad5cffb05555e7f2a7 dcc-1.3.16.ebuild 3546
+MD5 2f0c990719945740669b316ab41dd33b dcc-1.3.24.ebuild 3935
+RMD160 358bf5bbefa6bdd068f874eca61c27baf97f39d8 dcc-1.3.24.ebuild 3935
+SHA256 c37fe2cb7fb99bf1590586a30b9a72076ae48a5168971f11a6057b4500c85d17 dcc-1.3.24.ebuild 3935
 MD5 f4024b299ddf4d0921ef9dc6cce1b0c3 files/digest-dcc-1.2.28 67
+RMD160 5c04163e71870bfd08291466ffce46aaee31269e files/digest-dcc-1.2.28 67
+SHA256 1237d991925a80fd6ee9f07d2b18a059f08b9af3fcebb937decd2c5b23eacd36 files/digest-dcc-1.2.28 67
 MD5 f4024b299ddf4d0921ef9dc6cce1b0c3 files/digest-dcc-1.2.28-r1 67
+RMD160 5c04163e71870bfd08291466ffce46aaee31269e files/digest-dcc-1.2.28-r1 67
+SHA256 1237d991925a80fd6ee9f07d2b18a059f08b9af3fcebb937decd2c5b23eacd36 files/digest-dcc-1.2.28-r1 67
 MD5 1e48ac518bb2e13c6194d45732e6efa5 files/digest-dcc-1.2.74 67
+RMD160 13f15cefc8b4da6218bad75db6a1c40264b1d229 files/digest-dcc-1.2.74 67
+SHA256 81e22c21173bb4bb962fe3ca79153a8e5338e06f6676d5d7b83da779f9aa0149 files/digest-dcc-1.2.74 67
 MD5 fb9e3179011fd75dc427787fbcd6a028 files/digest-dcc-1.3.16 67
-MD5 fff69962c33a1f171df123bd9953845d files/digest-dcc-1.3.24 67
+RMD160 ef82e9b49e3dd84888cdb2de7fd0e00f65022853 files/digest-dcc-1.3.16 67
+SHA256 08bedcf7846ea76c89f61b1aea51783cdb0cf7c976e1d84ad87094006d46cb82 files/digest-dcc-1.3.16 67
+MD5 a055d56425b58fa58fd225c92c063d58 files/digest-dcc-1.3.24 247
+RMD160 fe31df476cdddfb19965d2639657d583d5fa03b3 files/digest-dcc-1.3.24 247
+SHA256 d1edff47a4b87b36b3de0dcf0f708aaebfe71db0d776892437a3b7a123183a22 files/digest-dcc-1.3.24 247
 MD5 5e658b705b2985d36d82b2a5d218ec78 metadata.xml 224
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.1-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFEFhpfKRy60XGEcJIRAoTqAKCgwRwIObfhPZyigrW9T49Lg4SSFgCcC2Q9
-cREvUFMyWnFP8x1JLz/rGp8=
-=dPKi
------END PGP SIGNATURE-----
+RMD160 7a7b22292aa2fdfd4c9e3f9abe62aff83170f428 metadata.xml 224
+SHA256 d67b611ce73649753af8a136a53c5dfae6628c053d01687779f108753fd20929 metadata.xml 224
diff --git a/mail-filter/dcc/dcc-1.3.24.ebuild b/mail-filter/dcc/dcc-1.3.24.ebuild
index 188afc309664..810bc65f32c0 100644
--- a/mail-filter/dcc/dcc-1.3.24.ebuild
+++ b/mail-filter/dcc/dcc-1.3.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.24.ebuild,v 1.5 2006/03/14 01:20:12 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-filter/dcc/dcc-1.3.24.ebuild,v 1.6 2006/03/26 10:07:28 robbat2 Exp $
 
 inherit flag-o-matic
 
@@ -15,8 +15,7 @@ KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="ipv6"
 
 RDEPEND="dev-lang/perl
-	net-analyzer/rrdtool
-	|| ( mail-filter/procmail mail-mta/courier )
+	rrdtool? ( net-analyzer/rrdtool )
 	|| ( net-misc/wget www-client/fetch net-misc/curl net-ftp/ftp )
 	virtual/libc"
 DEPEND="sys-apps/sed
@@ -42,7 +41,7 @@ src_compile() {
 		cgi-bin/Makefile.in
 
 	local myconf
-	export LDFLAGS="$(bindnow-flags)"
+	append-ldflags $(bindnow-flags)
 	myconf="${myconf} --homedir=${dcc_homedir}"
 	myconf="${myconf} --libexecdir=${dcc_libexec}"
 	myconf="${myconf} --bindir=/usr/bin"
@@ -91,8 +90,17 @@ src_install() {
 	einfo "Providing cronjob"
 	mv ${D}/usr/bin/cron-dccd ${D}/etc/cron.daily/dccd
 
-	einfo "Puting system code in sbin instead of bin"
-	mv ${D}/usr/bin/{dbclean,dblist,dccd,dccsight,start-dccd,stop-dccd,wlist,dcc-stats-graph,newwebuser,dcc-stats-init,stats-get,dcc-stats-collect,dccifd,start-grey,start-dccifd,fetch-testmsg-whitelist} ${D}/usr/sbin/
+	einfo "Putting system code in sbin instead of bin"
+	mv ${D}/usr/bin/{dbclean,dblist,dccd,dccsight,start-dccd,stop-dccd,wlist,newwebuser,stats-get,dccifd,start-grey,start-dccifd,fetch-testmsg-whitelist} ${D}/usr/sbin/ || die "Failed to move apps to sbin"
+
+	statslist="${D}/usr/bin/{dcc-stats-graph,dcc-stats-init,dcc-stats-collect}"
+	if use rrdtool; then
+		einfo "Installing rrdtool interface scripts"
+		eval mv $statslist ${D}/usr/sbin/ || die "Failed to move rrdtool apps"
+	else
+		einfo "Removing rrdtool interface scripts"
+		rm -f ${statslist} || die "Failed to clean up rrdtool scripts"
+	fi
 
 	einfo "Cleaning up"
 	rm -f ${D}/usr/bin/{logger,hackmc,na-spam,ng-spam,rcDCC,start-dccm,updatedcc}
diff --git a/mail-filter/dcc/files/digest-dcc-1.3.24 b/mail-filter/dcc/files/digest-dcc-1.3.24
index f3e33054e14b..532ff320e1fa 100644
--- a/mail-filter/dcc/files/digest-dcc-1.3.24
+++ b/mail-filter/dcc/files/digest-dcc-1.3.24
@@ -1 +1,3 @@
 MD5 2d8a135e48bcae6a2cf4f62acaf8298c dcc-dccd-1.3.24.tar.Z 1392701
+RMD160 39874c3ba844555534ccae4bb17d4b6d7c4a4d62 dcc-dccd-1.3.24.tar.Z 1392701
+SHA256 2ae4b63a9ac5168ca3ff3e3a4a3de2d5494548f09b059139c8fc885fce350851 dcc-dccd-1.3.24.tar.Z 1392701