Install to python sitedir and comform more to python.eclass wrt #313933.

(Portage version: 2.2_rc67/cvs/Linux x86_64)

2 files changed, 43 insertions, 14 deletions

diff --git a/media-sound/apetag/ChangeLog b/media-sound/apetag/ChangeLog
index d37a2af0f28d..2076641f6f40 100644
--- a/media-sound/apetag/ChangeLog
+++ b/media-sound/apetag/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/apetag
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/ChangeLog,v 1.9 2009/05/08 16:16:54 ssuominen Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/ChangeLog,v 1.10 2010/08/23 17:45:05 ssuominen Exp $
+
+  23 Aug 2010; Samuli Suominen <ssuominen@gentoo.org> apetag-1.12.ebuild:
+  Install to python sitedir and comform more to python.eclass wrt #313933.
 
   08 May 2009; Samuli Suominen <ssuominen@gentoo.org> apetag-1.12.ebuild:
   Remove -Werror from build.
diff --git a/media-sound/apetag/apetag-1.12.ebuild b/media-sound/apetag/apetag-1.12.ebuild
index edda0c2f3d9b..ade289b63f79 100644
--- a/media-sound/apetag/apetag-1.12.ebuild
+++ b/media-sound/apetag/apetag-1.12.ebuild
@@ -1,9 +1,12 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/apetag-1.12.ebuild,v 1.3 2009/05/08 18:23:31 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/apetag/apetag-1.12.ebuild,v 1.4 2010/08/23 17:45:05 ssuominen Exp $
 
-EAPI=2
-inherit toolchain-funcs
+EAPI=3
+
+PYTHON_DEPEND="2"
+
+inherit python toolchain-funcs
 
 DESCRIPTION="Command-line ape 2.0 tagger"
 HOMEPAGE="http://muth.org/Robert/Apetag/"
@@ -14,23 +17,46 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-lang/python"
-DEPEND=""
-
 S=${WORKDIR}/Apetag
 
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
 src_prepare() {
-	sed -i -e 's:CXXDEBUG:LDFLAGS:g' \
-		"${S}"/Makefile || die "sed failed"
+	sed -i \
+		-e 's:CXXDEBUG:LDFLAGS:' \
+		Makefile || die
+	python_convert_shebangs -r 2 .
 }
 
 src_compile() {
 	tc-export CXX
-	emake CXXFLAGS="${CXXFLAGS} -pedantic" \
-		LDFLAGS="${LDFLAGS}" || die "emake failed"
+	emake \
+		CXXFLAGS="${CXXFLAGS} -Wall -pedantic" \
+		LDFLAGS="${LDFLAGS}" || die
 }
 
 src_install() {
-	dobin apetag tagdir.py rmid3tag.py cddb.py || die "dobin failed"
+	dobin ${PN} || die
+
+	local sitedir="$(python_get_sitedir)"/${PN}
+	exeinto ${sitedir}
+	doexe *.py || die
+
+	local x
+	for x in {rmid3tag,tagdir}.py; do
+		ln -s "${sitedir}"/${x} "${D}"/usr/bin/${x} || die
+	done
+
 	dodoc 00readme
 }
+
+pkg_postinst() {
+	python_mod_optimize apetag
+}
+
+pkg_postrm() {
+	python_mod_cleanup apetag
+}