Fix bug 240213 with patches imported from PLD linux. Make phlib not break the sandbox, now that it compiles.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64

5 files changed, 67 insertions, 9 deletions

diff --git a/dev-libs/phlib/ChangeLog b/dev-libs/phlib/ChangeLog
index 9b645b524d44..03e39e92fd9c 100644
--- a/dev-libs/phlib/ChangeLog
+++ b/dev-libs/phlib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-libs/phlib
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/phlib/ChangeLog,v 1.4 2007/02/09 02:35:53 flameeyes Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/phlib/ChangeLog,v 1.5 2008/10/21 14:07:00 loki_val Exp $
+
+  21 Oct 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/phlib-soname.patch, +files/phlib-types.patch, phlib-1.20.ebuild:
+  Fix bug 240213 with patches imported from PLD linux. Make phlib not break
+  the sandbox, now that it compiles.
 
   09 Feb 2007; Diego Pettenò <flameeyes@gentoo.org> ChangeLog:
   Regenerate digest in Manifest2 format.
diff --git a/dev-libs/phlib/Manifest b/dev-libs/phlib/Manifest
index eb0e695889f8..ff00b4f1f1d8 100644
--- a/dev-libs/phlib/Manifest
+++ b/dev-libs/phlib/Manifest
@@ -1,4 +1,6 @@
+AUX phlib-soname.patch 1295 RMD160 223c83b25baf56335af1a8d72142fc0cc3778296 SHA1 db1c363f16dab68121dcd36827cdc17fe8124455 SHA256 20b4e84423b4d724be478e024f2336af956d252a964146a7543b14e34f14d134
+AUX phlib-types.patch 352 RMD160 a002b5d8e37434b4f9ec71da8a79423573c39202 SHA1 1a34f206ad295f4c5e2cc5a0344997f6b40aa2bd SHA256 157a4cf7c151421e9b2c6be393752f201ebb9976cfa66acb747892f38d0e3501
 DIST phlib-1.20.tgz 86172 RMD160 67e0263870355a5348d7219e6c2a8a9c2dafb780 SHA1 ecd73113c24fd25ef25c249002ab825d4f9794d5 SHA256 fbe6a9bbde886355b5211c1027a0b3c281cdae31962fff3e745b57e3814e31a3
-EBUILD phlib-1.20.ebuild 682 RMD160 089ff1f571d18ffe124d6e19c30595b6710ef168 SHA1 c88b2f9e68a6d59be13749f15aec0d5a8a8cf251 SHA256 9bd49e32e1e59c1b23e5c7e0e0a064b6b27a4178ebd491850f5ea1cfab9b2d1f
-MISC ChangeLog 628 RMD160 fb994b4dc2ae1f473dfa60c2caa09e6e0e3495ea SHA1 f2aec9526809ffe7c0a4561f9dc73099645e8e1b SHA256 8d9ab5549213269afb9885d82a0fc7e75817776618867f36bc7ef870b89503a6
+EBUILD phlib-1.20.ebuild 842 RMD160 eb26d366cfab37a88628bf8246339e104dfa5f88 SHA1 a8525812f8d4c6aed4c3f4e4af9f5fe9cf790579 SHA256 ea491045e72def2ce2fe47c59138632150c96d241462a09f91f765150960b598
+MISC ChangeLog 868 RMD160 842def038d6f4af068a24e4b84373167e65b642b SHA1 31a7a5348017db4e205e4e253baab86674667c59 SHA256 e920fb75b29a3d1993f8a23db0a5b8cc4e1e8db093f2457ca82a55070e14e81c
 MISC metadata.xml 159 RMD160 41527b6d3fa74dfdcd619b7d91c478b72ecc8ae8 SHA1 ac19a418765e817e54d4c54c1992c9062d5dcf3e SHA256 986c3e2fa3baa5d6e8c0b5c27a2550601780d0cc7857f7f1c01523491706d909
diff --git a/dev-libs/phlib/files/phlib-soname.patch b/dev-libs/phlib/files/phlib-soname.patch
new file mode 100644
index 000000000000..9c11cd95285f
--- /dev/null
+++ b/dev-libs/phlib/files/phlib-soname.patch
@@ -0,0 +1,34 @@
+--- phlib-1.20/Makefile.in~	Mon Oct 20 21:08:46 2003
++++ phlib-1.20/Makefile.in	Fri Dec  5 18:02:38 2003
+@@ -108,7 +108,9 @@
+ $(OURLIBSO): $(OBJS) $(HEAD)
+ 	@echo Creating shared library $(OURLIBSO)
+ 	@rm -f $@
+-	$(SHLD) -o $@ $(OBJS)
++	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJS)
++	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@.$(VER_MAJOR)
++	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@
+ 
+ $(OURLIBDB): $(OBJS) $(MDBOBJS) $(HEAD)
+ 	@echo Creating library $@
+@@ -118,15 +120,17 @@
+ $(OURLIBDBSO): $(OBJS) $(MDBOBJS) $(HEAD)
+ 	@echo Creating shared library $@
+ 	@rm -f $@
+-	$(SHLD) -o $@ $(OBJS) $(MDBOBJS)
++	$(CC) -shared -o$@.$(VER_MAJOR).$(VER_MINOR) -Wl,-soname=$@.$(VER_MAJOR) $(OBJS)
++	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@.$(VER_MAJOR)
++	ln -sf $@.$(VER_MAJOR).$(VER_MINOR) $@
+ 
+ $(OBJ)/%.o: %.c $(HEAD)
+ 	$(CC) $(CFLAGS) -D_XL_LIB_BUILD -o $@	$<
+ 
+ install: $(OURLIB)
+ 	@./mkinstalldirs $(i_libdir) $(MINC)
+-	@./install-lib $(OURLIB) $(OURLIB) $(i_libdir) $(VER_MAJOR) $(VER_MINOR)
+-	@./install-lib $(OURLIBSO) $(OURLIBSO) $(i_libdir) $(VER_MAJOR) $(VER_MINOR)
++	@install $(OURLIB) $(i_libdir)/$(OURLIB)
++	@./install-lib $(OURLIBSO).$(VER_MAJOR).$(VER_MINOR) $(OURLIBSO) $(i_libdir) $(VER_MAJOR) $(VER_MINOR)
+ 	@./install-head $(SINC) $(MINC) $(HEADF)
+ 
+ clean:
diff --git a/dev-libs/phlib/files/phlib-types.patch b/dev-libs/phlib/files/phlib-types.patch
new file mode 100644
index 000000000000..7cca8acf461a
--- /dev/null
+++ b/dev-libs/phlib/files/phlib-types.patch
@@ -0,0 +1,11 @@
+--- phlib-1.20/include/phlib/xl_ufile.h~	2003-01-11 13:40:09.000000000 +0100
++++ phlib-1.20/include/phlib/xl_ufile.h	2007-09-05 18:30:40.000000000 +0200
+@@ -32,7 +32,7 @@
+   extern "C" {
+ #endif
+ 
+-Boolean xl_unique_filename(char*,const char*,size_t);
++RetValue xl_unique_filename(char*,const char*,size_t);
+ 
+ #ifdef __cplusplus
+   } /* extern "C" */
diff --git a/dev-libs/phlib/phlib-1.20.ebuild b/dev-libs/phlib/phlib-1.20.ebuild
index 1b151f6b43d7..6502dbac90db 100644
--- a/dev-libs/phlib/phlib-1.20.ebuild
+++ b/dev-libs/phlib/phlib-1.20.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2004 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/phlib/phlib-1.20.ebuild,v 1.4 2004/07/02 04:53:46 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/phlib/phlib-1.20.ebuild,v 1.5 2008/10/21 14:07:00 loki_val Exp $
+
+inherit eutils
 
 DESCRIPTION="phlib is a collection of support functions and classes used by Goldwater and the DGEE"
 HOMEPAGE="http://www.nfluid.com/"
@@ -16,14 +18,18 @@ DEPEND="virtual/libc"
 
 src_unpack() {
 	unpack ${A}
-	sed -i s/cflags/CFLAGS/ ${S}/configure
+	cd "${S}"
+	sed -i s/cflags/CFLAGS/ configure
+	epatch "${FILESDIR}/${PN}-types.patch"
+	epatch "${FILESDIR}/${PN}-soname.patch"
 }
 
 src_compile() {
+	CFLAGS="${CFLAGS} -fPIC -Wall"
 	econf || die "econf failed"
-	emake || die "emake failed"
+	emake -j1 || die "emake failed"
 }
 
 src_install() {
-	einstall || die "einstall failed"
+	emake -j1 DESTDIR="${D}" install || die "install failed"
 }