Fix install paths wrt bug 309095. Thanks to Nathan Phillip Brink <ohnobinki@ohnopublishing.net> for report and patch. Additionally fixing multiple QA issues and install shared libs

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 162 insertions, 1 deletions

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index 516d5db9eba7..45b82a460058 100644
--- a/sys-libs/libixp/ChangeLog
+++ b/sys-libs/libixp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libixp
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.12 2010/06/03 04:42:20 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.13 2010/06/11 16:12:22 xarthisius Exp $
+
+*libixp-0.5-r1 (11 Jun 2010)
+
+  11 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> +libixp-0.5-r1.ebuild,
+  +files/libixp-0.5-gentoo.diff:
+  Fix install paths wrt bug 309095. Thanks to Nathan Phillip Brink
+  <ohnobinki@ohnopublishing.net> for report and patch. Additionally fixing
+  multiple QA issues and install shared libs.
 
   03 Jun 2010; Jeroen Roovers <jer@gentoo.org> metadata.xml:
   Needed by x11-wm/wmii, so reassigning to desktop-wm herd.
diff --git a/sys-libs/libixp/files/libixp-0.5-gentoo.diff b/sys-libs/libixp/files/libixp-0.5-gentoo.diff
new file mode 100644
index 000000000000..235f8ee658c3
--- /dev/null
+++ b/sys-libs/libixp/files/libixp-0.5-gentoo.diff
@@ -0,0 +1,117 @@
+--- util/link.orig	2010-06-11 14:42:17.814559383 +0000
++++ util/link	2010-06-11 14:43:17.809433593 +0000
+@@ -21,10 +21,10 @@
+ xtmp=/tmp/ld.$$.$USER.out
+ 
+ echo LD "$($bin/cleanname ${BASE}$outfile)"
+-[ -n "$noisycc" ] && echo $LD -o $outfile $ofiles $LDFLAGS $args
+-$LD -o $outfile $ofiles $LDFLAGS $args >$xtmp 2>&1
++[ -n "$noisycc" ] && echo $LD -o $outfile $ofiles $LDFLAGS $args $LDLIBS $LIBS
++$LD -o $outfile $ofiles $LDFLAGS $args $LDLIBS $LIBS >$xtmp 2>&1
+ status=$?
+-[ $? -eq 0 ] || $LD -o $outfile $ofiles $LDFLAGS $args >&2
++[ $? -eq 0 ] || $LD -o $outfile $ofiles $LDFLAGS $args $LDLIBS $LIBS >&2
+ 
+ sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | 
+ egrep -v 'is almost always misused|is dangerous, better use|in statically linked applications requires at runtime'
+--- util/compile.orig	2010-06-11 14:54:24.250496949 +0000
++++ util/compile	2010-06-11 14:54:43.913433647 +0000
+@@ -8,10 +8,10 @@
+ xtmp=/tmp/cc.$$.$USER.out
+ 
+ echo CC $($bin/cleanname ${BASE}$outfile)
+-[ -n "$noisycc" ] && echo $CC -o $outfile $CFLAGS $@
+-$CC -o $outfile $CFLAGS $@ >$xtmp 2>&1
++[ -n "$noisycc" ] && echo $CC -c -o $outfile $CFLAGS $@
++$CC -c -o $outfile $CFLAGS $@ >$xtmp 2>&1
+ status=$?
+-[ $? -eq 0 ] || echo $CC -o $outfile $CFLAGS $@ >&2
++[ $? -eq 0 ] || echo $CC -c -o $outfile $CFLAGS $@ >&2
+ 
+ base=$(echo $BASE | sed 's/,/\\,/g')
+ re='\([^[:space:]/]*\..:[0-9]\)'
+--- config.mk.orig	2008-09-21 03:39:51.000000000 +0000
++++ config.mk	2010-06-11 15:21:30.997400330 +0000
+@@ -5,36 +5,32 @@
+ 	libixp_pthread
+ 
+ # Paths
+-PREFIX = /usr/local
+-  BIN = $(PREFIX)/bin
+-  MAN = $(PREFIX)/share/man
+-  ETC = $(PREFIX)/etc
+-  LIBDIR = $(PREFIX)/lib
+-  INCLUDE = $(PREFIX)/include
++PREFIX = $(DESTDIR)/usr
++BIN = $(PREFIX)/bin
++MAN = $(PREFIX)/share/man
++ETC = /etc
++LIBDIR = $(PREFIX)/lib
++INCLUDE = $(PREFIX)/include
+ 
+ # Includes and libs
+ INCPATH = .:$(ROOT)/include:$(INCLUDE):/usr/include
+ LIBS = -L/usr/lib -lc
+ 
+ # Flags
+-include $(ROOT)/mk/gcc.mk
+-CFLAGS += $(DEBUGCFLAGS) -O0 $(INCS)
+-LDFLAGS = -g $(LDLIBS) $(LIBS)
+-
+-# Compiler, Linker. Linker should usually *not* be ld.
+-CC = cc -c
+-LD = cc
++MKDEP = cpp -M
++SOCFLAGS += -fPIC
++
+ # Archiver
+ AR = ar crs
+ #AR = sh -c 'ar cr "$$@" && ranlib "$$@"'
+ 
+ # Solaris
+ #CFLAGS = -fast $(INCS)
+-#LDFLAGS = $(LIBS) -R$(PREFIX)/lib -lsocket -lnsl
++#LDFLAGS = $(LIBS) -R$(PREFIX)/lib64 -lsocket -lnsl
+ #CFLAGS += -xtarget=ultra
+ 
+ # Misc
+-#MAKESO = 1
++MAKESO = 1
+ 
+ # Extra Components
+ IGNORE = \
+--- mk/hdr.mk.orig	2010-06-11 15:25:24.526400144 +0000
++++ mk/hdr.mk	2010-06-11 15:26:21.257247841 +0000
+@@ -2,8 +2,8 @@
+ EXCFLAGS = -I$$(echo $(INCPATH)|sed 's/:/ -I/g') -D_XOPEN_SOURCE=600
+ COMPILE= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS)" $(ROOT)/util/compile
+ COMPILEPIC= CC="$(CC)" CFLAGS="$(EXCFLAGS) $(CFLAGS) $(SOCFLAGS)" $(ROOT)/util/compile
+-LINK= LD="$(LD)" LDFLAGS="$(LDFLAGS)" $(ROOT)/util/link
+-LINKSO= LD="$(LD)" LDFLAGS="$(SOLDFLAGS) $(SHARED)" $(ROOT)/util/link
++LINK= LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LDLIBS="$(LDLIBS)" $(ROOT)/util/link
++LINKSO= LD="$(LD)" LDFLAGS="-shared -Wl,-soname,$(SONAME) $(LDFLAGS)" LIBS="$(LIBS)" LDLIBS="$(LDLIBS)" $(ROOT)/util/link
+ CLEANNAME=$(ROOT)/util/cleanname
+ SOEXT=so
+ 
+@@ -61,8 +61,8 @@
+ 	echo INSTALL $$($(CLEANNAME) $(BASE)$<)
+ 	set -e; \
+ 	file=$<; \
+-	cp -f $< $(LIBDIR)/$${file##*/}; \
+-	#chmod 0644 $(LIBDIR)/$${file##*/}
++	cp -f $< $(LIBDIR)/$${file##*/}; \
++	#chmod 0644 $(LIBDIR)/$${file##*/}
+ .a.uninstall .$(SOEXT).uninstall:
+ 	echo UNINSTALL $$($(CLEANNAME) $(BASE)$<)
+ 	rm -f $(LIBDIR)/$<
+--- mk/so.mk.orig	2010-06-11 15:50:15.577433966 +0000
++++ mk/so.mk	2010-06-11 15:50:31.998433985 +0000
+@@ -1,6 +1,6 @@
+ SOPTARG = $(ROOT)/lib/$(TARG)
+-SO = $(SOPTARG).$(SOEXT)
+-SONAME = $(TARG).$(SOEXT)
++SO = $(SOPTARG).$(SOEXT).$(VERSION)
++SONAME = $(TARG).$(SOEXT).$(VERSION)
+ OFILES_PIC = ${OBJ:=.o_pic}
+ 
+ all: $(HFILES) $(SO) 
diff --git a/sys-libs/libixp/libixp-0.5-r1.ebuild b/sys-libs/libixp/libixp-0.5-r1.ebuild
new file mode 100644
index 000000000000..8aae4fa1d8d9
--- /dev/null
+++ b/sys-libs/libixp/libixp-0.5-r1.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.5-r1.ebuild,v 1.1 2010/06/11 16:12:22 xarthisius Exp $
+
+EAPI=2
+
+inherit eutils multilib toolchain-funcs
+
+DESCRIPTION="Standalone client/server 9P library"
+HOMEPAGE="http://libs.suckless.org/libixp"
+SRC_URI="http://code.suckless.org/dl/libs/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	sed -i -e "s:(PREFIX)/lib:(PREFIX)/$(get_libdir):" config.mk || die
+}
+
+src_compile() {
+	tc-export CC
+	emake CC="${CC}" LD="${CC}" || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dolib.so lib/*.so* || die
+	dosym libixp.so.${PV} /usr/$(get_libdir)/libixp.so
+	dosym libixp_pthread.so.${PV} /usr/$(get_libdir)/libixp_pthread.so
+}