EAPI3, apply conditional patch for sqlalchemy-0.7.1. Add post_inst message about optional runtime dependencies. Bug #377789

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

5 files changed, 84 insertions, 12 deletions

diff --git a/media-video/griffith/ChangeLog b/media-video/griffith/ChangeLog
index 0b5fd8c61662..192b7559f6aa 100644
--- a/media-video/griffith/ChangeLog
+++ b/media-video/griffith/ChangeLog
@@ -1,6 +1,11 @@
 # 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.55 2011/06/04 17:36:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/ChangeLog,v 1.56 2011/08/05 09:17:45 hwoarang Exp $
+
+  05 Aug 2011; Markos Chandras <hwoarang@gentoo.org> griffith-0.12.1.ebuild,
+  +files/griffith-0.12.1-sqlalchemy-0.7.patch, griffith-9999.ebuild:
+  EAPI3, apply conditional patch for sqlalchemy-0.7.1. Add post_inst message
+  about optional runtime dependencies. Bug #377789
 
   04 Jun 2011; Pacho Ramos <pacho@gentoo.org> griffith-0.12.1.ebuild,
   griffith-9999.ebuild:
diff --git a/media-video/griffith/Manifest b/media-video/griffith/Manifest
index 4b2c76774a9e..cb4a60fb30b7 100644
--- a/media-video/griffith/Manifest
+++ b/media-video/griffith/Manifest
@@ -1,17 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+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-extra-artwork-0.9.4.tar.gz 124008 RMD160 926081627d650803d4a16b140a23de4e9798321e SHA1 c518bcca5f279fc3e5f0263c29296b9ba431b54f SHA256 96bc01a05ad54aad9fabcf411809c46c78b990fc7656ea004cebdfd8ea9894fd
-EBUILD griffith-0.12.1.ebuild 1825 RMD160 d39478c149a232b02a826e121d2094173ddc49b3 SHA1 90432bdabef685c048aba50bedf9138041a9859b SHA256 da09ca4d19b8ead8ea769847fcddf5f26d8cbdce998fd21494b724b622304cc0
-EBUILD griffith-9999.ebuild 2219 RMD160 0e61d26b5b641708d926c250bc949d66583ded44 SHA1 5e3a04084953f04a79ca6afca3598c56436a81ce SHA256 b8d10964afa20ee5ca615ff73740b4dc3b8e0eb437233001061dfedbee84159b
-MISC ChangeLog 7819 RMD160 9b304b7264eb4893a6b92e84bdfac435dd3df983 SHA1 f837134c42bcf15712e57bf2cf9fcf5ab0566572 SHA256 b0ed254f70084b0fe08cb1885896a192787491cb5e1859b3a0d5b34ae2479140
+EBUILD griffith-0.12.1.ebuild 2240 RMD160 62f0f7f1d1e97188e4c4ee170ffdecf2e4f6146d SHA1 189552e4ade8b9db71f61bb2f5d269fed84cbf93 SHA256 e316678564204c71776e6df0a3ba5f493d43de7954dd57c7eaa79869c4ebd141
+EBUILD griffith-9999.ebuild 2515 RMD160 88c025e0c41cfefe841fd9b0303fab29c29b52a8 SHA1 092b397690bf9bfc6f4225f7f165272bd9a4b57f SHA256 5a33386dfa7475ede8eaa0d8e1636904fae8b90147fec87269440a5461922934
+MISC ChangeLog 8097 RMD160 47d53f6ef6410047ecf2eb2798fae0675d68c399 SHA1 e196b4c50989853479ca8bec0c341f90323af3c7 SHA256 b874209442414f5b64f6a5b5b68f7fd86bad27fb14818f25130a3899ff218ebb
 MISC metadata.xml 396 RMD160 bd923c9f95910d90c221d7ab2fb605ad04be4ea1 SHA1 0965485891286a8571c29a1975ece94d0cc20392 SHA256 ccf6be79fb955aeaafc2fffe07ba6a1cd8aaf7fe4afc1b5baa7a32153efc928d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk3qbScACgkQCaWpQKGI+9QVawCdEVSAExPdMXOiBW1dqTDYoVPR
-VzwAnRbcbTUEowfeJcRWlkARPdeMik+v
-=25Xz
+iQIcBAEBCgAGBQJOO7UlAAoJEPqDWhW0r/LCpkYP/j/A0kbdSrQ9RWlc/PFqzMlL
+K/tHmiPDISmaHk8jIvWZ0+kBU+bd2Ga6Qt1loz4s5Dtj6El+26nH/HKmVydk/IlY
+LyIpyyaZ6IdfWzIjm1UBCW6ucYn4n+cpiaxu5mTerzE0w9yAzuNfeUXBBVQNvvRN
+HZQamKsQFV64k8yMkj1i7r7yHExMNWUoIMJKm8OrGXEi9EOfwKrivRx1ficW+WSf
+QqANCZBhSnJeCfswisRpR7KfBZL8tU9zxAplh9+5OGKXh90af9fNfF19/BuJ7bW9
+1+t/LED58E/Jlq1TFqzOxCSHryOPLvqBXAQRm6es8w8FJJo74FcfOfvXc99TGNUh
+CdmbHcpm+bbmlYXpHfbbQAcdKAU2S45Mxx1vw4UpMqfZ0rQyyXmUi86MGrSYFiMh
+WSOxNCJ7SDzVn5u54DILJ5M4tRqVYUHiweXzB3u4c3QiORNopeRTh8erPItp3isP
+46oBSQgkM+9Ck70KZeG7oDGL6Howj/T4E4Mo36g5kXg2Hkx5YKMFaK4mwWz7ir5B
+N85RWO8ZlYbpegBLCLU13XBHmQsPaIy4erJPsMVMMo1OBT8Msv4Ce+AE+4qHW8/A
+rN5u3M6yPmKCfwNjLPHF7pUrGXVWH54u1rolfO46wmQo6oIcNjxLBQZjAI5o9Myz
+qZu+HCnTNspoXUDRVi1j
+=ER5M
 -----END PGP SIGNATURE-----
diff --git a/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch b/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch
new file mode 100644
index 000000000000..d3e6a5b6e182
--- /dev/null
+++ b/media-video/griffith/files/griffith-0.12.1-sqlalchemy-0.7.patch
@@ -0,0 +1,39 @@
+Index: griffith-0.12.1/lib/add.py
+===================================================================
+--- griffith-0.12.1.orig/lib/add.py
++++ griffith-0.12.1/lib/add.py
+@@ -26,7 +26,7 @@ import logging
+ import os
+ 
+ import gtk
+-from sqlalchemy.exceptions import IntegrityError
++from sqlalchemy.exc import IntegrityError
+ 
+ import quick_filter
+ import db
+Index: griffith-0.12.1/lib/db/tables.py
+===================================================================
+--- griffith-0.12.1.orig/lib/db/tables.py
++++ griffith-0.12.1/lib/db/tables.py
+@@ -64,7 +64,7 @@ movies = Table('movies', metadata,
+     Column('poster_md5', ForeignKey(posters.c.md5sum)),
+     Column('loaned', Boolean, nullable=False, default=False),
+     Column('seen', Boolean, nullable=False, default=False),
+-    Column('rating', SmallInteger(2)),
++    Column('rating', SmallInteger),
+     Column('color', SmallInteger),
+     Column('cond', SmallInteger), # MySQL will not accept name "condition"
+     Column('layers', SmallInteger),
+Index: griffith-0.12.1/lib/sql.py
+===================================================================
+--- griffith-0.12.1.orig/lib/sql.py
++++ griffith-0.12.1/lib/sql.py
+@@ -29,7 +29,7 @@ import logging
+ import os.path
+ 
+ from sqlalchemy import create_engine, or_, and_, not_, exists, asc, desc
+-from sqlalchemy.exceptions import OperationalError
++from sqlalchemy.exc import OperationalError
+ from sqlalchemy.orm import sessionmaker, scoped_session
+ from sqlalchemy.sql.expression import Update, Delete
+ 
diff --git a/media-video/griffith/griffith-0.12.1.ebuild b/media-video/griffith/griffith-0.12.1.ebuild
index ba3d51d1c68a..890292ea9f86 100644
--- a/media-video/griffith/griffith-0.12.1.ebuild
+++ b/media-video/griffith/griffith-0.12.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-0.12.1.ebuild,v 1.4 2011/06/04 17:36:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-0.12.1.ebuild,v 1.5 2011/08/05 09:17:45 hwoarang Exp $
 
-EAPI="2"
+EAPI="3"
 
 PYTHON_DEPEND="2"
 
@@ -46,6 +46,11 @@ src_prepare() {
 		-e 's/ISO-8859-1/UTF-8/' \
 		"${S}"/lib/gconsole.py || die "sed failed"
 	epatch "${FILESDIR}/0.10-fix_lib_path.patch"
+
+	#bug 377789
+	if has_version ">=dev-python/sqlalchemy-0.7.1"; then
+		epatch ${FILESDIR}/${P}-sqlalchemy-0.7.patch
+	fi
 }
 
 src_compile() {
@@ -67,6 +72,12 @@ src_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() {
diff --git a/media-video/griffith/griffith-9999.ebuild b/media-video/griffith/griffith-9999.ebuild
index b9576e128173..225e398f521e 100644
--- a/media-video/griffith/griffith-9999.ebuild
+++ b/media-video/griffith/griffith-9999.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.5 2011/06/04 17:36:33 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/griffith/griffith-9999.ebuild,v 1.6 2011/08/05 09:17:45 hwoarang Exp $
 
-EAPI="1"
+EAPI="3"
 ESVN_REPO_URI="http://svn.berlios.de/svnroot/repos/griffith/trunk"
 
 inherit eutils python multilib subversion
@@ -78,6 +78,12 @@ src_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() {