Version bump with cleanups, fixes bugs #180765 (bump request), #252119 (stripped files), and #265841 (ldconfig run on install)

Package-Manager: portage-2.2_rc48/cvs/Linux x86_64

4 files changed, 151 insertions, 2 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 3f1aa88ab604..23d8ec13bd80 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.82 2009/07/10 13:58:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.83 2009/11/03 14:49:26 voyageur Exp $
+
+*afterstep-2.2.9 (03 Nov 2009)
+
+  03 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
+  +afterstep-2.2.9.ebuild, +files/no-alternatives-2.2.9.patch:
+  Version bump with cleanups, fixes bugs #180765 (bump request), #252119
+  (stripped files), and #265841 (ldconfig run on install)
 
   10 Jul 2009; Samuli Suominen <ssuominen@gentoo.org>
   -files/afterstep-1.8.11-gentoo.diff, -afterstep-2.00.05.ebuild,
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 3b028df45abf..917ef51a4b54 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,6 +1,9 @@
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
+AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f
 AUX no-alternatives.patch 1178 RMD160 de3efea2502d9f8f8dbe403a4cc5c2e796017afd SHA1 11e79670530f8c9846adbe2a4fbe2cfc53a9688e SHA256 c3849ba4cd53fa1de52ab3b743b194b005754577dbe661ad7ee23a4b3eef36fc
 DIST AfterStep-2.2.4.tar.bz2 5707951 RMD160 74ab7c74afce8d5d669a1520a3c02f04882e05b9 SHA1 592da988696a0745c4bef240e49274b3915ee277 SHA256 e1787184faaee583435730666ef3dd1c221ced493ccd9ba0a06f94ac5e5b05ec
+DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
 EBUILD afterstep-2.2.4.ebuild 3625 RMD160 eff115bafda692a558deea1d604a428f22c2cbe8 SHA1 8b545ce96c055fef54abd2937c7daf8a4817afdd SHA256 0ecbdf951eb1c16cf160cd97fe7db2fb9134ed320cc67bc63383af7171c6964e
-MISC ChangeLog 11769 RMD160 d5395b20a3d5320ce3e69a089c4033f269905d60 SHA1 87842e0ca325086db6d30fda6e8dad5547b8e802 SHA256 11046f1a5834cf385633562627132135cdfe65fc383d3f5294d3cf0d09f1c0e3
+EBUILD afterstep-2.2.9.ebuild 3272 RMD160 1a37cc4ff2d0b0b670a6c0e1fcceb357029bd276 SHA1 68d676dc26d344b4874876a4acc50e3c5e325bef SHA256 e136d105e0e8e0cc8491637934979e9783f21acac623258b067943597a520c08
+MISC ChangeLog 12050 RMD160 aa3b69f8373fad29bb9f2b462c0fd0c598faf3e2 SHA1 c853f65427fbd72206bbb3d3dead805595455339 SHA256 26da56b95e955c299b4d730b7a80f2778fa19fc3cd26bd6f239fa653573f0c7e
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
diff --git a/x11-wm/afterstep/afterstep-2.2.9.ebuild b/x11-wm/afterstep/afterstep-2.2.9.ebuild
new file mode 100644
index 000000000000..c51d040d00a1
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.2.9.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2009 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.1 2009/11/03 14:49:26 voyageur Exp $
+
+EAPI=2
+inherit autotools flag-o-matic eutils
+
+DESCRIPTION="AfterStep is a feature rich NeXTish window manager"
+HOMEPAGE="http://www.afterstep.org"
+SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2"
+
+LICENSE="AFTERSTEP"
+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? ( >=media-libs/jpeg-6b )
+	gif?  ( >=media-libs/giflib-4.1.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( >=media-libs/libpng-1.2.5 )
+	svg? ( gnome-base/librsvg:2 )
+	tiff? ( >=media-libs/tiff-3.5.7 )
+	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}
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+S=${WORKDIR}/AfterStep-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/no-alternatives-${PV}.patch
+
+	# Do not strip binaries, bug #252119
+	sed -e "/STRIP_BINARIES/s/-s//" -i autoconf/configure.in || die "strip sed failed"
+	cd "${S}"/autoconf || die "cd autoconf failed"
+	eautoreconf
+	cp "${S}"/autoconf/autoconf/config.h.in "${S}"/autoconf || die "cp failed"
+	cp "${S}"/autoconf/configure "${S}" || die "cp failed"
+}
+
+src_configure() {
+	local myconf
+
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
+
+	#implied intent of debug means you need the frame pointers.
+	use debug && filter-flags -fomit-frame-pointer
+
+	# 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} || die "configure failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "make install failed"
+
+	# 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 "${S}"/TODO "${D}"/usr/share/doc/${PF}/
+	dodir /usr/share/doc/${PF}/html
+	cp -pPR "${S}"/doc/* "${D}"/usr/share/doc/${PF}/html
+	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
+
+	insinto /usr/share/xsessions
+	newins "${S}"/AfterStep.desktop.final AfterStep.desktop
+
+	# For desktop managers like GDM or KDE
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/afterstep
+}
diff --git a/x11-wm/afterstep/files/no-alternatives-2.2.9.patch b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch
new file mode 100644
index 000000000000..4195413c5eed
--- /dev/null
+++ b/x11-wm/afterstep/files/no-alternatives-2.2.9.patch
@@ -0,0 +1,29 @@
+--- Makefile.in.orig	2008-08-08 18:59:39.000000000 +0200
++++ Makefile.in	2008-08-08 19:00:51.000000000 +0200
+@@ -71,7 +71,8 @@
+ 
+ module.clean:
+  
+-install:  install.alternative install.desktop install.wmprops mkdir
++#install:  install.alternative install.desktop install.wmprops mkdir
++install:  install.desktop install.wmprops mkdir
+ 	@for I in ${subdirs} ; do if [ -d $$I ]; then (cd $$I; ${MAKE} install || exit 1); fi; done
+ 
+ install.bin: mkdir.bin
+@@ -86,11 +87,11 @@
+ install.script: mkdir.bin
+ 	@for I in ${subdirs}; do if [ -d $$I ]; then (cd $$I; ${MAKE} install.script || exit 1); fi; done
+ 
+-install.alternative:
+-	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
+-		update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
+-		echo "added AfterStep as an x-window-manager alternative"; \
+-	fi
++#install.alternative:
++#	@if update-alternatives --version > /dev/null 2>&1 ; then 	\
++#		update-alternatives --install /etc/alternatives/x-window-manager x-window-manager $(AFTER_BIN_DIR)/afterstep 100; \
++#		echo "added AfterStep as an x-window-manager alternative"; \
++#	fi
+ 	
+ 
+ install.desktop: AfterStep.desktop.final mkdir.share