Corrected slotting for png and tiff, resorted ebuild to fit common sense order, removed unnessesary die and illegal ebeep

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

5 files changed, 39 insertions, 40 deletions

diff --git a/x11-wm/afterstep/Manifest b/x11-wm/afterstep/Manifest
index 99a1810961ee..73e8ef98cb92 100644
--- a/x11-wm/afterstep/Manifest
+++ b/x11-wm/afterstep/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX afterstep 29 RMD160 a1fafb8971d47c7cebfe972bb74bbef19de4ac52 SHA1 7ce7a198aef7adb7484981fed4b84798311f5409 SHA256 c6e31f7e4912188f1ce7c41298cb66178944960628e1451efd42331236cbc3c5
 AUX afterstep-2.2.9-alpha.patch 475 RMD160 8945b4685e011e49a0c81c835cbe37bf275046c7 SHA1 d80c3791133c101fa4a914cd442d7b1afe9815e2 SHA256 3208d1126ba14fc8c39c537cea701b2c89bcf9f778645add0e3465ce74139cd6
@@ -8,17 +8,13 @@ AUX afterstep-2.2.9-libpng15.patch 1132 RMD160 6d08dc54c73771ebb6d05a57b94884dd2
 AUX afterstep-2.2.9-make_session_data_file.patch 422 RMD160 b4e694ac6514d34dfbee5f6fe15ffa109e5bfbad SHA1 932abcf0c2fb469e45e95035244d97df40c8dfe1 SHA256 3fa0e494903d374db0da66de432e407889356cd50d1072aa4078516f5d31b5a3
 AUX no-alternatives-2.2.9.patch 1214 RMD160 c6a02643da9c82c5228800a399ffd6ce89c0b542 SHA1 140e5d5d011df340ece7f36a88c7f49540786a89 SHA256 f7a87859d043b210dd309128c9338e938f695cf248d2987ae2b8535243405e4f
 DIST AfterStep-2.2.9.tar.bz2 6094706 RMD160 b332078efa50abde522438c825fca91f31c4d554 SHA1 dfd7dd912866316e93c3be7a8460d34b95cd54a2 SHA256 678493cd3ec44eee219d65fee0e612f2d1e36f8b93cbabdf40a22133c0617148
-EBUILD afterstep-2.2.9.ebuild 3667 RMD160 06443bbddd590b51ab0a62a0abb3196511982327 SHA1 0d0a06252ac7be9830825dfbaa90656445eaa19c SHA256 e5440404eb6d54d5c03b8314d10b3d8d0b8a78ac1363c4d5724cad9f607ad297
-MISC ChangeLog 14093 RMD160 301368cda6a6be54e5ebc31adb48a857b0275e5c SHA1 a9e1208f1d54db117dc49a23d754b2f87c7ae866 SHA256 8fd4b37aae05f54673212c284d195db74e1916c2db1226157bc4f92094af691e
+EBUILD afterstep-2.2.9.ebuild 3620 RMD160 1945c80d6741ec4c0be9b366c3fd992b81f1fddb SHA1 d5a70b276bac65d3f1193b6a0d70c81cbc6b0017 SHA256 5103badfb9ce04f0c80019349f330fc8a4162799077c7044ea5a37bc95151948
+MISC ChangeLog 14198 RMD160 6db732d304d111c866d5592920d245bf9795a6f8 SHA1 a315fc2b580027d20d33b1be4dd6a344c163cb58 SHA256 620b0fdc7bdf6158afbdef7c432f55459e59bfca302bfb8359dde68ca9455e52
 MISC metadata.xml 350 RMD160 8a78f43601183735a3e88e99953e83fa319a2c9c SHA1 a0887e36150abf9d32d108bd1339880ca2a21449 SHA256 ffc449f67b60b79df064e7843b19ce9c16ab0ccc495de3b9cd9b1a38bf6b0c26
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOjZ0KAAoJEEdUh39IaPFNX5QH/1FE9N2rRGq5RTLmFFoJ7TeT
-B42hI3SjkWcoDf3aEwShN176rKtnIDozdah8OaeCd1e/ixceDMy4LVBOc5gqEbz5
-gZt+7JTGfNjkZNVdgAKfYU1vIekgP1PplfBoAhmlz2nAaXNA69ChQVGWfiKa9r9B
-6aujEvkMpU0Nrxnt8LxYBjieGaT/EpQ/2h+i+/n2Po4a/9agZZVwMfRWISUwvzhR
-s1kaEuyb7BJBP+xGLs5tOrHV/GJ82Ic3bBlhFnDKbbo6gTCVVJJvwW99i3xR2GAg
-2HXOOlcan3WaHxnyrpruCQTn9/1RhXd/z62MdWcJlkrF5LMi+Rjz52SS7+U/W4U=
-=DENC
+iEYEAREKAAYFAk6+TQkACgkQgAnW8HDreRZiRwCfZe1k78MlbEr9Wk9B0C6NuSAR
+zzUAoKiNJ26EwjTMd3mMy99zE3zJkPtW
+=wizD
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/ChangeLog b/x11-wm/windowmaker/ChangeLog
index d9a18a64ee72..e3b0520541a6 100644
--- a/x11-wm/windowmaker/ChangeLog
+++ b/x11-wm/windowmaker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-wm/windowmaker
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.128 2011/10/23 19:56:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/ChangeLog,v 1.129 2011/11/12 10:36:45 jlec Exp $
+
+  12 Nov 2011; Justin Lecher <jlec@gentoo.org> windowmaker-0.92.0-r11.ebuild,
+  metadata.xml:
+  Corrected slotting for png and tiff, resorted ebuild to fit common sense
+  order, removed unnessesary die and illegal ebeep
 
   23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
   -windowmaker-0.92.0-r9.ebuild, -windowmaker-0.92.0-r10.ebuild:
diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index f600ec6d2206..d96c2528cb05 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,21 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 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-5.tar.bz2 226417 RMD160 c49fa346e3d024a5e12e576073d141f1d1c9958b SHA1 a6285c3034b80575f8a9dbda95f830f6387cd554 SHA256 3298be8a2f1eb8130c249df790ed2a35a230c337f2d12fd426e14df9652a9adc
-EBUILD windowmaker-0.92.0-r11.ebuild 6452 RMD160 22ee345af2853eda5a9b776374509762f33f532d SHA1 6418e51cedbbcde86509e71b0ded811af0d384ce SHA256 f308a5d8d5dcd9fee0c8667c41c4180086a69e038a2f66a68f42c831c57839ba
-MISC ChangeLog 26622 RMD160 35bdeaa752dbfe13c3ba5f280f4356a6eba34791 SHA1 8c7f217c928f58090439ac16f33b7cfe03c13b3e SHA256 b03878275aada8257d857053b51ba95fd1bc7617a8e795daae9b44daa92b1cee
-MISC metadata.xml 455 RMD160 41514c712d553ed4752ce045efca3d27dd036c19 SHA1 345b35512a60f3d19cf5fc4cebbfe30bd6006bf3 SHA256 7661636f854da151e83478668ff58943b0d80662f6abd2a209707d3d34b37c7c
+EBUILD windowmaker-0.92.0-r11.ebuild 6343 RMD160 f7dcecec467c6c4d09fb91ccd78989e58e7976dc SHA1 d4e770681d45c311599e3cd7c9ff372077313f9b SHA256 09979ec2a7e3ecbbebd54be27ba6b9662abcb1ad8f44aaf0baf73aa68e415d9a
+MISC ChangeLog 26838 RMD160 549e37782e8d9bae31f2a92e81d353515d9c1dc7 SHA1 6312b4787f9ded7fdf744f997279af67510b49d9 SHA256 48373fdee46381f370453472cfec01b0726e4b76b24f630a3f5b9dafe377a5f3
+MISC metadata.xml 455 RMD160 202964c6e0d8690a1da8ce5eb64828bb94a6a644 SHA1 03f68b3aafcf8993075bea20d30ce46886e92283 SHA256 1addf9c33da2a98799731f659d06ee368b601dd1cf159c12baf14c9e11df304b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOpHFCAAoJEEdUh39IaPFNg0gH/RYQAKh23QaNmWV+GWE3shjB
-8nNnYl5eTtz81f8IcX91Rka+hhE1qIQZbys0XLYC08DwvIYYlvxEt3nGaV4DN2SH
-g8vFbmEhc9I0GbK3E6EuRQKSOMTC2RDeP8IFZpxWBoX2Eb5CrcV/G/XwM0UoX+8N
-uQ5mpCusmPN4EdSwCPRd0ut3hNRveOVY8mXyjeTloh9k0dblP7eIM9yus6azDSss
-MV19ZyH/SL7g5KLsh/yZ62QrsfiTY6tqAZSBlIBtY2Fi8dwGOmx4uYW3+RV5hjRK
-4MsRvG6fy4mRCnKUIPy7bGOqSlpPbgNcSCZgTZ/RAPiJjfrj5r+TjCuV6xpLUHc=
-=GIgX
+iEYEAREKAAYFAk6+TEgACgkQgAnW8HDreRZatQCfWn6IRE/2nqJZBFBTgFTuMEqT
+TjIAoLjMUvT41BRcidQys0/1RAb1DE5G
+=Ub6F
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/metadata.xml b/x11-wm/windowmaker/metadata.xml
index 3ecadd4c49b5..334bd509da28 100644
--- a/x11-wm/windowmaker/metadata.xml
+++ b/x11-wm/windowmaker/metadata.xml
@@ -3,10 +3,10 @@
 <pkgmetadata>
 	<herd>gnustep</herd>
 	<use>
-		<flag name='modelock'>Enable XKB language status lock support. README
+		<flag name="modelock">Enable XKB language status lock support. README
 			says: "If you don't know what it is you probably don't need
 			it."</flag>
-		<flag name='vdesktop'>Enable dynamic virtual desktop (conflicts with
+		<flag name="vdesktop">Enable dynamic virtual desktop (conflicts with
 			software that works on the edges of the screen)</flag>
 	</use>
 </pkgmetadata>
diff --git a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
index 59491e050d0f..4e774df0716f 100644
--- a/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild
@@ -1,37 +1,39 @@
 # 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.8 2011/10/23 16:12:52 armin76 Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.92.0-r11.ebuild,v 1.9 2011/11/12 10:36:45 jlec Exp $
 EAPI=3
 
 inherit autotools eutils flag-o-matic
 
 # note: patchset is in gentoo/src/patchsets/windowmaker
 PATCHVER=5
-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
+HOMEPAGE="http://www.windowmaker.info/"
+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/"
 
+SLOT="0"
+LICENSE="GPL-2"
 IUSE="gif jpeg nls png tiff modelock +vdesktop xinerama"
-DEPEND="x11-libs/libXv
+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
-	media-libs/fontconfig
+	x11-libs/libXv
 	gif? ( >=media-libs/giflib-4.1.0-r3 )
-	png? ( >=media-libs/libpng-1.2.1 )
+	png? ( media-libs/libpng:0 )
 	jpeg? ( virtual/jpeg )
-	tiff? ( >=media-libs/tiff-3.6.1-r2 )
+	tiff? ( media-libs/tiff: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"
+S=${WORKDIR}/${P/windowm/WindowM}
 
 src_prepare() {
 	local psd="${WORKDIR}"/${P}-patchset-${PATCHVER}
@@ -109,14 +111,14 @@ src_prepare() {
 		fi;
 	done;
 
-	eautoreconf || die "eautoreconf failed"
+	eautoreconf
 }
 
 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
+		&& ewarn "CFLAG -fstack-protector has been disabled, as it is known to cause bugs with WindowMaker (bug #78051)"
 	replace-flags "-Os" "-O2"
 	replace-flags "-O3" "-O2"
 
@@ -144,9 +146,9 @@ src_configure() {
 		--enable-usermenu \
 		--with-pixmapdir="${EPREFIX}"/usr/share/pixmaps \
 		--with-nlsdir="${EPREFIX}"/usr/share/locale \
-		${myconf} || die
+		${myconf}
 	cd ../WindowMaker-extra-0.1
-	econf || die "windowmaker-extra: configure has failed"
+	econf
 }
 
 src_compile() {