Cleanup. Remove the getmail-3 conditional code.

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

3 files changed, 11 insertions, 42 deletions

diff --git a/net-mail/getmail/ChangeLog b/net-mail/getmail/ChangeLog
index 0fd03939c94a..bc7fb85f23f8 100644
--- a/net-mail/getmail/ChangeLog
+++ b/net-mail/getmail/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-mail/getmail
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.163 2009/06/02 08:37:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/ChangeLog,v 1.164 2009/06/02 09:09:27 tove Exp $
+
+  02 Jun 2009; Torsten Veller <tove@gentoo.org> getmail-4.9.1.ebuild:
+  Remove the getmail-3 conditional code.
 
 *getmail-4.9.1 (02 Jun 2009)
 
diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest
index bdf46f0093fd..23f9798f56e9 100644
--- a/net-mail/getmail/Manifest
+++ b/net-mail/getmail/Manifest
@@ -10,13 +10,13 @@ EBUILD getmail-4.7.6.ebuild 1550 RMD160 ed464f02a883dc95f5d2eb4966cd031133a9c176
 EBUILD getmail-4.8.1.ebuild 1735 RMD160 3e4fd12f94effef2009663cecacc8be89b0cc26e SHA1 cb4dc9e6b48afff2c172d45822f97cb8d03e4898 SHA256 6b752fb43789a3c49620ca87c1d172ee7aabfe58bf40939660f4b47675651971
 EBUILD getmail-4.8.4.ebuild 1734 RMD160 2eb7b0061b34997c64c0d18157143a5ced6fe914 SHA1 e48e9afd0a0c620f74b59bcf7b289fea799f3051 SHA256 4e916b96cb2b47909f8cf94767f76a30ca6da597faf3b56180e73496997e097c
 EBUILD getmail-4.9.0.ebuild 1734 RMD160 d410279a94188d036ba5eac44bb9f8f5c05b698e SHA1 5f802c593e385be185be0e288292d05b18fc80fb SHA256 23ca235f0de0a15bb535e02e44c6fcdcd45f401e08298b77d8dfbc0d19cea58d
-EBUILD getmail-4.9.1.ebuild 1761 RMD160 797feb035e7875f298e4f734d411694ac1ed94f0 SHA1 71c94444a05ac606f4d4365480355e9953826a86 SHA256 98d6b5c447531b3807405ba20be37310bb3b27504ec2a92682d01e1e57f09877
-MISC ChangeLog 21234 RMD160 354628ad573339d3491e60374fbe51049377d828 SHA1 c3329178bbf02256e9b85bb600aa1b16f02f086a SHA256 3e45c403f13a2d0ab6320706d4f0b1f0c13a91414054354bb70cc2a8e97790b9
+EBUILD getmail-4.9.1.ebuild 926 RMD160 849e89dbfd425c431221193cd73b35578ebd6688 SHA1 03154cbd1730def42fd4539911146bc48ac2a022 SHA256 a1a9a43ef1b816a26bf2ac80d08457fdebf9b8450612e2ded7e701866b289754
+MISC ChangeLog 21346 RMD160 d0b614890bc635b0792fd97ea197d39d3e9a8e70 SHA1 10852f7e9aa8c6821a540557075a5ff62f696ffa SHA256 92d383f210a5f17ddec91b7d21e3419867e82da2540dfa94f4456cb2687076c8
 MISC metadata.xml 161 RMD160 273e570423fa3cd9d3f15f7967a43307c8ee9661 SHA1 a1fecd2f7b169d621b88c6ccab9d758209fc8f19 SHA256 4ebf9a8f60040bfb95f13790c1d146a49c69f791f9c421e02a5d96fd6fcb2b32
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkok5NoACgkQV3J2n04EauzGvQCeMNqEtm+o/WDjVf1rI4GdDTth
-EkgAnjlGyheAJnEHGST1URGhfOjyBbM5
-=lvPP
+iEYEARECAAYFAkok7GAACgkQV3J2n04Eauz3JwCgg8gwlRXet0zfXFF7A1WiEZqK
+MTAAnjAZveaE6CwQVmperdFxhKrSq3kK
+=wLkR
 -----END PGP SIGNATURE-----
diff --git a/net-mail/getmail/getmail-4.9.1.ebuild b/net-mail/getmail/getmail-4.9.1.ebuild
index 4bb68d951b15..45ad9d0b6393 100644
--- a/net-mail/getmail/getmail-4.9.1.ebuild
+++ b/net-mail/getmail/getmail-4.9.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.9.1.ebuild,v 1.1 2009/06/02 08:37:22 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/getmail/getmail-4.9.1.ebuild,v 1.2 2009/06/02 09:09:27 tove Exp $
 
 inherit distutils
 
@@ -16,27 +16,11 @@ IUSE=""
 DEPEND=">=dev-lang/python-2.3.3"
 RDEPEND="${DEPEND}"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# getmail.spec is missing due to upstream packaging mistake
-	sed -i -e '/getmail.spec/d' setup.py || die
-}
-
-src_compile() {
-	distutils_src_compile
-}
+PYTHON_MODNAME=getmailcore
 
 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
 	rm "${D}"/usr/share/doc/${P}/COPYING
 	if [ ${P} != ${PF} ]; then
@@ -46,21 +30,3 @@ src_install() {
 	dodir /usr/share/doc/${PF}/html
 	mv "${D}"/usr/share/doc/${PF}/*.html "${D}"/usr/share/doc/${PF}/*.css "${D}"/usr/share/doc/${PF}/html
 }
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize /usr/lib/python${PYVER}/site-packages/getmailcore
-
-	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
-}
-
-pkg_postrm() {
-	python_version
-	python_mod_cleanup
-}