net-mail/qmqtool: Version bump. Cleanup.

svn path=/sunrise/; revision=10944

5 files changed, 58 insertions, 48 deletions

diff --git a/net-mail/qmqtool/ChangeLog b/net-mail/qmqtool/ChangeLog
index b626473f6..08f72cf23 100644
--- a/net-mail/qmqtool/ChangeLog
+++ b/net-mail/qmqtool/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*qmqtool-1.14 (07 Jul 2010)
+
+  07 Jul 2010; Michał Górny (sedzimir) <mgorny.3ehbo@mailnull.com>
+  -qmqtool-1.12.ebuild, +qmqtool-1.14.ebuild:
+  Version bump. Cleanup.
+
   29 Jan 2010; Piotr Szymaniak <lazy_bum@o2.pl> qmqtool-1.12.ebuild:
   Added missing dies, added src_prepare and EAPI declaration.
 
diff --git a/net-mail/qmqtool/Manifest b/net-mail/qmqtool/Manifest
index 42a6d7a2f..67b95d127 100644
--- a/net-mail/qmqtool/Manifest
+++ b/net-mail/qmqtool/Manifest
@@ -1,5 +1,4 @@
-AUX qmqtool-perlpath.patch 258 RMD160 107d994ea15121fc412a6de023998f12fbd2e5ea SHA1 2bb784a4697e2850f7d0da4de22199f41dd44b9f SHA256 54269dbde9331860e99a42f7bf116ca1db346d91c3ae336adf398ca00cd417be
-DIST qmqtool-current.tgz 18916 RMD160 457b7976f6a3c135ebf50614366255778c6caafe SHA1 37ca3ff01f27b3199ab5d005ef2b33648a32b5ee SHA256 f8691556e05daf753f02734dcd81023d44010549f8a6b60edecbe1b5a7c39fb0
-EBUILD qmqtool-1.12.ebuild 737 RMD160 d80b600c8a4735c3ed226a14741e7a4217e29f78 SHA1 0744bc5eba53be923e6421c363fe75f2f5ed2ecc SHA256 39e297ea8774a8276d84b3046337d2f2052018e820ca2cee499b0b82162fe8f8
-MISC ChangeLog 371 RMD160 e0956dfcd9bd2c63bef2897aac12c4440dd955ef SHA1 af7629d7baf0ad6e9114064aa1e3389df2fb7903 SHA256 ba27d9014db138f4426128b80374bc9e07759e1f8b8bfdf1550c08aeb8ed16ef
+DIST qmqtool-1.14.tgz 25357 RMD160 020abb26fe17f10448bb6a1619f408e4899845cf SHA1 a15ea167137697665d770574aae19f98c8caa44d SHA256 0697589f68c24a21aa5176ce29c35cc075b2f08dacf79b30269a48285c76e2c1
+EBUILD qmqtool-1.14.ebuild 1079 RMD160 21d9a0453201c95fb8d22eb210849ed72fd448fd SHA1 dc2e31575ac8c6f3e01ce6e073d7d8e8713e6fcc SHA256 26eb3940897eb4055087840af4ce7aeb68a8ef55a62525674499949219993610
+MISC ChangeLog 541 RMD160 51fde624cb0d56aeee1298addc5493045a6d31d3 SHA1 e34c0a95e8d7a397fb98dadc01ae689b13502f81 SHA256 f6bc22938278821f71c985012acffbcc89a0f1b01f11907c721787aff9b29b79
 MISC metadata.xml 229 RMD160 f0f6417bec31ce8baba6d476664f7210c8c84c98 SHA1 e5f94f5caadc6f843fc90bb7959570cd503676fd SHA256 3b08fca3c878bdfc4e7639f477dd542d55a4ab5dce39a475e82633071d13eb3f
diff --git a/net-mail/qmqtool/files/qmqtool-perlpath.patch b/net-mail/qmqtool/files/qmqtool-perlpath.patch
deleted file mode 100644
index b63223603..000000000
--- a/net-mail/qmqtool/files/qmqtool-perlpath.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- qmqtool.orig        2006-06-19 23:39:02.000000000 +0200
-+++ qmqtool     2006-06-19 23:39:07.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
-
- # qmqtool: Copyright 2003-2005 Jeremy Kister
- # Released under Perl's Artistic License.
diff --git a/net-mail/qmqtool/qmqtool-1.12.ebuild b/net-mail/qmqtool/qmqtool-1.12.ebuild
deleted file mode 100644
index c408d6d05..000000000
--- a/net-mail/qmqtool/qmqtool-1.12.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=2
-
-inherit eutils
-
-DESCRIPTION="qmqtool is a qmail queue manipulation program"
-HOMEPAGE="http://jeremy.kister.net/code/qmqtool/"
-SRC_URI="http://jeremy.kister.net/code/qmqtool/${PN}-current.tgz"
-
-LICENSE="Artistic"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-RDEPEND="virtual/qmail
-	dev-lang/perl"
-DEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}/qmqtool-perlpath.patch"
-}
-
-src_install() {
-	dodoc README FAQ ChangeLog || die "dodoc failed"
-
-	docinto contrib/argus
-	dodoc contrib/argus/* || die "dodoc failed"
-
-	docinto contrib/cricket
-	dodoc contrib/cricket/* || die "dodoc failed"
-
-	dobin qmqtool || die "dobin failed"
-}
diff --git a/net-mail/qmqtool/qmqtool-1.14.ebuild b/net-mail/qmqtool/qmqtool-1.14.ebuild
new file mode 100644
index 000000000..e4438c27b
--- /dev/null
+++ b/net-mail/qmqtool/qmqtool-1.14.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=2
+
+DESCRIPTION="A qmail queue manipulation program"
+HOMEPAGE="http://jeremy.kister.net/code/qmqtool/"
+SRC_URI="http://jeremy.kister.net/code/qmqtool/files/${P}.tgz"
+
+LICENSE="Artistic"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND="virtual/qmail
+	dev-lang/perl"
+
+src_prepare() {
+	# make the configure script less capricious and ${ROOT}-friendly
+	# i.e. replace real directory/file checks with non-empty var checks
+	# and disallow calling perl
+	sed -i \
+		-e 's:\[ -[dx]:[ -n:g' \
+		-e 's:\[ ! -[dx]:[ ! -n:g' \
+		-e '/^$perl/d' \
+		configure || die
+}
+
+src_configure() {
+	# econf-incompatible
+	./configure \
+		--prefix="${D}"/usr \
+		--scriptdir="${D}"/usr/bin \
+		--perl=/usr/bin/perl \
+		--qmaildir=/var/qmail \
+		|| die
+}
+
+src_install() {
+	emake install || die
+	dodoc README FAQ ChangeLog || die "dodoc failed"
+
+	docinto contrib/argus
+	dodoc contrib/argus/* || die "dodoc failed"
+
+	docinto contrib/cricket
+	dodoc contrib/cricket/* || die "dodoc failed"
+}