cleanups

36 files changed, 54 insertions, 351 deletions

diff --git a/x11-misc/icecc/ChangeLog b/x11-misc/icecc/ChangeLog
index a6d28ebdd0cd..e424e855c7d9 100644
--- a/x11-misc/icecc/ChangeLog
+++ b/x11-misc/icecc/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-misc/icecc
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/ChangeLog,v 1.12 2003/07/08 13:47:54 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/ChangeLog,v 1.13 2003/07/30 10:16:45 phosphan Exp $
+
+  30 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> icecc-0.5.ebuild,
+  icecc-1.5.ebuild, icecc-2.1.ebuild, icecc-2.2.ebuild, icecc-2.3.ebuild,
+  icecc-2.4.ebuild, files/icecc-2.1.patch, files/icecc-2.2.patch,
+  files/icecc-2.3.patch:
+  Cleanup + mark 2.4 as stable
 
 *icecc-2.4 (08 Jul 2003)
 
diff --git a/x11-misc/icecc/Manifest b/x11-misc/icecc/Manifest
index e353b767572a..a20377c2cdc8 100644
--- a/x11-misc/icecc/Manifest
+++ b/x11-misc/icecc/Manifest
@@ -1,21 +1,8 @@
-MD5 82b833a9114865c3de6c61676737e051 icecc-2.1.ebuild 949
-MD5 6806a2c35284ed922a910529735f0aec icecc-1.5.ebuild 614
-MD5 a39c43058b48dc22f1b19f31aa9602b7 icecc-2.3.ebuild 949
 MD5 6beb3d1bb7021baceb3c4c8f3268cccd icecc-2.0.ebuild 951
-MD5 3c3583ea36b707b668c345847986a904 icecc-2.2.ebuild 949
-MD5 bad14db3379484c9ab6f33e0ecff4cde ChangeLog 1838
-MD5 b7146c3db19527599b2ccd7547bf4a3e icecc-2.4.ebuild 949
+MD5 c1eed191e77b4ebcfdcd5b711cd3cc6f ChangeLog 2106
+MD5 f88cfa4359ff02aec6d4f1babf7b40a9 icecc-2.4.ebuild 948
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
-MD5 8ffdf6aa0e2ce02cd060a956279b0f1d icecc-0.5.ebuild 725
-MD5 f255bba4b714e8448420f1fee95f89bf files/icecc-2.3.patch 357
 MD5 f255bba4b714e8448420f1fee95f89bf files/icecc-2.4.patch 357
 MD5 f255bba4b714e8448420f1fee95f89bf files/icecc-2.0.patch 357
-MD5 f255bba4b714e8448420f1fee95f89bf files/icecc-2.1.patch 357
-MD5 f255bba4b714e8448420f1fee95f89bf files/icecc-2.2.patch 357
-MD5 2bbad17c47095ef6bbb2d8d6b3148809 files/digest-icecc-0.5 62
-MD5 526fd0596038b1731c21dc06a1bfc3bf files/digest-icecc-1.5 62
 MD5 386c86dda906b8079a792ea611fc390b files/digest-icecc-2.0 62
-MD5 7abecd7cef81f784a9cc4655223c6c35 files/digest-icecc-2.1 62
-MD5 8a95d6a4b3aa51ce494b266b8dc1b10f files/digest-icecc-2.2 62
-MD5 1d9eb8cdbbee707d8c7eb179673107c0 files/digest-icecc-2.3 62
 MD5 eae671be233f56af57649fd4ee86e961 files/digest-icecc-2.4 62
diff --git a/x11-misc/icecc/files/digest-icecc-0.5 b/x11-misc/icecc/files/digest-icecc-0.5
deleted file mode 100644
index f6699a927c6a..000000000000
--- a/x11-misc/icecc/files/digest-icecc-0.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6d9e2c9e1f097952405abc8f579e5074 icecc-0.5.tar.bz2 302055
diff --git a/x11-misc/icecc/files/digest-icecc-1.5 b/x11-misc/icecc/files/digest-icecc-1.5
deleted file mode 100644
index 2bf8f378ccb2..000000000000
--- a/x11-misc/icecc/files/digest-icecc-1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 d825160422af53575488257814e36d19 icecc-1.5.tar.bz2 300454
diff --git a/x11-misc/icecc/files/digest-icecc-2.1 b/x11-misc/icecc/files/digest-icecc-2.1
deleted file mode 100644
index 5d5f26f391c7..000000000000
--- a/x11-misc/icecc/files/digest-icecc-2.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 f5745198f158a2087d4112e7438da272 icecc-2.1.tar.bz2 337536
diff --git a/x11-misc/icecc/files/digest-icecc-2.2 b/x11-misc/icecc/files/digest-icecc-2.2
deleted file mode 100644
index a9465f121455..000000000000
--- a/x11-misc/icecc/files/digest-icecc-2.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 16b97cc868a7770aefac382689424bb6 icecc-2.2.tar.bz2 338294
diff --git a/x11-misc/icecc/files/digest-icecc-2.3 b/x11-misc/icecc/files/digest-icecc-2.3
deleted file mode 100644
index 03cdc65431c7..000000000000
--- a/x11-misc/icecc/files/digest-icecc-2.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 3acf890f5ff6707b9c8b1ed54b84f6d1 icecc-2.3.tar.bz2 338718
diff --git a/x11-misc/icecc/files/icecc-2.1.patch b/x11-misc/icecc/files/icecc-2.1.patch
deleted file mode 100644
index 855431abf148..000000000000
--- a/x11-misc/icecc/files/icecc-2.1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icecc/icecc.cpp     2003-04-03 22:48:22.000000000 +0200
-+++ icecc/icecc.cpp.new 2003-04-14 11:27:47.000000000 +0200
-@@ -49,7 +49,7 @@
- themeBrowser(0),
- icewmCfgDir(getenv("ICEWM_PRIVCFG")),
- aTools(COUNTTOOLS),
--themeDir("/usr/local/share/icecc/themes/")
-+themeDir("/usr/share/icecc/themes/")
- {
-     setCaption(tr("IceWM Control Center " VERSION));
- 
diff --git a/x11-misc/icecc/files/icecc-2.2.patch b/x11-misc/icecc/files/icecc-2.2.patch
deleted file mode 100644
index 855431abf148..000000000000
--- a/x11-misc/icecc/files/icecc-2.2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icecc/icecc.cpp     2003-04-03 22:48:22.000000000 +0200
-+++ icecc/icecc.cpp.new 2003-04-14 11:27:47.000000000 +0200
-@@ -49,7 +49,7 @@
- themeBrowser(0),
- icewmCfgDir(getenv("ICEWM_PRIVCFG")),
- aTools(COUNTTOOLS),
--themeDir("/usr/local/share/icecc/themes/")
-+themeDir("/usr/share/icecc/themes/")
- {
-     setCaption(tr("IceWM Control Center " VERSION));
- 
diff --git a/x11-misc/icecc/files/icecc-2.3.patch b/x11-misc/icecc/files/icecc-2.3.patch
deleted file mode 100644
index 855431abf148..000000000000
--- a/x11-misc/icecc/files/icecc-2.3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- icecc/icecc.cpp     2003-04-03 22:48:22.000000000 +0200
-+++ icecc/icecc.cpp.new 2003-04-14 11:27:47.000000000 +0200
-@@ -49,7 +49,7 @@
- themeBrowser(0),
- icewmCfgDir(getenv("ICEWM_PRIVCFG")),
- aTools(COUNTTOOLS),
--themeDir("/usr/local/share/icecc/themes/")
-+themeDir("/usr/share/icecc/themes/")
- {
-     setCaption(tr("IceWM Control Center " VERSION));
- 
diff --git a/x11-misc/icecc/icecc-0.5.ebuild b/x11-misc/icecc/icecc-0.5.ebuild
deleted file mode 100644
index 760862c750ef..000000000000
--- a/x11-misc/icecc/icecc-0.5.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-0.5.ebuild,v 1.9 2003/04/25 16:08:03 vapier Exp $
-
-DESCRIPTION="IceWM Control-Center"
-SRC_URI="http://www.selena.kherson.ua/xvadim/${P}.tar.bz2"
-HOMEPAGE="http://www.selena.kherson.ua/xvadim/"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 sparc"
-
-DEPEND="virtual/x11
-	x11-libs/qt
-	x11-misc/icets
-	x11-misc/icebgset
-	x11-misc/icesndcfg"
-RDEPEND="x11-wm/icewm"
-
-src_compile() {
-	econf --with-qt-dir=${QTDIR} || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	rm -rf ${D}/usr/doc
-
-	dohtml icecc/docs/en/*.{html,sgml}
-	dodoc AUTHORS COPYING README TODO
-}
diff --git a/x11-misc/icecc/icecc-1.5.ebuild b/x11-misc/icecc/icecc-1.5.ebuild
deleted file mode 100644
index 3f8313276c51..000000000000
--- a/x11-misc/icecc/icecc-1.5.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-1.5.ebuild,v 1.3 2003/04/25 16:08:03 vapier Exp $
-
-DESCRIPTION="IceWM Control Center"
-SRC_URI="http://tsa.dyndns.org/mirror/xvadim/${P}.tar.bz2"
-HOMEPAGE="http://tsa.dyndns.org/mirror/xvadim/"
-
-LICENSE="GPL-2"
-KEYWORDS="x86"
-SLOT="0"
-
-DEPEND=">=x11-libs/qt-3.0.0"
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	rm -rf ${D}/usr/doc
-	dohtml ${PN}/docs/en/*.{html,sgml}
-	dodoc AUTHORS ChangeLog README TODO
-}
diff --git a/x11-misc/icecc/icecc-2.1.ebuild b/x11-misc/icecc/icecc-2.1.ebuild
deleted file mode 100644
index 038f97fd98e8..000000000000
--- a/x11-misc/icecc/icecc-2.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-2.1.ebuild,v 1.1 2003/05/19 13:15:34 phosphan Exp $
-
-DESCRIPTION="IceWM Control Center (only main program, see icewm-tools for the rest)"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://icecc.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND=">=x11-libs/qt-3.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}.patch || die "patch failed"
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	rm -rf ${D}/usr/doc
-	dohtml ${PN}/docs/en/*.{html,sgml}
-	dodoc AUTHORS ChangeLog README TODO
-	dodir /usr/share/${PN}/themes
-	cp -a theme/* ${D}/usr/share/${PN}/themes/
-	chmod go-w ${D}/usr/share/${PN}/themes/
-}
-
-pkg_postinst() {
-	einfo "emerge icewm-tools for the control center helper tools"
-}
diff --git a/x11-misc/icecc/icecc-2.2.ebuild b/x11-misc/icecc/icecc-2.2.ebuild
deleted file mode 100644
index b7282097222d..000000000000
--- a/x11-misc/icecc/icecc-2.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-2.2.ebuild,v 1.1 2003/06/24 09:36:03 phosphan Exp $
-
-DESCRIPTION="IceWM Control Center (only main program, see icewm-tools for the rest)"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://icecc.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND=">=x11-libs/qt-3.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}.patch || die "patch failed"
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	rm -rf ${D}/usr/doc
-	dohtml ${PN}/docs/en/*.{html,sgml}
-	dodoc AUTHORS ChangeLog README TODO
-	dodir /usr/share/${PN}/themes
-	cp -a theme/* ${D}/usr/share/${PN}/themes/
-	chmod go-w ${D}/usr/share/${PN}/themes/
-}
-
-pkg_postinst() {
-	einfo "emerge icewm-tools for the control center helper tools"
-}
diff --git a/x11-misc/icecc/icecc-2.3.ebuild b/x11-misc/icecc/icecc-2.3.ebuild
deleted file mode 100644
index 6dd6c2aa1507..000000000000
--- a/x11-misc/icecc/icecc-2.3.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-2.3.ebuild,v 1.1 2003/07/01 11:47:44 phosphan Exp $
-
-DESCRIPTION="IceWM Control Center (only main program, see icewm-tools for the rest)"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-HOMEPAGE="http://icecc.sourceforge.net/"
-
-LICENSE="GPL-2"
-KEYWORDS="~x86"
-SLOT="0"
-
-DEPEND=">=x11-libs/qt-3.0.0"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	patch -p0 < ${FILESDIR}/${P}.patch || die "patch failed"
-}
-
-src_compile() {
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-
-	rm -rf ${D}/usr/doc
-	dohtml ${PN}/docs/en/*.{html,sgml}
-	dodoc AUTHORS ChangeLog README TODO
-	dodir /usr/share/${PN}/themes
-	cp -a theme/* ${D}/usr/share/${PN}/themes/
-	chmod go-w ${D}/usr/share/${PN}/themes/
-}
-
-pkg_postinst() {
-	einfo "emerge icewm-tools for the control center helper tools"
-}
diff --git a/x11-misc/icecc/icecc-2.4.ebuild b/x11-misc/icecc/icecc-2.4.ebuild
index 3dcc32ebfa30..605189891791 100644
--- a/x11-misc/icecc/icecc-2.4.ebuild
+++ b/x11-misc/icecc/icecc-2.4.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-2.4.ebuild,v 1.1 2003/07/08 13:47:54 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icecc/icecc-2.4.ebuild,v 1.2 2003/07/30 10:16:45 phosphan Exp $
 
 DESCRIPTION="IceWM Control Center (only main program, see icewm-tools for the rest)"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 HOMEPAGE="http://icecc.sourceforge.net/"
 
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 SLOT="0"
 
 DEPEND=">=x11-libs/qt-3.0.0"
diff --git a/x11-misc/iceiconcvt/Manifest b/x11-misc/iceiconcvt/Manifest
index 9f7155a8400b..62882d9b0272 100644
--- a/x11-misc/iceiconcvt/Manifest
+++ b/x11-misc/iceiconcvt/Manifest
@@ -1,5 +1,6 @@
-MD5 791d0432b4d7387bef67c2d734c2a5b6 iceiconcvt-1.0.ebuild 608
+MD5 5df4bf3d3cf9a9c2338ca7b83fb90bc0 iceiconcvt-1.0.ebuild 607
 MD5 bc39ee47bdd8aff8bf21b0d46667de2a ChangeLog 814
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 e3296b256000683a844a75edb8ccb7e1 iceiconcvt-0.9.ebuild 607
 MD5 081b0a7102e0d163c0d504786d5d02f3 files/digest-iceiconcvt-0.9 65
 MD5 2633a54757bf5f611edb5b906ca82a0c files/digest-iceiconcvt-1.0 65
diff --git a/x11-misc/iceiconcvt/iceiconcvt-1.0.ebuild b/x11-misc/iceiconcvt/iceiconcvt-1.0.ebuild
index 72fb6a37445a..81517f742828 100644
--- a/x11-misc/iceiconcvt/iceiconcvt-1.0.ebuild
+++ b/x11-misc/iceiconcvt/iceiconcvt-1.0.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/iceiconcvt/iceiconcvt-1.0.ebuild,v 1.1 2003/07/01 12:00:13 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/iceiconcvt/iceiconcvt-1.0.ebuild,v 1.2 2003/07/30 10:17:54 phosphan Exp $
 
 DESCRIPTION="IceWM icons' converter"
 SRC_URI="mirror://sourceforge/icecc/${P}.tar.bz2"
 HOMEPAGE="http://icecc.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 RESTRICT="nostrip"
 
 DEPEND="dev-python/PyQt"
diff --git a/x11-misc/icemc/ChangeLog b/x11-misc/icemc/ChangeLog
index d4234909cb8b..c45f90dddbb9 100644
--- a/x11-misc/icemc/ChangeLog
+++ b/x11-misc/icemc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/icemc
 # Copyright 2000-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemc/ChangeLog,v 1.6 2003/07/08 13:49:19 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemc/ChangeLog,v 1.7 2003/07/30 10:19:02 phosphan Exp $
+
+  30 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> icemc-1.3.ebuild,
+  icemc-1.4.ebuild, icemc-1.5.ebuild:
+  Cleanup
 
 *icemc-1.5 (08 Jul 2003)
 
diff --git a/x11-misc/icemc/Manifest b/x11-misc/icemc/Manifest
index dc4d751f6a08..679daa9ad10a 100644
--- a/x11-misc/icemc/Manifest
+++ b/x11-misc/icemc/Manifest
@@ -1,10 +1,6 @@
-MD5 08cc8e45c4dddc3d67891268499a5ba9 icemc-1.4.ebuild 633
-MD5 fc2753ef5f5e04fa0fbce7030c5a37b7 icemc-1.3.ebuild 633
-MD5 3b58061254c53401859f6a058fafb55c icemc-1.5.ebuild 633
-MD5 c6b8382a40ffdc88e1a4de7bb605f78e ChangeLog 890
+MD5 6127e51a400129c25de087143302007f icemc-1.5.ebuild 632
+MD5 c7e64debefeec45fcdb3d57035243589 ChangeLog 1010
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 8d60b9f84575ddd3a237b4addcd8903f icemc-1.2.ebuild 632
 MD5 052babcceb7f9cb2ed976ca553de0374 files/digest-icemc-1.2 62
-MD5 4fea137cbd954a0f34fceb7ca9a93dd0 files/digest-icemc-1.3 62
-MD5 77fb95d25551d466f437ec0adca6d611 files/digest-icemc-1.4 62
 MD5 8df45c04db0517efcfcd3b446137c43d files/digest-icemc-1.5 62
diff --git a/x11-misc/icemc/files/digest-icemc-1.3 b/x11-misc/icemc/files/digest-icemc-1.3
deleted file mode 100644
index 76d1fe03dea8..000000000000
--- a/x11-misc/icemc/files/digest-icemc-1.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 624264ef79ef8cccb950600d53e67c30 icemc-1.3.tar.bz2 250516
diff --git a/x11-misc/icemc/files/digest-icemc-1.4 b/x11-misc/icemc/files/digest-icemc-1.4
deleted file mode 100644
index b39390cf6e32..000000000000
--- a/x11-misc/icemc/files/digest-icemc-1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 1bff193128d2ade73af4edce99557b88 icemc-1.4.tar.bz2 251407
diff --git a/x11-misc/icemc/icemc-1.3.ebuild b/x11-misc/icemc/icemc-1.3.ebuild
deleted file mode 100644
index db5fae008c56..000000000000
--- a/x11-misc/icemc/icemc-1.3.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemc/icemc-1.3.ebuild,v 1.1 2003/06/23 13:25:51 phosphan Exp $
-
-DESCRIPTION="IceWM menu/toolbar editor"
-HOMEPAGE="http://icecc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/icecc/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=qt-3.0.0"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	rm -rf ${D}/usr/doc
-	dohtml icemc/docs/en/*
-	dodoc authors ChangeLog readme
-}
diff --git a/x11-misc/icemc/icemc-1.4.ebuild b/x11-misc/icemc/icemc-1.4.ebuild
deleted file mode 100644
index 08d2dda8ccfd..000000000000
--- a/x11-misc/icemc/icemc-1.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemc/icemc-1.4.ebuild,v 1.1 2003/07/01 11:56:56 phosphan Exp $
-
-DESCRIPTION="IceWM menu/toolbar editor"
-HOMEPAGE="http://icecc.sourceforge.net/"
-SRC_URI="mirror://sourceforge/icecc/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-DEPEND=">=qt-3.0.0"
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	einstall || die "einstall failed"
-	rm -rf ${D}/usr/doc
-	dohtml icemc/docs/en/*
-	dodoc authors ChangeLog readme
-}
diff --git a/x11-misc/icemc/icemc-1.5.ebuild b/x11-misc/icemc/icemc-1.5.ebuild
index da94e7291e9f..6cd7ff9dce5d 100644
--- a/x11-misc/icemc/icemc-1.5.ebuild
+++ b/x11-misc/icemc/icemc-1.5.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemc/icemc-1.5.ebuild,v 1.1 2003/07/08 13:49:19 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemc/icemc-1.5.ebuild,v 1.2 2003/07/30 10:19:02 phosphan Exp $
 
 DESCRIPTION="IceWM menu/toolbar editor"
 HOMEPAGE="http://icecc.sourceforge.net/"
 SRC_URI="mirror://sourceforge/icecc/${P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 IUSE=""
 DEPEND=">=qt-3.0.0"
 
diff --git a/x11-misc/icemergeprefs/Manifest b/x11-misc/icemergeprefs/Manifest
index 153316cc6561..ddc054dfcc18 100644
--- a/x11-misc/icemergeprefs/Manifest
+++ b/x11-misc/icemergeprefs/Manifest
@@ -1,3 +1,4 @@
-MD5 d57e410869eb37b5b7186a6f3fa9d5bd icemergeprefs-0.5.ebuild 631
+MD5 e73409bd214e2cfb3752b77281fe6ee6 icemergeprefs-0.5.ebuild 630
 MD5 1d691f6e6bd19df915ef8d28688cff55 ChangeLog 359
+MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
 MD5 734796d8f5c936589ef733a6266a29ea files/digest-icemergeprefs-0.5 68
diff --git a/x11-misc/icemergeprefs/icemergeprefs-0.5.ebuild b/x11-misc/icemergeprefs/icemergeprefs-0.5.ebuild
index dd797158b911..764ed7f0b723 100644
--- a/x11-misc/icemergeprefs/icemergeprefs-0.5.ebuild
+++ b/x11-misc/icemergeprefs/icemergeprefs-0.5.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemergeprefs/icemergeprefs-0.5.ebuild,v 1.1 2003/06/23 13:47:14 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icemergeprefs/icemergeprefs-0.5.ebuild,v 1.2 2003/07/30 10:19:50 phosphan Exp $
 
 DESCRIPTION="IceWM private/global preferences merger"
 SRC_URI="mirror://sourceforge/icecc/${P}.tar.bz2"
 HOMEPAGE="http://icecc.sourceforge.net/"
 LICENSE="GPL-2"
-KEYWORDS="~x86"
+KEYWORDS="x86"
 RESTRICT="nostrip"
 
 DEPEND="dev-python/PyQt"
diff --git a/x11-misc/icesndcfg/Manifest b/x11-misc/icesndcfg/Manifest
index d7e0368232e8..082272ef1236 100644
--- a/x11-misc/icesndcfg/Manifest
+++ b/x11-misc/icesndcfg/Manifest
@@ -1,8 +1,6 @@
 MD5 bd1ec6487061a5124bb214d25779d5ab icesndcfg-0.8.ebuild 854
-MD5 9143294c8ec46a06b96188a1b47cbfa3 icesndcfg-1.1.ebuild 576
+MD5 ce4678b6d633c451977878ee09b12c68 icesndcfg-1.1.ebuild 575
 MD5 36a74deaff7524ba3c17ea2e266e9953 ChangeLog 790
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
-MD5 06b1d6d84ebed73482a1f2a93aff7857 icesndcfg-1.0.ebuild 576
 MD5 889fd02e3c187951459c32bab5dfc8a6 files/digest-icesndcfg-0.8 65
-MD5 81a4f08c0e6bd3ba2e94811ee8b5930a files/digest-icesndcfg-1.0 66
 MD5 32a90c4b4c8add7fc091909eb59aedb0 files/digest-icesndcfg-1.1 66
diff --git a/x11-misc/icesndcfg/files/digest-icesndcfg-1.0 b/x11-misc/icesndcfg/files/digest-icesndcfg-1.0
deleted file mode 100644
index d3269ca2a331..000000000000
--- a/x11-misc/icesndcfg/files/digest-icesndcfg-1.0
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91a638107b9c7ea675e4b9cca3cb9761 icesndcfg-1.0.tar.bz2 443790
diff --git a/x11-misc/icesndcfg/icesndcfg-1.0.ebuild b/x11-misc/icesndcfg/icesndcfg-1.0.ebuild
deleted file mode 100644
index eeea622cceb3..000000000000
--- a/x11-misc/icesndcfg/icesndcfg-1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icesndcfg/icesndcfg-1.0.ebuild,v 1.1 2003/05/19 14:00:14 phosphan Exp $
-
-IUSE=""
-
-DESCRIPTION="IceWM sound editor."
-SRC_URI="mirror://sourceforge/icecc/${P}.tar.bz2"
-HOMEPAGE="http://icecc.sourceforge.net/"
-
-DEPEND="virtual/x11
-	>=x11-libs/qt-3.0.0"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
-
-src_compile () {
-
-	econf 
-	emake || die
-}
-
-src_install () {
-	einstall || die
-
-	dodoc AUTHORS COPYING TODO README
-}
diff --git a/x11-misc/icesndcfg/icesndcfg-1.1.ebuild b/x11-misc/icesndcfg/icesndcfg-1.1.ebuild
index fd05cad34359..ef60b9e9853e 100644
--- a/x11-misc/icesndcfg/icesndcfg-1.1.ebuild
+++ b/x11-misc/icesndcfg/icesndcfg-1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icesndcfg/icesndcfg-1.1.ebuild,v 1.1 2003/07/08 13:53:46 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icesndcfg/icesndcfg-1.1.ebuild,v 1.2 2003/07/30 10:20:22 phosphan Exp $
 
 IUSE=""
 
@@ -13,7 +13,7 @@ DEPEND="virtual/x11
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~x86 ~sparc "
+KEYWORDS="x86 ~sparc "
 
 src_compile () {
 
diff --git a/x11-misc/icets/ChangeLog b/x11-misc/icets/ChangeLog
index 3fd696dbc64c..ef320039dabb 100644
--- a/x11-misc/icets/ChangeLog
+++ b/x11-misc/icets/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for x11-misc/icets
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icets/ChangeLog,v 1.7 2003/05/19 14:03:31 phosphan Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icets/ChangeLog,v 1.8 2003/07/30 10:21:25 phosphan Exp $
+
+*icets-1.1 (30 Jul 2003)
+
+  30 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> icets-0.8.ebuild,
+  icets-1.1.ebuild:
+  Cleanup
+
+*icets-1.1 (30 Jul 2003)
+
+  30 Jul 2003; Patrick Kursawe <phosphan@gentoo.org> icets-1.1.ebuild:
+  Version bump
 
   19 May 2003; Patrick Kursawe <phosphan@gentoo.org> icets-1.0.ebuild:
   Homepage moved to SF
diff --git a/x11-misc/icets/Manifest b/x11-misc/icets/Manifest
index 4fbbad3fb989..a9c2831ed6d8 100644
--- a/x11-misc/icets/Manifest
+++ b/x11-misc/icets/Manifest
@@ -1,8 +1,6 @@
-MD5 41827f7a1b486fd2037b27c85763a92a icets-0.8.ebuild 1016
-MD5 6b64197ad8625bd6b4f5b5aeded040cb icets-1.1.ebuild 864
+MD5 6b71823ad7bff5f8077500243ef770a1 icets-1.1.ebuild 864
 MD5 6be7664164c5aee5e1117af816180ac2 icets-1.0.ebuild 863
-MD5 fa78e9df2318822363bb27eeb91c9617 ChangeLog 814
+MD5 31e8019ff36e04be1998dd73a9bdfba3 ChangeLog 1055
 MD5 b742040acaeddc3798a21739bd59e8aa metadata.xml 224
-MD5 50d90d6ccf580242ec2f4046bf05631a files/digest-icets-0.8 62
 MD5 ee0f4b71bc738ec4dae126e201191b1b files/digest-icets-1.0 62
 MD5 2b2bb51a215b1b08030e0b71b477f47d files/digest-icets-1.1 62
diff --git a/x11-misc/icets/files/digest-icets-0.8 b/x11-misc/icets/files/digest-icets-0.8
deleted file mode 100644
index 1d92bd6f3344..000000000000
--- a/x11-misc/icets/files/digest-icets-0.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 93bde7e212c091759b0259c3c7fc08ad icets-0.8.tar.bz2 233000
diff --git a/x11-misc/icets/files/digest-icets-1.1 b/x11-misc/icets/files/digest-icets-1.1
new file mode 100644
index 000000000000..1b406247575b
--- /dev/null
+++ b/x11-misc/icets/files/digest-icets-1.1
@@ -0,0 +1 @@
+MD5 78d64a3f9e83620984a791a5318a55ae icets-1.1.tar.bz2 234177
diff --git a/x11-misc/icets/icets-0.8.ebuild b/x11-misc/icets/icets-1.1.ebuild
index 4eeee2694152..c69c50947de7 100644
--- a/x11-misc/icets/icets-0.8.ebuild
+++ b/x11-misc/icets/icets-1.1.ebuild
@@ -1,22 +1,15 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/icets/icets-0.8.ebuild,v 1.7 2003/02/13 17:14:54 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/icets/icets-1.1.ebuild,v 1.1 2003/07/30 10:21:25 phosphan Exp $
 
-MY_P=${P/./}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="IceWM Theme Editor."
-SRC_URI="http://www.selena.kherson.ua/xvadim/${P}.tar.bz2"
-HOMEPAGE="http://www.selena.kherson.ua/xvadim"
+DESCRIPTION="IceWM Theme Editor"
+SRC_URI="mirror://sourceforge/icecc/${P}.tar.bz2"
+HOMEPAGE="http://icecc.sourceforge.net/"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc "
+KEYWORDS="~x86"
 
-DEPEND="virtual/x11
-	x11-libs/qt
-	media-libs/jpeg
-	media-libs/libpng"
-
-#RDEPEND="x11-wm/icewm"
+DEPEND=">=qt-3.0.0"
 
 src_unpack() {
 
@@ -26,12 +19,12 @@ src_unpack() {
 	# Change the default directory that it looks into to be consistent
 	# with Gentoo's layout
 	cp icets.cpp icets.cpp.orig
-	sed "s:/usr/local/lib/X11/icewm/themes:/usr/lib/icewm/themes:" \
+	sed "s:/usr/local/share/icewm/themes:/usr/share/icewm/themes:" \
 		icets.cpp.orig > icets.cpp
 }
 
 src_compile () {
-	econf --with-qt-dir=${QTDIR} || die
+	econf || die
 	emake || die
 }