Some fixes and general cleanup.

Package-Manager: portage-2.1.3_rc8

4 files changed, 46 insertions, 57 deletions

diff --git a/x11-wm/aewm++/Manifest b/x11-wm/aewm++/Manifest
index edf9c5d6e186..004f2069c9f2 100644
--- a/x11-wm/aewm++/Manifest
+++ b/x11-wm/aewm++/Manifest
@@ -5,34 +5,26 @@ AUX gcc-3.4.patch 329 RMD160 8a775251a307ff160a265776b9dedc92fa5a38a8 SHA1 4e33f
 MD5 946a878c80fa1dcb5179316f2777de7b files/gcc-3.4.patch 329
 RMD160 8a775251a307ff160a265776b9dedc92fa5a38a8 files/gcc-3.4.patch 329
 SHA256 de47ec151bdab3b8b9583676026a87ddadfd32747b4f352c51958fc110db0989 files/gcc-3.4.patch 329
-DIST aewm++-1.0.22.tar.bz2 42517 RMD160 5b966fe95507833d75fa2ffadaa8136dcf59d535 SHA1 49fb1aac02ec64896f607513d786a8e2628ac2a5 SHA256 f0bbd858c5f6504f62600a19ecb815b9b0fe7a298b594e806b48cf90ff591580
 DIST aewm++-1.0.24.tar.bz2 36642 RMD160 6e37b29343948f469dcceba90732209b4b7324b9 SHA1 366da85a5edf47e3214c772007aebb2daf7d18d0 SHA256 75d93b20dbdea1d94f0a850adeb2df0f6d30dfcd71a119583ee223936eaa6a03
-EBUILD aewm++-1.0.22.ebuild 781 RMD160 e4b62dd487762ad7204d4de28d3bfae04d47335e SHA1 ab2530e62d66494809f68e4d207ac2eace437327 SHA256 9b3b8d1432664ce66d5e21f2bd434d5511f57f3dbc57e672b12061bb3d8a3dbc
-MD5 d86733f3232c0cc25b7de3d6b36b0cd8 aewm++-1.0.22.ebuild 781
-RMD160 e4b62dd487762ad7204d4de28d3bfae04d47335e aewm++-1.0.22.ebuild 781
-SHA256 9b3b8d1432664ce66d5e21f2bd434d5511f57f3dbc57e672b12061bb3d8a3dbc aewm++-1.0.22.ebuild 781
 EBUILD aewm++-1.0.24.ebuild 860 RMD160 4457bfb420455627017fdb961742b93bf323303d SHA1 c7bd9fd51a7c1eaa46a767b2d4f3e3d13a6a4520 SHA256 cf783fdae42bd938e0c752c2dcc3b942e48eefb0d2bafbc4ab5e1f1dd2089b9b
 MD5 6694f2021597ee1687af23a1ceaa94c3 aewm++-1.0.24.ebuild 860
 RMD160 4457bfb420455627017fdb961742b93bf323303d aewm++-1.0.24.ebuild 860
 SHA256 cf783fdae42bd938e0c752c2dcc3b942e48eefb0d2bafbc4ab5e1f1dd2089b9b aewm++-1.0.24.ebuild 860
-MISC ChangeLog 1249 RMD160 8f8c256994d5e91cf74a3fc8313579d0b837d0c9 SHA1 f10cea8e5192280bd2341554c20160dfe6f511d9 SHA256 13a4fce548cc8b78b4f06994bed510a472653af7af66a0dc51cb89c3bbf91258
-MD5 d8b64da93f0ab062d957bea3926893f2 ChangeLog 1249
-RMD160 8f8c256994d5e91cf74a3fc8313579d0b837d0c9 ChangeLog 1249
-SHA256 13a4fce548cc8b78b4f06994bed510a472653af7af66a0dc51cb89c3bbf91258 ChangeLog 1249
+MISC ChangeLog 1343 RMD160 60069c97d004d3f714dd939e01ce2bc69f5c86cc SHA1 042a47ceb8af150ab64ce82fb0afc2b68a1c6e5c SHA256 402bce417fabd4ff954b530ec402cea24afc012564f2ffa964b0af5a95aac73d
+MD5 68480540a626b30e0295d433eb4df061 ChangeLog 1343
+RMD160 60069c97d004d3f714dd939e01ce2bc69f5c86cc ChangeLog 1343
+SHA256 402bce417fabd4ff954b530ec402cea24afc012564f2ffa964b0af5a95aac73d ChangeLog 1343
 MISC metadata.xml 378 RMD160 51bb4bb374cabf652c9cf60f8dd75c4a03c7d483 SHA1 99f39b046604bb9e86e71260fd4f200e37f74646 SHA256 391d805c0eab020910580503ae5e51117bc38d8039f7a65ae4d987566214fe35
 MD5 e6947c959196876d1192553a30343522 metadata.xml 378
 RMD160 51bb4bb374cabf652c9cf60f8dd75c4a03c7d483 metadata.xml 378
 SHA256 391d805c0eab020910580503ae5e51117bc38d8039f7a65ae4d987566214fe35 metadata.xml 378
-MD5 6eb3c76a8d046acc0d46f3e21368e2ba files/digest-aewm++-1.0.22 241
-RMD160 dc7f6e9d03b93c39c625f046a3b76baadc27723e files/digest-aewm++-1.0.22 241
-SHA256 65039ed0adc876bb6bd38a647c8f2052d8bcc9fa42c3ff73ea4b7d5c6750ab28 files/digest-aewm++-1.0.22 241
 MD5 fac01a6562684ec87e4687889c239f60 files/digest-aewm++-1.0.24 241
 RMD160 7a7852bdc84a2201113fa7e9c3059d6e62e42b22 files/digest-aewm++-1.0.24 241
 SHA256 7797e429536bd6d6eff89262c0e98380529ca63d03c4b6ba8e497a72ce1b479d files/digest-aewm++-1.0.24 241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.1 (GNU/Linux)
+Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFF3MiVz974XjDVpbkRApeKAKCN2bOr59G/BFZ8biVZ+/CbdJcoiwCgo+vc
-8dsFHoakIeekuEjJwtggWsU=
-=8MEK
+iD8DBQFGl2nYvSApE0uP4UsRAni+AJ9JzlQSPtnKzocNIcmkh731jr47egCfei11
+T9lPbEIxdk1TNncnuh0YiYg=
+=qFqI
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/ctwm/ChangeLog b/x11-wm/ctwm/ChangeLog
index e8cb899b31d8..51d4d629338b 100644
--- a/x11-wm/ctwm/ChangeLog
+++ b/x11-wm/ctwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/ctwm
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.18 2007/07/13 11:51:06 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ChangeLog,v 1.19 2007/07/13 11:59:37 omp Exp $
+
+  13 Jul 2007; David Shakaryan <omp@gentoo.org> ctwm-3.7.ebuild:
+  Some fixes and general cleanup.
 
   13 Jul 2007; David Shakaryan <omp@gentoo.org> -ctwm-3.6-r1.ebuild:
   Remove older version.
diff --git a/x11-wm/ctwm/Manifest b/x11-wm/ctwm/Manifest
index 10ebe971ae23..732b7ee1edf6 100644
--- a/x11-wm/ctwm/Manifest
+++ b/x11-wm/ctwm/Manifest
@@ -6,14 +6,14 @@ MD5 6752682809aa0c15d7e76cd6013da292 files/ctwm-3.6-r1-gentoo.diff 1329
 RMD160 4f99f36e7c96e70be2efa6da7a5916e1925de4b3 files/ctwm-3.6-r1-gentoo.diff 1329
 SHA256 e263f47c575b556ed4a4f6f58b00d02c000f05f880337a92328d5071e07d4aa6 files/ctwm-3.6-r1-gentoo.diff 1329
 DIST ctwm-3.7.tar.gz 1139461 RMD160 9809df2555b3eb2bf0c46c041df8c1c089b67255 SHA1 6140e82ec23499146eaab5bf3bd592f92e95683e SHA256 fa16dbaef6992cdbcdbe05a9dc12c2c16910f5e51a2df54607aeb74f9b4a5171
-EBUILD ctwm-3.7.ebuild 1360 RMD160 3f2c49b7b16d4dadda75fc4f21e9755101d5f409 SHA1 f0c0e9cefbf9708fbf109183d2305504768fe06f SHA256 728293030c7a3a60216ae44ff1b43fe95aa2cb62da9bfd6ebfbef61e21416e1d
-MD5 e92eb8b5c4331220e7951606d3847cc4 ctwm-3.7.ebuild 1360
-RMD160 3f2c49b7b16d4dadda75fc4f21e9755101d5f409 ctwm-3.7.ebuild 1360
-SHA256 728293030c7a3a60216ae44ff1b43fe95aa2cb62da9bfd6ebfbef61e21416e1d ctwm-3.7.ebuild 1360
-MISC ChangeLog 2662 RMD160 bc4cc41166ab036c23a9648e14d158eb6b2f0962 SHA1 6a99dd1535346cc03fe656a1d8c9820595e744ab SHA256 a76222c3328e56b69e19ff5d1f30a64d18b3faa37732d91bd99993b950b270d3
-MD5 2f547a86562dfd4c211572ff56513371 ChangeLog 2662
-RMD160 bc4cc41166ab036c23a9648e14d158eb6b2f0962 ChangeLog 2662
-SHA256 a76222c3328e56b69e19ff5d1f30a64d18b3faa37732d91bd99993b950b270d3 ChangeLog 2662
+EBUILD ctwm-3.7.ebuild 1295 RMD160 daf1304ded5d2718adf47efc6047978e9b0d3a5a SHA1 cd00e4d6580c5e1bcf4aefaaf1c62e98faa444b6 SHA256 a67f212109a06428225a3505c29f5c419893615216b801ba2916613afd80d5ad
+MD5 2f7ef04539f40be683727e408bd1f658 ctwm-3.7.ebuild 1295
+RMD160 daf1304ded5d2718adf47efc6047978e9b0d3a5a ctwm-3.7.ebuild 1295
+SHA256 a67f212109a06428225a3505c29f5c419893615216b801ba2916613afd80d5ad ctwm-3.7.ebuild 1295
+MISC ChangeLog 2762 RMD160 e70fb47953803d7b4dc706f9cc9953d5e35633ad SHA1 875d9363994cf203aa9a5dd59e0d796d7fc26583 SHA256 de0179fa54748b9c4a32afaa09dd2838d9e481f05ffefeef77cca93d352e2919
+MD5 c0da71e43a248c712ac888395eaa6b1e ChangeLog 2762
+RMD160 e70fb47953803d7b4dc706f9cc9953d5e35633ad ChangeLog 2762
+SHA256 de0179fa54748b9c4a32afaa09dd2838d9e481f05ffefeef77cca93d352e2919 ChangeLog 2762
 MISC metadata.xml 163 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 SHA1 8be4981b79174c7879a386bd8e0fd4609ad9d41f SHA256 e8dcd61085d237c64dc37b1d7dd932b2c5e75010f9b6d9fd19b103bfe3a47797
 MD5 e7307c1653035014c1e36a27ca8ccb45 metadata.xml 163
 RMD160 7c2ff9d5408196433d3c5d74537d222335183899 metadata.xml 163
@@ -24,7 +24,7 @@ SHA256 d110ce3d82ece4713eafcf48ccf4ebc92f1216e0be3e2ead820557ce2c333b62 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.5 (GNU/Linux)
 
-iD8DBQFGl2cwvSApE0uP4UsRAtS4AJ4iUDAEGUMb2snC9L42WJZmAdAi/ACeKwXa
-hwFhhCVw5FYAdrm8HhZxsDA=
-=gzKc
+iD8DBQFGl2k1vSApE0uP4UsRAn2DAJ4rwED1KZ/fj9Ywafp/Yt2Ir1SahACfeoY7
+PaAacVRsaeWjRnFrJN6jDhw=
+=ivEW
 -----END PGP SIGNATURE-----
diff --git a/x11-wm/ctwm/ctwm-3.7.ebuild b/x11-wm/ctwm/ctwm-3.7.ebuild
index f1726a2a917b..e6771878c939 100644
--- a/x11-wm/ctwm/ctwm-3.7.ebuild
+++ b/x11-wm/ctwm/ctwm-3.7.ebuild
@@ -1,55 +1,49 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7.ebuild,v 1.7 2007/02/22 05:45:24 omp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ctwm/ctwm-3.7.ebuild,v 1.8 2007/07/13 11:59:37 omp Exp $
 
 inherit eutils
 
-IUSE=""
-
-MY_P="${P/_/-}"
-S=${WORKDIR}/${MY_P}
-
 DESCRIPTION="A clean, light window manager."
-SRC_URI="http://ctwm.free.lp.se/dist/${MY_P}.tar.gz"
-#SRC_URI="http://ctwm.free.lp.se/preview/${MY_P}.tar.gz"
 HOMEPAGE="http://ctwm.free.lp.se/"
+SRC_URI="http://ctwm.free.lp.se/dist/${P}.tar.gz"
 
+LICENSE="MIT"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
-LICENSE="MIT"
+IUSE=""
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXmu
-		x11-libs/libXt
-		x11-libs/libXext
-		x11-libs/libXpm )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXmu
+	x11-libs/libXpm
+	x11-libs/libXt"
 DEPEND="${RDEPEND}
-	|| ( (
-		x11-proto/xproto
-		x11-proto/xextproto
-		app-text/rman
-		x11-misc/imake )
-	virtual/x11 )
-	media-libs/jpeg"
+	app-text/rman
+	media-libs/jpeg
+	x11-misc/imake
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_compile() {
-	sed -i -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" Imakefile || die
-	cp Imakefile.local-template Imakefile.local || die
-	xmkmf || die
-	make TWMDIR=/usr/share/${PN} || die
+	sed -i -e "s@\(CONFDIR =\).*@\1 /etc/X11/twm@g" Imakefile \
+		|| die "sed failed"
+
+	cp Imakefile.local-template Imakefile.local
+
+	xmkmf || die "xmkmf failed"
+	make TWMDIR=/usr/share/${PN} || die "make failed"
 }
 
 src_install() {
 	make BINDIR=/usr/bin \
 		MANPATH=/usr/share/man \
 		TWMDIR=/usr/share/${PN} \
-		DESTDIR=${D} install || die
+		DESTDIR="${D}" install || die "make install failed"
 
 	make MANPATH=/usr/share/man \
 		DOCHTMLDIR=/usr/share/doc/${PF}/html \
-		DESTDIR=${D} install.man || die
+		DESTDIR="${D}" install.man || die "make install.man failed"
 
 	echo "#!/bin/sh" > ${T}/ctwm
 	echo "/usr/bin/ctwm" >> ${T}/ctwm