Change ixp_serve9pconn define to ixp_serve9conn as per upstream http://code.google...

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

diff --git a/sys-libs/libixp/ChangeLog b/sys-libs/libixp/ChangeLog
index 472762d0accc0aa740ac722d0fc180aaec81a6a4..a5c199c3064715f762e0ce527a5d4662e33edbbe 100644 (file)
--- a/sys-libs/libixp/ChangeLog
+++ b/sys-libs/libixp/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/libixp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.18 2011/12/04 21:11:30 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/libixp/ChangeLog,v 1.19 2011/12/04 21:38:23 ssuominen Exp $
+
+*libixp-0.5_p20110208-r2 (04 Dec 2011)
+
+  04 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
+  +libixp-0.5_p20110208-r2.ebuild:
+  Change ixp_serve9pconn define to ixp_serve9conn as per upstream
+  http://code.google.com/p/libixp/issues/detail?id=2 (this is required for
+  unbundling libixp in x11-wm/wmii-3.9.2)
 
   04 Dec 2011; Samuli Suominen <ssuominen@gentoo.org>
   -libixp-0.5_p20110208.ebuild:

diff --git a/sys-libs/libixp/Manifest b/sys-libs/libixp/Manifest
index b2153acd97bc0a03d0e95977c7c49ddf0fc41ef6..32031a5e3f9253a76fbc31e1404761eb8488512b 100644 (file)
--- a/sys-libs/libixp/Manifest
+++ b/sys-libs/libixp/Manifest
@@ -3,16 +3,17 @@ Hash: SHA1
 
 DIST libixp-0.5_p20110208.tar.xz 655956 RMD160 2704f1ef72d37e208c3891e7ae3a2f705ee95ab0 SHA1 2e23276e2667042f690763d8f531616a500cfc9e SHA256 66ce92b25486505d04b97d838fb9b102cd1edb1455d90916d00dc38369b2c06b
 EBUILD libixp-0.5_p20110208-r1.ebuild 952 RMD160 2ca36b1d93f09908b3ac393da98c9c64fbf0fb91 SHA1 78bbf3c307be0a143901e512e8a973ae61920078 SHA256 656592efb37c75b409aa4065a57a2a80c00cdf90404096e645b2a0cc4b25de2e
-MISC ChangeLog 3093 RMD160 11eab232cad383369db341ca78be0a7f6dd10d52 SHA1 c2268a468424442c60c1235666fb45c6278e12fe SHA256 e9163e81053ca4e5293fe28b2f148649294a7b212e80ac49c12b3371138049ce
+EBUILD libixp-0.5_p20110208-r2.ebuild 1093 RMD160 cf7d298e81f7b1c6f229a094f48240b4d5a32c0c SHA1 a837e8a3afc7e202bc39c3d3118010b718f64edc SHA256 8e5ec6ac447d9d5b21e3b8f8f9c49c8fc4de0d850a6e59a33e1ff03fe378ca96
+MISC ChangeLog 3406 RMD160 c3a7883863e6392112d1ff3d3195c60764ba4eec SHA1 5c855109cb23f512b8c948b54e8ca2877365ed37 SHA256 5314488059ee8485e97fea3d3b3a159a2c6f5979955f1ade5fad7fe010f5fcd1
 MISC metadata.xml 165 RMD160 b8020f1f8aabec4b8cd485910dc5df54338df9ff SHA1 08100b521b6fe603fc93ce48c1d7a892f2ee01a9 SHA256 5c2ed5ccdbc5064106e1f0227a30ec58377fa5299087516c9ebf9701619596ac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO2+H8AAoJEEdUh39IaPFNOvIH/jyJODyvbeklCcCiHyFrrvEQ
-2IClvqb2mIXZUUp73Y6FWGa16CPocHmO8JpEfPRkIYBSkcUtbH7wKYvQcVcNT4/L
-09CGMLhz9o/u1vKQ0X/4934o5NrgstIGAew+cby0MQ0eoCiAvZuNnEssH4czZFlh
-ANcRwFFRBp2qFouHwgjhIKA9WGrn2DnykBCKsaF2rnw0RI9Tx5bxokeuK5m+Vk8T
-xTwsbAq4X+3tzmLugXGs39uPtm7QrfGCfQp9/bwSbsmZHo1J/p0O29cagiIQ5jv9
-qRzdbNEGEOAihVlZNonKIWQ2mEiCx/UQsYm5JDJCmt0qCRrtQVHG1Zi+juPXR3A=
-=ry5o
+iQEcBAEBAgAGBQJO2+hJAAoJEEdUh39IaPFNiCAH/iXXPUnmAIIBgdzub3ugWI+Z
+RRHqlPGkXJ51awjCOcC7H17OgDInB5wZkqrVNILbmmxWhFqHRllcDvEWaLnLqf+q
+ZfmVqmeF94D5DRIkSCxBpGJPbljc6vnTSpq3XOFWqkkdYDMZMmXFbShu6e/gIo9i
+5MTADuukmG5OGDLdqBd2oW4hL4ar5psp5rOEKg6CDraRtmsmm3EFHh3Z1ierTgAM
+9CtxCe4b/38mIH34KpVUqPwlK2Ql1pdCIwk1TYT/YKknyvdkzfu6NxVV83081PbW
+JPBpWjJbrCxOFm3LR4iT0pMSOtrWoAVV92LT7QOB09yZW1zEDE6jMPsi2Y2xJZU=
+=BGX6
 -----END PGP SIGNATURE-----

diff --git a/sys-libs/libixp/libixp-0.5_p20110208-r2.ebuild b/sys-libs/libixp/libixp-0.5_p20110208-r2.ebuild
new file mode 100644 (file)
index 0000000..e6df7e4
--- /dev/null
+++ b/sys-libs/libixp/libixp-0.5_p20110208-r2.ebuild
@@ -0,0 +1,47 @@
+# 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-r2.ebuild,v 1.1 2011/12/04 21:38:23 ssuominen Exp $
+
+# hg clone http://hg.suckless.org/libixp
+
+EAPI=4
+inherit multilib toolchain-funcs
+
+DESCRIPTION="A stand-alone client/server 9P library including ixpc client"
+HOMEPAGE="http://libs.suckless.org/libixp"
+SRC_URI="mirror://gentoo/${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"
+               )
+}
+
+src_prepare() {
+       # http://code.google.com/p/libixp/issues/detail?id=2
+       sed -i -e 's:ixp_serve9pconn:ixp_serve9conn:' include/ixp.h || die
+}
+
+src_compile() {
+       emake "${myixpconf[@]}" || die
+}
+
+src_install() {
+       emake "${myixpconf[@]}" DESTDIR="${D}" install || die
+       dolib.so lib/libixp{,_pthread}.so || die
+       dodoc NEWS
+}