Python, EROOT/ED cleanups and depend cleanups

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

3 files changed, 19 insertions, 12 deletions

diff --git a/media-tv/mythtv/ChangeLog b/media-tv/mythtv/ChangeLog
index 0813fe17fd57..62b3a527c179 100644
--- a/media-tv/mythtv/ChangeLog
+++ b/media-tv/mythtv/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-tv/mythtv
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.342 2012/06/22 03:30:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/ChangeLog,v 1.343 2012/06/22 03:56:07 cardoe Exp $
+
+  21 Jun 2012; Doug Goldstein <cardoe@gentoo.org> mythtv-0.25.1.ebuild:
+  Python, EROOT/ED cleanups and depend cleanups
 
 *mythtv-0.25.1 (21 Jun 2012)
 
diff --git a/media-tv/mythtv/Manifest b/media-tv/mythtv/Manifest
index 532f7bfcea14..2dfa7a82c960 100644
--- a/media-tv/mythtv/Manifest
+++ b/media-tv/mythtv/Manifest
@@ -12,6 +12,6 @@ AUX xinitrc 240 RMD160 9c0c1030aa65c8fd3f20501f45757515a9208a61 SHA1 11795aa8be5
 DIST mythtv-0.24.1_p20110524.tar.gz 69756131 RMD160 e42fd2350d2b0199805e4f6e62646c8d835f353b SHA1 db7a91f237cd64c0604e7ee1672b041c37fe5e06 SHA256 ea3e37258f8596c9186865289ffd8f9ece9fc80d28a2ded80bd008544138a863
 DIST mythtv-0.25.1.tar.bz2 31827158 RMD160 88a5ce19b4b04f4b28a08b39bd7265e0a0ddd6d8 SHA1 eae92975c7d4cfa085d819944e454521e2d96c4d SHA256 7638ffc547b62f2d6dd031c6f164ccb993387a7b4b6d9218cdd37594c1cca508
 EBUILD mythtv-0.24.1_p20110524.ebuild 9230 RMD160 936bf295882ef4c8b37f2e46c990380990a17f0d SHA1 2756a2c8bc20a4846360738c91d0bcc7e971bbfa SHA256 d5c246f523e234fa8e5202930448db67b91a808d5bb8c4a014ee9f182eed8402
-EBUILD mythtv-0.25.1.ebuild 7252 RMD160 ec144ffa1688021735c8ea9c7cdb5a1494b9966d SHA1 e880c7326b0425ffbc363376af16333c23d47351 SHA256 fb0b1225c3a616c947cd71260f0d70781b2bfb0a27302ea3b1d26a7dc84571c1
-MISC ChangeLog 67631 RMD160 78d0c3022bc3a54165b9d9f74b9dfd73565fa255 SHA1 9f5702b09ec74b9ae5a9a3fd007e92be9b78bd9f SHA256 9503f5fffca5d6c467a8d1df0b557bc838d080c5f29a9cf24062be4738c66d83
+EBUILD mythtv-0.25.1.ebuild 7356 RMD160 80e97147c7cceb22da253d650041282722df8d16 SHA1 10b3d2a904401563a8dc97a12c629d4ad87b4be5 SHA256 add622a5063be1c757197aa5f27872d55c9b20c2b26e2178dc2ad8ee65fcf0de
+MISC ChangeLog 67752 RMD160 5e6ecc4e435d8fc60f935cbc647fe26baa42dd30 SHA1 9b6ca00bf2cfd231d6dc3a1acf8babe986f118d5 SHA256 c15d94bbc139b4906c12a6ae2d0d7df6697b4a3e64a88c9971809c1e2006898f
 MISC metadata.xml 3259 RMD160 efebc376333820f60fe8f0d060737d25a4fcab4d SHA1 5457ab31e3856b6f4fd095126375272d789c1060 SHA256 9453b1fa72b7b501f593cc744d5b2a0a83272f3b09f291891d7358998fc4400f
diff --git a/media-tv/mythtv/mythtv-0.25.1.ebuild b/media-tv/mythtv/mythtv-0.25.1.ebuild
index 95acddd5c637..a3fcad03d084 100644
--- a/media-tv/mythtv/mythtv-0.25.1.ebuild
+++ b/media-tv/mythtv/mythtv-0.25.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1.ebuild,v 1.1 2012/06/22 03:30:49 cardoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/mythtv/mythtv-0.25.1.ebuild,v 1.2 2012/06/22 03:56:07 cardoe Exp $
 
 EAPI=4
 
 inherit flag-o-matic multilib eutils python user
 
-PYTHON_DEPEND="2"
+PYTHON_DEPEND="python? 2"
 
 #MYTHTV_VERSION="v${PV}-15-g${MYTHTV_SREV}"
 #MYTHTV_BRANCH="fixes/0.25"
@@ -41,8 +41,8 @@ SDEPEND="
 	virtual/mysql
 	virtual/opengl
 	virtual/glu
-	alsa? ( >=media-libs/alsa-lib-0.9 )
-	ass? ( media-libs/libass )
+	alsa? ( >=media-libs/alsa-lib-1.0.24 )
+	ass? ( >=media-libs/libass-0.9.11 )
 	cec? ( dev-libs/libcec )
 	dvb? ( media-libs/libdvb virtual/linuxtv-dvb-headers )
 	ieee1394? (	>=sys-libs/libraw1394-1.2.0
@@ -93,7 +93,7 @@ MYTHTV_GROUPS="video,audio,tty,uucp"
 pkg_setup() {
 	einfo "This ebuild now uses a heavily stripped down version of your CFLAGS"
 
-	python_set_active_version 2
+	use python && python_set_active_version 2
 	python_pkg_setup
 
 	enewuser mythtv -1 /bin/bash /home/mythtv ${MYTHTV_GROUPS}
@@ -216,7 +216,7 @@ src_install() {
 
 	if use autostart; then
 		dodir /etc/env.d/
-		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${D}"/etc/env.d/95mythtv
+		echo 'CONFIG_PROTECT="/home/mythtv/"' > "${ED}"/etc/env.d/95mythtv
 
 		insinto /home/mythtv
 		newins "${FILESDIR}"/bash_profile .bash_profile
@@ -229,11 +229,11 @@ src_install() {
 }
 
 pkg_preinst() {
-	export CONFIG_PROTECT="${CONFIG_PROTECT} ${ROOT}/home/mythtv/"
+	export CONFIG_PROTECT="${CONFIG_PROTECT} ${EROOT}/home/mythtv/"
 }
 
 pkg_postinst() {
-	use python && python_mod_optimize
+	use python && python_mod_optimize MythTV
 
 	elog "To have this machine operate as recording host for MythTV, "
 	elog "mythbackend must be running. Run the following:"
@@ -247,6 +247,10 @@ pkg_postinst() {
 	elog "http://dev.gentoo.org/~cardoe/mythtv/autostart.html"
 }
 
+pkg_postrm() {
+	use python && python_mod_cleanup MythTV
+}
+
 pkg_info() {
 	if [[ -f "${EROOT}"/usr/bin/mythfrontend ]]; then
 		"${EROOT}"/usr/bin/mythfrontend --version
@@ -256,5 +260,5 @@ pkg_info() {
 pkg_config() {
 	echo "Creating mythtv MySQL user and mythconverg database if it does not"
 	echo "already exist. You will be prompted for your MySQL root password."
-	"${ROOT}"/usr/bin/mysql -u root -p < "${ROOT}"/usr/share/mythtv/database/mc.sql
+	"${EROOT}"/usr/bin/mysql -u root -p < "${EROOT}"/usr/share/mythtv/database/mc.sql
 }