Adding older, revised version for x11-wm/wmii. Minor cleanup in patches.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

5 files changed, 152 insertions, 15 deletions

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index c8319df67552..69a326017c96 100644
--- a/sys-libs/libixp/ChangeLog
+++ b/sys-libs/libixp/ChangeLog
@@ -1,6 +1,13 @@
 # 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.14 2010/06/11 16:15:42 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.15 2010/06/11 17:02:01 xarthisius Exp $
+
+*libixp-0.4-r1 (11 Jun 2010)
+
+  11 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> +libixp-0.4-r1.ebuild,
+  +files/libixp-0.4-gentoo.diff, libixp-0.5-r1.ebuild,
+  files/libixp-0.5-gentoo.diff:
+  Adding older, revised version for x11-wm/wmii. Minor cleanup in patches.
 
   11 Jun 2010; Kacper Kowalik <xarthisius@gentoo.org> -libixp-0.2-r1.ebuild,
   -files/libixp-0.2-shared-object.patch, -libixp-0.4.ebuild,
diff --git a/sys-libs/libixp/files/libixp-0.4-gentoo.diff b/sys-libs/libixp/files/libixp-0.4-gentoo.diff
new file mode 100644
index 000000000000..f1beef766d9f
--- /dev/null
+++ b/sys-libs/libixp/files/libixp-0.4-gentoo.diff
@@ -0,0 +1,103 @@
+--- util/link
++++ util/link
+@@ -21,7 +21,7 @@
+ xtmp=/tmp/ld.$$.$USER.out
+ 
+ echo LD "$($bin/cleanname ${BASE}$outfile)"
+-$LD -o $outfile $ofiles $LDFLAGS $args >$xtmp 2>&1
++$LD -o $outfile $ofiles $LDFLAGS $args $LDLIBS $LIBS >$xtmp 2>&1
+ status=$?
+ 
+ sed 's/.*: In function `[^:]*: *//' $xtmp | egrep . | 
+--- util/compile
++++ util/compile
+@@ -8,7 +8,7 @@
+ xtmp=/tmp/cc.$$.$USER.out
+ 
+ echo CC $($bin/cleanname ${BASE}$outfile)
+-$CC -o $outfile $CFLAGS $@ 2>$xtmp
++$CC -c -o $outfile $CFLAGS $@ 2>$xtmp
+ status=$?
+ 
+ base=$(echo $BASE | sed 's/,/\\,/g')
+--- config.mk
++++ config.mk
+@@ -11,10 +11,10 @@
+ TASKINC = -I${HOME}/libtask
+ 
+ # paths
+-PREFIX = /usr/local
++PREFIX = $(DESTDIR)/usr
+ BIN = ${PREFIX}/bin
+ MAN = ${PREFIX}/share/man
+-ETC = ${PREFIX}/etc
++ETC = /etc
+ LIBDIR = ${PREFIX}/lib
+ INCLUDE = ${PREFIX}/include
+ 
+@@ -23,14 +23,10 @@
+ LIBS = -L/usr/lib -lc
+ 
+ # Flags
+-include ${ROOT}/mk/gcc.mk
+-CFLAGS = -g -Wall ${INCS} -DVERSION=\"${VERSION}\"
+-LDFLAGS = -g ${LIBS}
++MKDEP = cpp -M
++SOCFLAGS += -fPIC
++EXTRACFLAGS = ${INCS} -DVERSION=\"${VERSION}\"
+ 
+-# Compiler
+-CC = cc -c
+-# Linker (Under normal circumstances, this should *not* be 'ld')
+-LD = cc
+ # Other
+ AR = ar crs
+ #AR = sh -c 'ar cr "$$@" && ranlib "$$@"'
+--- mk/dir.mk
++++ mk/dir.mk
+@@ -9,15 +9,15 @@
+ 	done
+ 
+ dall:
+-	dirs="${DIRS}"; ${MKSUBDIR}
++	+dirs="${DIRS}"; ${MKSUBDIR}
+ dclean:
+-	dirs="${DIRS}"; ${MKSUBDIR}
++	+dirs="${DIRS}"; ${MKSUBDIR}
+ dinstall:
+-	dirs="${INSTDIRS}"; ${MKSUBDIR}
++	+dirs="${INSTDIRS}"; ${MKSUBDIR}
+ duninstall:
+-	dirs="${INSTDIRS}"; ${MKSUBDIR}
++	+dirs="${INSTDIRS}"; ${MKSUBDIR}
+ ddepend:
+-	dirs="${DIRS}"; ${MKSUBDIR}
++	+dirs="${DIRS}"; ${MKSUBDIR}
+ 
+ all: dall
+ clean: dclean
+--- mk/hdr.mk
++++ mk/hdr.mk	2010-06-11 16:53:56.018621649 +0000
+@@ -41,8 +41,9 @@
+ 
+ .a.install:
+ 	echo INSTALL $$($(CLEANNAME) ${BASE}$<)
+-	cp -f $< ${LIBDIR}/$<
+-	chmod 0644 ${LIBDIR}/$<
++	file=$<; \
++	cp -f $< ${LIBDIR}/$${file##*/}; \
++	chmod 0644 ${LIBDIR}/$${file##*/}
+ .a.uninstall:
+ 	echo UNINSTALL $$($(CLEANNAME) ${BASE}$<)
+ 	rm -f ${LIBDIR}/$<
+@@ -76,8 +77,8 @@
+ depend: cleandep
+ 
+ FILTER = cat
+-COMPILE= CC="${CC}" CFLAGS="${CFLAGS}" ${ROOT}/util/compile
+-LINK= LD="${LD}" LDFLAGS="${LDFLAGS}" ${ROOT}/util/link
++COMPILE= CC="$(CC)" CFLAGS="$(CFLAGS) $(EXTRACFLAGS)" ${ROOT}/util/compile
++LINK= LD="$(LD)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LDLIBS="$(LDLIBS)" ${ROOT}/util/link
+ CLEANNAME=${ROOT}/util/cleanname
+ 
+ include ${ROOT}/config.mk
diff --git a/sys-libs/libixp/files/libixp-0.5-gentoo.diff b/sys-libs/libixp/files/libixp-0.5-gentoo.diff
index 235f8ee658c3..056bc57c0696 100644
--- a/sys-libs/libixp/files/libixp-0.5-gentoo.diff
+++ b/sys-libs/libixp/files/libixp-0.5-gentoo.diff
@@ -1,5 +1,5 @@
---- util/link.orig	2010-06-11 14:42:17.814559383 +0000
-+++ util/link	2010-06-11 14:43:17.809433593 +0000
+--- util/link
++++ util/link
 @@ -21,10 +21,10 @@
  xtmp=/tmp/ld.$$.$USER.out
  
@@ -14,8 +14,8 @@
  
  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
+--- util/compile
++++ util/compile
 @@ -8,10 +8,10 @@
  xtmp=/tmp/cc.$$.$USER.out
  
@@ -30,8 +30,8 @@
  
  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
+--- config.mk
++++ config.mk
 @@ -5,36 +5,32 @@
  	libixp_pthread
  
@@ -80,8 +80,8 @@
  
  # 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
+--- mk/hdr.mk
++++ mk/hdr.mk
 @@ -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
@@ -104,8 +104,8 @@
  .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
+--- mk/so.mk
++++ mk/so.mk
 @@ -1,6 +1,6 @@
  SOPTARG = $(ROOT)/lib/$(TARG)
 -SO = $(SOPTARG).$(SOEXT)
diff --git a/sys-libs/libixp/libixp-0.4-r1.ebuild b/sys-libs/libixp/libixp-0.4-r1.ebuild
new file mode 100644
index 000000000000..2e9b6138174d
--- /dev/null
+++ b/sys-libs/libixp/libixp-0.4-r1.ebuild
@@ -0,0 +1,30 @@
+# 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.4-r1.ebuild,v 1.1 2010/06/11 17:02:01 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=""
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	sed -i -e "/LIBDIR/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
+}
diff --git a/sys-libs/libixp/libixp-0.5-r1.ebuild b/sys-libs/libixp/libixp-0.5-r1.ebuild
index 8aae4fa1d8d9..7322cd8a684f 100644
--- a/sys-libs/libixp/libixp-0.5-r1.ebuild
+++ b/sys-libs/libixp/libixp-0.5-r1.ebuild
@@ -1,6 +1,6 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.5-r1.ebuild,v 1.2 2010/06/11 17:02:01 xarthisius Exp $
 
 EAPI=2
 
@@ -15,9 +15,6 @@ 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