Version bump.

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

4 files changed, 138 insertions, 9 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 90bf883638c5..3a1337e49295 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.99 2011/11/12 10:39:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.100 2011/12/23 07:49:43 ssuominen Exp $
+
+*afterstep-2.2.11 (23 Dec 2011)
+
+  23 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> +afterstep-2.2.11.ebuild:
+  Version bump.
 
   12 Nov 2011; Justin Lecher <jlec@gentoo.org> afterstep-2.2.9.ebuild:
   Corrected slotting for png and tiff
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 73e8ef98cb92..7747bd90f7ba 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
 AUX afterstep-2.2.9-alpha.patch 475 RMD160 8945b4685e011e49a0c81c835cbe37bf275046c7 SHA1 d80c3791133c101fa4a914cd442d7b1afe9815e2 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6
@@ -7,14 +7,20 @@ AUX afterstep-2.2.9-ldflags.patch 1374 RMD160 e0a947fe48de238eb0a8ebdbfa365254dc
 AUX afterstep-2.2.9-libpng15.patch 1132 RMD160 6d08dc54c73771ebb6d05a57b94884dd211d4502 SHA1 8789eadee2f29c5c875c972cb2001a92b7e5e608 SHA256 4b08424b98d0b18f744f0a5fe0000f9149963b84bc28487a3e3f8eae1804560d
 AUX afterstep-2.2.9-make_session_data_file.patch 422 RMD160 b4e694ac6514d34dfbee5f6fe15ffa109e5bfbad SHA1 932abcf0c2fb469e45e95035244d97df40c8dfe1 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3
 AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f
+DIST AfterStep-2.2.11.tar.bz2 6126237 RMD160 a82a4b3fddcbcd97862212669c11d14629e51a4d SHA1 ecfd815b659046281530441af0bc4fc42900d0da SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa
 DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
-EBUILD afterstep-2.2.9.ebuild 3620 RMD160 1945c80d6741ec4c0be9b366c3fd992b81f1fddb SHA1 d5a70b276bac65d3f1193b6a0d70c81cbc6b0017 SHA256 5103badfb9ce04f0c80019349f330fc8a4162799077c7044ea5a37bc95151948
-MISC ChangeLog 14198 RMD160 6db732d304d111c866d5592920d245bf9795a6f8 SHA1 a315fc2b580027d20d33b1be4dd6a344c163cb58 SHA256 620b0fdc7bdf6158afbdef7c432f55459e59bfca302bfb8359dde68ca9455e52
+EBUILD afterstep-2.2.11.ebuild 3388 RMD160 52020250a50fb69c03821d86ad47115d008f0d81 SHA1 dbffc99d88ce5c4939390316dc83e5810d5c4724 SHA256 0fdcfc55868e649ff8212e52d90eff1df3c871bb189770dddcaad3781e073e50
+EBUILD afterstep-2.2.9.ebuild 3646 RMD160 94d27935d611dd1510c13a7b7379bb10f02a0d64 SHA1 a137170539a1af5ad931af5aebbb65ee82980ec6 SHA256 ed62b4d6a1683ef834736cda1f37b2d8514bdba47fa8675dfc1e157dc5c36812
+MISC ChangeLog 14334 RMD160 ee872c469c580de3044b53a0af99a92d33aac394 SHA1 be7924da481782b743e68059c4c650f580a48826 SHA256 c873b4c350fbcb91571a4f5ce7887fc99c96f396dd3592ee112de0ee325c6ddb
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEAREKAAYFAk6+TQkACgkQgAnW8HDreRZiRwCfZe1k78MlbEr9Wk9B0C6NuSAR
-zzUAoKiNJ26EwjTMd3mMy99zE3zJkPtW
-=wizD
+iQEcBAEBAgAGBQJO9DJiAAoJEEdUh39IaPFN+QQIAJo3M7vtK4OrKg1FCe1/kV7X
+CqjlvBU2EBKDcamt9G9kiPIhnz+ouJd74xryBQyWXuCBrNg2Um03DkZaHgdas6sR
+hWmISDcjZLPsQazkUluwkEwJF9herUcJghv0NkS9w/pa2liRMkFGpCJI795y5+2x
+7/1OPNgI33t/P2tW/10opKy3FCL/qB+RYN5VeBFASIb3YXfRUOpHkdhl3YVEHYQH
+5wZxIxR8etwtj+fQl9nJMkd3cMiNp2k/2nE6TqqpOiXO6JAj7kN3wxvoGgW0WaLa
+mOsEvSWOb7M5U1adPx8fwi4oI1pB8IE7WQ1ab6KSai+9O1r8Uwmhp2OvRE1R/2U=
+=mZBJ
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/afterstep/afterstep-2.2.11.ebuild b/x11-wm/afterstep/afterstep-2.2.11.ebuild
new file mode 100644
index 000000000000..f9849b7893b0
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.2.11.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.11.ebuild,v 1.1 2011/12/23 07:49:43 ssuominen Exp $
+
+EAPI=4
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A feature rich NeXTish window manager"
+HOMEPAGE="http://www.afterstep.org/"
+SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
+	mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="alsa debug dbus gif gtk jpeg mmx nls png svg tiff xinerama"
+
+RDEPEND="media-libs/freetype
+	alsa? ( media-libs/alsa-lib )
+	dbus? ( sys-apps/dbus )
+	jpeg? ( virtual/jpeg )
+	gif? ( >=media-libs/giflib-4.1.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0 )
+	svg? ( gnome-base/librsvg:2 )
+	tiff? ( media-libs/tiff:0 )
+	x11-libs/libICE
+	x11-libs/libXext
+	x11-libs/libSM
+	x11-libs/libXmu
+	x11-libs/libXt
+	x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXrender
+	xinerama? ( x11-libs/libXinerama )"
+DEPEND="${RDEPEND}
+	!media-libs/libafterimage
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+S=${WORKDIR}/AfterStep-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.9-{alpha,ldflags,libpng15}.patch
+
+	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
+	sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
+	sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
+	sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
+
+	pushd autoconf >/dev/null
+	eautoreconf
+	cp autoconf/config.h.in ./ || die
+	cp configure ../ || die
+	popd >/dev/null
+}
+
+src_configure() {
+	local myconf
+
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
+
+	# Explanation of configure options
+	# ================================
+	# --with-helpcommand="xterm -e man" -  Avoid installing xiterm
+	# --with-xpm - Contained in xfree
+	# --disable-availability - So we can use complete paths for menuitems
+	# --enable-ascp - The AfterStep ControlPanel is abandoned
+	# LDCONFIG - bug #265841
+
+	LDCONFIG=/bin/true econf \
+		$(use_enable alsa) \
+		$(use_enable mmx mmx-optimization) \
+		$(use_enable nls i18n) \
+		$(use_enable xinerama) \
+		$(use_with dbus dbus1) \
+		$(use_with gif) \
+		$(use_with gtk) \
+		$(use_with jpeg) \
+		$(use_with png) \
+		$(use_with tiff) \
+		$(use_with svg) \
+		--with-helpcommand="xterm -e man" \
+		--disable-availability \
+		--disable-staticlibs \
+		--enable-ascp=no \
+		${myconf}
+}
+
+src_compile() {
+	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
+	# make[1]: *** [PrintDesktopEntries] Error 1
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# Create a symlink from MonitorWharf to Wharf
+	rm "${D}"/usr/bin/MonitorWharf
+	dosym /usr/bin/Wharf /usr/bin/MonitorWharf
+
+	# Handle the documentation
+	dodoc ChangeLog INSTALL NEW* README* TEAM UPGRADE
+	cp -pPR TODO "${D}"/usr/share/doc/${PF}/
+	dodir /usr/share/doc/${PF}/html
+	cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html
+	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
+
+	insinto /usr/share/xsessions
+	newins AfterStep.desktop.final AfterStep.desktop
+
+	# For desktop managers like GDM or KDE
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/${PN}
+}
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
index cfb8855c4b74..33db560bf005 100644
--- a/x11-wm/afterstep/afterstep-2.2.9.ebuild
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.18 2011/11/12 10:39:59 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.9.ebuild,v 1.19 2011/12/23 07:49:43 ssuominen Exp $
 
 EAPI=4
 
@@ -113,7 +113,7 @@ src_compile() {
 }
 
 src_install() {
-	default
+	emake DESTDIR="${D}" install
 
 	# Create a symlink from MonitorWharf to Wharf
 	rm "${D}"/usr/bin/MonitorWharf