Removed -Werror, bug #260884. Fixed python dependency, bug #312189.

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

3 files changed, 51 insertions, 14 deletions

diff --git a/dev-libs/libhid/ChangeLog b/dev-libs/libhid/ChangeLog
index 28c2752331ba..7c0bdfa53527 100644
--- a/dev-libs/libhid/ChangeLog
+++ b/dev-libs/libhid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libhid
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhid/ChangeLog,v 1.2 2009/09/23 23:53:21 matsuu Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhid/ChangeLog,v 1.3 2010/04/04 14:56:17 matsuu Exp $
+
+*libhid-0.2.16-r2 (04 Apr 2010)
+
+  04 Apr 2010; MATSUU Takuto <matsuu@gentoo.org> -libhid-0.2.16-r1.ebuild,
+  +libhid-0.2.16-r2.ebuild:
+  Removed -Werror, bug #260884. Fixed python dependency, bug #312189.
 
 *libhid-0.2.16-r1 (23 Sep 2009)
 
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index f3acf4059e33..f67a1a2902d3 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1,4 +1,24 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST libhid-0.2.16.tar.gz 435245 RMD160 f61f016ae54bc5532202fd676d38d1f684e7ab8d SHA1 9a25fef674e8f20f97fea6700eb91c21ebbbcc02 SHA256 f6809ab3b9c907cbb05ceba9ee6ca23a705f85fd71588518e14b3a7d9f2550e5
-EBUILD libhid-0.2.16-r1.ebuild 1494 RMD160 98bf7575c2dc093e5cce92420c0cf0fb1320030a SHA1 0c8c5981073af42d91ae1c70018d0f8b39d197fc SHA256 fcd08c45e39316199af8294aa85266f4ab92e824671b562004cb696350b0a065
-MISC ChangeLog 557 RMD160 1af8b7e1ceb697f5ae173fb1653fd3ac362a74ad SHA1 4fc0055b99a3c4daf949ef5c21b328d040596446 SHA256 6da0b5721686b3d8f3e7f30841df55c493f51a3b67b1761e2dbe6ab912b07420
+EBUILD libhid-0.2.16-r2.ebuild 1645 RMD160 eb2d74ac13a7762239dfdeca2be0c6c032e91774 SHA1 9b50eb6191c0f8e4cc8d2ea3c8895610ce172893 SHA256 d078c77c11079faf48793be9035a4696cc0f673e582f4bd404146c009528c341
+MISC ChangeLog 764 RMD160 5be72f91ffacdef2555d4d8aa9857110e36a5c5c SHA1 941570c7b5980ed652aef727b8c36042b5120974 SHA256 95ce486cf566b17fa536bccc2204ce67a802709ca0a8f02cbd55684740746095
 MISC metadata.xml 550 RMD160 93eacd05e85031e424468b57585ce7bd20bcfb87 SHA1 57562a7ba3822914c992304f814fc5b0fe6142b0 SHA256 24d8e5690795c1a6842852b9ac2f9b33323805e26ac83a16c1571d016ace4fae
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iQIcBAEBAgAGBQJLuKiXAAoJECaGw+YFKA1pUTQP/314hb/AHa0RIwn/iVVvZ2zm
+dg7RkBjMhsJen2DXH6LSQyPlvl91PhrHRqDi4R9o5tLSLQhpzj7chskvcssnnWrs
+pSRlU55xyY/5O23g2y4A+pVR1B4QiAnRURGnt4yBfJuPaTV9M+xONomcE/AJKMp/
+k74sGPSR9A13T0SPZrbZJOBzBXlI6tWtMc+AE6PeklJaq6WABbea3CA4+WMCVEWI
+fyBICSc5je7okFQVc9lXxCOV9LkVNPdGz2LhQg4e32Lc1xlYIcgIg4GuLDzDsh//
+FRcA6VH8JbD7oXG901xdGcsTSHaUnvFVoNUKOtM0NW7YTUJ8bSIzINE+TPHNcR7w
+dQWzM7kLYHXtJo5oFJRdxTEvU/+JulBifdWfCN86cik58eOC/shm5Qt3/JyBNFAV
+IcjbPitpnPN0gSDoaJovrm1CAGkXjGM8mWJFnhwNZGzE8aO9OJg7uhiQ7Bbn3fNv
+oqrHmlS0jx5IE3uQauwF8rd5fU4RgwwpdkPq8JR59A1GoKGqzsV//+z416eYOpt9
+s8u2QDqnJMSJf9xIHfDlgpuHuuW/achc+qbQ/pSYHqIBPsbZE1b/kF+bhJZhqVhJ
+J5dLmR5QVLTTAu2iDyInhDAUZnS+XKWMd+Bli/MtICAjnNT806cgJmvHATtkRQGf
+jqsgJTc3PaUbteDUPzH4
+=PdOs
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libhid/libhid-0.2.16-r1.ebuild b/dev-libs/libhid/libhid-0.2.16-r2.ebuild
index 50b71a82a641..8b1a49b9c7e7 100644
--- a/dev-libs/libhid/libhid-0.2.16-r1.ebuild
+++ b/dev-libs/libhid/libhid-0.2.16-r2.ebuild
@@ -1,8 +1,13 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhid/libhid-0.2.16-r1.ebuild,v 1.1 2009/09/23 23:53:21 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhid/libhid-0.2.16-r2.ebuild,v 1.1 2010/04/04 14:56:17 matsuu Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="python? 2"
+
+inherit autotools python
 
-EAPI="1"
 DESCRIPTION="Provides a generic and flexible way to access and interact with USB HID devices"
 HOMEPAGE="http://libhid.alioth.debian.org/"
 SRC_URI="http://beta.magicaltux.net/${P}.tar.gz"
@@ -15,12 +20,19 @@ IUSE="debug doc python"
 RDEPEND="virtual/libusb:0"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )
-	python? (
-		dev-lang/swig
-		>=dev-lang/python-2.1.0
-	)"
+	python? ( dev-lang/swig )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Bug #260884
+	sed -i -e 's/-Werror//' m4/md_conf_compiler.m4 || die
+	eautoconf
+}
 
-src_compile() {
+src_configure() {
 	local myconf
 
 	myconf="${myconf} $(use_with doc doxygen)"
@@ -39,7 +51,6 @@ src_compile() {
 		# "python" use flag is not set
 		econf ${myconf} || die
 	fi
-	emake || die "emake failed"
 }
 
 src_install() {
@@ -47,6 +58,6 @@ src_install() {
 
 	dodoc AUTHORS ChangeLog NEWS README README.licence TODO || die
 	if use doc; then
-		dohtml -r doc/html/*
+		dohtml -r doc/html/* || die
 	fi
 }