Set SUPPORT_PYTHON_ABIS (bug #363893). Fix dependency on Perl.

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

3 files changed, 50 insertions, 16 deletions

diff --git a/app-misc/g15daemon/ChangeLog b/app-misc/g15daemon/ChangeLog
index 5a53b9800693..124778569877 100644
--- a/app-misc/g15daemon/ChangeLog
+++ b/app-misc/g15daemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/g15daemon
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.35 2011/03/28 01:03:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/ChangeLog,v 1.36 2011/04/16 22:56:19 arfrever Exp $
+
+  16 Apr 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
+  g15daemon-1.9.5.3-r3.ebuild:
+  Set SUPPORT_PYTHON_ABIS (bug #363893). Fix dependency on Perl.
 
   28 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
   g15daemon-1.9.5.3-r3.ebuild:
diff --git a/app-misc/g15daemon/Manifest b/app-misc/g15daemon/Manifest
index 6c268a89c5f1..282a42097a5d 100644
--- a/app-misc/g15daemon/Manifest
+++ b/app-misc/g15daemon/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 99-g15daemon.rules 90 RMD160 35df4086850c7170227e472cc82d7db0d0e2d23b SHA1 fff177b525ba9e7882cc01ae61091c483a3863c1 SHA256 dab916b3cb839bb55f4b6f599f83de2c4dbdd87005394f737dc59ab4df7d4e84
 AUX g15daemon-1.2.7-r2.initd 1107 RMD160 33a13cbbdf3701b6e81fb39dfad5f6ee3318d1bc SHA1 7832d5da216f59b42423d2f9583eb2b3356ae237 SHA256 37d29b422cdc680bd066d8b0dca874781396aded214cf080014454421c9bb26d
 AUX g15daemon-1.2.7.confd 329 RMD160 962088db694d25a6935de80299a45d94787ed251 SHA1 f452f915e6f903e4cdbbfc3db3e2e57ef702425f SHA256 a7977e03f0faaed85f659b077fddc3a589c2e2d4386df1e9afc89133c25bc613
@@ -5,6 +8,23 @@ AUX g15daemon-1.9.5.3-forgotten-open-mode.patch 639 RMD160 04b8ae6d53ccb99a9bba3
 AUX g15daemon-hotplug 187 RMD160 df076cb3c47e976085e362fa1b6c7b1429857684 SHA1 61a1ddf817746e46e48c77186f145c59b5e3256f SHA256 694fcaa68b7de070a257c72b3d9b0736377bbf3102d41c9aadcb9b27d0efcdad
 AUX g15daemon.conf 516 RMD160 50e8da6e93ae52960519c00d0f76ca6ba636f33a SHA1 db3b0b119c1f77dc91a7a9222c45ed3bd65f73df SHA256 94a79cea3ac0fa566cd6515e32eec22bb6a26e353c83608767dc65d1a2404037
 DIST g15daemon-1.9.5.3.tar.gz 414603 RMD160 937362cd75d578e1b992868aeacefa928390ab4d SHA1 bc10775494ff38e78ecb62074869332d96c5cb55 SHA256 40ff07a4186c1fd01ea23d1753a2cb3bef25f92cc496ddddc6abde6a574cd60a
-EBUILD g15daemon-1.9.5.3-r3.ebuild 3873 RMD160 4f3205a2c0918adf660c19219ae5ed96f78361d6 SHA1 3fd4c3a57f7b2e10ef3741e9d8caed77d02ea7fa SHA256 f14d131dfd52f3971080109ad2b0f40ef7d0a4fbdfc8499a4c2b840060ca800e
-MISC ChangeLog 7174 RMD160 6d415a1171201070647090eb046f49925394dba2 SHA1 714f74e1865cd19cac4e813f32fbeaf3d37310e8 SHA256 0c7377f951988f43fe96d6d89227f763bd5852f41c24d29eaa9ffc2485a2572b
+EBUILD g15daemon-1.9.5.3-r3.ebuild 3978 RMD160 8d8c01b53f712c36b52e381763a167e0037f3baf SHA1 5af1cd345517247407bb669f7c1bf1617647a8fa SHA256 a9fe2935b56303c08282836ce857db559c2225123d2e80230c224d06bae33337
+MISC ChangeLog 7343 RMD160 c0860d67d8903293a2a3af7b10aee14e0a317566 SHA1 2b3dd141396044cc57db4f56ce64eb39d526a1e3 SHA256 a1b92700df18db358ff1a0a8f6a6d90a46daa0b51a25bf31881202ced5a64369
 MISC metadata.xml 222 RMD160 f3b76907c0789c67d2e3d9d4073a5911aa8ae42f SHA1 792ac055d4a27ee4d9120df34d5390ac3732ab94 SHA256 edd5f0f934fb8e9338e5a0ce8caaae6f6232dfb8cb4e0c0cfbac0363eb42b7c9
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBAgAGBQJNqh6aAAoJENgZr6v6gHY0Yf8P/0OmAVWki8x1SDfb2AscIx42
+aIzqBPTURvstsAUnXiV9/MzJwetuufTC88UkFdLG30VUIbwQERuYtNSSJBez9vCX
+CY1wZo08PfSov5PR77ohBogs3p6zmhZC6/VO2246mu1kJCV3sX4cHji1eFWHoH5V
+u3QgSyMYSz6LT4myrhlsjBvklxz4q4rxPLgghMaYy6dTZ27inDtaaRer+wMKitn3
+yaa+g/NKHdjpyAjQK5EH3GamDrsquh2pRIZ3+VCDM3oZ4nMLhPudxMyDnor4JVEZ
+RGQJNzYM5VbKAJihHFmA+mHjiOY+Lun83osITUv/vt5prP17XC9N+3oRhpj7q0jO
+8w/r38X3QhU/B1is/gEm0QvAsY2XM277xQxT9VnfORZjBcrPVmCf0zoNHqhCe+Nk
+K3aPaLMWJxuFuIoHebvZp/hb5DVzvQhroTEvU3kkYMZGGpD75QCbf2kQJQfr+V/X
+ujjViHx5CPG380Fy90MwjEbiM5yj7h0hzo8AOnwFMSKO/YhlxNakWXIkngeCEyLV
+5YXDsdoNRzqOnJputTN5BlBCPKCUiSq6Dc8JErg3MrkUVrCg0L3M7flh1DR0LVii
+KGzbEV1HWMPw2Yzg4Vvh0bXqHMvUX0VWbDSBlROPlUQSK7DltV0wdYXpcoeCHeyG
+kfY+IWUAXpNAWbIaE+bk
+=rGEb
+-----END PGP SIGNATURE-----
diff --git a/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild b/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild
index 6d2ff308a82a..6b18abe86fe5 100644
--- a/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild
+++ b/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild
@@ -1,10 +1,13 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild,v 1.7 2011/03/28 01:03:43 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/g15daemon/g15daemon-1.9.5.3-r3.ebuild,v 1.8 2011/04/16 22:56:19 arfrever Exp $
 
-EAPI=2
+EAPI=3
+GENTOO_DEPEND_ON_PERL="no"
+PYTHON_DEPEND="python? *"
+SUPPORT_PYTHON_ABIS="1"
 
-inherit eutils linux-info perl-module python multilib base
+inherit eutils linux-info perl-module python base
 
 DESCRIPTION="G15daemon takes control of the G15 keyboard, through the linux kernel uinput device driver"
 HOMEPAGE="http://g15daemon.sourceforge.net/"
@@ -15,14 +18,15 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="perl python"
 
-DEPEND="=virtual/libusb-0*
+DEPEND="virtual/libusb:0
 	>=dev-libs/libg15-1.2.4
 	>=dev-libs/libg15render-1.2
-	perl? ( >=dev-perl/Inline-0.4 )
-	python? ( dev-lang/python )"
-
-RDEPEND="${DEPEND}
-	perl? ( dev-perl/GDGraph )"
+	perl? (
+		dev-lang/perl
+		dev-perl/GDGraph
+		>=dev-perl/Inline-0.4
+	)"
+RDEPEND="${DEPEND}"
 
 PATCHES=( "${FILESDIR}/${P}-forgotten-open-mode.patch" )
 uinput_check() {
@@ -45,6 +49,9 @@ uinput_check() {
 pkg_setup() {
 	linux-info_pkg_setup
 	uinput_check
+	if use python; then
+		python_pkg_setup
+	fi
 }
 
 src_unpack() {
@@ -121,8 +128,11 @@ src_install() {
 		ebegin "Installing Python Bindings (g15daemon.py)"
 		cd "${WORKDIR}/pyg15daemon"
 
-		insinto $(python_get_sitedir)/g15daemon
-		doins g15daemon.py
+		installation() {
+			insinto $(python_get_sitedir)
+			doins g15daemon.py
+		}
+		python_execute_function installation
 
 		docinto python
 		dodoc AUTHORS
@@ -131,7 +141,7 @@ src_install() {
 
 pkg_postinst() {
 	if use python; then
-		python_mod_optimize $(python_get_sitedir)/g15daemon
+		python_mod_optimize g15daemon.py
 		echo ""
 	fi
 
@@ -152,6 +162,6 @@ pkg_postinst() {
 
 pkg_postrm() {
 	if use python; then
-		python_mod_cleanup $(python_get_sitedir)/g15daemon
+		python_mod_cleanup g15daemon.py
 	fi
 }