Cleanup the ebuild and source code so it doesnt suck nearly as much and add some amd64 love.

Package-Manager: portage-2.1.1_rc1

5 files changed, 215 insertions, 19 deletions

diff --git a/dev-libs/libezV24/ChangeLog b/dev-libs/libezV24/ChangeLog
index 8441cc47eec2..66a9d5ca287f 100644
--- a/dev-libs/libezV24/ChangeLog
+++ b/dev-libs/libezV24/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libezV24
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/ChangeLog,v 1.4 2004/12/29 22:22:35 ciaranm Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/ChangeLog,v 1.5 2006/08/26 22:51:29 vapier Exp $
+
+  26 Aug 2006; Mike Frysinger <vapier@gentoo.org>
+  -files/libezV24-0.1.1-Makefile.diff, +files/libezV24-0.1.1-build.patch,
+  +files/libezV24-0.1.1-test.patch, -files/libezV24-0.1.1-test-v24.c.diff,
+  libezV24-0.1.1.ebuild:
+  Cleanup the ebuild and source code so it doesnt suck nearly as much and add
+  some amd64 love.
 
   29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
   Change encoding to UTF-8 for GLEP 31 compliance
diff --git a/dev-libs/libezV24/files/digest-libezV24-0.1.1 b/dev-libs/libezV24/files/digest-libezV24-0.1.1
index c430d2866d33..5e1dbc813fa6 100644
--- a/dev-libs/libezV24/files/digest-libezV24-0.1.1
+++ b/dev-libs/libezV24/files/digest-libezV24-0.1.1
@@ -1 +1,3 @@
 MD5 59a682a6ba5cce142760f7309dea44f9 libezV24-0.1.1.tar.gz 50515
+RMD160 2af0688d37aec8b44d610b5f6f98155e55a10547 libezV24-0.1.1.tar.gz 50515
+SHA256 684afbc6c20515101c879aebd220537defe261ec080c819ebce3aea81182f606 libezV24-0.1.1.tar.gz 50515
diff --git a/dev-libs/libezV24/files/libezV24-0.1.1-build.patch b/dev-libs/libezV24/files/libezV24-0.1.1-build.patch
new file mode 100644
index 000000000000..6446ed32f380
--- /dev/null
+++ b/dev-libs/libezV24/files/libezV24-0.1.1-build.patch
@@ -0,0 +1,170 @@
+--- libezV24-0.1.1/Makefile
++++ libezV24-0.1.1/Makefile
+@@ -19,68 +19,62 @@
+ # 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
+ 
++# 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"
++ifeq ($(RELEASE),DEBUG)
+ NAME = lib$(SOBASE).so.$(SORELEASE).dbg
+ else
+ NAME = lib$(SOBASE).so.$(VERSION)
+ endif
+ SONAME = lib$(SOBASE).so.$(SORELEASE)
+-LIBNAME = lib$(SOBASE)-$(SORELEASE)_s.a
++LIBNAME = lib$(SOBASE).a
+ PLAINNAME = lib$(SOBASE).so
+ 
+ # basename of the project
+ PROJECTNAME = libezV24-$(VERSION).$(PATCHLEVEL)
+ 
+-OBJS = ezV24.o snprintf.o
++STATIC_OBJS = ezV24.o snprintf.o
++SHARED_OBJS = $(patsubst %.o,%.lo,$(STATIC_OBJS))
+ LIBS = 
+ 
+-
+-ifeq "${RELEASE}" "DEBUG"
+-C_FLAG = -c -Wall -fPIC -D$(PLATFORM) $(INCDIR)
+-C_DEFS = -DDEBUG -DBETA
+-LFLAGS = $(LIBDIR)
++ifeq ($(RELEASE),DEBUG)
++CPPFLAGS += -DDEBUG -DBETA
+ else 
+-ifeq "${RELEASE}" "BETA"
+-C_FLAG = -c -Wall -fPIC -O2 -D$(PLATFORM) $(INCDIR)
+-C_DEFS = -DBETA
+-LFLAGS = $(LIBDIR)
++ifeq ($(RELEASE),BETA)
++CPPFLAGS += -DBETA
+ else
+-C_FLAG = -c -Wall  -fPIC -O2 -D$(PLATFORM) $(INCDIR)
+-C_DEFS = -DFINAL
+-LFLAGS = -s $(LIBDIR)
++CPPFLAGS += -DFINAL
+ endif
+ endif
+ 
++CPPFLAGS += -I.
++CFLAGS ?= -O2
++CFLAGS += -Wall
++LDFLAGS ?= -s
++
+ # tools to build the static library
+ ARFLAGS = cru
+-AR = ar
+-RANLIB = ranlib
+-
+-# concatinate the compile flags
+-CFLAGS = $(C_FLAG) $(C_DEFS)
+-
++AR ?= ar
++RANLIB ?= ranlib
+ 
+-
+-# ------------------------------------------------------------------------
+-# AUTOMATISCHE COMPILE-ANWEISUNGEN
+-# ------------------------------------------------------------------------
+-
+-.c.o:
+-		gcc $(CFLAGS) $<
++# some distros have a messed up path when in su -
++LDCONFIG ?= /sbin/ldconfig
+ 
+ 
+ # --------------------------------------------------------------------------
+ # ANHÄNGIGKEITEN
+ # --------------------------------------------------------------------------
+ 
++%.lo: %.c
++	$(CC) -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++
+ all:		shared static test-v24
+ 
+ shared:		$(NAME)
+@@ -88,13 +82,13 @@
+ static:		$(LIBNAME)
+ 
+ 
++$(NAME):	$(SHARED_OBJS)
++	$(CC) $(CFLAGS) -shared -Wl,-soname,$(SONAME) -o $@ $^ $(LDFLAGS)
+ 
+-$(NAME):	$(OBJS)
+-		gcc -shared -W1,soname,$(SONAME) -o $(NAME) $(OBJS)
++$(LIBNAME):	$(STATIC_OBJS)
++	$(AR) $(ARFLAGS) $@ $^
++	$(RANLIB) $@
+ 
+-$(LIBNAME):	$(OBJS)
+-		$(AR) $(ARFLAGS) $(LIBNAME) $(OBJS)
+-		$(RANLIB) $(LIBNAME)
+ 
+ 
+ # Abhängigkeiten des Source, jedoch dann ohne Generierungsanweisung, wenn
+@@ -111,14 +104,17 @@
+ #
+ 
+ install:
+-		install -d -m 755 $(PREFIX)/include/$(SOBASE)/;
+-		install -m 644 ezV24.h $(PREFIX)/include/$(SOBASE)/
+-		install -m 644 -s $(LIBNAME) $(PREFIX)/lib/$(LIBNAME)
+-		install -m 755 -s $(NAME) $(PREFIX)/lib/$(NAME)
+-		rm -f $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME)
+-		ln -s $(PREFIX)/lib/$(NAME) $(PREFIX)/lib/$(SONAME);\
+-		ln -s $(PREFIX)/lib/$(SONAME) $(PREFIX)/lib/$(PLAINNAME);\
+-		ldconfig
++		install -d -m 755 $(DESTDIR)$(PREFIX)/include/
++		install -d -m 755 $(DESTDIR)$(PREFIX)/lib/
++		install -m 644 ezV24.h $(DESTDIR)$(PREFIX)/include/
++		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)
++		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)
+-		ldconfig
++		if [ -z $$NO_LDCONFIG ]; then \
++		  $(LDCONFIG); \
++		fi  
+ 
+ 
+ # This entry is for packing a distribution tarball
+@@ -158,15 +156,15 @@
+ #	gcc -o test-v24 -Wall test-v24.c -l$(SOBASE)
+ #
+ test-v24:	test-v24.c ezV24.h $(LIBNAME)
+-		gcc -o test-v24 -Wall test-v24.c -L./ $(LIBNAME)
++		$(CC) -o test-v24 -Wall -DUNINSTALLED test-v24.c -L./ $(LIBNAME)
+ 
+ 
+ # --------------------------------------------------------------------------
+ # ANDERE AUFGABEN
+ # --------------------------------------------------------------------------
+ 
+ clean:
+-		rm -f *.o core
++		rm -f *.o *.lo core
+ 
+ clean-all:
+ 		rm -f *.o core test-v24 $(NAME) $(LIBNAME)
diff --git a/dev-libs/libezV24/files/libezV24-0.1.1-test.patch b/dev-libs/libezV24/files/libezV24-0.1.1-test.patch
new file mode 100644
index 000000000000..f3c2b676546f
--- /dev/null
+++ b/dev-libs/libezV24/files/libezV24-0.1.1-test.patch
@@ -0,0 +1,20 @@
+Index: test-v24.c
+===================================================================
+RCS file: /cvsroot/ezv24/libezv24/test-v24.c,v
+retrieving revision 1.2
+retrieving revision 1.3
+diff -u -p -r1.2 -r1.3
+--- test-v24.c	11 Feb 2003 13:29:43 -0000	1.2
++++ test-v24.c	13 Oct 2003 07:50:26 -0000	1.3
+@@ -30,7 +33,11 @@
+ #include <string.h>
+ #include <signal.h>
+ 
++#ifdef UNINSTALLED
++#include "ezV24.h"
++#else
+ #include <ezV24/ezV24.h>
++#endif
+ 
+ #define __TEST_V24_C__
+ 
diff --git a/dev-libs/libezV24/libezV24-0.1.1.ebuild b/dev-libs/libezV24/libezV24-0.1.1.ebuild
index a4325757fb02..736774df02ea 100644
--- a/dev-libs/libezV24/libezV24-0.1.1.ebuild
+++ b/dev-libs/libezV24/libezV24-0.1.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2006 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.4 2004/06/24 23:16:39 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libezV24/libezV24-0.1.1.ebuild,v 1.5 2006/08/26 22:51:29 vapier Exp $
 
 inherit eutils
 
@@ -10,29 +10,26 @@ SRC_URI="mirror://sourceforge/ezv24/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 -ppc ~sparc alpha"
+KEYWORDS="alpha ~amd64 -ppc ~sparc ~x86"
 IUSE=""
 
 DEPEND=""
 RDEPEND=""
 
-src_compile() {
-	epatch ${FILESDIR}/${P}-test-v24.c.diff
-	epatch ${FILESDIR}/${P}-Makefile.diff
-	emake || die "Make failed"
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	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_install() {
-	make install PREFIX=${D}usr || die "Make install failed"
+	export NO_LDCONFIG="stupid"
+	emake install DESTDIR="${D}" || die "Make install failed"
 	dodoc AUTHORS BUGS ChangeLog HISTORY README
 	dohtml api-html/*
-
-	# make install makes symlinks that don't exist when installed, so
-	# replace them and re-create with dosym
-
-	rm ${D}/usr/lib/libezV24.so
-	rm ${D}/usr/lib/libezV24.so.0
-
-	dosym libezV24.so.0.1 /usr/lib/libezV24.so.0
-	dosym libezV24.so.0 /usr/lib/libezV24.so
 }