Cleanup. Remove the getmail-3 conditional code.

(Portage version: 2.2_rc33/cvs/Linux i686)

2 files changed, 6 insertions, 37 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/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
-}