Version bump, with official tarball now

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

3 files changed, 114 insertions, 5 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index cdde80b7b53b..a1491741210b 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.130 2012/02/10 18:20:06 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.131 2012/02/14 20:26:25 voyageur Exp $
+
+*windowmaker-0.95.2 (14 Feb 2012)
+
+  14 Feb 2012; Bernard Cafarelli <voyageur@gentoo.org>
+  +windowmaker-0.95.2.ebuild:
+  Version bump, with official tarball now
 
 *windowmaker-0.95.1 (10 Feb 2012)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index d8aacce0b792..9a4b0b748518 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -4,16 +4,18 @@ 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-0.95.1.tar.gz 2714745 RMD160 70e7f0b1bd522bffda98ff43052bf405ab144a68 SHA1 65a6fc8c05870a75412a54216706a811d608d4a8 SHA256 a9862caac5ab563f5a6ffca7b11ec98e937ef6c5da5aa06e7cd16cae362851e2
+DIST WindowMaker-0.95.2.tar.gz 2753910 RMD160 bd0e1737ca356a0178afdbaac156abb50115fb1d SHA1 9fa55d525a04377089caf6ffc0c4d8d0aebe9d61 SHA256 6b271e9427f5207484ec21c25e114e4eb1eafa957b446a1ff516f0c41ac19c59
 DIST WindowMaker-extra-0.1.tar.gz 238018 RMD160 94334c2c12d20a8fd0cd2a70e54cd3689f043038 SHA1 80f34cb3af705ec0f79d727b82cef28ee50fc4e7 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4
 DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 RMD160 c49fa346e3d024a5e12e576073d141f1d1c9958b SHA1 a6285c3034b80575f8a9dbda95f830f6387cd554 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc
 EBUILD windowmaker-0.92.0-r11.ebuild 6343 RMD160 f7dcecec467c6c4d09fb91ccd78989e58e7976dc SHA1 d4e770681d45c311599e3cd7c9ff372077313f9b SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a
 EBUILD windowmaker-0.95.1.ebuild 2995 RMD160 482f6df373cc8d479fea3029c0056c23aa8fa3f5 SHA1 d871d4bed4f87e6293b704b10e850bacef535105 SHA256 a078834869a8cb33c025dbdb5793cb976351ef347f52ee6e303a8c408d910ebf
-MISC ChangeLog 27188 RMD160 c5654b6094620fc008496c2de4d9037f312ad66d SHA1 a381d8c13fa7a205a9032a8265c115d49e9e6bda SHA256 dfc5e8135376635effecac55045dbc0d2e20f9b8379a241bbbd68b7558737578
+EBUILD windowmaker-0.95.2.ebuild 2869 RMD160 d32f62f2d382e862a6550e19b561a01df013bf8f SHA1 ae0ba57a7b808ce5495928bcf73407d7869a6a76 SHA256 4ad00248882bd4788b10ee9fc24241d62535ddcfd3ed77bd991d5bfc38bc0b1b
+MISC ChangeLog 27351 RMD160 096102bb5b3996b77b2d4d8fee99f9692c50c87a SHA1 aa558207564de05f8662d492990727fdb5f2bfe7 SHA256 0f89edf777e33d200d4eb0fefc822a496881d5e26abe4a1f5f2a5bd824c55ca3
 MISC metadata.xml 523 RMD160 65016780ac744ca6af2a6d9a65872b24f8a77aad SHA1 da7ab9ff44ceb7976c660b9c9fd676a87e93b59c SHA256 e13995c0dd8f3ebfaba07e96f2721cd2f3e81554567a1c0380f88870c8b97ceb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk81X+IACgkQFYEBGcdFJfIUsgD/SY9AqpHGQwZWMWi0NVJCf6qJ
-/3wjYj0qlA2WdrFgHxoA/1cBaJUs3VC1aofTSLa9QM0z3cNfy5MHaW4FzXMwd+LD
-=RIiQ
+iF4EAREIAAYFAk86w4AACgkQFYEBGcdFJfK+gwD/SZVxlEM/4yKUZa1eRIUXi5Eg
+ykybMIjmhKsIGVywcYIA+gOq1A4rdgj5Apjgd6hPuXFKEGpRXT7pZlhQ+n1RD+oI
+=Q1tx
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.95.2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.2.ebuild
new file mode 100644
index 000000000000..a966ceb4996b
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.2.ebuild,v 1.1 2012/02/14 20:26:25 voyageur Exp $
+
+EAPI=4
+
+DESCRIPTION="The fast and light GNUstep window manager"
+HOMEPAGE="http://www.windowmaker.org/"
+SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.tar.gz
+	http://www.windowmaker.org/pub/source/release/WindowMaker-extra-0.1.tar.gz"
+
+SLOT="0"
+LICENSE="GPL-2"
+IUSE="gif jpeg nls png tiff modelock xinerama +xrandr"
+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"
+
+DEPEND="media-libs/fontconfig
+	>=x11-libs/libXft-2.1.0
+	x11-libs/libXt
+	x11-libs/libXv
+	gif? ( >=media-libs/giflib-4.1.0-r3 )
+	png? ( media-libs/libpng:0 )
+	jpeg? ( virtual/jpeg )
+	tiff? ( media-libs/tiff:0 )
+	xinerama? ( x11-libs/libXinerama )
+	xrandr? ( x11-libs/libXrandr )"
+RDEPEND="${DEPEND}
+	nls? ( >=sys-devel/gettext-0.10.39 )"
+
+S=${WORKDIR}/${P/windowm/WindowM}
+
+src_prepare() {
+	# Fix some paths
+	for file in WindowMaker/*menu* util/wmgenmenu.c; 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;
+}
+
+src_configure() {
+	local myconf
+
+	# 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 xrandr) $(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
+
+	# 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}
+
+	cd ../WindowMaker-extra-0.1
+	econf
+}
+
+src_compile() {
+	emake
+
+	# WindowMaker Extra Package (themes and icons)
+	cd ../WindowMaker-extra-0.1
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	dodoc AUTHORS BUGFORM BUGS ChangeLog INSTALL* FAQ* \
+		  README* NEWS TODO
+
+	# WindowMaker Extra
+	cd ../WindowMaker-extra-0.1
+	emake DESTDIR="${D}" install
+
+	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 /usr/share/xsessions
+	doins "${FILESDIR}"/wmaker.desktop
+	make_desktop_entry /usr/bin/wmaker
+}