Revision bump to force rebuild against -r3 of libixp wrt #393299

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

3 files changed, 92 insertions, 10 deletions

diff --git a/x11-wm/wmii/ChangeLog b/x11-wm/wmii/ChangeLog
index c02cffe835fb..bb1174d6d973 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.41 2011/12/04 21:42:49 ssuominen Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/wmii/ChangeLog,v 1.42 2012/03/05 13:42:07 ssuominen Exp $
+
+*wmii-3.9.2-r3 (05 Mar 2012)
+
+  05 Mar 2012; Samuli Suominen <ssuominen@gentoo.org> +wmii-3.9.2-r3.ebuild:
+  Revision bump to force rebuild against -r3 of libixp wrt #393299
 
   04 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> -wmii-3.9.2-r1.ebuild:
   old
diff --git a/x11-wm/wmii/Manifest b/x11-wm/wmii/Manifest
index ca6419590d52..4199e77b1028 100644
--- a/x11-wm/wmii/Manifest
+++ b/x11-wm/wmii/Manifest
@@ -4,16 +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-r2.ebuild 1687 RMD160 86e3078f6bd060c721bde47d5832c1a296c124a3 SHA1 62858a91a71a5d352ad30376fa2a1bd52569a209 SHA256 2606d30a143786e8c6ccd15902455f84d3b1212812a4919652bad290b85c56b2
-MISC ChangeLog 6131 RMD160 3fe51dc4040ae4a8974edf55b8e6b86ea9fcb8ef SHA1 8cee6ec3bb327324684b271f3783136f872d4607 SHA256 cd7038cd82554a30b8bb96c90ff28c61ad20c44af15d6a7e0fe5c317539eb045
+EBUILD wmii-3.9.2-r3.ebuild 1687 RMD160 b33413da3e0323240171483f6d697f51ec8890bb SHA1 0a7af0107a8eea130894be25cde6f263930e8a99 SHA256 a3842d179f6a0c108fac518760203ce7af7ad2022996a3c78dba0d19df2ea3e9
+MISC ChangeLog 6306 RMD160 44732cd86b96aa2c6f4a4d5eaf3177ae0f0ad681 SHA1 4eb74eb285ac872b07406bc19170722094d54c33 SHA256 e4e3360da97428fab6cfe5fc64935d7df498be545d72e246ba51cb096c0e7f16
 MISC metadata.xml 596 RMD160 0393838f1da4a5783906f5dfb820201f7b1e21a6 SHA1 7af8ccb9f0a48904e923ab610f1fa7199fbad301 SHA256 dc4ec29b62ec8e8d41c91f30f34da4cce7f51ce898516ecd94428512676b059e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJO2+nCAAoJEEdUh39IaPFN44kH/33euVT/baoNu20uzP++NkjO
-Ub8e1tTmtBaWwQANnEko0SDiEdd8a/5uK6FaY7eU9jcmWk0rZM+UU4AvclaTCuV7
-68ZTEUXvR/ULGzZgB1BvJeckUvfVLqMH62h0/sROI8VlUTSIK9WWdDF6hYQxf434
-wC6npIPCGlcFIYUzHto2u0F1A970U75+Ok2zE/JQLRtIvbnc+nS66Y+2qw5dPlEo
-IzybRfqNH6CdyaFoX46TVBJ8eFbeVv+KAdYk8jOTiHUjPmXPQdUBz4AdN/9dD28o
-ftDN9vavUUPcC7C7uauCo/qCpd5keEDtd++vSVV+I8dRwqP5LtnBG9WCoh4yUs8=
-=+RtH
+iQEcBAEBAgAGBQJPVMJxAAoJEEdUh39IaPFNWzQH+gLc3fQ0Nao+8V8lzTSmCBXp
+C1hfTZ5TvpGMxVw2Qrii2/UVDSWSgsXLvjSBKCF29hrqDeVtFjjOn+gOKnTRFsTp
+0joWCd1/VhYiNL6+YffeWg5fBf84/oj81nBLhrsIsF0FlzNW2q6R+j+uhM2FR6Dm
+us3knW943ym5OrTafdm0cOWl18GIDEoZ+05CC1WWG8j90eRTkRaVuHMFY4O0BWJC
+qUWZhChunRZK6M5ZN7ougP3PVxPrp0lPhs27B93lthvBrI69Ev87K4/Fctn3xhVd
+BFaa4obPFLRgjAdWyJE4OIfjgx9GxpWUT/0zM4s2cXqJSW4NSuWk/NvZk7CKFKE=
+=290X
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/wmii/wmii-3.9.2-r3.ebuild b/x11-wm/wmii/wmii-3.9.2-r3.ebuild
new file mode 100644
index 000000000000..c902cc5b5e97
--- /dev/null
+++ b/x11-wm/wmii/wmii-3.9.2-r3.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2012 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-r3.ebuild,v 1.1 2012/03/05 13:42:07 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-r3
+	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 sys-libs/libixp #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
+}