EAPI bump and libpng slot dependency

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

6 files changed, 156 insertions, 28 deletions

diff --git a/x11-wm/afterstep/ChangeLog b/x11-wm/afterstep/ChangeLog
index 3ab07114ce87..553f3f5335f5 100644
--- a/x11-wm/afterstep/ChangeLog
+++ b/x11-wm/afterstep/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/afterstep
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.103 2013/04/06 01:04:10 naota Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/ChangeLog,v 1.104 2013/04/10 09:46:27 voyageur Exp $
+
+*afterstep-2.2.11-r1 (10 Apr 2013)
+
+  10 Apr 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  +afterstep-2.2.11-r1.ebuild:
+  EAPI bump and libpng slot dependency
 
   06 Apr 2013; Naohiro Aota <naota@gentoo.org>
   +files/afterstep-2.2.11-configure.patch,
diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index dfa072a648d0..3de3ced74e9f 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -11,24 +11,15 @@ AUX afterstep-2.2.9-make_session_data_file.patch 422 SHA256 3fa0e494903d374db0da
 AUX no-alternatives-2.2.9.patch 1214 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f SHA512 d8d98d2f9cdab4818fbbc4050c0e5a6b244365e401996ffc2cd24e97fdb4f795ff396dd12766cd7c180bf0b717ac7f55c7072afc0761a526e529c300970b07fa WHIRLPOOL a94163a1dd362706f983f025a8621ae3a6427bc89e6fe94060ffd6b846f3d4dea269fecf8c7d0e7d13e844790bd6caf8255e9d579d41fc1b41a6e36fa7b98217
 DIST AfterStep-2.2.11.tar.bz2 6126237 SHA256 ca7e872fc4d8320899667087d934e0672a3f38264a5207ea314d3c20242903aa SHA512 cf6663427656162f20cce596f63c7368c66fb336d5865dda5127f5aae123c61d647444336cc4c339ae6c64e5f25e837c0ba8889d30b1298ef26569505e0ff3d9 WHIRLPOOL 057d2420776be19db7ddf69ca7a7a2dae570dcca3b9fad4e56e8c9b4268d1f6c5dc6cbcc45b6caab41b3c06dcf7efe2b06289cf2684ac22a3dc2879282ff898f
 DIST AfterStep-2.2.9.tar.bz2 6094706 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
+EBUILD afterstep-2.2.11-r1.ebuild 3531 SHA256 14a107699c9d11ba5427a3b9b24c8ca0bc8a29f580c901a0ae6e7a355c1cc63c SHA512 63f29edf53cf41e9838e9014fdcbe82d315ac0632317a9bc09df3c8f488af7167ee846c6150157db633c188986321e52aac9d62f9b5517ff290d83fddb16efc8 WHIRLPOOL e627026fe9c24c2a7943f2d04ad12eea7ac74ae345504fc9efb92c59fbd32916f66c1c3c108034c239863bb1db89fd66820b70513aaae7e8a0f6573c9a3babf1
 EBUILD afterstep-2.2.11.ebuild 3524 SHA256 d632e84b137c6e4ce816f64910f6bbae55e63c5b912f6772c07f646b19d902a6 SHA512 791febb9f1e71e585332687caba13cf6fa024993e3b41e07db5f7b6d580f1039214257f3d51378c16e4dc469613e628fbecdb4f0623890f74bdc7cabd2f2fa39 WHIRLPOOL 00509892db64f0021ab7fd1999fbc77b7c084ebb98bb49460d481e5d5d6367335729b8aaf1021788a16326bf14bf9f8ab6a8d98fcd1842d3c9a5fa63a6d3cb10
 EBUILD afterstep-2.2.9.ebuild 3647 SHA256 cf9b9866ed2a4ca614ffd2a8d67f0e33a29ccb74274792d408a1d3d586d6756a SHA512 1c6202d2910797b19f352c4db39e730284015c9651abe9e20fd33ddbf2ca61b60115e6d693e2230a6533544c87eecc22c27372a04de991c0f796ca043c67d16d WHIRLPOOL a0eb2bf9f9d1ac9cc4a7e42b1dfea07bb6e8f050d715abf96700918e82b1b95321b931369e07d473b955919fdb0d63a781b3c87b0396280462a77824b2bee173
-MISC ChangeLog 14814 SHA256 223e9be330bcbd2788fe8b38043284b57b512f4c150ef84608097cd52293b848 SHA512 00db9a8b9d524957dad318fc55d2c5351e021139039389aa9ac20bc6f25dfc4b23c17fbc0eb3f8f97fbe32b20e4843bc181c0cf914f1c1f89c7386c77286e037 WHIRLPOOL e01d41d12a62046dc792e4b414841c6acd4df20349362a3170ced8883d73a9f475cb4f57bf8c2c599722ec3e30ca684450d1477973fb243dc196c5cb58069fc5
+MISC ChangeLog 14979 SHA256 f0173dbecd2c7b8d8b45a464317e2168c6f1defc6348f1ccc931fc62ffbff021 SHA512 1ae8be31fd3fe74cd8aa1cf235df9dcd5782305866f207d41f9d136cb84d8e274a72e1f6136c2f3695086d876b57ba1926ee0ec5d52df371e1ac958aceefff9f WHIRLPOOL b1ef43033b03864d78ec0dfdbbf86b28dbeb0876f31e5f02a4f03f0737405f15ea557029f9cbab91c9a6b6d827f993ad09c1eec94dd0180c410d7e7b85222e76
 MISC metadata.xml 350 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26 SHA512 339ffbac1afc8388025a787a7b037b8a0096f1a5625e9a5b7bdc8241d4209b69633caeb90bf712c862934786351b01bae16a8c44da76902d12ac199326c21c9d WHIRLPOOL 1c052ca0020f3ee2a2e7182d5c065574de21bacbec89b7618295e80b317b16bca8139304a4a83f96f61624704578a27b0586127981697b0586a42a0b9230021f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRX3SLAAoJEDYO1FT4VRUU4ocP/0ZlOqKm8mGuYIt6uQwqLqA2
-WwBwNCVtwXtWum7+0JAGOqaB11gsUBFsTWVfUk2udI7wefbtv8kXAohelyZFbAw3
-KCwVwAeffSz9sIxCrdNfIUgkh8UEKqF01TYhMmEVGZdLGfnfajRe0/5Qsuj+0Edh
-7+RCPC+mCDb65IAXs/OG/CPgKAfSLuu6JCF4WzcnGSi96vvd2bmwNa/er+fqaMSc
-YYQrxc5qW3TS1k393mq7l6TJOJCWyq8/nIb/IZinmbP++bePkOf0q8QvjV9UGT1a
-wKBQ4xLsOVYGk4dsBGLiiqT4C5QU0CmKbX7H229krAsqdQOgv3HaQs4VG1q37M0c
-zUsY9nmJNgDk1nBBUu8jtZu3C+JiaRm9oApfSLrGEzZ8rJHc3iY12/Bv7QvOfzp6
-QdIr3J0ZEoJQdIZmdZjLDYnpjSkd0dofhyDDm/hoh7hxWuq/cqU0+ccjio1DtyAE
-0HsF/wGaRRLb7fChGaXTSN806aw3LPY6vvUo4IR+iNoiylFgYlezDBxDyRwOwxk1
-Q2fIugtP5QryvVXP+S96v0Jqyc73o8UHrQE8bYGXu4qQw+YRWwCwqorSpTcGOeot
-t8Qp1GtfBt0Inx4j23z53LuVXCb+CPNCtNbAjkKXmRXcuZKFp4xb/YHUzmtUqSBo
-VrudwoNIrMGH/Km4GT+j
-=5vxl
+iF4EAREIAAYFAlFlNPgACgkQFYEBGcdFJfKXaQD/QDGiMUvSS5NQEEitQp4GPZ99
+PYdDE5hQW1EdfbqqZfYBAKpH7a2Bz3bOZ7yYVfiO4QgfRnzc5Wq8qe3JtCoFybLi
+=G4lD
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild b/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild
new file mode 100644
index 000000000000..9c4a10458317
--- /dev/null
+++ b/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/afterstep/afterstep-2.2.11-r1.ebuild,v 1.1 2013/04/10 09:46:27 voyageur Exp $
+
+EAPI=5
+inherit autotools eutils flag-o-matic
+
+DESCRIPTION="A feature rich NeXTish window manager"
+HOMEPAGE="http://www.afterstep.org/"
+SRC_URI="ftp://ftp.afterstep.org/stable/AfterStep-${PV}.tar.bz2
+	mirror://sourceforge/${PN}/AfterStep-${PV}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+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? ( virtual/jpeg )
+	gif? ( >=media-libs/giflib-4.1.0 )
+	gtk? ( x11-libs/gtk+:2 )
+	png? ( media-libs/libpng:0= )
+	svg? ( gnome-base/librsvg:2 )
+	tiff? ( media-libs/tiff:0 )
+	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}
+	!!media-libs/libafterimage
+	x11-proto/xextproto
+	x11-proto/xproto
+	xinerama? ( x11-proto/xineramaproto )"
+
+S=${WORKDIR}/AfterStep-${PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-2.2.9-{alpha,ldflags,libpng15}.patch
+	epatch "${FILESDIR}"/${PN}-2.2.11-{execinfo,configure}.patch
+
+	sed -i -e '/^install:/s:install.alternative ::' Makefile.in || die
+	sed -i -e '/CFLAGS="-O3"/d' libAfter{Base,Image}/configure || die
+	sed -i -e '/STRIP_BINARIES/s:-s::' autoconf/configure.in || die #252119
+	sed -i -e '/--with-builtin-gif/s/$with_gif/no/' autoconf/configure.in || die #253259
+
+	pushd autoconf >/dev/null
+	eautoreconf
+	cp autoconf/config.h.in ./ || die
+	cp configure ../ || die
+	popd >/dev/null
+
+	pushd libAfterBase >/dev/null
+	eautoreconf
+	popd >/dev/null
+}
+
+src_configure() {
+	local myconf
+
+	use debug && myconf="--enable-gdb --enable-warn --enable-gprof
+		--enable-audit --enable-trace --enable-trace-x"
+
+	# 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}
+}
+
+src_compile() {
+	# gcc: ../libAfterConf/libAfterConf.a: No such file or directory
+	# make[1]: *** [PrintDesktopEntries] Error 1
+	emake -j1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	# 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 TODO "${D}"/usr/share/doc/${PF}/
+	dodir /usr/share/doc/${PF}/html
+	cp -pPR doc/* "${D}"/usr/share/doc/${PF}/html
+	rm "${D}"/usr/share/doc/${PF}/html/{Makefile*,afterstepdoc.in}
+
+	insinto /usr/share/xsessions
+	newins AfterStep.desktop.final AfterStep.desktop
+
+	# For desktop managers like GDM or KDE
+	exeinto /etc/X11/Sessions
+	doexe "${FILESDIR}"/${PN}
+}
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index 86d48fd87586..44c60aff71f9 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.137 2013/01/10 10:41:46 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.138 2013/04/10 09:42:07 voyageur Exp $
+
+*windowmaker-0.95.4-r1 (10 Apr 2013)
+
+  10 Apr 2013; Bernard Cafarelli <voyageur@gentoo.org>
+  -windowmaker-0.95.2.ebuild, +windowmaker-0.95.4-r1.ebuild:
+  EAPI bump and libpng slot dependency
 
 *windowmaker-0.95.4 (10 Jan 2013)
 
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index d27c09f2556c..5a6e6165a7b1 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -4,21 +4,20 @@ Hash: SHA256
 AUX windowmaker-0.95.3-fix_underlinking.patch 355 SHA256 ae4bc0f40edb8fc38084051f06672b80b59ddf7a75805ae22376565f958c9682 SHA512 9ebf6ec14cfe821eb69d8385b3009953bfc58da576f06d22291d2acb112635ffd0a89c5388656fff76f07d7aef8f68a6226b8621b776b1f7437f73159ef6d349 WHIRLPOOL edde5e6d86da9fee9d9acb1cd75244554c455fabe0bb5705a25837e09f5cb0f6c2a825a96584ae7068c1194bfe63632ff28d7136832217f3dbb694d77809ae9c
 AUX wmaker.desktop 221 SHA256 40359d3c61117f0dbc5eb547e4c369982427e8bc3174c95002d34eb30f9a4a84 SHA512 1c1b24001e47a2af8f18a5f90675d095ba7f929ad9273ca82f61fd13ad35ff22dc9b777eec24fc3fd984790a5d494949d1dd5e0ca39780920017ea7971a3289d WHIRLPOOL 68ea31480ba1796e4243184deff38270963841c2bdb54bc85a606ecad0cdccc6815b11fa67158cbcc527ae3a17488b97a209283289922323ed42ea37a062ac2b
 DIST WindowMaker-0.92.0.tar.gz 2758524 SHA256 9edaa8d9ee6e6beb06f4c391c0aec5cd0e5b5494456cae2cdcfd49656177afc6
-DIST WindowMaker-0.95.2.tar.gz 2753910 SHA256 6b271e9427f5207484ec21c25e114e4eb1eafa957b446a1ff516f0c41ac19c59
 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-extra-0.1.tar.gz 238018 SHA256 acd6e1fb790485b107daf2b710da372367b41383c55d9c8bdfdac521d850edc4 SHA512 0fe9b3ffc093942db167d8a01e15c0f6741f3a40959d1434ea4f23e7b9d4a9c13935a61eabef9691e5fdfd4e407564caafce15c2d65d66499960a6764a874ab8 WHIRLPOOL f2c61b318f64a2debb727ae79dfa1bb8101888bc9492633a96ace0e704c731c383e92882c871622987d5971b919359c066638fba05c5dade330fe3bee21bb034
 DIST windowmaker-0.92.0-patchset-5.tar.bz2 226417 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc
 EBUILD windowmaker-0.92.0-r11.ebuild 6343 SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a SHA512 45af454a20c5f7cfd22b9a71e7c44dd080a7fe9d4a3697dfc988ebf3363a6ed8d7adf2d319e861bdb5bf1c351f83e4d668f8e802ea032b8a8422422dd68eee55 WHIRLPOOL ba513ee2b7e8a602ccc8a44f63a4ede9720d16bd5d54f4d94991b29d77e2aa3329a915f2c9360a1dc05ca5421c3df51731de4e7f7fdeec7522b541eb0df284b1
-EBUILD windowmaker-0.95.2.ebuild 2900 SHA256 db41a0681630123f93d889a2bd08c0589a330ef8348e48caa3599b8f9b3a4e40 SHA512 4acdec6f3631494c4f29691c8d4e13300c057200483a6d3d800d0302cbc78e7993de8f6b261282ad10dba11b6d343d525782d48304193902a95c9450f50eaced WHIRLPOOL 905c44db6c5560f75565d4d25c40125ce02b64630c9a1d1f34f0d81eb95c3bc9bd19728d38b8e38987801da647e1b8538a1716fabb4c66be957e1c5064a4193d
 EBUILD windowmaker-0.95.3-r1.ebuild 2982 SHA256 0776a28212eff71a353591e2fab0f392a1ad4459b430ef831b03c4f221365e85 SHA512 540523d33406d47c2ea9597a367de36ebe20c031058f6f6f3f9c36e30577513309cab8d497a40b02070ff9688fdbf59a89db98dbfea8269528b5365c2a351959 WHIRLPOOL e726b98478d645b14293b8891bd4404b8282ae328cd1177f4ce6d182a8053c736dbde660cb60bd818e48126aa12ad531672b8e14b8f0bfb624569c68e7ceab76
+EBUILD windowmaker-0.95.4-r1.ebuild 2991 SHA256 73d06e4b1e8d058752d6e8848baa81e3aa0b340cc378e4ebc145d0a20f7315fa SHA512 2b3b88a0e8a0fd0efc44918fa3da2dc896b0805113bda9db97156e2752f158b73b5737433444811673695671f7c82af8cb9e52a2b2fa04a6484f54dbdfcad366 WHIRLPOOL bd7f2aa96e35bc29fafa88a89a9f3d6fa886b7ded39dfc5548e8c324c91f056073bf7c3cf793822a1af19bfb7f1b6ca5868806c59c492841acfa498adfc2df95
 EBUILD windowmaker-0.95.4.ebuild 2987 SHA256 f74e8ad2c77578ae54c2796e35009f04a728965b6af0b0f27147ced9588c3fff SHA512 e46deff68ab3a1b926f0ee2ccdff50fea93d840eca4901fac4e5ab5a688e7f44931376228d230bab70e427267f3e2dfeb2c9857107b5cb28491f1f49190ddb5b WHIRLPOOL c3f86b7ea3805df8d08b192141f85633c8ca899003c8b5153a5f0b6b0f588c7f5bbce5a6fefb0ba1ea8ef344ca59f8927eb95438cded869fd66a53e8ce503fb5
-MISC ChangeLog 28527 SHA256 707301297353789dff6de3aa4e885a99ca65e683d12f362c9c1b03278c2ea7ce SHA512 be5242908dc06d42bfd95516cf64ea5172962621cbe4e42da1001413804b70b812be801b33ff5a9f464423475135e76481fe365d0069a42c2d454d5b8f1e08d7 WHIRLPOOL 05da3d07b8ccc7cd4dce047653f35e910943369cb4d6be72673c463ece57390e1292c1d55794df4a8d4a5fa38897dd9597860fdff2aba45074b7f334af19c636
+MISC ChangeLog 28721 SHA256 94804521f66cc9f6df3b7a42595030db690d64ccec853ec2817d17c91784dc6d SHA512 7f6723dffe8081ea0bb7fef951eda8e62475b7a7927d08602c933ff11ab820713f4479bd8265b13dff0d88f281fc9224bbb48c4134e98e9380c7754af39cff7d WHIRLPOOL 5e4ea3f999ce0653bac9764f94fc5ae9bc273c0c7d4ef283ba443214b4f415abf5b051965cdb5cc60d0ec63e3dd0b6377ef692f548ff874f4f33f8f85c48f331
 MISC metadata.xml 523 SHA256 e13995c0dd8f3ebfaba07e96f2721cd2f3e81554567a1c0380f88870c8b97ceb SHA512 feded16f4fd775bb4531c067965acf4c5e2a536938a39c05e6fc47833ccf53c4e2509519d20e725368ec49c132a53ec344f4957a51c57ee2f16c9eae2ecdd001 WHIRLPOOL 5a50662514af64aeb0c229fc881f325628c7cf23da8d51d94d103a4ba96332dd567eece0b4484a18a4e2dc70e6d193b6acc89c62a02d691fea88d3e7d915d425
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDumvIACgkQFYEBGcdFJfIWHAEAljZpySwP7xieFeRUbaMGL6Ln
-RaC2tH47rUmVjsG8e64A/1nxP7nw3ayA6VLFYTOTkTRmGzteoZINEw8xCfnSDlfJ
-=H/na
+iF4EAREIAAYFAlFlNCAACgkQFYEBGcdFJfJy9gD/ZbnooKydL4Kg65sHKf9WRwYK
+/Ghtv7Y7mph15M/pOdIA/iskPW2ba4qOr5IPk2QFhvG9n726ntPQgrr6Bb1w0Dfg
+=C/1D
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/windowmaker-0.95.2.ebuild b/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild
index 853ffa14194a..c4dae3244c5c 100644
--- a/x11-wm/windowmaker/windowmaker-0.95.2.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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.4 2012/06/07 22:42:15 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild,v 1.1 2013/04/10 09:42:07 voyageur Exp $
 
-EAPI=4
-inherit eutils
+EAPI=5
+inherit autotools eutils
 
 DESCRIPTION="The fast and light GNUstep window manager"
 HOMEPAGE="http://www.windowmaker.org/"
@@ -13,7 +13,7 @@ SRC_URI=" http://windowmaker.org/pub/source/release/${P/windowm/WindowM}.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"
+KEYWORDS="~alpha ~amd64 ~arm ~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
@@ -21,7 +21,7 @@ DEPEND="media-libs/fontconfig
 	x11-libs/libXt
 	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( media-libs/libpng:0 )
+	png? ( media-libs/libpng:0= )
 	jpeg? ( virtual/jpeg )
 	tiff? ( media-libs/tiff:0 )
 	xinerama? ( x11-libs/libXinerama )
@@ -40,6 +40,9 @@ src_prepare() {
 			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() {