Version bump. Removed few older versions

Package-Manager: portage-2.0.52-r1

10 files changed, 42 insertions, 202 deletions

diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index 3444b82db5d7..096526854552 100644
--- a/x11-themes/fvwm-crystal/ChangeLog
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-themes/fvwm-crystal
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.28 2005/08/09 00:12:40 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.29 2005/09/23 09:13:28 lucass Exp $
+
+*fvwm-crystal-3.0_rc2 (23 Sep 2005)
+
+  23 Sep 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  -files/fvwm-crystal-fvwm-version-check.diff, -fvwm-crystal-1.0.1.ebuild,
+  -fvwm-crystal-2.20041128.ebuild, -fvwm-crystal-2.20041224.ebuild,
+  +fvwm-crystal-3.0_rc2.ebuild:
+  Version bump. Removed few older versions.
 
   09 Aug 2005; Luis Medinas <metalgod@gentoo.org>
   fvwm-crystal-3.0_rc1.ebuild:
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index fa8fd93c552d..c51e2160abff 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,16 +1,21 @@
-MD5 ff049fa25f9c5013afecd2e71d8f98d0 ChangeLog 5044
-MD5 2f58c0035f2de3cf16062e7314c6888e fvwm-crystal-1.0.1.ebuild 1988
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 31501bf250738040ec48484558c1d96b ChangeLog 5353
+MD5 0a94e35606cc2371a8aad69f2bdddcb5 metadata.xml 916
 MD5 061902112f226e67e8eb4061e28d1c4e fvwm-crystal-1.0.3_pre1.ebuild 1105
-MD5 8a4b3a8431e9cb8de3d930a50fa5bcc1 fvwm-crystal-2.20041128.ebuild 2174
-MD5 c4e793d8ed141203ac5ed4258e06c87e fvwm-crystal-2.20041224.ebuild 1884
 MD5 e45c1335b9fcb21e3bf276392f03b8cd fvwm-crystal-2.20050306.ebuild 1909
 MD5 2808acb9d22f18452a9ed591241ddd26 fvwm-crystal-3.0_rc1.ebuild 1662
-MD5 0a94e35606cc2371a8aad69f2bdddcb5 metadata.xml 916
-MD5 d2d23021573eab4cf7108ba429abf1a1 files/digest-fvwm-crystal-1.0.1 70
+MD5 260912841b76ff8350d45635b296aa09 fvwm-crystal-3.0_rc2.ebuild 1660
+MD5 282c809ddaa59071830b6c8dd9b0a3a1 files/fvwm-crystal 25
+MD5 aaf4f336df952f8b947853826cd7c392 files/digest-fvwm-crystal-3.0_rc1 73
+MD5 8cce344766f4c73acf209d4664226a0b files/digest-fvwm-crystal-3.0_rc2 73
 MD5 81073a58381613d272d02f2062ba6750 files/digest-fvwm-crystal-1.0.3_pre1 74
-MD5 c0d5410eb95b09d2b26a581ddc9e14d6 files/digest-fvwm-crystal-2.20041128 73
-MD5 2d26e39e4aa7ef4a817c8ed1381493f4 files/digest-fvwm-crystal-2.20041224 73
 MD5 33c0533262c8862823091a907f3099cf files/digest-fvwm-crystal-2.20050306 73
-MD5 aaf4f336df952f8b947853826cd7c392 files/digest-fvwm-crystal-3.0_rc1 73
-MD5 282c809ddaa59071830b6c8dd9b0a3a1 files/fvwm-crystal 25
-MD5 8146e2077293da51342d5f6d09cec37a files/fvwm-crystal-fvwm-version-check.diff 429
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDM8fU2jLqHNfbg2URAmbQAKDDI2ar2GaTM13eDbQXkX+7uoz7gACeOIX1
+SZVY/gGZnolgxiVqk8iUpU0=
+=gG7d
+-----END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-1.0.1 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-1.0.1
deleted file mode 100644
index c30898864259..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-1.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 53038c173567976be13ba94f3b47141c fvwm-crystal-1.0.1.tar.gz 336960
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20041128 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20041128
deleted file mode 100644
index 398fba2813a4..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20041128
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b7502b1e2cfaf39e939d8f026108e1f7 fvwm-crystal-20041128.tar.gz 481758
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20041224 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20041224
deleted file mode 100644
index 1c352f773d90..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20041224
+++ /dev/null
@@ -1 +0,0 @@
-MD5 701620b8c298f1683bcf8c5d7e0e3587 fvwm-crystal-20041224.tar.gz 564049
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc2 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc2
new file mode 100644
index 000000000000..08aa14f4df7c
--- /dev/null
+++ b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc2
@@ -0,0 +1 @@
+MD5 798a08fa0273f5994cadc9ba130aeae2 fvwm-crystal-3.0.RC2.tar.gz 2493892
diff --git a/x11-themes/fvwm-crystal/files/fvwm-crystal-fvwm-version-check.diff b/x11-themes/fvwm-crystal/files/fvwm-crystal-fvwm-version-check.diff
deleted file mode 100644
index 325e32a84f34..000000000000
--- a/x11-themes/fvwm-crystal/files/fvwm-crystal-fvwm-version-check.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.in	2004-01-01 21:03:42.000000000 +0000
-+++ configure.in	2004-03-25 18:55:30.441245224 +0000
-@@ -27,8 +27,7 @@
- if test "x$FVWM_VERSION" = "x"; then FVWM_VERSION=unknown; fi
- AC_SUBST(FVWM_VERSION)dnl
- 
--if (echo $REQUIRED_FVWM_VERSION; echo $FVWM_VERSION) \
--| sed 's/\./ /g' | uniq | sort -n -c 2>/dev/null; then
-+if test ${REQUIRED_FVWM_VERSION//./} -le ${FVWM_VERSION//./}; then
- 	:
- 	# fvwm version is ok
- else
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild
deleted file mode 100644
index c1a3d67a16e7..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild,v 1.13 2005/07/09 19:36:56 swegener Exp $
-
-inherit eutils
-
-DESCRIPTION="A very nice and powerful theme for FVWM"
-HOMEPAGE="http://fvwm-crystal.linuxpl.org/"
-SRC_URI="ftp://ftp.linuxpl.org/fvwm-crystal/tarballs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-IUSE="xmms"
-
-RDEPEND=">=x11-wm/fvwm-2.5.8
-	xmms? ( media-plugins/xmms-shell
-		>=media-sound/xmms-1.2.7
-		media-plugins/xmms-find )
-	x11-misc/xdaliclock
-	x11-terms/aterm
-	x11-misc/habak
-	media-sound/aumix"
-
-# http://fvwm-crystal.linuxpl.org/info.en.html also reccomends:
-# app-misc/rox
-# media-gfx/scrot
-# x11-misc/xlockmore
-
-DEPEND="${RDEPEND} sys-devel/automake"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}; epatch ${FILESDIR}/fvwm-crystal-fvwm-version-check.diff
-
-	# cp: cannot stat `INSTALL.CVS': No such file or directory
-	# cp: cannot stat `INSTALL-PL.CVS': No such file or directory
-	# make: *** [install] Error 1
-	ebegin "Updating Makefile"
-	automake || die
-	eend $?
-
-	# configure: error:
-	# You have fvwm-2.5.10, which is not up to date
-	# You need at least fvwm-2.5.8
-	ebegin "Updating configure script"
-	autoconf || die
-	eend $?
-}
-
-src_compile() {
-	# doesnt make any difference with this version but if xmms
-	# support controls any features in future, we shouldnt leave
-	# it up to configure to enable it.
-	#
-	#if ! use xmms; then
-	#	sed -i 's#test -z "$XMMS_SHELL";#false;#g' ${S}/configure.in
-	#	sed -i 's#test -z "$XMMS";#false;#g' ${S}/configure.in
-	#	autoconf || die
-	#fi
-
-	econf || die
-	emake || die
-}
-
-src_install() {
-	einstall || die
-}
-
-pkg_postinst() {
-	einfo
-	einfo "users should run fvwm-crystal.install to configure fvwm-crystal"
-	einfo
-	einfo
-	einfo "fvwm-crystal authors also reccomend the following applications:"
-	einfo
-	einfo "	app-misc/rox"
-	einfo "	media-gfx/scrot"
-	einfo "	x11-misc/xlockmore"
-	einfo
-}
-
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-2.20041128.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-2.20041128.ebuild
deleted file mode 100644
index 1982c8727791..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20041128.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-2.20041128.ebuild,v 1.4 2005/07/09 19:36:56 swegener Exp $
-
-MY_P="${P/-2./-}"
-DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency."
-HOMEPAGE="http://fvwm-crystal.berlios.de/"
-SRC_URI="http://fvwm-crystal.berlios.de/files/files/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
-IUSE="xmms"
-RDEPEND=">=x11-wm/fvwm-2.5.12
-	app-admin/sudo
-	dev-python/pyxml
-	media-gfx/imagemagick
-	media-sound/aumix
-	x11-misc/habak
-	x11-terms/aterm
-	xmms? ( media-plugins/xmms-shell
-		>=media-sound/xmms-1.2.7
-		media-plugins/xmms-find )"
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	einfo "There is nothing to compile."
-}
-
-src_install() {
-	dodoc AUTHORS COPYING INSTALL NEWS README doc/*
-	dobin bin/*
-
-	dodir /usr/share/${PN}
-	cp -r addons fvwm ${D}/usr/share/${PN}
-
-	# Original session file doesn't work on Gentoo
-	exeinto /etc/X11/Sessions
-	doexe ${FILESDIR}/fvwm-crystal
-
-	insinto /usr/share/xsessions
-	doins addons/gdm/fvwm-crystal.desktop
-}
-
-pkg_postinst() {
-	einfo
-	einfo "This is a new branch of fvwm-crystal theme. If you prefer"
-	einfo "to stay with versions 1.x, put the following line in"
-	einfo "/etc/portage/package.mask, and reemerge fvwm-crystal:"
-	einfo " >=x11-themes/fvwm-crystal-2*"
-	einfo
-	einfo "In order to finish installation, copy configuration files"
-	einfo "to your home directory:"
-	einfo " $ mkdir ~/.fvwm/"
-	einfo " $ cp -r /usr/share/${PN}/fvwm/user-preferences/ ~/.fvwm/"
-	einfo " $ echo \"Read /usr/share/${PN}/fvwm/config\" > ~/.fvwm/.fvwm2rc"
-	einfo " $ cp -r /usr/share/${PN}/addons/Xresources-EN ~/.Xresources"
-	einfo
-	einfo "If you start X server by command startx, execute additionally:"
-	einfo " $ cp -r /usr/share/${PN}/addons/Xsession ~/.xinitrc"
-	einfo
-	einfo "Authors of fvwm-crystal recommend also installing"
-	einfo "the following applications:"
-	einfo " app-admin/gkrellm"
-	einfo " app-misc/rox"
-	einfo " media-gfx/scrot"
-	einfo " x11-misc/xlockmore"
-	einfo " x11-misc/xpad"
-	einfo " x11-misc/xscreensaver"
-	einfo
-}
-
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-2.20041224.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc2.ebuild
index 5e6d57eeed43..27b8b433e0b8 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20041224.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc2.ebuild
@@ -1,56 +1,50 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-2.20041224.ebuild,v 1.5 2005/07/09 19:36:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc2.ebuild,v 1.1 2005/09/23 09:13:28 lucass Exp $
 
-MY_P="${P/-2./-}"
+MY_P="${P/_rc/.RC}"
 DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency."
 HOMEPAGE="http://fvwm-crystal.berlios.de/"
-SRC_URI="http://fvwm-crystal.berlios.de/files/files/${PN}/${MY_P}.tar.gz"
+SRC_URI="http://download.berlios.de/${PN}/${MY_P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 sparc ~ppc"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
 IUSE="xmms"
-RDEPEND=">=x11-wm/fvwm-2.5.12
+RDEPEND=">=x11-wm/fvwm-2.5.13
 	app-admin/sudo
 	dev-python/pyxml
 	media-gfx/imagemagick
 	media-sound/aumix
-	x11-misc/habak
-	x11-terms/aterm
+	x11-misc/trayer
+	|| ( x11-misc/habak x11-terms/eterm )
 	xmms? ( media-plugins/xmms-shell
 		>=media-sound/xmms-1.2.7
-		media-plugins/xmms-find )"
+		media-plugins/xmms-find )
+	!xmms? ( media-sound/mpd
+		media-sound/mpc )"
 
 S=${WORKDIR}/${MY_P}
 
-src_compile() {
-	einfo "There is nothing to compile."
-}
-
 src_install() {
+	einstall
+
 	dodoc AUTHORS COPYING INSTALL NEWS README doc/*
-	dobin bin/*
 
 	dodir /usr/share/${PN}
-	cp -r addons fvwm ${D}/usr/share/${PN}
+	cp -r addons ${D}/usr/share/${PN}
 
 	# Original session file doesn't work on Gentoo
 	exeinto /etc/X11/Sessions
 	doexe ${FILESDIR}/fvwm-crystal
 
 	insinto /usr/share/xsessions
-	doins addons/gdm/fvwm-crystal.desktop
+	doins addons/fvwm-crystal.desktop
 }
 
 pkg_postinst() {
 	einfo
-	einfo "This is a new branch of fvwm-crystal theme. If you prefer"
-	einfo "to stay with versions 1.x, put the following line in"
-	einfo "/etc/portage/package.mask, and reemerge fvwm-crystal:"
-	einfo " >=x11-themes/fvwm-crystal-2*"
-	einfo
 	einfo "After installation, execute following commands:"
-	einfo " $ cp -r /usr/share/${PN}/addons/Xresources-EN ~/.Xresources"
+	einfo " $ cp -r /usr/share/${PN}/addons/Xresources ~/.Xresources"
 	einfo " $ cp -r /usr/share/${PN}/addons/Xsession ~/.xinitrc"
 	einfo
 	einfo "Authors of fvwm-crystal recommend also installing"
@@ -61,6 +55,7 @@ pkg_postinst() {
 	einfo " x11-misc/xlockmore"
 	einfo " x11-misc/xpad"
 	einfo " x11-misc/xscreensaver"
+	einfo " x11-terms/aterm"
 	einfo
 }