Compile shared object file; thanks to Maxim Treskin for patch. (bug #161105)

Package-Manager: portage-2.1.2_rc4-r7

5 files changed, 134 insertions, 16 deletions

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index a587154111e7..15bd5d083a92 100644
--- a/sys-libs/libixp/ChangeLog
+++ b/sys-libs/libixp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-libs/libixp
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.1 2006/12/28 07:20:16 omp Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.2 2007/01/10 01:18:27 omp Exp $
+
+  10 Jan 2007; David Shakaryan <omp@gentoo.org>
+  +files/libixp-0.2-shared-object.patch, +libixp-0.2-r1.ebuild:
+  Compile shared object file; thanks to Maxim Treskin for patch. (bug #161105)
 
   28 Dec 2006; David Shakaryan <omp@gentoo.org> +libixp-0.2.ebuild,
   +metadata.xml:
diff --git a/sys-libs/libixp/Manifest b/sys-libs/libixp/Manifest
index 901ddcdaa040..ad55dc822192 100644
--- a/sys-libs/libixp/Manifest
+++ b/sys-libs/libixp/Manifest
@@ -1,15 +1,20 @@
------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
 DIST libixp-0.2.tar.gz 20701 RMD160 a0738f88ea8b150f1eead51ef9270bf567d7795e SHA1 14e11b5ae179415e1353df4e0d4bc6cb1b434156 SHA256 5e5eec16dd02bce3f014b90df029e91136031852568ff9a147d3f99f6eaf0143
+EBUILD libixp-0.2-r1.ebuild 885 RMD160 1855029506407831ebddeebcacb0b063e8b85f05 SHA1 00b0f1547dcd3272dd236decaeb198ca40a869d7 SHA256 2a468757c65c095563d033e6c32c1c243bee119ec940f56d56b2bea74df4cfa0
+MD5 88eb8a916200ed19da23238070fccdda libixp-0.2-r1.ebuild 885
+RMD160 1855029506407831ebddeebcacb0b063e8b85f05 libixp-0.2-r1.ebuild 885
+SHA256 2a468757c65c095563d033e6c32c1c243bee119ec940f56d56b2bea74df4cfa0 libixp-0.2-r1.ebuild 885
 EBUILD libixp-0.2.ebuild 828 RMD160 cef20877a14f96b461f2f62f24da16ac727f5543 SHA1 0b891a2c64a16258cb39f3197343eac0e10b2598 SHA256 733a067345f95f301a0aa07ba67d151564e1e6478c8076e8b492cbcbac34fe66
 MD5 8d8734bc1fa61fcf6e2b59c6af273f0f libixp-0.2.ebuild 828
 RMD160 cef20877a14f96b461f2f62f24da16ac727f5543 libixp-0.2.ebuild 828
 SHA256 733a067345f95f301a0aa07ba67d151564e1e6478c8076e8b492cbcbac34fe66 libixp-0.2.ebuild 828
-MISC ChangeLog 317 RMD160 e28a0c6be7a0c250ada79bcfe8f246102fdcc23e SHA1 ff29206d73bc9ef4698dcbffbed6811fe6a59953 SHA256 ca82b639eadc8a0365ef9320b9fb53fa74c80dc7112073397d100f9ca943a239
-MD5 7b9ef8c29b0761fab6afabf44451e7de ChangeLog 317
-RMD160 e28a0c6be7a0c250ada79bcfe8f246102fdcc23e ChangeLog 317
-SHA256 ca82b639eadc8a0365ef9320b9fb53fa74c80dc7112073397d100f9ca943a239 ChangeLog 317
+MISC ChangeLog 509 RMD160 1db17c9361f7aeccefe8a77c49b51cd25d4738cf SHA1 aade9d8af1cf5605393de9c65fbf5840c91c373a SHA256 26b0fd1b2334e719b6cd948abec60a8bb346c2d7031b120b28735b169d51280c
+MD5 c49a21d62229efbf35ba73deaa0e4966 ChangeLog 509
+RMD160 1db17c9361f7aeccefe8a77c49b51cd25d4738cf ChangeLog 509
+SHA256 26b0fd1b2334e719b6cd948abec60a8bb346c2d7031b120b28735b169d51280c ChangeLog 509
 MISC metadata.xml 260 RMD160 dbaa41ad7e8690ea69581ffd7942620f933f4034 SHA1 d33ecf36eb5ec0c109a094cbb3fa118ddf19a13e SHA256 90b3aa60c9ccae72a239a37d39549809f8726dfaa9d0dcfebf173bb12c977492
 MD5 bc7fda634314666261386f0bb7eb080c metadata.xml 260
 RMD160 dbaa41ad7e8690ea69581ffd7942620f933f4034 metadata.xml 260
@@ -17,10 +22,6 @@ SHA256 90b3aa60c9ccae72a239a37d39549809f8726dfaa9d0dcfebf173bb12c977492 metadata
 MD5 3d876a296cfdc4d744270a9ae1c270ce files/digest-libixp-0.2 229
 RMD160 ae2ffdf2db4e35ba114d59586e63248f1ed4b305 files/digest-libixp-0.2 229
 SHA256 0e4d7ff1f88400851e5e7bb7a43689a5c7b693be865103dd7efa222746f5047d files/digest-libixp-0.2 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFFk3A7vSApE0uP4UsRAuzjAJ97BvyVJWVJln9fqcQyDpku+3rwVQCfbla+
-/YWL2VEaEL7CkyRDFu+dhJo=
-=XizH
------END PGP SIGNATURE-----
+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
diff --git a/sys-libs/libixp/files/digest-libixp-0.2-r1 b/sys-libs/libixp/files/digest-libixp-0.2-r1
new file mode 100644
index 000000000000..fb7204d6b0af
--- /dev/null
+++ b/sys-libs/libixp/files/digest-libixp-0.2-r1
@@ -0,0 +1,3 @@
+MD5 e50c613f7410bc1cff3a18926804202f libixp-0.2.tar.gz 20701
+RMD160 a0738f88ea8b150f1eead51ef9270bf567d7795e libixp-0.2.tar.gz 20701
+SHA256 5e5eec16dd02bce3f014b90df029e91136031852568ff9a147d3f99f6eaf0143 libixp-0.2.tar.gz 20701
diff --git a/sys-libs/libixp/files/libixp-0.2-shared-object.patch b/sys-libs/libixp/files/libixp-0.2-shared-object.patch
new file mode 100644
index 000000000000..c3318d02932e
--- /dev/null
+++ b/sys-libs/libixp/files/libixp-0.2-shared-object.patch
@@ -0,0 +1,73 @@
+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
+@@ -14,6 +14,7 @@
+ # flags
+ CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+ LDFLAGS = ${LIBS}
++SOFLAGS = -fPIC -shared
+ #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 @@
+ OBJ = ${SRC:.c=.o}
+ OBJIXPC = ${SRCIXPC:.c=.o}
+ 
+-all: options libixp.a ixpc
++all: options libixp.a libixp.so ixpc
+ 
+ options:
+ 	@echo libixp build options:
+ 	@echo "CFLAGS   = ${CFLAGS}"
+ 	@echo "LDFLAGS  = ${LDFLAGS}"
+ 	@echo "CC       = ${CC}"
++	@echo "SOFLAGS  = ${SOFLAGS}"
+ 	@echo "LD       = ${LD}"
+ 
+ .c.o:
+@@ -29,6 +30,10 @@
+ 	@${AR} $@ ${OBJ}
+ 	@${RANLIB} $@
+ 
++libixp.so: ${OBJ}
++	@echo CC $@
++	@${CC} ${SOFLAGS} -o $@ ${OBJ}
++
+ ixpc: ${OBJIXPC}
+ 	@echo LD $@
+ 	@${LD} -o $@ ${OBJIXPC} ${LDFLAGS} -lixp
+@@ -36,7 +41,7 @@
+ 
+ clean:
+ 	@echo cleaning
+-	@rm -f ixpc libixp.a ${OBJ} ${OBJIXPC} libixp-${VERSION}.tar.gz
++	@rm -f ixpc libixp.a libixp.so ${OBJ} ${OBJIXPC} libixp-${VERSION}.tar.gz
+ 
+ dist: clean
+ 	@echo creating dist tarball
+@@ -55,6 +60,9 @@
+ 	@mkdir -p ${DESTDIR}${PREFIX}/lib
+ 	@cp -f libixp.a ${DESTDIR}${PREFIX}/lib
+ 	@chmod 644 ${DESTDIR}${PREFIX}/lib/libixp.a
++	@cp -f libixp.so ${DESTDIR}${PREFIX}/lib/libixp.so.${VERSION}
++	@chmod 755 ${DESTDIR}${PREFIX}/lib/libixp.so.${VERSION}
++	@ln -s libixp.so.${VERSION} ${DESTDIR}${PREFIX}/lib/libixp.so
+ 	@echo installing ixpc to ${DESTDIR}${PREFIX}/bin
+ 	@mkdir -p ${DESTDIR}${PREFIX}/bin
+ 	@cp -f ixpc ${DESTDIR}${PREFIX}/bin
+@@ -67,8 +75,12 @@
+ uninstall:
+ 	@echo removing header file from ${DESTDIR}${PREFIX}/include
+ 	@rm -f ${DESTDIR}${PREFIX}/include/ixp.h
++
+ 	@echo removing library file from ${DESTDIR}${PREFIX}/lib
+ 	@rm -f ${DESTDIR}${PREFIX}/lib/libixp.a
++	@echo removing shared object file from ${DESTDIR}${PREFIX}/lib
++	@rm -f ${DESTDIR}${PREFIX}/lib/libixp.so
++	@rm -f ${DESTDIR}${PREFIX}/lib/libixp.so.${VERSION}
+ 	@echo removing ipx client from ${DESTDIR}${PREFIX}/bin
+ 	@rm -f ${DESTDIR}${PREFIX}/bin/ixpc
+ 	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
diff --git a/sys-libs/libixp/libixp-0.2-r1.ebuild b/sys-libs/libixp/libixp-0.2-r1.ebuild
new file mode 100644
index 000000000000..72a9c29f0b46
--- /dev/null
+++ b/sys-libs/libixp/libixp-0.2-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.2-r1.ebuild,v 1.1 2007/01/10 01:18:27 omp Exp $
+
+inherit toolchain-funcs
+
+DESCRIPTION="Standalone client/server 9P library"
+HOMEPAGE="http://libs.suckless.org/"
+SRC_URI="http://libs.suckless.org/download/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/libixp-0.2-shared-object.patch"
+
+	sed -i \
+		-e "/^PREFIX/s/=.*/= \/usr/" \
+		-e "/^CFLAGS/s/= -Os/+=/" \
+		-e "/^LDFLAGS/s/=/+=/" \
+		-e "/^AR/s/=.*/= $(tc-getAR) cr/" \
+		-e "/^CC/s/=.*/= $(tc-getCC)/" \
+		-e "/^RANLIB/s/=.*/= $(tc-getRANLIB)/" \
+		config.mk || die "sed failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}