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

(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)

2 files changed, 83 insertions, 2 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/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
+}