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

Package-Manager: portage-2.1.8.3/cvs/Linux x86_64

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index c8319df675520ab1069acf12d673579a41a90874..69a326017c9699a51a7035a9acc151010d4af4e2 100644 (file)
--- 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/Manifest b/sys-libs/libixp/Manifest
index a00cf02e7e35d348efa9b810a86742b06698fc56..c9fb65f51a8ec4d0d565ca1f84e14513ebd30418 100644 (file)
--- a/sys-libs/libixp/Manifest
+++ b/sys-libs/libixp/Manifest
@@ -1,17 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-AUX libixp-0.5-gentoo.diff 3847 RMD160 b854a7b503b987cfde307c25dbdbca91591f2f2c SHA1 2913e0ab2ac566a9936e098faf5a1341210719eb SHA256 bfae6984f5d20c9ceb0ad635595382dc382855edd29f6967d24775abb6e1a20b
+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.5-r1.ebuild 903 RMD160 27158d917a5a89b302b6ed43fca0fc793e872c64 SHA1 dc770f5223c2a37aad3a1e9dd83063f177bae65e SHA256 162b41a66a1b895c6cfebad8f54f53d339baa7260bf963f98c8160b41e17015f
-MISC ChangeLog 2190 RMD160 ec41ccaa8d91e9b27a96cba8bafb7ce598c34e4a SHA1 d1e064a09623ebdda10a2c80a0d3c3cd68b0cf01 SHA256 3aec04f166cedc11fc83868800f6d2d568f2da11bcaf2a5d04cb0823120a176a
+EBUILD libixp-0.4-r1.ebuild 742 RMD160 8a52ae5b2da9140c9e7c8e144229f565498eb962 SHA1 a3c0713255e715041d98da7a331de79bd5b79752 SHA256 38780d3f0eb6c64a243e775f3137f764a8dc9e4da676a82bdfd297111545e316
+EBUILD libixp-0.5-r1.ebuild 881 RMD160 15c9c15062e4f9dbd37ea3d1efabf6b42aa65a0f SHA1 c73ffe534c5681d306840629b1a2ead09f7793e5 SHA256 733b26ac678f3282e5cf901f8ef4ce460faeaaaf43c8462b90ea921cbf867ae2
+MISC ChangeLog 2460 RMD160 8f2de03374d9dcb5599f659b4d1f277c8a0dc675 SHA1 e362b5ad2c70f9642086d31b27bdb7b6d32b5c03 SHA256 168de362df736f9c1b1820b60b7fd8d809416b0057afad8ec1ef9078ee723e13
 MISC metadata.xml 165 RMD160 b8020f1f8aabec4b8cd485910dc5df54338df9ff SHA1 08100b521b6fe603fc93ce48c1d7a892f2ee01a9 SHA256 5c2ed5ccdbc5064106e1f0227a30ec58377fa5299087516c9ebf9701619596ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iJwEAQECAAYFAkwSYTcACgkQIiMqcbOVdxRG1AP8Doeyhqf6/T7fhvTk/NVzWFFC
-Oz7n8B9cJpjDuxzCXHU3ipf6HH4doXJFhA8kcNYNAG1Lt7DqeGfD5LJQ1SFnLy2l
-PejsNizhfdhHFOLQx7Hj0DKRJRBiF6CC1z/MAjq+YL/N+3H43Y5kd9DBRbzbUsg3
-rde9h86bnSXJDFVL+rs=
-=6Zf+
+iJwEAQECAAYFAkwSbBIACgkQIiMqcbOVdxTtpgP/ZWc1W2Mym479EqQF/Pwy0cIq
+qJZ1hOqFVclrC8OHyhjmyxmUEh7ClssjC6Nf+7TVBGHpV3oofMztwYl3fW7SSGNa
+N0+jXXIri8zBubkfl+T5jgZt0o25NscfwwipHjLA9juNcrwBEcPM2Zb5t2uhgmCp
+udH9yz5J6rIVbyo71qs=
+=lZaw
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..f1beef7
--- /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 235f8ee658c37fc00ce1dd8aafe28d2464fec878..056bc57c06965907f803d9e4d9b20e756fc8fb25 100644 (file)
--- 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 (file)
index 0000000..2e9b613
--- /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 8aae4fa1d8d94349bef1328b32479fb1124ff03b..7322cd8a684f9c44bdf64897fcb11fe666aae7f8 100644 (file)
--- 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