7 files changed, 95 insertions, 8 deletions
diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index ff0296fb91aa..59128f87aa6c 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-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.12 2004/08/15 21:28:13 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.13 2004/09/10 19:05:51 lucass Exp $
+
+*fvwm-crystal-2.20040903 (10 Sep 2004)
+
+  10 Sep 2004; Lukasz Strzygowski <lucass@gentoo.org>
+  fvwm-crystal-1.0.1.ebuild, fvwm-crystal-1.0.3_pre1.ebuild,
+  fvwm-crystal-2.20040723-r1.ebuild, +fvwm-crystal-2.20040903.ebuild:
+  Version bump. Thanks for information to Daniel Webert in #62871. Stabilized
+  older versions on x86, except 2.20040723, because it's buggy.
 
   15 Aug 2004; Jason Wever <weeve@gentoo.org>
   fvwm-crystal-2.20040723-r1.ebuild:
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index c2f355bfa24c..4dc2f4291b08 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -4,9 +4,11 @@ MD5 93da14508ef28deab9f99dda6e22ad33 fvwm-crystal-1.0.3_pre1.ebuild 1118
 MD5 1cb8d8a3282c6376a920bd0797732be0 metadata.xml 1007
 MD5 06ba4e79b0de78888783dc4b1edfab9c fvwm-crystal-2.20040723-r1.ebuild 2291
 MD5 93fd7ee469d81426ef7b8f8de66ba9ee fvwm-crystal-2.20040723.ebuild 2257
+MD5 06ba4e79b0de78888783dc4b1edfab9c fvwm-crystal-2.20040903.ebuild 2291
+MD5 282c809ddaa59071830b6c8dd9b0a3a1 files/fvwm-crystal 25
 MD5 d2d23021573eab4cf7108ba429abf1a1 files/digest-fvwm-crystal-1.0.1 70
 MD5 81073a58381613d272d02f2062ba6750 files/digest-fvwm-crystal-1.0.3_pre1 74
 MD5 8146e2077293da51342d5f6d09cec37a files/fvwm-crystal-fvwm-version-check.diff 429
 MD5 acbef73f565db20ec2daccc52564315e files/digest-fvwm-crystal-2.20040723 73
 MD5 acbef73f565db20ec2daccc52564315e files/digest-fvwm-crystal-2.20040723-r1 73
-MD5 282c809ddaa59071830b6c8dd9b0a3a1 files/fvwm-crystal 25
+MD5 4168b1b88ed4ce9f1e9c71b75d153235 files/digest-fvwm-crystal-2.20040903 72
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040903 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040903
new file mode 100644
index 000000000000..72585e14ba88
--- /dev/null
+++ b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-2.20040903
@@ -0,0 +1 @@
+MD5 abcd7514e0e0ca80516f38c30c8e30c4 fvwm-crystal-20040903.tar.gz 60380
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild
index 2159f11f952b..0414cf1fd0e7 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.10 2004/06/24 23:26:02 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-1.0.1.ebuild,v 1.11 2004/09/10 19:05:52 lucass Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.linuxpl.org/fvwm-crystal/tarballs/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc"
+KEYWORDS="x86 ppc"
 IUSE="xmms"
 
 RDEPEND=">=x11-wm/fvwm-2.5.8
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.3_pre1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-1.0.3_pre1.ebuild
index 80cfc8774c6b..8985e5506dc0 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.3_pre1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-1.0.3_pre1.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2004 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.3_pre1.ebuild,v 1.5 2004/07/03 23:11:43 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-1.0.3_pre1.ebuild,v 1.6 2004/09/10 19:05:52 lucass Exp $
 
 DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency."
 HOMEPAGE="http://fvwm-crystal.linuxpl.org/"
 SRC_URI="ftp://ftp.linuxpl.org/fvwm-crystal/tarballs/${P/_pre/pre}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc ~sparc"
+KEYWORDS="x86 ppc ~sparc"
 IUSE="xmms"
 
 RDEPEND=">=x11-wm/fvwm-2.5.8
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild
index d5d53ca494ab..f956cfbb746e 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 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.3 2004/08/20 01:57:53 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-2.20040723-r1.ebuild,v 1.4 2004/09/10 19:05:52 lucass Exp $
 
 MY_P="${P/-2./-}"
 DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency."
@@ -8,7 +8,7 @@ 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"
+KEYWORDS="x86 ~sparc ppc"
 IUSE="xmms"
 RDEPEND=">=x11-wm/fvwm-2.5.10
 	app-admin/sudo
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-2.20040903.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-2.20040903.ebuild
new file mode 100644
index 000000000000..922fadbc5d7b
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-2.20040903.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2004 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.1 2004/09/10 19:05:52 lucass 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 ""
+}
+