Revision bump. Thanks to Frank Benkstein <benkstein@gmx.de>. Resolved bug #59101. Remove old ebuild.

5 files changed, 57 insertions, 60 deletions

diff --git a/net-mail/getmail/ChangeLog b/net-mail/getmail/ChangeLog
index 37ed645bbbf7..fd8c546db7c4 100644
--- a/net-mail/getmail/ChangeLog
+++ b/net-mail/getmail/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-mail/getmail
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.15 2004/07/31 16:01:38 langthang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.16 2004/08/02 17:42:10 langthang Exp $
+
+*getmail-4.0.2-r1 (02 Aug 2004)
+
+  02 Aug 2004; Tuan Van <langthang@gentoo.org> +getmail-4.0.2-r1.ebuild:
+  Revision bump. Thanks to Frank Benkstein <benkstein@gmx.de>. Resolved 
+  bug #59101.
 
 *getmail-4.0.2 (31 Jul 2004)
 
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index 45cfb42eb4a3..846b2c5b1732 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 MD5 821f8506642ad867a99f337be131eaa0 getmail-3.2.4.ebuild 941
 MD5 40fa089fe8eaa04a4acb613dbe571b56 getmail-3.2.1.ebuild 940
-MD5 eca8f8a1247a759e65f045f54b7ec058 getmail-4.0.2.ebuild 1620
-MD5 419ccde61b6e127ecb6f838822321989 ChangeLog 1788
+MD5 dd1fdd7c80d518711b1fde2a6784ee99 getmail-4.0.2-r1.ebuild 1406
+MD5 f3f2eb576371ace8d5b0787e6b821b2e ChangeLog 1982
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 87d126cb233d900a20274ee09c8cf904 getmail-3.1.7.ebuild 930
+MD5 84bd6cedb9212fef5bc6ffb6c653736c files/digest-getmail-4.0.2-r1 65
 MD5 caec3387c9daa726c3e2a68ae906e5ba files/digest-getmail-3.1.7 64
 MD5 02e47482585d06da914552e487232ceb files/digest-getmail-3.2.1 64
 MD5 998916c10355bce7b9a852cd17a7fc9e files/digest-getmail-3.2.4 64
-MD5 84bd6cedb9212fef5bc6ffb6c653736c files/digest-getmail-4.0.2 65
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.4 (GNU/Linux)
 
-iD8DBQFBC8WO5FrxP71izLARAnpDAJwL7BY2PVUjO1thRBxAFs4F8gbdMwCgk5CP
-wBTBh1F8tl05vQyeboFBcNI=
-=j6kE
+iD8DBQFBDn2K5FrxP71izLARAjB8AJ9MvQHFoT4VPElJGcNUdeG3wM+TqgCgsgW8
+4NUGdiPYtjisrRFegil6Y2M=
+=JOAM
 -----END PGP SIGNATURE-----
diff --git a/net-mail/getmail/files/digest-getmail-4.0.2 b/net-mail/getmail/files/digest-getmail-4.0.2-r1
index 8c455b964c84..8c455b964c84 100644
--- a/net-mail/getmail/files/digest-getmail-4.0.2
+++ b/net-mail/getmail/files/digest-getmail-4.0.2-r1
diff --git a/net-mail/getmail/getmail-4.0.2-r1.ebuild b/net-mail/getmail/getmail-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..05c75708e283
--- /dev/null
+++ b/net-mail/getmail/getmail-4.0.2-r1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.0.2-r1.ebuild,v 1.1 2004/08/02 17:42:10 langthang Exp $
+
+inherit distutils
+IUSE=""
+DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
+HOMEPAGE="http://www.qcc.ca/~charlesc/software/getmail-4/"
+SRC_URI="http://www.qcc.ca/~charlesc/software/getmail-4/${P}.tar.gz"
+
+SLOT="4"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+
+DEPEND=">=dev-lang/python-2.3.3"
+
+src_compile() {
+	distutils_src_compile
+}
+
+src_install() {
+	python setup.py install --prefix=${D}/usr --install-data=${D}/usr/share
+
+	if has_version "=net-mail/getmail-3*" ; then
+		mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4
+		mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4
+		mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4
+	fi
+
+	# handle docs the gentoo way
+	mkdir ${D}/usr/share/doc/${P}/html
+	mv ${D}/usr/share/doc/${P}/*.html ${D}/usr/share/doc/${P}/*.css ${D}/usr/share/doc/${P}/html
+	gzip -q ${D}/usr/share/doc/${P}/*
+}
+
+pkg_postinst() {
+	if has_version "=net-mail/getmail-3*" ; then
+		echo
+		ewarn "An already installed instance of getmail v3 was detected. In order to"
+		ewarn "co-exist with it the three main scripts of getmail v4 were renamed to"
+		ewarn "getmail4, getmail_maildir4, getmail_mbox4."
+		echo
+	fi
+}
diff --git a/net-mail/getmail/getmail-4.0.2.ebuild b/net-mail/getmail/getmail-4.0.2.ebuild
deleted file mode 100644
index 329abbd18ad9..000000000000
--- a/net-mail/getmail/getmail-4.0.2.ebuild
+++ /dev/null
@@ -1,53 +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/getmail/getmail-4.0.2.ebuild,v 1.1 2004/07/31 16:01:38 langthang Exp $
-
-inherit distutils
-IUSE=""
-DESCRIPTION="A POP3 mail retriever with reliable Maildir and mbox delivery"
-HOMEPAGE="http://www.qcc.ca/~charlesc/software/getmail-4/"
-SRC_URI="http://www.qcc.ca/~charlesc/software/getmail-4/${P}.tar.gz"
-
-SLOT="4"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
-
-DEPEND=">=dev-lang/python-2.3.3"
-
-warn() {
-	echo
-	ewarn "getmail version 4 has been completely rewritten. Visit:"
-	echo "http://www.qcc.ca/~charlesc/software/getmail-4/documentation.html#v4differences"
-	ewarn "for changes it might affect you upgrading from getmail version 3."
-	echo
-	ewarn "This version has been SLOTTED to co-exist with getmail 3."
-	ewarn "The three main scripts are getmail4, getmail_maildir4, getmail_mbox4."
-	ewarn "Please remember to \`env-update; source /etc/profile\` before the first use."
-	echo
-	ewarn "Waiting 15 seconds before continuing..."
-	sleep 15
-}
-
-pkg_setup() {
-	warn
-}
-
-src_compile() {
-	distutils_src_compile
-}
-
-src_install() {
-	LIBPATH=${ROOT}/usr/lib/${P}
-	echo "PYTHONPATH=\"${LIBPATH}\"" > 99${P}
-	insinto ${ROOT}/etc/env.d
-	doins 99${P}
-	python setup.py install --install-scripts=${D}/usr/bin/ \
-		--install-data=${D}/usr/share/ --install-lib=${D}/usr/lib/${P}/
-	mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4
-	mv ${D}/usr/bin/getmail_maildir ${D}/usr/bin/getmail_maildir4
-	mv ${D}/usr/bin/getmail_mbox ${D}/usr/bin/getmail_mbox4
-}
-
-pkg_postinst() {
-	warn
-}