Version bump, supports more image formats, code cleanups and translation updates

Package-Manager: portage-2.2.12/cvs/Linux x86_64
Manifest-Sign-Key: 0xC74525F2

3 files changed, 121 insertions, 16 deletions

diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 2072c3a68d79..7674b4abd03f 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.147 2014/05/17 14:06:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.148 2014/09/03 21:03:03 voyageur Exp $
+
+*windowmaker-0.95.6 (03 Sep 2014)
+
+  03 Sep 2014; Bernard Cafarelli <voyageur@gentoo.org>
+  +windowmaker-0.95.6.ebuild:
+  Version bump, supports more image formats, code cleanups and translation
+  updates
 
   17 May 2014; Agostino Sarubbo <ago@gentoo.org> windowmaker-0.95.5-r1.ebuild:
   Stable for alpha, wrt bug #496082
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index 3331bf24063c..5d866be0a7fb 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -8,6 +8,7 @@ DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e
 DIST WindowMaker-0.95.3.tar.gz 2780245 SHA256 b5eb88eccbf9a196a617594717797aa38f5c38d13d2ee40e914e153d09c9975a SHA512 7a70f6eb9de03c466d9de6a84febc59d46edee82c789287caa3a67012ab40c9b9a029ee46236f79dc80daeecab2313999a72f4d90caa77a464876116bd48ad16 WHIRLPOOL 056adcc7fd532aca611dd3699584aef793b5a86f66f051b571f4a0c247e33a37871e775389f7449d0357d3133a75ba3a7cd862a6cc2a243e447959b977d8a731
 DIST WindowMaker-0.95.4.tar.gz 2789390 SHA256 2bea97f00570f05ff115d147457c16abefe496a4fc882a027152ce592d768e45 SHA512 d170ee79f927c1eb70d6fe7e324bf3a5ab4eb206496b5d4182ba92fab5a3968ed00d465e69adad3b7d71e9d4d5ea333f78bee28a68510228baa8ce33de156dc3 WHIRLPOOL 8341be33680b69e984214efdfd3617dfb50fa3ea11d663ac91b3f3763b690de9f34986afa4862006d0fc1281ac52b7f9a2f2c37447085617e26ada0ba678ff75
 DIST WindowMaker-0.95.5.tar.gz 2927995 SHA256 4b25f474fde032a060c93fbc50f1ce04729ab17ea963ca3eb8dbb82f49af70d0 SHA512 0a6eb7c3ffee1d09dbc2408be4d2c04f6647cd1195366047083b5c5c89b61e92a5c7d5d134e43775fc371ea27ac8645ad0a7cbae86ebd53f2eae20066ac56703 WHIRLPOOL eb41cffab165af4efb66b28aacbc0e4695d57a426565554f20566b02bb0f428c31e23ec50af36759992a9a18f1598a727f98168d6bde7443f58821101d1653da
+DIST WindowMaker-0.95.6.tar.gz 3004856 SHA256 435b0b4a318a3a00e8267f02cdbd826ad547b1f54259d193ce43e9a77ce06dc4 SHA512 259db96b44058fde21b7efe65419b7f7ae149029dcfbf5cf480f920d68f906cd15345105ab67d8539be44d6f1b30e62accf68fc009d53af8c12e047c01154a11 WHIRLPOOL 6f27180cc4439b4b19c3f249fc9c5577463187c741c2e04112bb70feb8e052ad1093e0a5103f1772b59ee7b2549f7b126ac621165f94483e22fd756a969e0e3c
 DIST WindowMaker-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034
 DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc SHA512 9edc25386658e5ddeaee2e3c7f396adbe16e9fdccde906f7b69bca95b1e0b33a2b2481fa445f5cf5b8e6b2492ca1b8409615e7a66f7d039d449d099523c4c779 WHIRLPOOL 62b42d533f2c2c22259aa0004ab995472e455997ccb6074e3f5b599b22cdd1c640003b6903c104e8663e62be312254afbc4d4147366af72eb16227b36eacd77c
 EBUILD windowmaker-0.92.0-r11.ebuild 6343 SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a SHA512 45af454a20c5f7cfd22b9a71e7c44dd080a7fe9d4a3697dfc988ebf3363a6ed8d7adf2d319e861bdb5bf1c351f83e4d668f8e802ea032b8a8422422dd68eee55 WHIRLPOOL ba513ee2b7e8a602ccc8a44f63a4ede9720d16bd5d54f4d94991b29d77e2aa3329a915f2c9360a1dc05ca5421c3df51731de4e7f7fdeec7522b541eb0df284b1
@@ -16,22 +17,13 @@ EBUILD windowmaker-0.95.4-r1.ebuild 3003 SHA256 d7b38fbfd7a1786f84b6e1cc88113420
 EBUILD windowmaker-0.95.4.ebuild 2987 SHA256 f74e8ad2c77578ae54c2796e35009f04a728965b6af0b0f27147ced9588c3fff SHA512 e46deff68ab3a1b926f0ee2ccdff50fea93d840eca4901fac4e5ab5a688e7f44931376228d230bab70e427267f3e2dfeb2c9857107b5cb28491f1f49190ddb5b WHIRLPOOL c3f86b7ea3805df8d08b192141f85633c8ca899003c8b5153a5f0b6b0f588c7f5bbce5a6fefb0ba1ea8ef344ca59f8927eb95438cded869fd66a53e8ce503fb5
 EBUILD windowmaker-0.95.5-r1.ebuild 3035 SHA256 45360d307cdd2308b242f886ddaf291778b532947c3806d27c81e4cd1c812434 SHA512 459221b8dacfd9136d6b3ddf54accc0a15baddce679c2bb08d5cdededea9b01a2e95153b173a78d9620c5b2c1fe92d09dc3125064224bcafec8272d822d6273f WHIRLPOOL 9d1788472aacf7f9f8b385d3bee2850392d37ab72e958455cfd07605ef1c67bcd4950d7ed10d7e038a5b2e4fa4c8c7f92c3b4a20f486de5c9a4741f4036ddf09
 EBUILD windowmaker-0.95.5.ebuild 3000 SHA256 c650aaf158a890df4ff4f42f51bcb03e632183da2ec1db76778c645d5d1eb641 SHA512 114d42c81b7576eab8c3ee65ee1a3b4d5641c43be451aa1304e0a83e248c5048d031e8894c67b122d723d8bff0b0035a17e579bcedb43ce0150b5b2200de3a99 WHIRLPOOL 472f8c00945e8c9792cd6dbc1085a8af2630da4aa1d52ea4c6c72a241146180d6f499c7d587c594c47019e322b0ff4266584eaefd6720f48cb1f8844d2b1a3da
-MISC ChangeLog 29954 SHA256 09c1aa9f1a5d14cff7643589b8f2087f941f1c728c055ea49c34d2e916b0ea95 SHA512 001b898256fa2473e0c8d5a30f245e18060e46c75440842e3c80d47e4fbf2c0b567d37eeaba617b7432c2c7800d11152e9a844e4345f8ca53bef0254724b2190 WHIRLPOOL 18dd47ab34d7bc6674cd1d646497749103e0d546a13a5164e72e67d9f08a4fa5c7d3b7be889497e9a74d25839da3c2e7da8417098bfb5d74aeca0e6e6c922525
+EBUILD windowmaker-0.95.6.ebuild 3000 SHA256 a519a6e2c163b97745b99dd60ba58416850683116c9c624166fb4275df60f12a SHA512 08cd6cdfd4c717059eccb9812ccf7cf6434b01325526f65434e298958ca194cf5ef69ca2a111078b966c794cece13c1e163ca74c3cd004f305ab409355b3ecf7 WHIRLPOOL 62c2d41a19d745f03f896f963a43793a387acbb5155e2c0da4eb36647afd5c8b444eb99d7cbab57eb9e619e56255264fcd00b6bfd43dcfcabbb55301d1e510ef
+MISC ChangeLog 30165 SHA256 50a7ae63edebfa3ba4c082be714307fc184c7f5160d85bda9bdee5abac069215 SHA512 82c962c78105728206ec23505fc480f4ab14113c3ca2e133b65e7e6e3fd9b94b37c7ae3c8d39d56c3fe9a21b28e1424048f6c07355639e47d80bbd8182636a85 WHIRLPOOL 5b58875e31576e67e819edfea8bcdb14ddf45c215304327476b478c7ea14368fd26311f37e65ccad9a110fc1870caea3f156602aa63fa185c716e7d788374dcc
 MISC metadata.xml 523 SHA256 e13995c0dd8f3ebfaba07e96f2721cd2f3e81554567a1c0380f88870c8b97ceb SHA512 feded16f4fd775bb4531c067965acf4c5e2a536938a39c05e6fc47833ccf53c4e2509519d20e725368ec49c132a53ec344f4957a51c57ee2f16c9eae2ecdd001 WHIRLPOOL 5a50662514af64aeb0c229fc881f325628c7cf23da8d51d94d103a4ba96332dd567eece0b4484a18a4e2dc70e6d193b6acc89c62a02d691fea88d3e7d915d425
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTd2zSAAoJELp701BxlEWfwEAP/AnkFu40R6WRl3RqWVH37w4X
-VjLHU5X5hiVvz4O0qJB6+imXInQP3jnAfbvz3cS3JGsKQ/TSz09wVFKYr3IZfwfX
-qR7BpzuQ9Yg9OGbW2q+LtsNYF/PBZzwSGs5eIk69S1yYcEEeK2bKxmdxYRLO60NV
-yrMH1zYJ+biwxpwN2NrYNvnRfTbQpJDBMF9hZa2eBqtZiP0E+z/bC+UgITrwizJ+
-5KSTJdzQfac7POOIRTlG7w5rBHsVSsP2RCJROdzoFs65H1ddy9O66BclMiBdCFP8
-y7lNB6jC3WPzyEcb4gcS1ssSM+nDWrjlfUpmDfLDY1x1RY6r4TM+iulPOYqQDq1r
-R8VKiJqFXQgNfTaKd285UB+yD9CVB//IcABlw4g+aCU5uIrbz0YiRHROCe54FON4
-E1VLS3zjdlgisLrvcNrZgvem/A2QZp4AdSBhe7V2I61Jt2FKA2jnOy8eYhP8yeAY
-Cr6jtaH5+TGoC306XetsCGRLDwLOGLUE+SfC6F4UXnO76AEEWahxt4OKPtLWFjVU
-EGzZJ+jprXLAQY80MMPsEFQ8FthbZJ9RwrT1oONvMd4+FZDIdTI4zNG11vJMM1cJ
-ietWbSL/8uA5oCnBJxi30Qu80SPGniHFMbep99ajsY6QB9EDseiE/WKByH13niUD
-mYlsMgC0sJFnRLx9z6gG
-=iBYt
+iF4EAREIAAYFAlQHggwACgkQFYEBGcdFJfJ+1wD/c2aYSFUpuJ3oKbipCF+rB1Wv
+gAcd8fa68oKGL2/jcz0BAJtrnMXF8I6MZB9jWtmN6Nd3nUHo4l3sga4ETK5d/Yiw
+=YIRV
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.95.6.ebuild b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
new file mode 100644
index 000000000000..121959400aec
--- /dev/null
+++ b/x11-wm/windowmaker/windowmaker-0.95.6.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.6.ebuild,v 1.1 2014/09/03 21:03:03 voyageur Exp $
+
+EAPI=5
+inherit autotools eutils
+
+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 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~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/libXmu
+	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;
+
+	epatch "${FILESDIR}"/${PN}-0.95.3-fix_underlinking.patch
+	eautoreconf
+}
+
+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
+}