diff options
| -rw-r--r-- | sys-libs/libixp/ChangeLog | 10 | ||||
| -rw-r--r-- | sys-libs/libixp/Manifest | 16 | ||||
| -rw-r--r-- | sys-libs/libixp/files/libixp-0.5-gentoo.diff | 117 | ||||
| -rw-r--r-- | sys-libs/libixp/libixp-0.5-r1.ebuild | 36 |
4 files changed, 177 insertions, 2 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/Manifest b/sys-libs/libixp/Manifest index a09db0d52bac..23bdd4c13f84 100644 --- a/sys-libs/libixp/Manifest +++ b/sys-libs/libixp/Manifest @@ -1,9 +1,23 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX libixp-0.2-shared-object.patch 2509 RMD160 6b05223019d36a8c904a488e3cfdae0c353ce61e SHA1 8c36b9d0cf2d929c9f810b67f2e1001ac00e29eb SHA256 ed3e025666b2f3ef58c89cabc7a22b591c926ae0e2ca305a11db6184fe73d641 +AUX libixp-0.5-gentoo.diff 3847 RMD160 b854a7b503b987cfde307c25dbdbca91591f2f2c SHA1 2913e0ab2ac566a9936e098faf5a1341210719eb SHA256 bfae6984f5d20c9ceb0ad635595382dc382855edd29f6967d24775abb6e1a20b DIST libixp-0.2.tar.gz 20701 RMD160 a0738f88ea8b150f1eead51ef9270bf567d7795e SHA1 14e11b5ae179415e1353df4e0d4bc6cb1b434156 SHA256 5e5eec16dd02bce3f014b90df029e91136031852568ff9a147d3f99f6eaf0143 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.2-r1.ebuild 920 RMD160 5bbb7ef566bfce66c740e853f7675ec913db0e92 SHA1 758f5f6904782d28b6edd55f5cbc0f01e4663e68 SHA256 fdc7a0967791e8099557de23ae3130d4a8492cf26fbe6474d07f1a092fff235d EBUILD libixp-0.4.ebuild 807 RMD160 938c6fb27bac1196be73f3ef48ec1748623a5758 SHA1 2aeb93bd891e5d2da36991dc77f6959d17f89059 SHA256 71ce24ba6a93e2820d26a254e85301c9b78845deec17810a449ab3f6c63767b8 +EBUILD libixp-0.5-r1.ebuild 903 RMD160 27158d917a5a89b302b6ed43fca0fc793e872c64 SHA1 dc770f5223c2a37aad3a1e9dd83063f177bae65e SHA256 162b41a66a1b895c6cfebad8f54f53d339baa7260bf963f98c8160b41e17015f EBUILD libixp-0.5.ebuild 789 RMD160 0db63a441ab3d54fb78eaa70bf6e6a51d700b800 SHA1 123189593932249eb0a8bb548dc8a6471ef98569 SHA256 1284ae4ff49845a68f4d5762a664f6abb3c7d80c04fcc967e34deab35bb25dd0 -MISC ChangeLog 1680 RMD160 1ded9ac444590c9fee8d7c9103c077d1829bc827 SHA1 20e911529e29a18a9e5f3c9790f4b2cbe5f90d94 SHA256 9ca791ad519aecc68449d3a0a27ab06cbd7efa1d0192f5b7bc94e91ce99af264 +MISC ChangeLog 2016 RMD160 1be85d17a1261d2d19ba8b236104c265ec15cc60 SHA1 8c6fdd4abaa711499d04e93ee5521e10b3674ebc SHA256 fb1361a3ee19048710191709a57eb03194a139730ad458f15aad3b57d99d4748 MISC metadata.xml 165 RMD160 b8020f1f8aabec4b8cd485910dc5df54338df9ff SHA1 08100b521b6fe603fc93ce48c1d7a892f2ee01a9 SHA256 5c2ed5ccdbc5064106e1f0227a30ec58377fa5299087516c9ebf9701619596ac +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iJwEAQECAAYFAkwSYG8ACgkQIiMqcbOVdxTLCgP/T2DYwJvGk0LJ5K9iSxRMQ/z5 +k21QhS6b6Xz5mpeoLGGAhlxyaN1rKp+Boq1N4dSOgEkHfCGEqJRV0UQNNDa9TY9d +5kVCcJl5M+m8jpg8gsWu9IAJacYHTqbgqKXhD2eiPpbF2DFFX1WOqKKJwm1/5nO1 +dikkud8hYd4eJ7SE+94= +=c5Bj +-----END PGP SIGNATURE----- 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 +} |