Respect LDFLAGS. Remove useless .la file. Fixes bug #313841

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

3 files changed, 82 insertions, 22 deletions

diff --git a/dev-libs/libhid/ChangeLog b/dev-libs/libhid/ChangeLog
index 7c0bdfa53527..fa71c43a164d 100644
--- a/dev-libs/libhid/ChangeLog
+++ b/dev-libs/libhid/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libhid
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libhid/ChangeLog,v 1.4 2010/07/17 00:10:38 hwoarang Exp $
+
+*libhid-0.2.16-r3 (17 Jul 2010)
+
+  17 Jul 2010; Markos Chandras <hwoarang@gentoo.org>
+  +libhid-0.2.16-r3.ebuild:
+  Respect LDFLAGS. Remove useless .la file. Fixes bug #313841
 
 *libhid-0.2.16-r2 (04 Apr 2010)
 
diff --git a/dev-libs/libhid/Manifest b/dev-libs/libhid/Manifest
index f67a1a2902d3..ef654cae09ce 100644
--- a/dev-libs/libhid/Manifest
+++ b/dev-libs/libhid/Manifest
@@ -1,24 +1,5 @@
------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-r2.ebuild 1645 RMD160 eb2d74ac13a7762239dfdeca2be0c6c032e91774 SHA1 9b50eb6191c0f8e4cc8d2ea3c8895610ce172893 SHA256 d078c77c11079faf48793be9035a4696cc0f673e582f4bd404146c009528c341
-MISC ChangeLog 764 RMD160 5be72f91ffacdef2555d4d8aa9857110e36a5c5c SHA1 941570c7b5980ed652aef727b8c36042b5120974 SHA256 95ce486cf566b17fa536bccc2204ce67a802709ca0a8f02cbd55684740746095
+EBUILD libhid-0.2.16-r3.ebuild 1826 RMD160 43976d91acf1957da0584e946ab3e5d8cb09331f SHA1 7a04af49bab811f9b9f31ef27ab85a8047cc6f7d SHA256 abf6e6e0507a10cd3d3f07c8104b98b0ee0c1fdcd31e1ac4540765151b6298e2
+MISC ChangeLog 943 RMD160 e436c391f16c836b95cd0d6e8650a27115fb5b40 SHA1 09e73d52f58b67d3b7923abbb66b0d9ac382e89a SHA256 27762a136b5fc04cd7fd702c32bce89ccc4e21fc10b588722ca26454c889b10e
 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-r3.ebuild b/dev-libs/libhid/libhid-0.2.16-r3.ebuild
new file mode 100644
index 000000000000..86384b0a5d0e
--- /dev/null
+++ b/dev-libs/libhid/libhid-0.2.16-r3.ebuild
@@ -0,0 +1,73 @@
+# 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-r3.ebuild,v 1.1 2010/07/17 00:10:38 hwoarang Exp $
+
+EAPI="2"
+
+PYTHON_DEPEND="python? 2"
+
+inherit autotools python
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug doc python"
+
+RDEPEND="virtual/libusb:0"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	python? ( dev-lang/swig )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	# Respect LDFLAGS
+	export OS_LDFLAGS="${LDFLAGS}"
+	# Bug #260884
+	sed -i -e 's/-Werror//' m4/md_conf_compiler.m4 || die
+	eautoconf
+}
+
+src_configure() {
+	local myconf
+
+	myconf="${myconf} $(use_with doc doxygen)"
+	myconf="${myconf} $(use_enable debug)"
+	myconf="${myconf} $(use_enable python swig)"
+
+	if use python; then
+		# libhid includes its own python detection m4 from
+		# http://autoconf-archive.cryp.to/ac_python_devel.html
+		# As it seems to detect python in the wrong place, we'll force it by
+		# passing the right environnement variables, only if we have the python
+		# flag
+		PYTHON_LDFLAGS="$(python-config --ldflags)" econf ${myconf} || die
+	else
+		# avoid libhid running swig if it finds it automatically as long as the
+		# "python" use flag is not set
+		econf ${myconf} || die
+	fi
+}
+
+src_compile() {
+	append-ldflags
+	emake || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "install failed"
+
+	dodoc AUTHORS ChangeLog NEWS README README.licence TODO || die
+	if use doc; then
+		dohtml -r doc/html/* || die
+	fi
+	#delete .la file. Bug #313841
+	rm "${D}"/$(python_get_sitedir)/${PN}/_hid.la
+
+}