Fix paths in patches. Respect CFLAGS (bug #241058).

Package-Manager: portage-2.2_rc62/cvs/Linux i686

6 files changed, 72 insertions, 18 deletions

diff --git a/net-mail/qmrtg/ChangeLog b/net-mail/qmrtg/ChangeLog
index d524ab8e87ac..805144cc1421 100644
--- a/net-mail/qmrtg/ChangeLog
+++ b/net-mail/qmrtg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/qmrtg
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmrtg/ChangeLog,v 1.4 2009/09/23 19:10:51 patrick Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmrtg/ChangeLog,v 1.5 2010/02/12 16:50:30 jer Exp $
+
+*qmrtg-2.1-r1 (12 Feb 2010)
+
+  12 Feb 2010; Jeroen Roovers <jer@gentoo.org> qmrtg-2.1.ebuild,
+  +qmrtg-2.1-r1.ebuild, files/mrtg.cfg.patch, files/qmrtg.conf.sample.patch:
+  Fix paths in patches. Respect CFLAGS (bug #241058).
 
   23 Sep 2009; Patrick Lauer <patrick@gentoo.org> qmrtg-2.1.ebuild:
   Remove virtual/libc
diff --git a/net-mail/qmrtg/Manifest b/net-mail/qmrtg/Manifest
index 176782a63f8e..db483c615401 100644
--- a/net-mail/qmrtg/Manifest
+++ b/net-mail/qmrtg/Manifest
@@ -1,6 +1,7 @@
-AUX mrtg.cfg.patch 3569 RMD160 e0736737f96d7c095b10b003f8287a681572e5cc SHA1 7ecc60d8fad2ad673a3830e3d526694106104a3d SHA256 adf0c8b78e70f045a247ee5e28dc68bdf74062dcf2660bfff4a6ff14ccf97e61
-AUX qmrtg.conf.sample.patch 603 RMD160 2f8d397fef05d5c6db30988ffdf466deee3b8b66 SHA1 63da4ce472788aee1a3f32dde94f3aec8c642b96 SHA256 f3de43849b7e60743fb009b8f27aec082e543730a9dd1241e9712417d0ffc652
+AUX mrtg.cfg.patch 3602 RMD160 70d2ff50b05d484efbf4028fbd9663ee130fd5c6 SHA1 15f35192d8f5a2a20eccc14cb9201a84661aefa2 SHA256 f008d5a89c80eeb3c6ff587b6591c9d3a656a4ada34736488f3ca99387ee31aa
+AUX qmrtg.conf.sample.patch 636 RMD160 f99e4ba7b6bd406b3d8e2cf0d6399877a67b96ae SHA1 d22ed5996d3c3a99d2ee2722d89be6a55a83d6bb SHA256 b4fe8622857385b38a88134ef42000199bf08ebbab6d7e08b59ab3902b2db6f7
 DIST qmrtg-2.1.tar.gz 97255 RMD160 6c9f6f9b8176b885a0277a6738715e8651740be2 SHA1 a929ddd5659d9613f6966e81852064b02dec4b18 SHA256 6f8cd553f2c2ae66c7177694e96d6ee78e4892bdfd2b6227bffda184d1dcb5dd
-EBUILD qmrtg-2.1.ebuild 1226 RMD160 98b1fbd08b13a6852a9ae1e9bc1f540897641c96 SHA1 79a81a704128bbb12cd8f118ffb920a24c205fb8 SHA256 7c4494e420675172fd8762c5de3867552fab8bb4857c4a1b1984eb4901ba098c
-MISC ChangeLog 769 RMD160 19c00fc67717adc42c096b6e93f2d017d842945f SHA1 8b3bc247a2fed9e10c30eda024baeacbba7037b4 SHA256 721380d43b19cf8cfca42cc318d8dece102272cee4d526c663f8660199ecf83f
+EBUILD qmrtg-2.1-r1.ebuild 1222 RMD160 dd80cfbef8c059c70b0355e22637640f063b0dd5 SHA1 0799abd9341958da02ca4ed4a79f6e4017f59806 SHA256 a95ccbb2cec3b279acd9cd0ac679eb361c05480c54c5d879d284747cd7c2df93
+EBUILD qmrtg-2.1.ebuild 1137 RMD160 45dfa7f32d1a5ae4098feb4e867f5b4303e20588 SHA1 a2a08bb720fef465c006e2048cabfb635c8ff47e SHA256 053334404cbaad394aa6f90ec02d470743317b3060e37080c86fbed47e67874c
+MISC ChangeLog 991 RMD160 441bcda8446cc1da3fe1ba1a2e21939fbe38bfa2 SHA1 059bc3dc19c672ae7b86a8b75ce874981c4ab234 SHA256 38c394be623a45c6ae32d14b583ee469550d87e310864384ba771b8b95d1cf10
 MISC metadata.xml 159 RMD160 28e799fe0fd02aaab9d4bbe5595f133101606f5b SHA1 9f5df3eabd621951a959cc8e0e2e0d352cd1fe1e SHA256 b75c711bd971e46f0ec957e833c60879b0c5023e0bb94409a6255781b69f6dc6
diff --git a/net-mail/qmrtg/files/mrtg.cfg.patch b/net-mail/qmrtg/files/mrtg.cfg.patch
index bc1a51293d1d..6e8cf0724400 100644
--- a/net-mail/qmrtg/files/mrtg.cfg.patch
+++ b/net-mail/qmrtg/files/mrtg.cfg.patch
@@ -1,5 +1,5 @@
---- mrtg.cfg	2006-06-18 09:23:40.000000000 +0200
-+++ examples/mrtg.cfg	2006-06-18 09:54:30.653950445 +0200
+--- qmrtg-2.1.org/examples/mrtg.cfg	2006-06-18 09:23:40.000000000 +0200
++++ qmrtg-2.1/examples/mrtg.cfg	2006-06-18 09:54:30.653950445 +0200
 @@ -52,7 +52,7 @@
  Directory[qmail.deliveries]: qmail.deliveries
  MaxBytes[qmail.deliveries]: 10000
diff --git a/net-mail/qmrtg/files/qmrtg.conf.sample.patch b/net-mail/qmrtg/files/qmrtg.conf.sample.patch
index 28e4d0cae042..6b101a2f0c8f 100644
--- a/net-mail/qmrtg/files/qmrtg.conf.sample.patch
+++ b/net-mail/qmrtg/files/qmrtg.conf.sample.patch
@@ -1,5 +1,5 @@
---- qmrtg.conf.sample	2006-06-18 09:23:40.000000000 +0200
-+++ examples/qmrtg.conf.sample	2006-06-18 10:06:13.150506247 +0200
+--- qmrtg-2.1.org/examples/qmrtg.conf.sample	2006-06-18 09:23:40.000000000 +0200
++++ qmrtg-2.1/examples/qmrtg.conf.sample	2006-06-18 10:06:13.150506247 +0200
 @@ -6,7 +6,7 @@
   # this it where qmrtg keeps its dbfiles
   # dbfiles are a few little files used
diff --git a/net-mail/qmrtg/qmrtg-2.1-r1.ebuild b/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
new file mode 100644
index 000000000000..68ae1fdf8f9b
--- /dev/null
+++ b/net-mail/qmrtg/qmrtg-2.1-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmrtg/qmrtg-2.1-r1.ebuild,v 1.1 2010/02/12 16:50:30 jer Exp $
+
+EAPI="2"
+
+inherit eutils
+
+DESCRIPTION="A tool to analyze qmail's activity with the goal to graph everything through MRTG."
+HOMEPAGE="http://dev.publicshout.org/qmrtg"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+DEPEND=""
+RDEPEND="net-analyzer/mrtg"
+
+src_prepare() {
+	sed -i analyzers/Makefile.in filters/Makefile.in \
+		-e 's|^CFLAGS =|CFLAGS ?=|g' || die "sed failed"
+
+	epatch "${FILESDIR}/mrtg.cfg.patch"
+	epatch "${FILESDIR}/qmrtg.conf.sample.patch"
+}
+
+src_install () {
+	emake install DESTDIR=${D} || die "emake install failed"
+	keepdir /var/lib/qmrtg
+	dodoc INSTALL.txt
+	if use doc ; then
+		docinto txt
+		dodoc doc/*.txt
+		docinto html
+		dohtml -r html/*
+	fi
+
+	insinto /usr/share/qmrtg2
+	doins examples/*
+
+}
+
+pkg_postinst () {
+	elog
+	elog "You need to configure manually qmrtg in order to run it."
+	elog "The configuration templates in /usr/share/qmrtg2/ and"
+	elog "the INSTALL file in /usr/share/doc/qmrtg-2.1/"
+	elog "will be useful."
+	elog
+}
diff --git a/net-mail/qmrtg/qmrtg-2.1.ebuild b/net-mail/qmrtg/qmrtg-2.1.ebuild
index 46c31c36204a..5de6fd6e92c6 100644
--- a/net-mail/qmrtg/qmrtg-2.1.ebuild
+++ b/net-mail/qmrtg/qmrtg-2.1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/qmrtg/qmrtg-2.1.ebuild,v 1.5 2009/09/23 19:10:51 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/qmrtg/qmrtg-2.1.ebuild,v 1.6 2010/02/12 16:50:30 jer Exp $
 
 inherit eutils
 
 DESCRIPTION="A tool to analyze qmail's activity with the goal to graph everything through MRTG."
 HOMEPAGE="http://dev.publicshout.org/qmrtg"
-SRC_URI="${HOMEPAGE}/download/${PN}-${PV}.tar.gz"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
@@ -23,11 +23,6 @@ src_unpack() {
 	epatch "${FILESDIR}/qmrtg.conf.sample.patch"
 }
 
-src_compile () {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
 src_install () {
 	emake install DESTDIR=${D} || die "emake install failed"
 	keepdir /var/lib/qmrtg