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

(Portage version: 2.1.4)

3 files changed, 50 insertions, 35 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/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/*
 }