Fix patch to stop pre-stripping libraries, to support multilib and amd64 stable wrt #202668.

Package-Manager: portage-2.1.4

4 files changed, 62 insertions, 57 deletions

diff --git a/dev-libs/libezV24/ChangeLog b/dev-libs/libezV24/ChangeLog
index 95749fc4b04b..31c7010f51d7 100644
--- a/dev-libs/libezV24/ChangeLog
+++ b/dev-libs/libezV24/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/libezV24
-# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/ChangeLog,v 1.8 2007/12/22 20:28:20 maekke Exp $
+# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/ChangeLog,v 1.9 2008/01/15 09:01:17 drac Exp $
+
+  15 Jan 2008; Samuli Suominen <drac@gentoo.org>
+  files/libezV24-0.1.1-build.patch, libezV24-0.1.1.ebuild:
+  Fix patch to stop pre-stripping libraries, to support multilib and amd64
+  stable wrt #202668.
 
   22 Dec 2007; Markus Meier <maekke@gentoo.org> libezV24-0.1.1.ebuild:
   x86 stable, bug #202668
diff --git a/dev-libs/libezV24/Manifest b/dev-libs/libezV24/Manifest
index dd2d8fce083d..6b1de3915a4f 100644
--- a/dev-libs/libezV24/Manifest
+++ b/dev-libs/libezV24/Manifest
@@ -1,23 +1,20 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX libezV24-0.1.1-build.patch 4542 RMD160 308e6f92969affdc87b04671c0170c9a41a3cc2c SHA1 9c7f06d1d5358d71206e8116d5ba9c1a80c6b397 SHA256 567c58f2ffd9cfb48aa7d871763bdffb23650f2d844cbadd9f038f468517f99d
-MD5 770f040eece220923b0a3d89e7a14226 files/libezV24-0.1.1-build.patch 4542
-RMD160 308e6f92969affdc87b04671c0170c9a41a3cc2c files/libezV24-0.1.1-build.patch 4542
-SHA256 567c58f2ffd9cfb48aa7d871763bdffb23650f2d844cbadd9f038f468517f99d files/libezV24-0.1.1-build.patch 4542
+AUX libezV24-0.1.1-build.patch 4869 RMD160 db20ea42818ad6fca2abb36b89428c96da77b981 SHA1 96522ea036b8b826a9ff830af7842c710fd37b0b SHA256 fd997f1d268b288c64e675c4d7536e4b6b13775c05c1a19002123f59e3429bbc
+MD5 e8b2ccd8e33341542ffe5c2481b03c13 files/libezV24-0.1.1-build.patch 4869
+RMD160 db20ea42818ad6fca2abb36b89428c96da77b981 files/libezV24-0.1.1-build.patch 4869
+SHA256 fd997f1d268b288c64e675c4d7536e4b6b13775c05c1a19002123f59e3429bbc files/libezV24-0.1.1-build.patch 4869
 AUX libezV24-0.1.1-test.patch 468 RMD160 895fd74f8d2ff17ebb798498d9e589d72613d38a SHA1 2f6926c523a842b9fc10244c5fcbe4c571bc5710 SHA256 8971d385a4ab142ded395d4742851b80b53621db7c32c6a007aadb05a1bf1934
 MD5 b824687a659b66c494536f23f55a3295 files/libezV24-0.1.1-test.patch 468
 RMD160 895fd74f8d2ff17ebb798498d9e589d72613d38a files/libezV24-0.1.1-test.patch 468
 SHA256 8971d385a4ab142ded395d4742851b80b53621db7c32c6a007aadb05a1bf1934 files/libezV24-0.1.1-test.patch 468
 DIST libezV24-0.1.1.tar.gz 50515 RMD160 2af0688d37aec8b44d610b5f6f98155e55a10547 SHA1 e03cc4714275ff429f4e75505a5599c0ccce11fb SHA256 684afbc6c20515101c879aebd220537defe261ec080c819ebce3aea81182f606
-EBUILD libezV24-0.1.1.ebuild 884 RMD160 bd67c6ff33dba0233807dcec330555c1bb4f70f6 SHA1 9369b75a6879aed60f2c653d273fbd8c347cf592 SHA256 17fac17b52fd0d6b2d45f15fa0580f0dc564b243d5c6687aa97251eda2d89789
-MD5 398c8eaf7626ac62951c7786a114c16e libezV24-0.1.1.ebuild 884
-RMD160 bd67c6ff33dba0233807dcec330555c1bb4f70f6 libezV24-0.1.1.ebuild 884
-SHA256 17fac17b52fd0d6b2d45f15fa0580f0dc564b243d5c6687aa97251eda2d89789 libezV24-0.1.1.ebuild 884
-MISC ChangeLog 1262 RMD160 e2db86cae8add3b9b85792a507ac39e6b092336a SHA1 98f434c1dc2a79e6b3e9daf2cffd708c480226c9 SHA256 dea416fea326123f24e975c23051a0a85c2b799f99e148d5dee1327a04fb35d0
-MD5 9336b5708e92661764d84010861ab7b1 ChangeLog 1262
-RMD160 e2db86cae8add3b9b85792a507ac39e6b092336a ChangeLog 1262
-SHA256 dea416fea326123f24e975c23051a0a85c2b799f99e148d5dee1327a04fb35d0 ChangeLog 1262
+EBUILD libezV24-0.1.1.ebuild 955 RMD160 defead7f6f6b1264d19ee50d35a8310f7eb38141 SHA1 0e747f6299f10ea052ba7aaff1c458eac2da4825 SHA256 9edac90d71ac29e041b62ad07a37f6842755abff94ab2789c690f92f3d37a48b
+MD5 b13b092e49db91b20da5e56ee68e4c9d libezV24-0.1.1.ebuild 955
+RMD160 defead7f6f6b1264d19ee50d35a8310f7eb38141 libezV24-0.1.1.ebuild 955
+SHA256 9edac90d71ac29e041b62ad07a37f6842755abff94ab2789c690f92f3d37a48b libezV24-0.1.1.ebuild 955
+MISC ChangeLog 1466 RMD160 864f2318e51c1eb85bf067052b70a97c9586404e SHA1 b4cd87a5f448476521347ddb63d384b09c901c0f SHA256 32f660de889ac2fa8fc0581cfa0d7ccee44935b0c95b9ebc4458e399085c5358
+MD5 4269d7835646d90f958986d5403e91d5 ChangeLog 1466
+RMD160 864f2318e51c1eb85bf067052b70a97c9586404e ChangeLog 1466
+SHA256 32f660de889ac2fa8fc0581cfa0d7ccee44935b0c95b9ebc4458e399085c5358 ChangeLog 1466
 MISC metadata.xml 613 RMD160 a5bf0f2215bbb80bbc1347285c3497aeee61eb3b SHA1 b7909afe045da77c9425f5582fcd50de3b321610 SHA256 b6f9852332bfe4c826f65ff7014fc49d9fc9e045314c2f4f954ba642061dcd2a
 MD5 d3e13cdac64e93dc45ebafb31f598605 metadata.xml 613
 RMD160 a5bf0f2215bbb80bbc1347285c3497aeee61eb3b metadata.xml 613
@@ -25,10 +22,3 @@ SHA256 b6f9852332bfe4c826f65ff7014fc49d9fc9e045314c2f4f954ba642061dcd2a metadata
 MD5 af48fe71f14f21689f21555546f3d905 files/digest-libezV24-0.1.1 241
 RMD160 07008ba6cb9c419a264e81bca492a7421987858a files/digest-libezV24-0.1.1 241
 SHA256 e536a28a290e3b350b8ae6229846fe14a474174c74fbec7a26cd5fa4306e8833 files/digest-libezV24-0.1.1 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.8 (GNU/Linux)
-
-iEYEARECAAYFAkdtc68ACgkQkKaRLQcq0GLWdACdHQifM4qVgbOi3qHxJnR64tGg
-dhMAniLZEUn2x6Onc5/JsuyOV0ZCfVtl
-=6IGG
------END PGP SIGNATURE-----
diff --git a/dev-libs/libezV24/files/libezV24-0.1.1-build.patch b/dev-libs/libezV24/files/libezV24-0.1.1-build.patch
index 6d5e79b55148..3550f02edf2e 100644
--- a/dev-libs/libezV24/files/libezV24-0.1.1-build.patch
+++ b/dev-libs/libezV24/files/libezV24-0.1.1-build.patch
@@ -1,19 +1,23 @@
---- libezV24-0.1.1/Makefile
-+++ libezV24-0.1.1/Makefile
-@@ -19,68 +19,62 @@
+diff -ur libezV24-0.1.1.orig/Makefile libezV24-0.1.1/Makefile
+--- libezV24-0.1.1.orig/Makefile	2003-02-17 15:46:18.000000000 +0200
++++ libezV24-0.1.1/Makefile	2008-01-15 10:47:13.000000000 +0200
+@@ -19,68 +19,63 @@
  # the base name of the library
  SOBASE = ezV24
  
 -# define the destination OS (currently only linux)
 -PLATFORM=__LINUX__
 -
- # the base path where the file should be installed to.
- PREFIX = /usr/local
- 
+-# the base path where the file should be installed to.
+-PREFIX = /usr/local
++# the base paths where the files should be installed to.
++PREFIX = /usr
++LIBDIR = $(PREFIX)/lib
++
 +# an additional prefix for building RPM packages. NOTE: don't forget to add a
 +# trailing slash!
 +DESTDIR =
-+
+ 
  # generate the name of the output file in dependence of the development state.
  #
 -ifeq "${RELEASE}" "DEBUG"
@@ -57,10 +61,10 @@
  endif
  endif
  
++CC ?= gcc
 +CPPFLAGS += -I.
 +CFLAGS ?= -O2
 +CFLAGS += -Wall
-+LDFLAGS ?= -s
 +
  # tools to build the static library
  ARFLAGS = cru
@@ -69,11 +73,11 @@
 -
 -# concatinate the compile flags
 -CFLAGS = $(C_FLAG) $(C_DEFS)
--
 +AR ?= ar
 +RANLIB ?= ranlib
  
 -
+-
 -# ------------------------------------------------------------------------
 -# AUTOMATISCHE COMPILE-ANWEISUNGEN
 -# ------------------------------------------------------------------------
@@ -94,7 +98,7 @@
  all:		shared static test-v24
  
  shared:		$(NAME)
-@@ -88,13 +82,13 @@
+@@ -88,13 +83,13 @@
  static:		$(LIBNAME)
  
  
@@ -113,7 +117,7 @@
  
  
  # Abhängigkeiten des Source, jedoch dann ohne Generierungsanweisung, wenn
-@@ -111,14 +104,17 @@
+@@ -111,22 +106,27 @@
  #
  
  install:
@@ -126,31 +130,34 @@
 -		ln -s $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME);\
 -		ldconfig
 +		install -d -m 755 $(DESTDIR)$(PREFIX)/include/$(SOBASE)
-+		install -d -m 755 $(DESTDIR)$(PREFIX)/lib/
++		install -d -m 755 $(DESTDIR)$(LIBDIR)
 +		install -m 644 ezV24.h $(DESTDIR)$(PREFIX)/include/$(SOBASE)/
-+		install -m 644 $(LIBNAME) $(DESTDIR)$(PREFIX)/lib/$(LIBNAME)
-+		install -m 755 $(NAME) $(DESTDIR)$(PREFIX)/lib/$(NAME)
-+		rm -f $(DESTDIR)$(PREFIX)/lib/$(SONAME) $(DESTDIR)$(PREFIX)/lib/$(PLAINNAME)
-+		ln -s $(NAME) $(DESTDIR)$(PREFIX)/lib/$(SONAME)
-+		ln -s $(SONAME) $(DESTDIR)$(PREFIX)/lib/$(PLAINNAME)
++		install -m 644 $(LIBNAME) $(DESTDIR)$(LIBDIR)/$(LIBNAME)
++		install -m 755 $(NAME) $(DESTDIR)$(LIBDIR)/$(NAME)
++		rm -f $(DESTDIR)$(PREFIX)/lib/$(SONAME) $(DESTDIR)$(LIBDIR)/$(PLAINNAME)
++		ln -s $(NAME) $(DESTDIR)$(LIBDIR)/$(SONAME)
++		ln -s $(SONAME) $(DESTDIR)$(LIBDIR)/$(PLAINNAME)
 +		if [ -z $$NO_LDCONFIG ]; then \
 +		  $(LDCONFIG); \
 +		fi  
  
  uninstall:
  		rm -f $(PREFIX)/include/ezV24/*
-@@ -127,7 +122,9 @@
- 		rm -f $(PREFIX)/lib/$(LIBNAME)
- 		rm -f $(PREFIX)/lib/$(NAME)
- 		rm -f $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME)
+ 		rmdir $(PREFIX)/include/ezV24
+-		rm -f $(PREFIX)/lib/$(LIBNAME)
+-		rm -f $(PREFIX)/lib/$(NAME)
+-		rm -f $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME)
 -		ldconfig
++		rm -f $(LIBDIR)/$(LIBNAME)
++		rm -f $(LIBDIR)/$(NAME)
++		rm -f $(LIBDIR)/$(SONAME) $(LIBDIR/$(PLAINNAME)
 +		if [ -z $$NO_LDCONFIG ]; then \
 +		  $(LDCONFIG); \
 +		fi  
  
  
  # This entry is for packing a distribution tarball
-@@ -158,15 +156,15 @@
+@@ -157,7 +157,7 @@
  #	gcc -o test-v24 -Wall test-v24.c -l$(SOBASE)
  #
  test-v24:	test-v24.c ezV24.h $(LIBNAME)
@@ -159,7 +166,7 @@
  
  
  # --------------------------------------------------------------------------
- # ANDERE AUFGABEN
+@@ -165,7 +165,7 @@
  # --------------------------------------------------------------------------
  
  clean:
diff --git a/dev-libs/libezV24/libezV24-0.1.1.ebuild b/dev-libs/libezV24/libezV24-0.1.1.ebuild
index 60b5570a7eb8..71e5ecd6a11f 100644
--- a/dev-libs/libezV24/libezV24-0.1.1.ebuild
+++ b/dev-libs/libezV24/libezV24-0.1.1.ebuild
@@ -1,20 +1,20 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/libezV24-0.1.1.ebuild,v 1.9 2007/12/22 20:28:20 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/libezV24-0.1.1.ebuild,v 1.10 2008/01/15 09:01:17 drac Exp $
 
-inherit eutils
+inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="library that provides an easy API to Linux serial ports"
-HOMEPAGE="http://ezv24.sourceforge.net/"
+HOMEPAGE="http://ezv24.sourceforge.net"
 SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha ~amd64 ppc sparc x86"
+KEYWORDS="alpha amd64 ppc sparc x86"
 IUSE=""
 
-DEPEND=""
 RDEPEND=""
+DEPEND=""
 
 src_unpack() {
 	unpack ${A}
@@ -22,14 +22,17 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-build.patch
 	epatch "${FILESDIR}"/${P}-test.patch
 	sed -i -e 's:__LINUX__:__linux__:' *.c *.h
-	sed -i \
-		-e '/^PREFIX/s:/usr/local:/usr:' \
-		Makefile
+}
+
+src_compile() {
+	tc-export AR CC RANLIB
+	emake || die "emake failed."
 }
 
 src_install() {
 	export NO_LDCONFIG="stupid"
-	emake install DESTDIR="${D}" || die "Make install failed"
+	emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)" \
+		install || die "emake install failed."
 	dodoc AUTHORS BUGS ChangeLog HISTORY README
 	dohtml api-html/*
 }