Version bump. Ebuild clean up. EAPI4

Package-Manager: portage-2.2.0_alpha90/cvs/Linux x86_64

4 files changed, 112 insertions, 30 deletions

diff --git a/media-video/griffith/ChangeLog b/media-video/griffith/ChangeLog
index 3ba648f87dfe..6db3d482dd33 100644
--- a/media-video/griffith/ChangeLog
+++ b/media-video/griffith/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/griffith
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/ChangeLog,v 1.57 2011/08/05 09:39:16 hwoarang Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/ChangeLog,v 1.58 2012/03/22 21:56:14 hwoarang Exp $
+
+*griffith-0.13 (22 Mar 2012)
+
+  22 Mar 2012; Markos Chandras <hwoarang@gentoo.org> +griffith-0.13.ebuild,
+  griffith-9999.ebuild:
+  Version bump. Ebuild clean up. EAPI4
 
   05 Aug 2011; Markos Chandras <hwoarang@gentoo.org> griffith-9999.ebuild:
   Comply with EAPI3 standards
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index d4a4c35d8cd7..1be53d367790 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -4,25 +4,27 @@ Hash: SHA512
 AUX 0.10-fix_lib_path.patch 667 RMD160 3fefe17aa5edaed7c1531f59be717f661e8b5bad SHA1 bbe76a6bf701260d5ee8adaf2d0888891b93f944 SHA256 f9c5a58ac4552ddfe254cdb9e02ef3e91a5feb500c7afe92f9faed9cc02687f2
 AUX griffith-0.12.1-sqlalchemy-0.7.patch 1505 RMD160 2cec3305efe320a8c598bf0147332b31a6f6258b SHA1 7faa5e6cf6b71a14ce9b252225b1333071807825 SHA256 18989a678f44d4498e08c8c1a7cec41a3ce9bd245e93319878ff4dcefdaaa42c
 DIST griffith-0.12.1.tar.gz 1451056 RMD160 b36a8c85c120d75d4ea87eb55f067c11206c42a9 SHA1 1cfa8cd35d82779f3673146e6fa0f16b0bbafed8 SHA256 13d721dc1f7e638a0f22cbc903d6156c666d77b1c1fd4bc9050136c238aa7f57
+DIST griffith-0.13.tar.gz 1565903 RMD160 a567e83f08951df111d88d153f3e65b5f29453ad SHA1 3ac81b1941ed0ed9e9cd9cda771503f5bf2d77ab SHA256 60576d33aa855ab45d654288d7bf2ead8accecb72fd2acbc373656294ab8f242
 DIST griffith-extra-artwork-0.9.4.tar.gz 124008 RMD160 926081627d650803d4a16b140a23de4e9798321e SHA1 c518bcca5f279fc3e5f0263c29296b9ba431b54f SHA256 96bc01a05ad54aad9fabcf411809c46c78b990fc7656ea004cebdfd8ea9894fd
 EBUILD griffith-0.12.1.ebuild 2240 RMD160 62f0f7f1d1e97188e4c4ee170ffdecf2e4f6146d SHA1 189552e4ade8b9db71f61bb2f5d269fed84cbf93 SHA256 e316678564204c71776e6df0a3ba5f493d43de7954dd57c7eaa79869c4ebd141
-EBUILD griffith-9999.ebuild 2533 RMD160 47f628ce4b0e175cd5c761fd24bba88d6de7af6b SHA1 12b5ca4f92be35c813892d6ac7b54460234ddb01 SHA256 ea97627aed25f153e03cc4280c527c03fb8332c008788d1735c6a42c966ad7d0
-MISC ChangeLog 8203 RMD160 41e360e74d3dac6b1537ca185f5984d23d5103ed SHA1 2332e25c62c00c030e70b582941a9aa82d0ccfb0 SHA256 b16c4f20db55bf8655792e1a874cdf83dddccdd297971b1ae71ab236217593fb
+EBUILD griffith-0.13.ebuild 1988 RMD160 551849a09242a1d8df469c6f671bc30691af8afd SHA1 c8bdb8b79d6590cb2123e1ab734078c9521e231a SHA256 852c63abe02e05a74522c50fc62adb8a5106d38dce05e731501b6eca71ca040b
+EBUILD griffith-9999.ebuild 2376 RMD160 efe8d6394880bf26b74baf310495d29d53147e2c SHA1 3c46b2eaf7bcae043f33569858173babbeed28e9 SHA256 0b500ef3406bac953f2ce256e8b24e2717e5aa394808d4755d51c7713f973992
+MISC ChangeLog 8373 RMD160 d4ba63520a47fb0e7262ea212558d3c20c1a0d92 SHA1 b35c8d4f7182c686fac9af5783201bfa981cd786 SHA256 11d7f9a659eb0769b4724ed18857fcd2e9a06d454b7a88c25c370676f955bb8f
 MISC metadata.xml 396 RMD160 bd923c9f95910d90c221d7ab2fb605ad04be4ea1 SHA1 0965485891286a8571c29a1975ece94d0cc20392 SHA256 ccf6be79fb955aeaafc2fffe07ba6a1cd8aaf7fe4afc1b5baa7a32153efc928d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBCgAGBQJOO7oyAAoJEPqDWhW0r/LCeZcQAJIHlphHA1X+i0I6CJy997np
-H71dKmnvid8XAibEgRt+hPBIBAUxwBeaHLEOH7a0hOLF4hThLyl8yZIDQQG5MQ3I
-SY/xFk/PFV4AOLuBmCteX7EtXOA/mMZmLQEbtrDZvhuTJ+cjsg+WNLgyz7uxcUtN
-ydEql2WsKL9zZB9Tnx8nSkWY41fA9sdjNKGbto4po/mXvBOgWADvK1lXOSeWM2fh
-w6HHdmdXwR2xRefPsIb1Nj0yJodTSZoWHm3ra0mYAdDrqlnyRs7z65EvltKP6uW/
-9E8gwMHHS92CgeNd4NlcYWO72Ja5btCuEl/aJGYuLyD0pvhlpuEDZpmMVzsjhika
-3+XifWhQhHUhZU6FhzcfjlRveIje9S7Buj+NdcjRJUkARGeWFQlNlbkCtrryAQ0x
-ZD5B2Xvqp/Q7n2KDfszuhVhACezdRcyOhrf2LjoUqVK5yRGnSXgnDJ9ESIjudYgd
-PjHXVsCWFm+aota+3aA30ijoxVYJ/+lEYLrJpO1chSFz6aSE+Czfmq0ccsgxPfKD
-15tPnXCp19e7GtlTl5nIiJyU/qpshXDQsZ9OouWdxnRD0EDduDfjpRUYGdAv4eBg
-Eh21VFD9BGORJoR4s0e2TefdvyQaKc6Ik98FY0B4J5Svs6clCCnRJ0HpIlDbZYkr
-T/DrKSd0CGadA+Vh4XW9
-=Ck1P
+iQIcBAEBCgAGBQJPa5/FAAoJEPqDWhW0r/LCc/4P/190Jvo3y7KGWw5FLUIJU/sR
+SWxJTiBoOdRRIFA40lRkR32SIEasAXetcfDp6GtzUQpldtDJ45XHZn32jXWqZwNU
+KaX9dyBXc94M1J+t2I8aV++b+Ti8H75Qxp/IlrPPPc61cd1Wizwx9hMtzmwbYlwh
+tng9/12beqUSJhtlM2zV4kKYgGnoxEsso89i3Nj/kOhXmom3c0XargixRnzYCmO/
+/fIS67aFk9A2yIqRSvp3gSmkyliCUltWxoGdI6Ass01oIQs0eAV71TgcE5DdjHXm
++UX8ZzS+ytpAKFA8Y0LuPyHZJ8gWXd65q8MzpIO/NPS+cVcNwbt1UOIu6mX8bwIn
+pD5nJ04hrQN2JNJ0af+EYKtAgu82DtUZtRoxNgWjfWmi0ygLOtuiFTsr6hJjZp8O
+SLa3tKMh+xmdm9Q/mEt4WEZn+JaCmF+f4OCSNclE1H8QuzwX4dkAOcOWALEUxSfN
+TjdQY+Hth81WqgoBX47CVVCnT6vqf8rwgJ65KbQ4wrNjn8U/Z5gUepfexcyaSCjG
+F0sA9qaBpv5y0UpC4D6ffzsqMmD00QcPXPj/NuZpnHHZBhTpG/aFUwYGsOWmc+ON
+0PgJW16imdy4UH+CjpwITeOo9g+QnwTp06JcXc+m6AH2lX1OWXBPlOM3rD/xP9yi
+6WzBuYqvDzVCkj2T0RyL
+=iczJ
 -----END PGP SIGNATURE-----
diff --git a/media-video/griffith/griffith-0.13.ebuild b/media-video/griffith/griffith-0.13.ebuild
new file mode 100644
index 000000000000..6f5c17dc1851
--- /dev/null
+++ b/media-video/griffith/griffith-0.13.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-0.13.ebuild,v 1.1 2012/03/22 21:56:14 hwoarang Exp $
+
+EAPI="4"
+
+PYTHON_DEPEND="2"
+
+inherit eutils versionator python multilib
+
+ARTWORK_PV="0.9.4"
+
+DESCRIPTION="Movie collection manager"
+HOMEPAGE="http://griffith.berlios.de/"
+SRC_URI="http://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz
+	mirror://berlios/griffith/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="doc"
+
+RDEPEND="dev-python/imaging
+	gnome-base/libglade
+	dev-python/pyxml
+	>=dev-python/pygtk-2.6.1:2
+	dev-python/pygobject:2
+	dev-python/pysqlite:2
+	>=dev-python/sqlalchemy-0.5.2
+	>=dev-python/reportlab-1.19"
+DEPEND="${RDEPEND}
+	doc? ( app-text/docbook2X )"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	sed -i \
+		-e 's#/pl/#/pl.UTF-8/#' \
+		"${S}"/docs/pl/Makefile || die "sed failed"
+
+	sed -i \
+		-e 's/ISO-8859-1/UTF-8/' \
+		"${S}"/lib/gconsole.py || die "sed failed"
+	epatch "${FILESDIR}/0.10-fix_lib_path.patch"
+}
+
+src_compile() {
+	# Nothing to compile and default `emake` spews an error message
+	true
+}
+
+src_install() {
+	use doc || { sed -i -e '/docs/d' Makefile || die ; }
+
+	emake \
+		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
+		DESTDIR="${D}" DOC2MAN=docbook2man.pl install
+	dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS
+
+	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/"
+	emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	python_mod_optimize /usr/$(get_libdir)/${PN}
+	einfo
+	einfo "${PN} can make use of the following optional dependencies"
+	einfo "dev-python/chardet: CSV file encoding detections"
+	einfo "dev-python/mysql-python: Python interface for MySQL connectivity"
+	einfo ">=dev-python/psycopg-2.4: Python interface for PostgreSQL connectivity"
+	einfo
+}
+
+pkg_postrm() {
+	python_mod_cleanup /usr/$(get_libdir)/${PN}
+}
diff --git a/media-video/griffith/griffith-9999.ebuild b/media-video/griffith/griffith-9999.ebuild
index 83a73f822034..909aa61c7e4f 100644
--- a/media-video/griffith/griffith-9999.ebuild
+++ b/media-video/griffith/griffith-9999.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-9999.ebuild,v 1.7 2011/08/05 09:39:16 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-9999.ebuild,v 1.8 2012/03/22 21:56:14 hwoarang Exp $
 
-EAPI="3"
+EAPI="4"
 ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/griffith/trunk"
 
 inherit eutils python multilib subversion
@@ -15,7 +15,7 @@ SRC_URI="mirror://berlios/griffith/${PN}-extra-artwork-${ARTWORK_PV}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="csv doc spell"
+IUSE="doc"
 
 RDEPEND="dev-python/imaging
 	dev-util/glade:3
@@ -25,9 +25,7 @@ RDEPEND="dev-python/imaging
 	dev-python/pysqlite:2
 	>=dev-python/sqlalchemy-0.5.2
 	>=dev-python/reportlab-1.19
-	>=dev-python/sqlalchemy-0.4.6
-	csv? ( dev-python/chardet )
-	spell? ( dev-python/gtkspell-python )"
+	>=dev-python/sqlalchemy-0.4.6"
 DEPEND="${RDEPEND}
 	doc? ( app-text/docbook2X )"
 
@@ -38,12 +36,10 @@ pkg_setup() {
 }
 
 src_unpack() {
-	unpack ${A}
 	subversion_src_unpack
 }
 
 src_prepare() {
-	cd "${S}"
 	sed -i \
 		-e 's#/pl/#/pl.UTF-8/#' \
 		docs/pl/Makefile || die "sed failed"
@@ -66,16 +62,16 @@ src_compile() {
 }
 
 src_install() {
-	use doc || sed -i -e '/docs/d' Makefile
+	use doc || { sed -i -e '/docs/d' Makefile || die ; }
 
 	python_version
 	emake \
 		LIBDIR="${D}/usr/$(get_libdir)/griffith" \
-		DESTDIR="${D}" DOC2MAN=docbook2man.pl install || die "emake install failed"
+		DESTDIR="${D}" DOC2MAN=docbook2man.pl install
 	dodoc AUTHORS ChangeLog README THANKS TODO NEWS TRANSLATORS
 
 	cd "${WORKDIR}/${PN}-extra-artwork-${ARTWORK_PV}/"
-	emake DESTDIR="${D}" install || die "emake install artwork failed"
+	emake DESTDIR="${D}" install
 }
 
 pkg_postinst() {