Version bump, bug 304025. Updated usage of python eclass and also dep on >=pygtk-2.16. Remove old.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 39 insertions, 55 deletions

diff --git a/media-video/devede/ChangeLog b/media-video/devede/ChangeLog
index 10450e1f548b..5f72bc036c2d 100644
--- a/media-video/devede/ChangeLog
+++ b/media-video/devede/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/devede
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/devede/ChangeLog,v 1.25 2010/01/07 14:23:14 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/devede/ChangeLog,v 1.26 2010/03/20 20:27:25 spatz Exp $
+
+*devede-3.16.6 (20 Mar 2010)
+
+  20 Mar 2010; Dror Levin <spatz@gentoo.org> -devede-3.6.ebuild,
+  -devede-3.11b.ebuild, +devede-3.16.6.ebuild:
+  Version bump, bug 304025. Updated usage of python eclass and also dep on
+  >=pygtk-2.16. Remove old.
 
 *devede-3.15.2 (07 Jan 2010)
 
diff --git a/media-video/devede/Manifest b/media-video/devede/Manifest
index ac6dae2cf973..4850d20cfb6f 100644
--- a/media-video/devede/Manifest
+++ b/media-video/devede/Manifest
@@ -1,14 +1,26 @@
-DIST devede-3.11b.tar.bz2 1558761 RMD160 68808092519b1e52bf2e50d00055e4e4a8c8c097 SHA1 cc84eefbe7ee15cf88d790a3820d925cc29463dd SHA256 19b175bb40e306efd50fd08b64af29ea5bf223b6d085fbcf47290ab2696c9198
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 DIST devede-3.12c.tar.bz2 1612667 RMD160 4c0161c693fbdab73dce6c9177316b282d539b22 SHA1 80d5ac5acd6bf0cb3e704a0f627f83e70313f885 SHA256 8ce067b4a90430c99ba8fff36a6e1be39c9bbf69379c32dea9859170662b6bb6
 DIST devede-3.13.1.tar.bz2 1655463 RMD160 af703f473889e53ac7cf2d64034a55588bb9465c SHA1 6533cc314f9194b5bee03cec1b592d3d1dd86bd4 SHA256 ccd2f0e6a2f08365e1f487ca5e5d7816ab5479b8c9bf0dcbca9711f174682ec0
 DIST devede-3.14.0.tar.bz2 1614281 RMD160 1e17aafd60d6221e68899076e95126c3bcfdb280 SHA1 3fdf79e75c78c00e78aa6a7dfbba750c0224d64a SHA256 debdb1d91dbff469666e1cccaf8e21ced04b875df115efc28dee58b4f22b9f6e
 DIST devede-3.15.2.tar.bz2 2253583 RMD160 f657a0c8417672ee1481848dc113c4f0fcd34f9d SHA1 43469e0407b423badcf3f039b8c94d81acb2c358 SHA256 6d3554f36c675280ba4ac7d98dd15ebcefa5d2f9a6fad63d745230af63ffd9bb
-DIST devede-3.6.tar.bz2 1232228 RMD160 14e40f5511980e5e1064bdab3b826d22eadb0fcb SHA1 b10b3071a1cd814c3be8495ce884a57419e9d66e SHA256 c9e4122629e1cf80ea50b00cdd40a36ca22f2655536e9b8c0266e5edf8368a0c
-EBUILD devede-3.11b.ebuild 1368 RMD160 c2fd0194e0e50b78c99a72c312085010a26608d6 SHA1 2aab7da0f39288def484c7686597f818175d7118 SHA256 725804fbcaa152c3265ee4e36182cf2ee8ddd67917f8d685504ab43e16134212
+DIST devede-3.16.6.tar.bz2 2358601 RMD160 64da61faace059aba94aaf72bfec538b5ce37d8b SHA1 0b0631e5c42c4b6f2096b9a8ce26ca9816ac9710 SHA256 51ccc2748ceabd9e40a74f0ac8c977adcd234e1344641ac37482e14f05ee1685
 EBUILD devede-3.12c.ebuild 1364 RMD160 641fcc765701ae6f4169370b83d2cc4890a73e0b SHA1 11b315bbb00972534037062f77c5dbc98eda8957 SHA256 69e3c17f8cc5da8db109be2bfac580007b74b8e95024cb1af8df0d103c59162d
 EBUILD devede-3.13.1.ebuild 1371 RMD160 43cb71501de13131061b25367a2fcd9f9fa15b37 SHA1 0f6d9a887e8ae3a4422b434e8e632050a9ed9bb8 SHA256 27c3d9bff2c7ded8d5e4b1b7a49ba7c78850743906466fd18ca18560711feeff
 EBUILD devede-3.14.0.ebuild 1369 RMD160 98b681cfcd4a138a2b99ea2e53aa454a207a7354 SHA1 7913549fecb602ba4d67120ccd976893cf1549fd SHA256 cd9be60944945c823f01365a882e4ac13e0d21c80d7cbd23f199223dfebb095f
 EBUILD devede-3.15.2.ebuild 1369 RMD160 5d4c281c54a157a5abd4e60cbc619ac26476101d SHA1 3e81353d86c3afe448b1c19253a707b01a32f552 SHA256 6ad4a87537d1a1b93f083795d53ddfe550eee02079ae67a547e0094123549918
-EBUILD devede-3.6.ebuild 1307 RMD160 c11e6559a4ce782d135433b55880cd25ef0b49c4 SHA1 58c2daac33d18c177dfc021a82348e8ae258a28d SHA256 dec04c4ba32c38fd28a861f0351d521b1242e5aae59709681cee1b8aebac872f
-MISC ChangeLog 3597 RMD160 62e12912003a38f04fc7d189cfd37ea4a1200057 SHA1 805e6ef7c600fc19312ef8cc12a863bcd746a5d2 SHA256 ae9d550f92ad5131ac89211aac5f1951f77c616516b8666c2718783c83b735de
+EBUILD devede-3.16.6.ebuild 1478 RMD160 dd446f8d46a5d4a4b18af1aa3eeed0a0892b68b0 SHA1 437352eb74ee8879f80cf73c97e45db4c5f4811a SHA256 8f17de043171185ce98d73e2e852c8cde53d93b3c575e5c66fad2ed4e3732226
+MISC ChangeLog 3841 RMD160 cb3ca262ec7508d87c3cf2f320ca4a6646fd10d3 SHA1 a59376c12b18a8c2a12444b5a3991caa3d20a745 SHA256 e30f927000be425add5c2a3976a90c2ba60a8bbcf3ecd5ba2b875894713a584e
 MISC metadata.xml 305 RMD160 ed7371c406034cc84915e74b594281cc0d4973c1 SHA1 aad2ca853c4b7692f7024c019b2e83eff956152e SHA256 0da0ca1027ebd9494b46c492d94685e161f01bf4f32c2a5307ce7381e83b55eb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQEcBAEBCgAGBQJLpS+2AAoJEAWF714uGAc6/38H/jgRqFDWr14v7xkU2pbRzCUO
+jDMNUFYHXSg11ZWi5M+Y6WaNnOKROlbCcpGMjVB0M+4/RZu4/8aD1nblFs1GcKA9
+WbWO7RD8KycpnM+/kJdNE0mS0f/rCKECeRqoX5ng0tWJbstbwwJyGVRwFQdSWl2h
+98debuxMapvYvLWdxVg9aqitxOT8hNCoy7hnIMxjeRYtk8GDju5D7ys5NTXxkVf3
+7JD6pA9KjPsBLdjPalx9/7iSOmTx6jhSkBCYOLIgM4dxkPkAhmIqeav+7g9Rd6B/
+K6vPhrPh9T7b3yHyksxkU0OZbcNugno7biYvzwJG83Ud98rVQzy0vmPDHS1lKOo=
+=4B9a
+-----END PGP SIGNATURE-----
diff --git a/media-video/devede/devede-3.11b.ebuild b/media-video/devede/devede-3.16.6.ebuild
index a4396eb594d3..774ab65ed5d0 100644
--- a/media-video/devede/devede-3.11b.ebuild
+++ b/media-video/devede/devede-3.16.6.ebuild
@@ -1,8 +1,9 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/devede/devede-3.11b.ebuild,v 1.1 2008/09/08 04:47:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/devede/devede-3.16.6.ebuild,v 1.1 2010/03/20 20:27:25 spatz Exp $
 
-NEED_PYTHON=2.4
+EAPI=2
+PYTHON_DEPEND=2
 
 inherit multilib python
 
@@ -15,8 +16,8 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="psyco"
 
-RDEPEND=">=x11-libs/gtk+-2.6
-	dev-python/pygtk
+RDEPEND=">=x11-libs/gtk+-2.16
+	>=dev-python/pygtk-2.16
 	>=media-video/mplayer-1.0_rc1
 	media-video/dvdauthor
 	media-video/vcdimager
@@ -26,6 +27,14 @@ DEPEND=""
 
 S=${WORKDIR}/${P%*b}
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	./install.sh prefix="/usr" libdir="/usr/$(get_libdir)" \
 		pkgdocdir="/usr/share/doc/${PF}" DESTDIR="${D}" \
diff --git a/media-video/devede/devede-3.6.ebuild b/media-video/devede/devede-3.6.ebuild
deleted file mode 100644
index 71a4da323456..000000000000
--- a/media-video/devede/devede-3.6.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/devede/devede-3.6.ebuild,v 1.4 2008/05/29 17:27:21 hawking Exp $
-
-NEED_PYTHON=2.4
-
-inherit multilib python
-
-DESCRIPTION="DVD Video Creator"
-HOMEPAGE="http://www.rastersoft.com/programas/devede.html"
-SRC_URI="http://www.rastersoft.com/descargas/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="doc psyco"
-
-RDEPEND=">=x11-libs/gtk+-2.6
-	dev-python/pygtk
-	>=media-video/mplayer-1.0_rc1
-	media-video/dvdauthor
-	media-video/vcdimager
-	psyco? ( dev-python/psyco )
-	virtual/cdrtools"
-DEPEND=""
-
-src_install() {
-	./install.sh prefix="/usr" libdir="/usr/$(get_libdir)" \
-		DESTDIR="${D}" || die "install.sh failed."
-	rm -rf "${D}"/usr/share/doc/devede
-	use doc && dohtml docs/*
-}
-
-pkg_postinst() {
-	python_mod_optimize /usr/$(get_libdir)/${PN}
-	elog "To create DIVX/MPEG4 files, be sure that MPlayer is compiled with LAME support."
-	elog "In this case you want to check for both the encode and mp3 USE flags."
-	elog "To change the font used to render the subtitles, choose a TrueType font you like"
-	elog "and copy it in \$HOME/.spumux directory, renaming it to devedesans.ttf."
-}
-
-pkg_postrm() {
-	python_mod_cleanup /usr/$(get_libdir)/${PN}
-}