Version bump -> 4.0.8, tidy, Gentoo-ify the way upstream handles docs.

5 files changed, 79 insertions, 8 deletions

diff --git a/net-mail/getmail/ChangeLog b/net-mail/getmail/ChangeLog
index 4261090dbf07..e9f916af8737 100644
--- a/net-mail/getmail/ChangeLog
+++ b/net-mail/getmail/ChangeLog
@@ -1,6 +1,16 @@
 # 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.17 2004/08/04 22:12:36 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.18 2004/08/06 20:07:05 slarti Exp $
+
+*getmail-4.0.8 (06 Aug 2004)
+
+  06 Aug 2004; Tom Martin <slarti@gentoo.org> getmail-4.0.6.ebuild,
+  +getmail-4.0.8.ebuild:
+  Version bump -> 4.0.8. Tidy, and handle upstream's new method of handling docs
+  so it's consistent with Gentoo's. Thanks to Frank Benkstein <benkstein@gmx.de>
+  for reporting the new version in bug 59618.
+
+*getmail-4.0.6 (06 Aug 2004)
 
   04 Aug 2004; Tom Martin <slarti@gentoo.org> :
   Version bump, thanks to Martin KlaffenBöck <martin.klaffenboeck@gmx.de> for
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index bb3aae55c3e7..01656f1f652a 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -1,8 +1,9 @@
-MD5 df4d554b38d71a5dd6ff8193fcbb54be getmail-4.0.6.ebuild 1413
+MD5 ae222fa1e849cc4d7c632599ab40506d getmail-4.0.6.ebuild 1528
 MD5 821f8506642ad867a99f337be131eaa0 getmail-3.2.4.ebuild 941
+MD5 80de911bce08e02319e04a86752b0077 getmail-4.0.8.ebuild 1528
 MD5 40fa089fe8eaa04a4acb613dbe571b56 getmail-3.2.1.ebuild 940
 MD5 dd1fdd7c80d518711b1fde2a6784ee99 getmail-4.0.2-r1.ebuild 1406
-MD5 6b8c0c9e0e67b98071ebddcc4b70b2cf ChangeLog 2140
+MD5 0bab613e6b4c67d7da3b72aafa38772e ChangeLog 2502
 MD5 5721b86fd871bdfab77231abc6e02f68 metadata.xml 161
 MD5 87d126cb233d900a20274ee09c8cf904 getmail-3.1.7.ebuild 930
 MD5 84bd6cedb9212fef5bc6ffb6c653736c files/digest-getmail-4.0.2-r1 65
@@ -10,3 +11,4 @@ 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 64c5ee686032d37be077b5d3899e7aea files/digest-getmail-4.0.6 65
+MD5 8aab4d5a7deb9ff1537c31df5f89e6fa files/digest-getmail-4.0.8 65
diff --git a/net-mail/getmail/files/digest-getmail-4.0.8 b/net-mail/getmail/files/digest-getmail-4.0.8
new file mode 100644
index 000000000000..45449b410ddb
--- /dev/null
+++ b/net-mail/getmail/files/digest-getmail-4.0.8
@@ -0,0 +1 @@
+MD5 d28082a024c96df18d8d2dc16fe48ecb getmail-4.0.8.tar.gz 104180
diff --git a/net-mail/getmail/getmail-4.0.6.ebuild b/net-mail/getmail/getmail-4.0.6.ebuild
index 9303962fcdec..44d88d593c39 100644
--- a/net-mail/getmail/getmail-4.0.6.ebuild
+++ b/net-mail/getmail/getmail-4.0.6.ebuild
@@ -1,6 +1,6 @@
 # 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.6.ebuild,v 1.1 2004/08/04 22:12:36 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.0.6.ebuild,v 1.2 2004/08/06 20:07:05 slarti Exp $
 
 inherit distutils
 IUSE=""
@@ -19,7 +19,7 @@ src_compile() {
 }
 
 src_install() {
-	python setup.py install --prefix=${D}/usr --install-data=${D}/usr/share
+	distutils_src_install
 
 	if has_version "=net-mail/getmail-3*" ; then
 		mv ${D}/usr/bin/getmail ${D}/usr/bin/getmail4
@@ -28,9 +28,16 @@ src_install() {
 	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}/*
+	if [ ${P} != ${PF} ]; then
+		mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
+	fi
+
+	mkdir ${D}/usr/share/doc/${PF}/html
+	mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html
+	gzip --silent ${D}/usr/share/doc/${PF}/*
+
+	# and the man pages..
+	gzip --silent ${D}/usr/share/man/getmail*
 }
 
 pkg_postinst() {
diff --git a/net-mail/getmail/getmail-4.0.8.ebuild b/net-mail/getmail/getmail-4.0.8.ebuild
new file mode 100644
index 000000000000..de937d090320
--- /dev/null
+++ b/net-mail/getmail/getmail-4.0.8.ebuild
@@ -0,0 +1,51 @@
+# 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.8.ebuild,v 1.1 2004/08/06 20:07:05 slarti 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/old-versions/${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() {
+	distutils_src_install
+
+	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
+	if [ ${P} != ${PF} ]; then
+		mv ${D}/usr/share/doc/${P} ${D}/usr/share/doc/${PF}
+	fi
+
+	mkdir ${D}/usr/share/doc/${PF}/html
+	mv ${D}/usr/share/doc/${PF}/*.html ${D}/usr/share/doc/${PF}/*.css ${D}/usr/share/doc/${PF}/html
+	gzip --silent ${D}/usr/share/doc/${PF}/*
+
+	# and the man pages..
+	gzip --silent ${D}/usr/share/man/getmail*
+}
+
+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
+}