Use FHS layout for WPrefs, to keep in sync with the new default gnustep layout

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

3 files changed, 201 insertions, 3 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 750b65e82644..94975f604cd9 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,13 @@
 # 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.119 2010/11/08 15:01:38 voyageur Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.120 2011/04/21 14:26:48 voyageur Exp $
+
+*windowmaker-0.92.0-r11 (21 Apr 2011)
+
+  21 Apr 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  +windowmaker-0.92.0-r11.ebuild:
+  Use FHS layout for WPrefs, to keep in sync with the new default gnustep
+  layout
 
   08 Nov 2010; Bernard Cafarelli <voyageur@gentoo.org>
   -files/0.91.0/wlist-0.9x.patch,
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 79b66df3bbdd..ae11d1780600 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX wmaker.desktop 221 RMD160 501ba6451f7e756cc3d07682d728bcd6fe55366d SHA1 acd95a41645fbef358459f8f4753056cb321497e SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84
 DIST WindowMaker-0.92.0.tar.gz 2758524 RMD160 b8bebed6a34696625ae0ae7c0ebcfdfc0ba09cdd SHA1 6f545356acde7e9bf4c11345ac1359b451a9d1bc SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6
 DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
 DIST windowmaker-0.92.0-patchset-4.tar.bz2 226943 RMD160 afc95f3216ffba029de6798184601a21daa2c467 SHA1 2b97a62b85c6e12aa1b0c94ca61e5f86cd94f762 SHA256 369f7538d848ae4d3af8859d04fa282e0990d71b33f82666585f369bc3e8eff2
 EBUILD windowmaker-0.92.0-r10.ebuild 6936 RMD160 3572fc8b70f7ab6cb72663ce1e82342e84bd242d SHA1 86921bc6f91748c3b32fce35d2ca233e10b7d1c6 SHA256 18ffe9767059326910f1f1eb41fe130cd771ed743777d6c426f473d94fd174f9
+EBUILD windowmaker-0.92.0-r11.ebuild 6422 RMD160 3296350b46c4face0f822137e3598d4790a2af03 SHA1 ab13d24a39e33d736e56b585c6186d3420751607 SHA256 d26d6b487e5e6be6af6cf240028caffbef4d10d7d44d9fb3b6fe4c75d9743d2b
 EBUILD windowmaker-0.92.0-r9.ebuild 6846 RMD160 5db0d34cceefabef7ced492bf8e29f3b6d6b1463 SHA1 b4f06e7d317b77edd1dabe99e2d03d2e31e6a6d2 SHA256 3f80a22cff9be3d2ad16c598cc893345df004baa572eb2563cbeb3631dc65d41
-MISC ChangeLog 25405 RMD160 eb0459bdf6ad79c236f6754583047427c885fe1b SHA1 137cc57538d492d0e35b45916493aaa2609399d0 SHA256 97531b5e1a0fecf2c0b7955d2afebb1c2f4c82339073bc6708cc8c5f65fd7066
+MISC ChangeLog 25617 RMD160 668a3e8e6937496640817143ac78229701224375 SHA1 8f58084b0ecbbb9b60d446e5ae9d68ead3cb6c74 SHA256 7928cd3aa24498f52aa4593eaf3358d54bcde0e83e39690367203e71fe5caa57
 MISC metadata.xml 455 RMD160 41514c712d553ed4752ce045efca3d27dd036c19 SHA1 345b35512a60f3d19cf5fc4cebbfe30bd6006bf3 SHA256 7661636f854da151e83478668ff58943b0d80662f6abd2a209707d3d34b37c7c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk2wPrsACgkQFYEBGcdFJfLJWQD/WijWLVZh3cdjlTKGcjOPfVJx
+yvkRCHUyCCIBf5hdUPIBAIONTo5lVhDtuI3LpvUZx1KFe7+qq2wsVgNaOUVgfUVT
+=mViF
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
new file mode 100644
index 000000000000..ce801b8b43f6
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2011 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-r11.ebuild,v 1.1 2011/04/21 14:26:48 voyageur Exp $
+
+EAPI=3
+
+inherit autotools eutils flag-o-matic
+
+# note: patchset is in gentoo/src/patchsets/windowmaker
+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 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? ( virtual/jpeg )
+	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	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() {
+	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
+	for file in "${S}"/WindowMaker/*menu*; do
+		if [[ -r $file ]] ; then
+			sed -i -e "s:/usr/local/GNUstep/Applications/WPrefs.app:${EPREFIX}/usr/bin/:g;" "$file" || die
+			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 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
+}