Revbump to bump EAPI to 3, and to drop configure problem with gnustepdir

Package-Manager: portage-2.2.01.15553-prefix/cvs/SunOS i386

3 files changed, 206 insertions, 12 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 079b7d325948..994656fd5dc7 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.114 2010/08/24 11:50:47 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.115 2010/08/25 12:42:48 grobian Exp $
+
+*windowmaker-0.92.0-r10 (25 Aug 2010)
+
+  25 Aug 2010; Fabian Groffen <grobian@gentoo.org>
+  +windowmaker-0.92.0-r10.ebuild:
+  Revbump to bump EAPI to 3, and to drop configure problem with gnustepdir
 
   24 Aug 2010; Christian Faulhammer <fauli@gentoo.org>
   windowmaker-0.92.0-r9.ebuild:
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 45876601c453..1b3db9acdb74 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.91.0/singleclick-shadeormaxopts-0.9x.patch2 7788 RMD160 c448c6ac9269650b89dfcc87bcf3bbbf9fb20fd8 SHA1 6c97d5467f749ce8e183355e5ff0fe7606f95b23 SHA256 4cdf6629afeaec576864f6738ffa62497e63a429d2db69ea5db01dbde3894f49
 AUX 0.91.0/wlist-0.9x.patch 2980 RMD160 903fb1977228f651868515ca9719343b6f03ed4b SHA1 d29e5dc6c2f9fee2bc1200496fac6136ded21f53 SHA256 5f9ba4d49371e517834f9c8e1718cab943a682c43c573b1e6b6541bbf96b8a5d
 AUX 0.92.0/windowmaker-0.92.0-configure.patch 1003 RMD160 cd91114ae8d8a3e96ac04887ccdfcb128d7936b7 SHA1 66e9a3cacf1a5aed75ff8903a5536a1c8ace4639 SHA256 a71a4245be52013bb985b63508727fb19a379fbcbebfa89cdb00c02dbd796089
@@ -15,15 +12,9 @@ DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd368
 DIST windowmaker-0.92.0-patchset-1.tar.bz2 196673 RMD160 963b1941afd2b5038845e2d89fb2dffade9c17e0 SHA1 1f01455dae4de050953dd8b1a5039cdd798449e8 SHA256 0548af8e03a3696baf868966015400c9de5438e75dff4df7392ca58c61bf9365
 DIST windowmaker-0.92.0-patchset-3.tar.bz2 220812 RMD160 d73cd0c6064576817929855aac481228296eb7b1 SHA1 dd62a750f0c610e1bb4a95f5d2251f3181e89a82 SHA256 8d50cb8c7ac9370b6870e9d220968485d8bafddb896aab04b88a93cae306c5a9
 DIST windowmaker-0.92.0-patchset-4.tar.bz2 226943 RMD160 afc95f3216ffba029de6798184601a21daa2c467 SHA1 2b97a62b85c6e12aa1b0c94ca61e5f86cd94f762 SHA256 369f7538d848ae4d3af8859d04fa282e0990d71b33f82666585f369bc3e8eff2
+EBUILD windowmaker-0.92.0-r10.ebuild 6901 RMD160 50230ff5734c4f48c44cbb14ece0bd4340039bf5 SHA1 e914c66632852a21eb5274f9f71cfc91d175a291 SHA256 1b5dd7303ae5a2b842f97b0befc0eed32b6a2ff0252eb09ca48361bce6a8d34f
 EBUILD windowmaker-0.92.0-r7.ebuild 5845 RMD160 bb7a1bee7eb99ad993b248601508daf26afbdd77 SHA1 b99fe0c8e2e74e1f87d60815e93d195d618820c9 SHA256 4c3982cae623481c8b135ac30d9bf9a1b65f019327491fee38aca7172fdf27f1
 EBUILD windowmaker-0.92.0-r8.ebuild 6798 RMD160 15442067d02ae027ee8eed5e8be3efdce7117e4a SHA1 ae5a51c6b47b34fa39783032051ea628a4ff2db4 SHA256 3d4bf1b8a015a9bf50b180e490171ce0d130d781e9fe946ee473f5d3a17bb6f8
 EBUILD windowmaker-0.92.0-r9.ebuild 6857 RMD160 216eaf44a5aed666ecdd3115375e5d580d9ba6bb SHA1 f29397238c4f7bb12fd9ed6ca33e02996519812f SHA256 1f3fb67244e3b37ab54fe940086a5f8e920385dd4f0e599dc8d4e721c442b971
-MISC ChangeLog 24242 RMD160 fae360e6acf4e4adc5d8b3e9123f20edb0209dfa SHA1 bb01a24320d3bf548f4301d009dc0add72f57c2f SHA256 3cd339025b8d2664919568e6bbe67821566429a9692c3f9099454493374c4bb8
+MISC ChangeLog 24444 RMD160 6246b570e1ef10aac9875ef00472719c1ca8bf1e SHA1 c6b565f5d5464b4044eb6514ef35394213c0eec4 SHA256 aac0be2d4684ac3376a3e88db402cc7f177ae0b38124481fca2d3a48ede6ca31
 MISC metadata.xml 455 RMD160 41514c712d553ed4752ce045efca3d27dd036c19 SHA1 345b35512a60f3d19cf5fc4cebbfe30bd6006bf3 SHA256 7661636f854da151e83478668ff58943b0d80662f6abd2a209707d3d34b37c7c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iEYEARECAAYFAkxzskMACgkQNQqtfCuFneOCRACfS2dp0842hDB5YJARWe6LHrI0
-XM0AnRi8o0YH+Ti0EB0/H9gKKAMhCBHf
-=WJSh
------END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r10.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r10.ebuild
new file mode 100644
index 000000000000..493e9933bbbe
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r10.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r10.ebuild,v 1.1 2010/08/25 12:42:48 grobian Exp $
+
+EAPI=3
+
+inherit autotools eutils gnustep-base flag-o-matic
+
+PATCHVER=4
+S=${WORKDIR}/${P/windowm/WindowM}
+
+DESCRIPTION="The fast and light GNUstep window manager"
+SRC_URI="ftp://ftp.windowmaker.info/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.info/pub/source/release/WindowMaker-extra-0.1.tar.gz
+	mirror://gentoo/${P}-patchset-${PATCHVER}.tar.bz2"
+HOMEPAGE="http://www.windowmaker.info/"
+
+IUSE="gif gnustep jpeg nls png tiff modelock +vdesktop xinerama"
+DEPEND="x11-libs/libXv
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXt
+	media-libs/fontconfig
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	png? ( >=media-libs/libpng-1.2.1 )
+	jpeg? ( >=media-libs/jpeg-6b:0 )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	gnustep? ( >=gnustep-base/gnustep-make-2.0 )
+	xinerama? ( x11-libs/libXinerama )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+src_prepare() {
+	cd "${S}"
+	local psd="${WORKDIR}"/${P}-patchset-${PATCHVER}
+
+	epatch "${psd}"/WindowMaker-0.92.0-cvs20060123.patch
+	epatch "${psd}"/WindowMaker-0.92.0-cvs-gcc41.patch
+	epatch "${psd}"/wlist-0.9x.patch
+	epatch "${psd}"/${P}-gif-before-ungif.patch
+	epatch "${psd}"/${P}-math_h.patch
+	epatch "${psd}"/${P}-gettext.patch
+	epatch "${psd}"/${P}-libpng14.patch
+
+	# Patches from upstream HG
+	epatch "${psd}"/${P}-composite-non-24bit-depth.patch
+	epatch "${psd}"/${P}-mouse-window-focus.patch
+	epatch "${psd}"/${P}-maximise-borderless-too-small.patch
+	epatch "${psd}"/${P}-xinerama-switchpanel-corruption.patch
+	epatch "${psd}"/${P}-dialog-history.patch
+	epatch "${psd}"/${P}-single-click-dockapp-start.patch
+	epatch "${psd}"/${P}-no-pop-empty-array.patch
+	epatch "${psd}"/${P}-empty-command-fatal-error.patch
+	epatch "${psd}"/${P}-findfile-overflow.patch
+	epatch "${psd}"/${P}-pointer-integer-warn-fix.patch
+	epatch "${psd}"/${P}-workspace-change-crash.patch
+	epatch "${psd}"/${P}-app-icon-fix.patch
+	epatch "${psd}"/${P}-xchangeproperty-64bits-fix.patch
+
+	# Patches from altlinux
+	epatch "${psd}"/WindowMaker-0.91.0-alt-session.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-restartscrpt.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-menutrans.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-titlebar.patch
+	epatch "${psd}"/${P}-no-clip-title.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-mmx.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-focus.patch
+	epatch "${psd}"/WindowMaker-0.92.0-alt-alloca.patch
+
+	# New features (cool!)
+	epatch "${psd}"/${P}-doubleclick-maximise.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-dockhotkeys.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-trance.patch
+	epatch "${psd}"/WindowMaker-0.91.0-alt-vlaad-newbuttons.patch
+	epatch "${psd}"/WindowMaker-0.91.0-hmepas-minimizeall.patch
+	epatch "${psd}"/WindowMaker-0.91.0-hmepas-swmenu_rclick.patch
+	epatch "${psd}"/WindowMaker-0.91.0-sga-moving-add.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-newappicon.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-mouse-placement.patch
+	epatch "${psd}"/WindowMaker-0.91.0-peter-appicon-bouncer2.patch
+	epatch "${psd}"/WindowMaker-0.91.0-sga-swpanel-customization.patch
+	epatch "${psd}"/WindowMaker-0.92.0-alt-newpo.patch
+
+	[[ ${CHOST} == *-interix* ]] && epatch "${psd}"/${P}-interix3.patch
+	epatch "${psd}"/${P}-darwin-setlocale.patch
+	epatch "${psd}"/${P}-nls.patch
+
+	# Add UK localisation
+	cp "${psd}"/WindowMaker-uk.po po/uk.po
+	cp "${psd}"/WPrefs-uk.po WPrefs.app/po/uk.po
+
+	# Add newbuttons resources
+	cp "${psd}"/WindowMaker-newbuttons.nextstyle.tiff \
+		WPrefs.app/tiff/nextstyle.tiff
+	cp "${psd}"/WindowMaker-newbuttons.oldstyle.tiff \
+		WPrefs.app/tiff/oldstyle.tiff
+	cp "${psd}"/WindowMaker-newbuttons.nextstyle.xpm \
+		WPrefs.app/xpm/nextstyle.xpm
+
+	# Fix some paths
+	if use gnustep; then
+		egnustep_env
+	fi
+	for file in "${S}"/WindowMaker/*menu*; do
+		if [[ -r $file ]] ; then
+			if use gnustep ; then
+				sed -i -e "s:/usr/local/GNUstep/Applications:${GNUSTEP_SYSTEM_APPS}:g" "$file" || die
+			else
+				sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			fi
+
+			sed -i -e 's:/usr/local/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" || die
+			sed -i -e 's:/opt/share/WindowMaker:${EPREFIX}/usr/share/WindowMaker:g;' "$file" || die
+		fi;
+	done;
+
+	eautoreconf || die "eautoreconf failed"
+}
+
+src_configure() {
+	local myconf
+
+	is-flag -fstack-protector && filter-flags -fstack-protector \
+		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)" && ebeep 2
+	replace-flags "-Os" "-O2"
+	replace-flags "-O3" "-O2"
+
+	# image format types
+	# xpm is provided by X itself
+	myconf="--enable-xpm $(use_enable png) $(use_enable jpeg) $(use_enable gif) $(use_enable tiff)"
+
+	# non required X capabilities
+	myconf="${myconf} $(use_enable modelock) $(use_enable xinerama)"
+
+	if use gnustep ; then
+		egnustep_env
+		# Gentoo installs everything in System, make sure configure
+		# honors that.  Don't set --with-gnustepdir, configure is
+		# borked, and GNUSTEP_LOCAL_ROOT takes precedence anyway.
+		export GNUSTEP_LOCAL_ROOT=${GNUSTEP_SYSTEM_ROOT}
+	fi
+
+	if use nls; then
+		[[ -z $LINGUAS ]] && export LINGUAS="`ls po/*.po | sed 's:po/\(.*\)\.po$:\1:'`"
+	else
+		myconf="${myconf} --disable-locale"
+	fi
+
+	# enable new features, need to be done via defines
+	append-flags -DBOUNCE_APP -DNEWAPPICON
+	use vdesktop && append-flags -DVIRTUAL_DESKTOP
+
+	# default settings with $myconf appended
+	econf \
+		--sysconfdir="${EPREFIX}"/etc/X11 \
+		--with-x \
+		--enable-usermenu \
+		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
+		--with-nlsdir="${EPREFIX}"/usr/share/locale \
+		${myconf} || die
+	cd ../WindowMaker-extra-0.1
+	econf || die "windowmaker-extra: configure has failed"
+}
+
+src_compile() {
+	emake || die "windowmaker: make has failed"
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake || die "windowmaker-extra: make has failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "windowmaker: install has failed."
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog COPYING* INSTALL* FAQ* \
+		  MIRRORS README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install || die "windowmaker-extra: install failed"
+
+	newdoc README README.extra
+
+	# create wmaker session shell script
+	echo "#!/usr/bin/env bash" > wmaker
+	echo "${EPREFIX}/usr/bin/wmaker" >> wmaker
+	exeinto /etc/X11/Sessions/
+	doexe wmaker
+
+	insinto /etc/X11/dm/Sessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}