Fix ldflags and strip issues. Bug #339114.

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

5 files changed, 49 insertions, 16 deletions

diff --git a/sci-geosciences/gpsd/ChangeLog b/sci-geosciences/gpsd/ChangeLog
index 6eaee889b310..f36d74607a90 100644
--- a/sci-geosciences/gpsd/ChangeLog
+++ b/sci-geosciences/gpsd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-geosciences/gpsd
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.51 2010/09/30 23:07:55 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/ChangeLog,v 1.52 2010/10/03 16:17:01 scarabeus Exp $
+
+  03 Oct 2010; Tomáš Chvátal <scarabeus@gentoo.org>
+  +files/2.95-disable-strip.patch, gpsd-2.95.ebuild,
+  +files/2.95-fix-ldflags.patch:
+  Fix ldflags and strip issues. Bug #339114.
 
   30 Sep 2010; Sven Wegener <swegener@gentoo.org> files/gpsd.init-2:
   Change NAME to SVCNAME in init script.
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index 871fa60f1b90..8e905ad470d7 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -1,6 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX 2.95-disable-strip.patch 382 RMD160 e9e94c7593b60c12dde86dc4d769ff0ff7a60413 SHA1 4ae5f084998b1538bf5428fd37016f48d57da0ee SHA256 435a6fa9c1ea46befc24af760da9ef96f4a66b9bf98c2b9d5d3f9ba2c72b4080
+AUX 2.95-fix-ldflags.patch 721 RMD160 4be1b2ea581d8aef35896acd9098bc298b3199ad SHA1 c8b03243da8d747429632eab871fa40e412be509 SHA256 3a93468ca101c876549bdda0a1d129ca5803706e4291f9fc8e7c74d2015ecf5a
 AUX 40-usb-serial.rules 213 RMD160 f29e28c0ea6e349811d26676da9d9eea56dfb167 SHA1 7afbf73c4deda1f247cc4256bfd0a1cf08ec8a1c SHA256 39e131d15c59fcf23e946309a5aef91b5cbe515d2902d74aac87eeea2802c74a
 AUX 99-gpsd-usb.rules 2226 RMD160 2e8762cd3537800a030d7726ae827e17903bf0a4 SHA1 350158248f20fb22f52228fe0231a190c6b0d511 SHA256 a903a57382015394d638a0d6a13e796e5f0a8613ce4633f1b42182948d135b9f
 AUX gpsd-2.33-duplicate-device-add-hang.patch 1094 RMD160 651375eacec543581266b3bfbf996ee31f4bbc03 SHA1 b00cd23f00bdd24280664c8a38efa752838909fe SHA256 504784c891073fa8825704c9e94598fceb1c95c0750566e230ace19e7c777b83
@@ -16,13 +15,6 @@ DIST gpsd-2.95.tar.gz 1385681 RMD160 c9e8d3b7ff73c655d65f0f6e329ca7ff241b10f6 SH
 EBUILD gpsd-2.32.ebuild 3351 RMD160 7466bd9d7754e93a310fbc70f8dfe09b76c8b555 SHA1 af410021bba5b3cdfb52353204ca9190b7341c53 SHA256 16eec015d708aa5fbe234a193f21f08ea7a39979ab83c417ebf21120967c5e74
 EBUILD gpsd-2.38.ebuild 5364 RMD160 c9f8f683a1cc7ced12e0508fc59d159f1ccc0796 SHA1 20d0fa23eac6bbced8f5efee925a0d2c3a99ca84 SHA256 46f9fbcb94a60c079f215e07045c2e636d85b4a44498640fb0cb1f920bb75789
 EBUILD gpsd-2.39-r1.ebuild 5535 RMD160 f7fa6a3b55dc3023c97f46a7286b08473379ff19 SHA1 9a5ad894edaba33feb306c0809622f71617be9b8 SHA256 ef949bbc355f2df6987a096bb1f02762e7ae9ff6efd7407c5e3155a9b61c45ad
-EBUILD gpsd-2.95.ebuild 1987 RMD160 9af9dfef8b13c8a361657d72592de5962e4d26aa SHA1 3f78361d3312fb9d5e85b7c6abf524a0be3669da SHA256 0701c111c1d6a36bf825ae0841aacf2ae47f764531b80dc08eb9268a2e40995f
-MISC ChangeLog 10515 RMD160 b004e2b7ed1d5ba43d2483b941b01e7a3494f29d SHA1 62157239ae2f6d86c2818bf0069bd200da86e257 SHA256 008f0eb5d875175aba2e4980c084e04fdaf8e625d83f53225ba8e459a7c620ff
+EBUILD gpsd-2.95.ebuild 2302 RMD160 c47b178dcf3490fcd990a944652a51aad54ca3b0 SHA1 99d49b543ad1df4ac4b8bcb4f3f29be269b4a5ad SHA256 e72b90f979e0358a649dc10f7dfbe02939a18d9e541ed4667c1185ef3f2caaad
+MISC ChangeLog 10703 RMD160 2c5abb2e18645337511e4782fb4e2c9cfc290ae7 SHA1 d6cf53a49bdcc61c78d7ed7bdc8cdb0d2e24667c SHA256 db0c4dad5ef09475fb11c2e3d75d67e975e81e89cc05dfe4e7314828db76da2c
 MISC metadata.xml 1036 RMD160 a8eb31ca3ab1bce798c241acd2978facb680d4d6 SHA1 e59e389ad669d2ec8d7bb6b51eccdc4d39adf778 SHA256 0a99a5aee08d78d720fa0b07712660cba2ea9c229ed99ca6e488f3dea5e1116e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkylGFMACgkQI1lqEGTUzyQj1gCg1sFRohOtOzuwOxe8GpysJNoF
-8loAn3U7mRAItc/6mdjxZRupgvhAdSYx
-=l2qV
------END PGP SIGNATURE-----
diff --git a/sci-geosciences/gpsd/files/2.95-disable-strip.patch b/sci-geosciences/gpsd/files/2.95-disable-strip.patch
new file mode 100644
index 000000000000..734853968b71
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.95-disable-strip.patch
@@ -0,0 +1,10 @@
+--- gpsd-2.95/Makefile.am	2010-07-12 02:40:22.000000000 +0200
++++ gpsd-2.95.new/Makefile.am	2010-10-03 18:04:10.000000000 +0200
+@@ -340,6 +340,7 @@
+ 	     "QMAKE_CC=$(CC)" \
+ 	     "QMAKE_CFLAGS+=$(CFLAGS)" \
+ 	     "QMAKE_LFLAGS+=$(LDFLAGS)" \
++	     "QMAKE_STRIP=" \
+ 	     "VERSION=$(libgps_VERSION)" \
+ 	     "TARGET_LIBDIR=${libdir}" \
+ 	     "TARGET_INCLUDEDIR=${includedir}"
diff --git a/sci-geosciences/gpsd/files/2.95-fix-ldflags.patch b/sci-geosciences/gpsd/files/2.95-fix-ldflags.patch
new file mode 100644
index 000000000000..bcb8bdb3a1e8
--- /dev/null
+++ b/sci-geosciences/gpsd/files/2.95-fix-ldflags.patch
@@ -0,0 +1,12 @@
+diff -urN gpsd-2.95//Makefile.am gpsd-2.95.new//Makefile.am
+--- gpsd-2.95//Makefile.am	2010-07-12 02:40:22.000000000 +0200
++++ gpsd-2.95.new//Makefile.am	2010-10-03 18:12:23.000000000 +0200
+@@ -137,7 +137,7 @@
+ libgps_VERSION__REVISION = 0
+ libgps_VERSION_AGE = 0
+ libgps_VERSION_NUMBER = $(libgps_VERSION_AGE):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
+-libgps_la_LDFLAGS = -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
++libgps_la_LDFLAGS = ${LDFLAGS} -version-number $(libgps_VERSION_CURRENT):$(libgps_VERSION__REVISION):$(libgps_VERSION_AGE)
+ lib_LTLIBRARIES = libgps.la libgpsd.la
+ 
+ libgps_SONAME = $(shell expr $(libgps_VERSION_CURRENT) - $(libgps_VERSION_AGE))
diff --git a/sci-geosciences/gpsd/gpsd-2.95.ebuild b/sci-geosciences/gpsd/gpsd-2.95.ebuild
index 7cc15db159c7..647534db15a2 100644
--- a/sci-geosciences/gpsd/gpsd-2.95.ebuild
+++ b/sci-geosciences/gpsd/gpsd-2.95.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.95.ebuild,v 1.1 2010/09/26 13:36:50 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-geosciences/gpsd/gpsd-2.95.ebuild,v 1.2 2010/10/03 16:17:01 scarabeus Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="2:2.6"
 
-inherit python base
+inherit python base autotools
 
 DESCRIPTION="GPS daemon and library to support USB/serial GPS devices and various GPS/mapping clients."
 HOMEPAGE="http://gpsd.berlios.de/"
@@ -39,6 +39,11 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${PV}-disable-strip.patch"
+	"${FILESDIR}/${PV}-fix-ldflags.patch"
+)
+
 pkg_setup() {
 	python_set_active_version 2
 
@@ -46,6 +51,11 @@ pkg_setup() {
 	enewuser gpsd -1 -1 -1 "uucp"
 }
 
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+}
+
 src_configure() {
 	local myopts
 
@@ -73,7 +83,11 @@ src_configure() {
 }
 
 src_install() {
-	base_src_install
+	# no it cant be done using emake cause it is non-compilant
+	make DESTDIR="${D}" install || die
+
+	# no need for .la files here
+	find "${D}" -type f -name '*.la' -exec rm -f '{}' +
 
 	newconfd "${FILESDIR}"/gpsd.conf-2 gpsd || die
 	newinitd "${FILESDIR}"/gpsd.init-2 gpsd || die