bump to snapshot

Package-Manager: portage-2.2.0_alpha20/cvs/Linux x86_64

7 files changed, 52 insertions, 292 deletions

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index 064b9d933b62..b8a15bcf0a80 100644
--- a/sys-libs/libixp/ChangeLog
+++ b/sys-libs/libixp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2010/06/22 15:04:23 jer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.17 2011/02/08 18:23:54 ssuominen Exp $
+
+*libixp-0.5_p20110208 (08 Feb 2011)
+
+  08 Feb 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +libixp-0.5_p20110208.ebuild:
+  Snapshot to get x11-wm/wmii compatible library.
 
   22 Jun 2010; Jeroen Roovers <jer@gentoo.org> libixp-0.4-r1.ebuild,
   libixp-0.5-r1.ebuild:
diff --git a/sys-libs/libixp/Manifest b/sys-libs/libixp/Manifest
index 50289d985155..3a48795361ae 100644
--- a/sys-libs/libixp/Manifest
+++ b/sys-libs/libixp/Manifest
@@ -1,8 +1,4 @@
-AUX libixp-0.4-gentoo.diff 2438 RMD160 a13b77b3544a1eea9a170668da4fc8be6bdeb4f6 SHA1 6da5bfe103ca2c0eafa9997956938ab7a5a9a2ed SHA256 17ca2dc545933752710542bdc096a221c06ec59f9073f63657e1e7cbd7b77cf8
-AUX libixp-0.5-gentoo.diff 3462 RMD160 7622905dd433c5cae9998ec92c47f1200f177e47 SHA1 7c7718fbebe474d41528eff805f9f2749fe90c65 SHA256 d753d7e344765a3d742bb2ef3a73ca3d21f8a99c433c2dc927e29c85b01b0b4d
-DIST libixp-0.4.tar.gz 130229 RMD160 240fe1cb16eac23cf00bffb93df1b13201c9c1ba SHA1 ec1adfeb4c5f502dfcb1b99fcf440841ecee2f9a SHA256 171878dfb67ecf47866843c2d25882aeae44b2efd9a0d685f3b7ffba79ba842c
-DIST libixp-0.5.tar.gz 142064 RMD160 83670f829a1ff185f2df744fd33d56649b2b2b35 SHA1 6cb9d3e7c6323acd4c3876f6a01ad5d8af9e1c6a SHA256 65f4f0bb67e83cbd1414f297e22648c867f914e2498bdbae3afdc0f83be21e4b
-EBUILD libixp-0.4-r1.ebuild 741 RMD160 52b8e982dcbe641fde0c51dbeaed68208d22c92f SHA1 0d723df921b419e2f1acadf3b25426378252cea4 SHA256 12dffbf0d1f2d10da16290bfc1c81f0d7e11755bc62178ccd9fd19370e44a05f
-EBUILD libixp-0.5-r1.ebuild 880 RMD160 5ee290e90ede1c27496bf2ed75c37d5c8ed0f83a SHA1 387ab73d63ef36d64133381f7b4400570c7e8dd8 SHA256 df9958ae84c63abeb362865ec714bc1a79de266b552e9aa9f307d951037569d1
-MISC ChangeLog 2577 RMD160 a69231b17aa63e0d60bb2de7a27391dd213b9307 SHA1 d07e265959d6ba870d81fad6d4f69183cc263c0d SHA256 aa302a4d137765bf03ac4180b5a7cfa369a0b7f424272714e3921f2e50b102aa
+DIST libixp-0.5_p20110208.tar.xz 655956 RMD160 2704f1ef72d37e208c3891e7ae3a2f705ee95ab0 SHA1 2e23276e2667042f690763d8f531616a500cfc9e SHA256 66ce92b25486505d04b97d838fb9b102cd1edb1455d90916d00dc38369b2c06b
+EBUILD libixp-0.5_p20110208.ebuild 966 RMD160 4d6aee8db730b507c48562b040efa7dcf3125f43 SHA1 47f27bae6226b1fea90dea76e9ef1cd933117029 SHA256 56fb2fda8e802725e0b4a231847339b56aab2f12cca56223130bad665aa13ebe
+MISC ChangeLog 2757 RMD160 347d91176d38799f79645d8ca496fc02d91fed54 SHA1 4a603f20b857dbbd9579f0878835e16120083c57 SHA256 d1b198c269782e80bab98a8c3240e8bb4d684258943481214841c9a3216a0923
 MISC metadata.xml 165 RMD160 b8020f1f8aabec4b8cd485910dc5df54338df9ff SHA1 08100b521b6fe603fc93ce48c1d7a892f2ee01a9 SHA256 5c2ed5ccdbc5064106e1f0227a30ec58377fa5299087516c9ebf9701619596ac
diff --git a/sys-libs/libixp/files/libixp-0.4-gentoo.diff b/sys-libs/libixp/files/libixp-0.4-gentoo.diff
deleted file mode 100644
index f1beef766d9f..000000000000
--- a/sys-libs/libixp/files/libixp-0.4-gentoo.diff
+++ /dev/null
@@ -1,103 +0,0 @@
---- 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
deleted file mode 100644
index 056bc57c0696..000000000000
--- a/sys-libs/libixp/files/libixp-0.5-gentoo.diff
+++ /dev/null
@@ -1,117 +0,0 @@
---- util/link
-+++ util/link
-@@ -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
-+++ util/compile
-@@ -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
-+++ config.mk
-@@ -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
-+++ 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
- 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
-+++ mk/so.mk
-@@ -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.4-r1.ebuild b/sys-libs/libixp/libixp-0.4-r1.ebuild
deleted file mode 100644
index c87ca64c415b..000000000000
--- a/sys-libs/libixp/libixp-0.4-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# 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.2 2010/06/22 15:04:23 jer 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 ~hppa ~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
deleted file mode 100644
index 6bb654501b34..000000000000
--- a/sys-libs/libixp/libixp-0.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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.3 2010/06/22 15:04:23 jer 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 ~hppa ~ppc64 ~x86"
-IUSE=""
-
-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
-}
diff --git a/sys-libs/libixp/libixp-0.5_p20110208.ebuild b/sys-libs/libixp/libixp-0.5_p20110208.ebuild
new file mode 100644
index 000000000000..c1f97376ec59
--- /dev/null
+++ b/sys-libs/libixp/libixp-0.5_p20110208.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/libixp-0.5_p20110208.ebuild,v 1.1 2011/02/08 18:23:54 ssuominen Exp $
+
+# hg clone http://hg.suckless.org/libixp
+
+EAPI=3
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A stand-alone client/server 9P library including ixpc client"
+HOMEPAGE="http://libs.suckless.org/libixp"
+SRC_URI="http://dev.gentoo.org/~ssuominen/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=""
+DEPEND="app-arch/xz-utils"
+
+pkg_setup() {
+	myixpconf=(
+		PREFIX="/usr"
+		LIBDIR="/usr/$(get_libdir)"
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC) ${LDFLAGS}"
+		AR="$(tc-getAR) crs"
+		MAKESO="1"
+		SOLDFLAGS="-shared -Wl,-soname"
+		)
+}
+
+src_compile() {
+	emake "${myixpconf[@]}" || die
+}
+
+src_install() {
+	emake "${myixpconf[@]}" DESTDIR="${D}" install || die
+	dolib.so lib/libixp{,_pthread}.so || die
+}