Version bump. Closing bug #100485. Removed few old versions.

(Portage version: 2.0.51.22-r2)

10 files changed, 27 insertions, 262 deletions

diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index 72c9c1fbec19..25cbb5d5279c 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.26 2005/04/11 21:04:46 gustavoz Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.27 2005/07/27 19:58:24 lucass Exp $
+
+*fvwm-crystal-3.0_rc1 (27 Jul 2005)
+
+  27 Jul 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  -fvwm-crystal-2.20040723.ebuild, -fvwm-crystal-2.20040723-r1.ebuild,
+  -fvwm-crystal-2.20040903.ebuild, -fvwm-crystal-2.20040929.ebuild,
+  +fvwm-crystal-3.0_rc1.ebuild:
+  Version bump. Closing bug #100485. Removed few old versions.
 
   11 Apr 2005; Gustavo Zacarias <gustavoz@gentoo.org>
   fvwm-crystal-2.20050306.ebuild:
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040723 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040723
deleted file mode 100644
index cd174d3f715d..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040723
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91a2df579e4092453372bd125c5fb962 fvwm-crystal-20040723.tar.gz 403476
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040723-r1 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040723-r1
deleted file mode 100644
index cd174d3f715d..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040723-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 91a2df579e4092453372bd125c5fb962 fvwm-crystal-20040723.tar.gz 403476
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040903 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040903
deleted file mode 100644
index 72585e14ba88..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040903
+++ /dev/null
@@ -1 +0,0 @@
-MD5 abcd7514e0e0ca80516f38c30c8e30c4 fvwm-crystal-20040903.tar.gz 60380
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040929 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040929
deleted file mode 100644
index 4cb7f13e1aea..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040929
+++ /dev/null
@@ -1 +0,0 @@
-MD5 067558677408dfa2f846a2c343f5705d fvwm-crystal-20040929.tar.gz 475307
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc1 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc1
new file mode 100644
index 000000000000..add3f1e16ea0
--- /dev/null
+++ b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc1
@@ -0,0 +1 @@
+MD5 ddc3437763b7dc6b140560a9ba829e8d fvwm-crystal-3.0.RC1.tar.gz 2268238
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild
deleted file mode 100644
index e1895ef30ba4..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild
+++ /dev/null
@@ -1,77 +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.20040723-r1.ebuild,v 1.7 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.linux.net.pl/"
-SRC_URI="http://fvwm-crystal.linux.net.pl/files/files/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 sparc ppc"
-IUSE="xmms"
-RDEPEND=">=x11-wm/fvwm-2.5.10
-	app-admin/sudo
-	dev-python/pyxml
-	media-gfx/imagemagick
-	media-sound/aumix
-	x11-misc/fvwm-crystal-apps
-	x11-misc/habak
-	x11-misc/xdaliclock
-	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/wal.py
-
-	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
-
-	# Bug in tarball
-	fperms 644 /usr/share/${PN}/fvwm/bigicons/thunderbird.png
-}
-
-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/* ~/.fvwm/"
-	einfo " $ cp /usr/share/${PN}/fvwm/.fvwm2rc ~/.fvwm/"
-	einfo " $ cp -r /usr/share/${PN}/addons/Xresources ~/.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.20040723.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723.ebuild
deleted file mode 100644
index 81ff28c5940b..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723.ebuild
+++ /dev/null
@@ -1,76 +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.20040723.ebuild,v 1.3 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.linux.net.pl/"
-SRC_URI="http://fvwm-crystal.linux.net.pl/files/files/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="xmms"
-RDEPEND=">=x11-wm/fvwm-2.5.10
-	app-admin/sudo
-	media-gfx/imagemagick
-	media-sound/aumix
-	x11-misc/fvwm-crystal-apps
-	x11-misc/habak
-	x11-misc/xdaliclock
-	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/wal.py
-
-	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
-
-	# Bug in tarball
-	fperms 644 /usr/share/${PN}/fvwm/bigicons/thunderbird.png
-}
-
-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/* ~/.fvwm/"
-	einfo " $ cp /usr/share/${PN}/fvwm/.fvwm2rc ~/.fvwm/"
-	einfo " $ cp -r /usr/share/${PN}/addons/Xresources ~/.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.20040903.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-2.20040903.ebuild
deleted file mode 100644
index eeecee934799..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040903.ebuild
+++ /dev/null
@@ -1,76 +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.20040903.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.linux.net.pl/"
-SRC_URI="http://fvwm-crystal.linux.net.pl/files/files/${PN}/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ~sparc ~ppc"
-IUSE="xmms"
-RDEPEND=">=x11-wm/fvwm-2.5.10
-	app-admin/sudo
-	dev-python/pyxml
-	media-gfx/imagemagick
-	media-sound/aumix
-	x11-misc/fvwm-crystal-apps
-	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/wal.py
-
-	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
-
-	# Bug in tarball
-	fperms 755 /usr/share/${PN}/fvwm/decorations/Fear
-}
-
-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/* ~/.fvwm/"
-	einfo " $ cp /usr/share/${PN}/fvwm/.fvwm2rc ~/.fvwm/"
-	einfo " $ cp -r /usr/share/${PN}/addons/Xresources ~/.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.20040929.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc1.ebuild
index 45fed77153b3..d003013d7b52 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040929.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc1.ebuild
@@ -1,62 +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.20040929.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_rc1.ebuild,v 1.1 2005/07/27 19:58:24 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="~x86 ~sparc ~ppc"
 IUSE="xmms"
-RDEPEND=">=x11-wm/fvwm-2.5.10
+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 "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 "After installation, execute following commands:"
+	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"
@@ -67,6 +55,7 @@ pkg_postinst() {
 	einfo " x11-misc/xlockmore"
 	einfo " x11-misc/xpad"
 	einfo " x11-misc/xscreensaver"
+	einfo " x11-terms/aterm"
 	einfo
 }