Updated patch by Luke Renn. (bug #170439)

Package-Manager: portage-2.1.3_rc3

3 files changed, 38 insertions, 24 deletions

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index d2c0fc67130a..79af2860816e 100644
--- a/sys-libs/libixp/ChangeLog
+++ b/sys-libs/libixp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libixp
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.5 2007/02/23 01:36:28 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.6 2007/06/24 18:54:28 omp Exp $
+
+  24 Jun 2007; David Shakaryan <omp@gentoo.org>
+  files/libixp-0.2-shared-object.patch:
+  Updated patch by Luke Renn. (bug #170439)
 
   23 Feb 2007; David Shakaryan <omp@gentoo.org> libixp-0.2-r1.ebuild:
   Inherit eutils. (bug #161105)
diff --git a/sys-libs/libixp/Manifest b/sys-libs/libixp/Manifest
index e9e88d486f78..3c748adb5363 100644
--- a/sys-libs/libixp/Manifest
+++ b/sys-libs/libixp/Manifest
@@ -1,19 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libixp-0.2-shared-object.patch 2336 RMD160 9ce1f27c97a0a13c90c9f1463ad02ba3687d5e9d SHA1 576f887e4970bd782bbb703ae9e8f0206f972db6 SHA256 033341c61f65929ab5db36e533767ce6d6eca9675ff0a6ed690bfb35e1ea7dc0
-MD5 b77c7debe233a7b5e02105d720bdd0de files/libixp-0.2-shared-object.patch 2336
-RMD160 9ce1f27c97a0a13c90c9f1463ad02ba3687d5e9d files/libixp-0.2-shared-object.patch 2336
-SHA256 033341c61f65929ab5db36e533767ce6d6eca9675ff0a6ed690bfb35e1ea7dc0 files/libixp-0.2-shared-object.patch 2336
+AUX libixp-0.2-shared-object.patch 2509 RMD160 6b05223019d36a8c904a488e3cfdae0c353ce61e SHA1 8c36b9d0cf2d929c9f810b67f2e1001ac00e29eb SHA256 ed3e025666b2f3ef58c89cabc7a22b591c926ae0e2ca305a11db6184fe73d641
+MD5 c20d6950b3aa56df9a88296ad99ccdfe files/libixp-0.2-shared-object.patch 2509
+RMD160 6b05223019d36a8c904a488e3cfdae0c353ce61e files/libixp-0.2-shared-object.patch 2509
+SHA256 ed3e025666b2f3ef58c89cabc7a22b591c926ae0e2ca305a11db6184fe73d641 files/libixp-0.2-shared-object.patch 2509
 DIST libixp-0.2.tar.gz 20701 RMD160 a0738f88ea8b150f1eead51ef9270bf567d7795e SHA1 14e11b5ae179415e1353df4e0d4bc6cb1b434156 SHA256 5e5eec16dd02bce3f014b90df029e91136031852568ff9a147d3f99f6eaf0143
 EBUILD libixp-0.2-r1.ebuild 898 RMD160 700767f6661e2c66d4a2276d215d61a6c2d517f2 SHA1 146f123b78ddbeaee750488486a5471b17501435 SHA256 2ccaa2238b4ec98393fc39ef09cc4addbe579c63521a2d89192ac2d888a76070
 MD5 2801c62390f4577fbdf2189a8596b6b1 libixp-0.2-r1.ebuild 898
 RMD160 700767f6661e2c66d4a2276d215d61a6c2d517f2 libixp-0.2-r1.ebuild 898
 SHA256 2ccaa2238b4ec98393fc39ef09cc4addbe579c63521a2d89192ac2d888a76070 libixp-0.2-r1.ebuild 898
-MISC ChangeLog 828 RMD160 5505a2042654642e813c3a22d75cca7c35d38242 SHA1 3b1a889906767ce5b20a782b7bfcdf8a24da0c0f SHA256 d0c7a01fb183d07424733b76eb9ad0f9da939f96c3cb1c01edde2628c5ce3d61
-MD5 cdf8bcbb5046b4e72366211ceeae7651 ChangeLog 828
-RMD160 5505a2042654642e813c3a22d75cca7c35d38242 ChangeLog 828
-SHA256 d0c7a01fb183d07424733b76eb9ad0f9da939f96c3cb1c01edde2628c5ce3d61 ChangeLog 828
+MISC ChangeLog 961 RMD160 9eba1f8d4c34d13c946f5b1bbdcc62d22f6c9f9c SHA1 cb4d9a3cc88cc339e20ec8a8a046c746961f9ec8 SHA256 16e20bb87bd8e236e31f46a095d534b5e38fd24f3d07ba171bf19f37500fff1c
+MD5 dd964a57a2991d714951aae6e214ed6d ChangeLog 961
+RMD160 9eba1f8d4c34d13c946f5b1bbdcc62d22f6c9f9c ChangeLog 961
+SHA256 16e20bb87bd8e236e31f46a095d534b5e38fd24f3d07ba171bf19f37500fff1c ChangeLog 961
 MISC metadata.xml 260 RMD160 dbaa41ad7e8690ea69581ffd7942620f933f4034 SHA1 d33ecf36eb5ec0c109a094cbb3fa118ddf19a13e SHA256 90b3aa60c9ccae72a239a37d39549809f8726dfaa9d0dcfebf173bb12c977492
 MD5 bc7fda634314666261386f0bb7eb080c metadata.xml 260
 RMD160 dbaa41ad7e8690ea69581ffd7942620f933f4034 metadata.xml 260
@@ -22,9 +22,9 @@ MD5 3d876a296cfdc4d744270a9ae1c270ce files/digest-libixp-0.2-r1 229
 RMD160 ae2ffdf2db4e35ba114d59586e63248f1ed4b305 files/digest-libixp-0.2-r1 229
 SHA256 0e4d7ff1f88400851e5e7bb7a43689a5c7b693be865103dd7efa222746f5047d files/digest-libixp-0.2-r1 229
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.2 (GNU/Linux)
+Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFF3kUrvSApE0uP4UsRAladAKCgAnu0bQE8JcCfXG7gxtYlVs3OpACgn7Cu
-o6w8VePfVXfBAwFXlRQQA7g=
-=iZF4
+iD8DBQFGfr3svSApE0uP4UsRAgp7AJ0bpNVzUrsmvjhO+caxUKgQ+lo29wCbBUny
+TA7VOeRFWfINdVx+XUaVznc=
+=sbRP
 -----END PGP SIGNATURE-----
diff --git a/sys-libs/libixp/files/libixp-0.2-shared-object.patch b/sys-libs/libixp/files/libixp-0.2-shared-object.patch
index c3318d02932e..4f5ab7c0d36e 100644
--- a/sys-libs/libixp/files/libixp-0.2-shared-object.patch
+++ b/sys-libs/libixp/files/libixp-0.2-shared-object.patch
@@ -1,6 +1,6 @@
-diff -u libixp-0.2_orig/config.mk libixp-0.2/config.mk
---- libixp-0.2_orig/config.mk	2006-12-27 17:59:09.000000000 +0600
-+++ libixp-0.2/config.mk	2007-01-09 10:57:38.699888388 +0600
+diff -uN libixp-0.2.bak/config.mk libixp-0.2/config.mk
+--- libixp-0.2.bak/config.mk	2006-12-27 03:59:09.000000000 -0800
++++ libixp-0.2/config.mk	2007-06-24 11:45:59.000000000 -0700
 @@ -14,6 +14,7 @@
  # flags
  CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
@@ -9,10 +9,10 @@ diff -u libixp-0.2_orig/config.mk libixp-0.2/config.mk
  #CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
  #LDFLAGS = -g ${LIBS}
  
-diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile
---- libixp-0.2_orig/Makefile	2006-12-27 17:59:09.000000000 +0600
-+++ libixp-0.2/Makefile	2007-01-09 11:06:30.926977572 +0600
-@@ -9,13 +9,14 @@
+diff -uN libixp-0.2.bak/Makefile libixp-0.2/Makefile
+--- libixp-0.2.bak/Makefile	2006-12-27 03:59:09.000000000 -0800
++++ libixp-0.2/Makefile	2007-06-24 11:45:59.000000000 -0700
+@@ -9,18 +9,23 @@
  OBJ = ${SRC:.c=.o}
  OBJIXPC = ${SRCIXPC:.c=.o}
  
@@ -27,8 +27,18 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile
 +	@echo "SOFLAGS  = ${SOFLAGS}"
  	@echo "LD       = ${LD}"
  
++${OBJIXPC}: 
++	@echo CC ${@:.o=.c}
++	@${CC} -c ${CFLAGS} ${@:.o=.c}
++
  .c.o:
-@@ -29,6 +30,10 @@
+ 	@echo CC $<
+-	@${CC} -c ${CFLAGS} $<
++	@${CC} ${SOFLAGS} -c ${CFLAGS} $<
+ 
+ ${OBJ}: config.mk ixp.h
+ 
+@@ -29,6 +34,10 @@
  	@${AR} $@ ${OBJ}
  	@${RANLIB} $@
  
@@ -39,7 +49,7 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile
  ixpc: ${OBJIXPC}
  	@echo LD $@
  	@${LD} -o $@ ${OBJIXPC} ${LDFLAGS} -lixp
-@@ -36,7 +41,7 @@
+@@ -36,7 +45,7 @@
  
  clean:
  	@echo cleaning
@@ -48,7 +58,7 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile
  
  dist: clean
  	@echo creating dist tarball
-@@ -55,6 +60,9 @@
+@@ -55,6 +64,9 @@
  	@mkdir -p ${DESTDIR}${PREFIX}/lib
  	@cp -f libixp.a ${DESTDIR}${PREFIX}/lib
  	@chmod 644 ${DESTDIR}${PREFIX}/lib/libixp.a
@@ -58,7 +68,7 @@ diff -u libixp-0.2_orig/Makefile libixp-0.2/Makefile
  	@echo installing ixpc to ${DESTDIR}${PREFIX}/bin
  	@mkdir -p ${DESTDIR}${PREFIX}/bin
  	@cp -f ixpc ${DESTDIR}${PREFIX}/bin
-@@ -67,8 +75,12 @@
+@@ -67,8 +79,12 @@
  uninstall:
  	@echo removing header file from ${DESTDIR}${PREFIX}/include
  	@rm -f ${DESTDIR}${PREFIX}/include/ixp.h