Version bump. Cleaned up dependencies. Modified postinst message in 2.20050306. Removed 1.0.3_pre1.

(Portage version: 2.0.53_rc5)

7 files changed, 61 insertions, 59 deletions

diff --git a/x11-themes/fvwm-crystal/ChangeLog b/x11-themes/fvwm-crystal/ChangeLog
index 4bbc4dc92982..a5f2a69328c8 100644
--- a/x11-themes/fvwm-crystal/ChangeLog
+++ b/x11-themes/fvwm-crystal/ChangeLog
@@ -1,6 +1,15 @@
 # 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.30 2005/10/14 07:25:17 lucass Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/ChangeLog,v 1.31 2005/10/18 20:08:10 lucass Exp $
+
+*fvwm-crystal-3.0_rc3 (18 Oct 2005)
+
+  18 Oct 2005; Lukasz Strzygowski <lucass@gentoo.org>
+  -fvwm-crystal-1.0.3_pre1.ebuild, fvwm-crystal-2.20050306.ebuild,
+  +fvwm-crystal-3.0_rc3.ebuild:
+  Version bump. Cleaned up dependencies.
+  Modified postinst message in 2.20050306.
+  Removed 1.0.3_pre1.
 
   14 Oct 2005; Lukasz Strzygowski <lucass@gentoo.org>
   fvwm-crystal-3.0_rc2.ebuild:
diff --git a/x11-themes/fvwm-crystal/Manifest b/x11-themes/fvwm-crystal/Manifest
index 3a603572f5a4..63be05562ef7 100644
--- a/x11-themes/fvwm-crystal/Manifest
+++ b/x11-themes/fvwm-crystal/Manifest
@@ -1,21 +1,13 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 1e1f5f2d49af9af4d4927f18457429ff ChangeLog 5515
 MD5 81073a58381613d272d02f2062ba6750 files/digest-fvwm-crystal-1.0.3_pre1 74
 MD5 33c0533262c8862823091a907f3099cf files/digest-fvwm-crystal-2.20050306 73
 MD5 aaf4f336df952f8b947853826cd7c392 files/digest-fvwm-crystal-3.0_rc1 73
 MD5 8cce344766f4c73acf209d4664226a0b files/digest-fvwm-crystal-3.0_rc2 73
+MD5 bf25b6c7c1ced0b34b0a324436b8c65c files/digest-fvwm-crystal-3.0_rc3 73
 MD5 282c809ddaa59071830b6c8dd9b0a3a1 files/fvwm-crystal 25
 MD5 061902112f226e67e8eb4061e28d1c4e fvwm-crystal-1.0.3_pre1.ebuild 1105
 MD5 e45c1335b9fcb21e3bf276392f03b8cd fvwm-crystal-2.20050306.ebuild 1909
 MD5 2808acb9d22f18452a9ed591241ddd26 fvwm-crystal-3.0_rc1.ebuild 1662
 MD5 bcb16efc5cc85b183c8bb857293b2b75 fvwm-crystal-3.0_rc2.ebuild 1686
+MD5 a08f7f2ac6812a840c23fc515ffe0ff1 fvwm-crystal-3.0_rc3.ebuild 1451
 MD5 0a94e35606cc2371a8aad69f2bdddcb5 metadata.xml 916
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDT12a2jLqHNfbg2URAtSZAKC+7SjQ4GZ0rZY7Aos4mimj7A4tCgCgvFWA
-TYJbg2OasZ74Gg5N6GZGMfo=
-=/HsL
------END PGP SIGNATURE-----
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-1.0.3_pre1 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-1.0.3_pre1
deleted file mode 100644
index d3ab62fc70a4..000000000000
--- a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-1.0.3_pre1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 88fe572a305f2ce84fd1331db042c762 fvwm-crystal-1.0.3pre1.tar.gz 321026
diff --git a/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc3 b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc3
new file mode 100644
index 000000000000..5c1b919ffa37
--- /dev/null
+++ b/x11-themes/fvwm-crystal/files/digest-fvwm-crystal-3.0_rc3
@@ -0,0 +1 @@
+MD5 322532aeb2340a8e9b60af2605cdff7e fvwm-crystal-3.0.RC3.tar.gz 2680119
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
deleted file mode 100644
index cc6ca00128a9..000000000000
--- a/x11-themes/fvwm-crystal/fvwm-crystal-1.0.3_pre1.ebuild
+++ /dev/null
@@ -1,41 +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.3_pre1.ebuild,v 1.8 2005/07/09 19:36:56 swegener 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"
-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"
-
-# XXX: x11-misc/habak-0.2.3 (currently hardmasked) breaks.
-
-S=${WORKDIR}/${P/_pre/pre}
-
-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 recommend 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.20050306.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-2.20050306.ebuild
index 254fc006eb31..9d2a2dd0a6db 100644
--- a/x11-themes/fvwm-crystal/fvwm-crystal-2.20050306.ebuild
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-2.20050306.ebuild
@@ -1,6 +1,6 @@
 # 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.20050306.ebuild,v 1.5 2005/07/09 19:36:56 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-themes/fvwm-crystal/fvwm-crystal-2.20050306.ebuild,v 1.6 2005/10/18 20:08:10 lucass Exp $
 
 MY_P="${P/-2./-}"
 DESCRIPTION="Configurable and full featured theme for FVWM, with lots of transparency."
@@ -44,11 +44,6 @@ src_install() {
 
 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/Xsession ~/.xinitrc"
diff --git a/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc3.ebuild b/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc3.ebuild
new file mode 100644
index 000000000000..6758bcb825d4
--- /dev/null
+++ b/x11-themes/fvwm-crystal/fvwm-crystal-3.0_rc3.ebuild
@@ -0,0 +1,47 @@
+# 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-3.0_rc3.ebuild,v 1.1 2005/10/18 20:08:10 lucass Exp $
+
+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://download.berlios.de/${PN}/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+RDEPEND=">=x11-wm/fvwm-2.5.13
+	dev-python/pyxml
+	media-gfx/imagemagick
+	x11-misc/trayer
+	|| ( x11-misc/habak x11-misc/hsetroot )"
+
+S=${WORKDIR}/${MY_P}
+
+src_install() {
+	einstall
+
+	dodoc AUTHORS COPYING INSTALL NEWS README doc/*
+
+	dodir /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/fvwm-crystal.desktop
+}
+
+pkg_postinst() {
+	einfo
+	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 "Many applications can extend functionality of fvwm-crystal."
+	einfo "They are listed in /usr/share/doc/${PF}/INSTALL.gz."
+	einfo
+}
+