Version bump and fix to SRC_URI to download the source properly. Removed older 2.6.8 version. Closes bugs #94074 and #93929.

(Portage version: 2.0.51.21)

7 files changed, 44 insertions, 32 deletions

diff --git a/net-mail/mhonarc/ChangeLog b/net-mail/mhonarc/ChangeLog
index 74a3d0d23ca3..e707a84b2f29 100644
--- a/net-mail/mhonarc/ChangeLog
+++ b/net-mail/mhonarc/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-mail/mhonarc
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/ChangeLog,v 1.4 2004/08/21 20:43:39 kumba Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/ChangeLog,v 1.5 2005/05/28 04:25:42 kumba Exp $
+
+*mhonarc-2.6.10 (28 May 2005)
+
+  28 May 2005; Joshua Kinard <kumba@gentoo.org> mhonarc-2.6.10.ebuild,
+  +mhonarc-2.6.11.ebuild, -mhonarc-2.6.8-r1.ebuild:
+  Version bump and fix to SRC_URI to download the source properly. Removed older
+  2.6.8 version. Closes bugs #94074 and #93929.
 
   21 Aug 2004; Joshua Kinard <kumba@gentoo.org> :
   (long overdue) Revision bump.
diff --git a/net-mail/mhonarc/Manifest b/net-mail/mhonarc/Manifest
index 037e46bf27b9..d2467af9d801 100644
--- a/net-mail/mhonarc/Manifest
+++ b/net-mail/mhonarc/Manifest
@@ -1,6 +1,6 @@
-MD5 7f813e35b3f74f43788dd022471b20ba ChangeLog 713
+MD5 4dec3655cf92a984a4fb2260ca26364e ChangeLog 997
 MD5 90b497fcb28b98176bdcb02ab471b02e metadata.xml 356
-MD5 a47fac4d854d0614c33148aaf4309c20 mhonarc-2.6.8-r1.ebuild 611
-MD5 339504c6f44ac64682e141ecc1df97ba mhonarc-2.6.10.ebuild 731
-MD5 da00bbca59f83b10be60c5ee543d5386 files/digest-mhonarc-2.6.8-r1 66
+MD5 35c61ad6c22f668f664af3c591488071 mhonarc-2.6.10.ebuild 740
+MD5 343c82ca64c5457f0f1f3c234a574f2a mhonarc-2.6.11.ebuild 743
 MD5 823469b986476a8a87d4f6deb461d8d5 files/digest-mhonarc-2.6.10 68
+MD5 3ac6e5a669c1c4c576fdf494b0a1b3cf files/digest-mhonarc-2.6.11 68
diff --git a/net-mail/mhonarc/files/digest-mhonarc-2.6.11 b/net-mail/mhonarc/files/digest-mhonarc-2.6.11
new file mode 100644
index 000000000000..bf29d27efe9d
--- /dev/null
+++ b/net-mail/mhonarc/files/digest-mhonarc-2.6.11
@@ -0,0 +1 @@
+MD5 6f95f84f7422bf7000960f66bf716e83 MHonArc-2.6.11.tar.bz2 1552360
diff --git a/net-mail/mhonarc/files/digest-mhonarc-2.6.8-r1 b/net-mail/mhonarc/files/digest-mhonarc-2.6.8-r1
deleted file mode 100644
index b3a5e024e037..000000000000
--- a/net-mail/mhonarc/files/digest-mhonarc-2.6.8-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 058dc8ab73db2ce0c37d401ffc57b609 MHonArc-2.6.8.tar.gz 1902907
diff --git a/net-mail/mhonarc/mhonarc-2.6.10.ebuild b/net-mail/mhonarc/mhonarc-2.6.10.ebuild
index 88dbb3fae8a9..50315e22aac1 100644
--- a/net-mail/mhonarc/mhonarc-2.6.10.ebuild
+++ b/net-mail/mhonarc/mhonarc-2.6.10.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.10.ebuild,v 1.1 2004/08/21 20:43:39 kumba Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.10.ebuild,v 1.2 2005/05/28 04:25:42 kumba Exp $
 
 inherit perl-module
 
 IUSE=""
 
-SRC_URI="http://www.mhonarc.org/tar/${P/mhonarc/MHonArc}.tar.bz2"
+SRC_URI="http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
 RESTRICT="nomirror"
 
 DESCRIPTION="Perl Mail-to-HTML Converter"
diff --git a/net-mail/mhonarc/mhonarc-2.6.11.ebuild b/net-mail/mhonarc/mhonarc-2.6.11.ebuild
new file mode 100644
index 000000000000..40fb5b863ff4
--- /dev/null
+++ b/net-mail/mhonarc/mhonarc-2.6.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.11.ebuild,v 1.1 2005/05/28 04:25:42 kumba Exp $
+
+inherit perl-module
+
+IUSE=""
+
+SRC_URI="http://www.mhonarc.org/release/MHonArc/tar/MHonArc-${PV}.tar.bz2"
+RESTRICT="nomirror"
+
+DESCRIPTION="Perl Mail-to-HTML Converter"
+HOMEPAGE="http://www.mhonarc.org/"
+LICENSE="GPL-2"
+CATEGORY="net-mail"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~amd64"
+
+S="${WORKDIR}/${P/mhonarc/MHonArc}"
+
+src_install() {
+	mv ${S}/Makefile ${S}/Makefile.orig
+	sed -e "s:/usr:${D}/usr:g" -e "s:${D}/usr/bin/perl:/usr/bin/perl:g" \
+		${S}/Makefile.orig > ${S}/Makefile
+	perl-module_src_install
+}
diff --git a/net-mail/mhonarc/mhonarc-2.6.8-r1.ebuild b/net-mail/mhonarc/mhonarc-2.6.8-r1.ebuild
deleted file mode 100644
index 01e0f1872b98..000000000000
--- a/net-mail/mhonarc/mhonarc-2.6.8-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/mhonarc/mhonarc-2.6.8-r1.ebuild,v 1.2 2004/06/24 23:25:45 agriffis Exp $
-
-IUSE=""
-
-inherit perl-module
-CATEGORY="net-mail"
-
-MY_P="${P/mhonarc/MHonArc}"
-S="${WORKDIR}/${MY_P}"
-
-DESCRIPTION="Perl Mail-to-HTML Converter"
-SRC_URI="http://www.cpan.org/modules/by-authors/id/EHOOD/${MY_P}.tar.gz"
-HOMEPAGE="http:/search.cpan.org/author/EHOOD/${MY_P}/"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc sparc ~alpha mips ~amd64"
-
-src_install() {
-	perl-module_src_install
-}