Use system copy of sys-libs/libixp wrt #323037

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

3 files changed, 92 insertions, 8 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index 5817e2f57c91..b70edd6e0f15 100644
--- a/x11-wm/wmii/ChangeLog
+++ b/x11-wm/wmii/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/wmii
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.39 2011/05/29 08:36:05 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.40 2011/12/04 21:40:47 ssuominen Exp $
+
+*wmii-3.9.2-r2 (04 Dec 2011)
+
+  04 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> +wmii-3.9.2-r2.ebuild:
+  Use system copy of sys-libs/libixp wrt #323037
 
   29 May 2011; Kacper Kowalik <xarthisius@gentoo.org> wmii-3.9.2-r1.ebuild:
   Fix underlinking wrt #369115
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index bf9372632fa6..1ce54b13e480 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -4,14 +4,17 @@ Hash: SHA1
 AUX wmii.desktop 106 RMD160 e3b2042d2bf5a1eee8a317706f13dec7650f5b92 SHA1 85b1a8250145e1c06e321ba1a02acda950c1d6e1 SHA256 977337c9ca19c25265df36372038486f5de38e4422eec0271a5d71dc0ebc003c
 DIST wmii+ixp-3.9.2.tbz 432032 RMD160 8a401a5d0a033c0da254d15e7fe415ec40e7a332 SHA1 e85a2979a0bd0a1db7ed486fc709afe72bafd8b0 SHA256 0466f1a5c534b0ee9fdace2c7a2d251845b7ec0ae80bdb8e68ae6584ebeebf2b
 EBUILD wmii-3.9.2-r1.ebuild 1522 RMD160 bd3c15513e411d3499693d98f09cf0bc60be9c7e SHA1 6252b68791d0e8f2b794ffec80620939f550aaa3 SHA256 e643418d033c851e780c1283a4fd89ae20e7c0c88273be9853f7ea47343e158e
-MISC ChangeLog 5891 RMD160 51f4f3093e9c45cde1226c820a5b5fccfecf5f98 SHA1 0d040aeb6a27671c134b3ac96e7f4d7d9f06ca97 SHA256 03fc5ed64afac1a188d9b125562c7fe81e6b2a3013debea480bb7984d0607eea
+EBUILD wmii-3.9.2-r2.ebuild 1701 RMD160 67540f86ee5f19ffc0675cad21019cc25280e79b SHA1 b89ec26528a806c8b34e9b1832bd197c08ab53a1 SHA256 b98191368cb7d9f4e95c16423edd53139707e41f6c42e4302eed5dabaff3db4e
+MISC ChangeLog 6047 RMD160 26c4d85b4dd17fe11c55f40ff2185dfa1d4eb1fa SHA1 c11d95acf01d00d105a05ebb2b226970e427e8bb SHA256 f66723d16b1dc1d4cbe65e5aeda8e590b68cfb8e7b76d1b58199a1c5876fc369
 MISC metadata.xml 596 RMD160 0393838f1da4a5783906f5dfb820201f7b1e21a6 SHA1 7af8ccb9f0a48904e923ab610f1fa7199fbad301 SHA256 dc4ec29b62ec8e8d41c91f30f34da4cce7f51ce898516ecd94428512676b059e
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iJwEAQECAAYFAk3iBX8ACgkQIiMqcbOVdxRUIQP8DJg7IwOUA2CFzNrsvjDcrftF
-XmNOLLkEloWXTEk7+d0BGdjq1KCVaTOpjpG87OxTKWW8TBRoMnfVdUBCyvN7j91+
-+gYcJd09786+GoVafKyHYIzLQKqYNsKsTIcUbmEF1ogcGhZkZ7XHcd8I3VCvl8Pt
-PCrkTPaoIib5YgW0V/M=
-=KSYo
+iQEcBAEBAgAGBQJO2+jYAAoJEEdUh39IaPFN0EcH/jypGuMspsUokCSM9FT11hFj
+oX4rZa8gTd2sRLxZ4ZB69nai70tivkxaVxzkqa09qfXYA1d5CiE7XgMCFha53aNi
+cyMetV9WhNk8dzXHNg5uLbi+sgcTvxp/ZeBD7sGZyFVbv2Y74pdLsufkySiBEojI
+0AdssjOF36I6Fly05hyTm9KgtLpi3y1QLlcOAuu+VhOWW+CSrDa70EQlQn54EjH0
+K59SqCOnYxV7TeuKKKe88deipBgOGVQpwpt6qhHBpvCIog70kq5b2S4jLHld2cuA
+Jd6c2Jkqh5nyJJdo1UhJt+gWxiQo79b6N8TxETQTetdKtRHbr9FO+SNjrIoosMM=
+=VoJP
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/wmii-3.9.2-r2.ebuild b/x11-wm/wmii/wmii-3.9.2-r2.ebuild
new file mode 100644
index 000000000000..7a6d133a457d
--- /dev/null
+++ b/x11-wm/wmii/wmii-3.9.2-r2.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/wmii-3.9.2-r2.ebuild,v 1.1 2011/12/04 21:40:46 ssuominen Exp $
+
+EAPI=2
+inherit flag-o-matic multilib toolchain-funcs
+
+MY_P=wmii+ixp-${PV}
+
+DESCRIPTION="A dynamic window manager for X11"
+HOMEPAGE="http://wmii.suckless.org/"
+SRC_URI="http://dl.suckless.org/wmii/${MY_P}.tbz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND=">=sys-libs/libixp-0.5_p20110208-r2
+	x11-libs/libXft
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/libXrender
+	x11-libs/libX11
+	x11-libs/libXinerama
+	>=media-libs/freetype-2"
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xmessage
+	x11-apps/xsetroot
+	media-fonts/font-misc-misc"
+DEPEND="${COMMON_DEPEND}
+	dev-util/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+MAKEOPTS="${MAKEOPTS} -j1"
+
+pkg_setup() {
+	mywmiiconf=(
+		PREFIX=/usr
+		DOC=/usr/share/doc/${PF}
+		ETC=/etc
+		LIBDIR=/usr/$(get_libdir)
+		CC="$(tc-getCC) -c"
+		LD="$(tc-getCC)"
+		AR="$(tc-getAR) crs"
+		DESTDIR="${D}"
+		LIBIXP=/usr/$(get_libdir)/libixp.so
+		)
+}
+
+src_prepare() {
+	# punt internal copy of libixp and update API use wrt #323037
+	rm -f include/ixp{,_srvutil}.h || die
+	sed -i -e '/libixp/d' Makefile || die
+
+	sed -i -e "/BINSH \!=/d" mk/hdr.mk || die #335083
+	sed -i -e 's/-lXext/& -lXrender -lX11/' cmd/Makefile || die #369115
+}
+
+src_compile() {
+	append-flags -I/usr/include/freetype2
+	emake "${mywmiiconf[@]}"
+}
+
+src_install() {
+	emake "${mywmiiconf[@]}" install
+	dodoc NEWS NOTES README TODO
+
+	echo wmii > "${T}"/wmii
+	exeinto /etc/X11/Sessions
+	doexe "${T}"/wmii
+
+	insinto /usr/share/xsessions
+	doins "${FILESDIR}"/${PN}.desktop
+}