remove old versions; mark 2.1.3 stable on x86; bump to 2.1.4

12 files changed, 19 insertions, 160 deletions

diff --git a/app-misc/rox/ChangeLog b/app-misc/rox/ChangeLog
index 199582bf6805..69dbfd91a1ab 100644
--- a/app-misc/rox/ChangeLog
+++ b/app-misc/rox/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/rox
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/ChangeLog,v 1.38 2004/10/09 03:08:47 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/ChangeLog,v 1.39 2004/10/23 21:48:29 lanius Exp $
+
+*rox-2.1.4 (23 Oct 2004)
+
+  23 Oct 2004; Heinrich Wendel <lanius@gentoo.org> -rox-1.3.8.ebuild,
+  -rox-2.0.1.ebuild, -rox-2.1.1.ebuild, -rox-2.1.2-r1.ebuild,
+  rox-2.1.3.ebuild, +rox-2.1.4.ebuild:
+  remove old versions; mark 2.1.3 stable on x86; bump to 2.1.4
 
   08 Oct 2004; Jason Wever <weeve@gentoo.org> rox-2.1.2.ebuild:
   Stable on sparc.
diff --git a/app-misc/rox/Manifest b/app-misc/rox/Manifest
index 916106aad211..f41fade2d4fa 100644
--- a/app-misc/rox/Manifest
+++ b/app-misc/rox/Manifest
@@ -1,15 +1,9 @@
-MD5 ef5b5056796f79137636f6da3b636e3e ChangeLog 4840
-MD5 615081f765f3b2d8ad8e57055afac9a1 rox-1.3.8.ebuild 987
-MD5 a70e66be5239d3edca7647afb969e077 rox-2.0.1.ebuild 1154
-MD5 c31a97b0caf824cdb2792fb0230966f9 rox-2.1.1.ebuild 1613
 MD5 367cab8056ba0069d81ea49368c3c6ac rox-2.1.2.ebuild 1654
+MD5 ccc251a4ef55df059b41d47b7a0ea32e rox-2.1.4.ebuild 1655
+MD5 ca5b6655428810ce4ee462f66aa06416 rox-2.1.3.ebuild 1654
+MD5 6f5437b4424b3e9c308ae19af6916bc1 ChangeLog 5101
 MD5 503ccb1138f9c49f0855884d830988a6 metadata.xml 253
-MD5 8520d1d6709a7aa08deab8ebce947d61 rox-2.1.2-r1.ebuild 1780
-MD5 ccc251a4ef55df059b41d47b7a0ea32e rox-2.1.3.ebuild 1655
-MD5 526e20f6955fdb00bf18b1efec738419 files/digest-rox-1.3.8 59
-MD5 afcd1529de493af9538a32697d7e9425 files/digest-rox-2.0.1 59
 MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2 59
-MD5 28718b65c90c80b4504087b0a962c5b7 files/digest-rox-2.1.1 59
-MD5 16ef34ea63806f156b1cf68e34055f12 files/2.1.2-crash-save-display-settings.patch.bz2 1910
-MD5 1b87808842975d1a74679c0e1ec956e9 files/digest-rox-2.1.2-r1 59
 MD5 41ab2c5f1d5e3be857ddbad7ba6a7d2a files/digest-rox-2.1.3 59
+MD5 d7f3344d55ed0b3c386ef215755c31cf files/digest-rox-2.1.4 59
+MD5 16ef34ea63806f156b1cf68e34055f12 files/2.1.2-crash-save-display-settings.patch.bz2 1910
diff --git a/app-misc/rox/files/digest-rox-1.3.8 b/app-misc/rox/files/digest-rox-1.3.8
deleted file mode 100644
index 806226e7c3be..000000000000
--- a/app-misc/rox/files/digest-rox-1.3.8
+++ /dev/null
@@ -1 +0,0 @@
-MD5 34bacf583ed0beed87391f27987ac88e rox-1.3.8.tgz 1466605
diff --git a/app-misc/rox/files/digest-rox-2.0.1 b/app-misc/rox/files/digest-rox-2.0.1
deleted file mode 100644
index cef7e39d6a75..000000000000
--- a/app-misc/rox/files/digest-rox-2.0.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45287e5c8df889462301ba5fb41e3986 rox-2.0.1.tgz 1539675
diff --git a/app-misc/rox/files/digest-rox-2.1.1 b/app-misc/rox/files/digest-rox-2.1.1
deleted file mode 100644
index ebcf3a41516d..000000000000
--- a/app-misc/rox/files/digest-rox-2.1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b0c134a57e63b9bacae3967b0564218c rox-2.1.1.tgz 1722229
diff --git a/app-misc/rox/files/digest-rox-2.1.2-r1 b/app-misc/rox/files/digest-rox-2.1.2-r1
deleted file mode 100644
index c0541385a950..000000000000
--- a/app-misc/rox/files/digest-rox-2.1.2-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 c08a28f259e7e4bb01b56ed174ea7c12 rox-2.1.2.tgz 1758210
diff --git a/app-misc/rox/files/digest-rox-2.1.4 b/app-misc/rox/files/digest-rox-2.1.4
new file mode 100644
index 000000000000..9702de182fbd
--- /dev/null
+++ b/app-misc/rox/files/digest-rox-2.1.4
@@ -0,0 +1 @@
+MD5 8834d9f26297ae4c551745721147e01c rox-2.1.4.tgz 1870515
diff --git a/app-misc/rox/rox-1.3.8.ebuild b/app-misc/rox/rox-1.3.8.ebuild
deleted file mode 100644
index 61490ff01fc3..000000000000
--- a/app-misc/rox/rox-1.3.8.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-1.3.8.ebuild,v 1.6 2004/10/05 13:34:52 pvdabeel Exp $
-
-IUSE=""
-
-DESCRIPTION="fast and powerful graphical file manager"
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc"
-
-DEPEND=">=x11-libs/gtk+-2.0.5
-	>=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23
-	>=x11-misc/shared-mime-info-0.9"
-
-src_install() {
-	cd ${S}/Choices
-
-	dodir /usr/share/Choices
-	cp -rf MIME-icons/ ${D}/usr/share/Choices/
-	cp -rf MIME-types/ ${D}/usr/share/Choices/
-
-	cd ${S}
-	doman rox.1
-
-	dodir /usr/bin
-	cp -rf ROX-Filer/ ${D}/usr/share/
-	${D}/usr/share/ROX-Filer/AppRun --compile
-	(cd ${D}/usr/share/ROX-Filer/src; make clean) > /dev/null
-	echo "#!/bin/sh" > "${D}/usr/bin/rox"
-	echo "exec /usr/share/ROX-Filer/AppRun \"\$@\"" >> "${D}/usr/bin/rox"
-	chmod a+x ${D}/usr/bin/rox
-}
diff --git a/app-misc/rox/rox-2.0.1.ebuild b/app-misc/rox/rox-2.0.1.ebuild
deleted file mode 100644
index 991e980acab2..000000000000
--- a/app-misc/rox/rox-2.0.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.0.1.ebuild,v 1.5 2004/06/24 22:31:40 agriffis Exp $
-
-IUSE=""
-
-DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha"
-
-DEPEND=">=x11-libs/gtk+-2.0.5
-	>=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23
-	>=x11-misc/shared-mime-info-0.9"
-
-src_install() {
-	cd ${S}/Choices
-
-	dodir /usr/share/Choices
-	cp -rf MIME-icons/ ${D}/usr/share/Choices/
-	cp -rf MIME-types/ ${D}/usr/share/Choices/
-
-	cd ${S}
-	doman rox.1
-
-	dodir /usr/bin
-	cp -rf ROX-Filer/ ${D}/usr/share/
-	rm ${D}/usr/share/ROX-Filer/src/configure # see bug #26162
-
-	${D}/usr/share/ROX-Filer/AppRun --compile
-	(cd ${D}/usr/share/ROX-Filer/src; make clean) > /dev/null
-	echo "#!/bin/sh" > "${D}/usr/bin/rox"
-	echo "exec /usr/share/ROX-Filer/AppRun \"\$@\"" >> "${D}/usr/bin/rox"
-	chmod a+x ${D}/usr/bin/rox
-}
diff --git a/app-misc/rox/rox-2.1.1.ebuild b/app-misc/rox/rox-2.1.1.ebuild
deleted file mode 100644
index de10b3c2f996..000000000000
--- a/app-misc/rox/rox-2.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.1.ebuild,v 1.7 2004/09/25 15:27:10 weeve Exp $
-
-DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
-HOMEPAGE="http://rox.sourceforge.net/"
-SRC_URI="mirror://sourceforge/rox/${P}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 ppc alpha sparc"
-IUSE=""
-
-DEPEND=">=x11-libs/gtk+-2.0.5
-	>=dev-libs/glib-2.0.4
-	>=dev-libs/libxml2-2.4.23
-	>=x11-misc/shared-mime-info-0.9"
-
-src_compile() {
-#	rm ROX-Filer/src/configure # see bug #26162
-
-	# If the env variable PLATFORM is set, rox will build using that
-	# string.  This causes issues as while the package will compile fine,
-	# it will try to rebuild it the first time rox is run because it will
-	# not be able to find a proper executable to run.
-	use sparc && unset PLATFORM
-
-	ROX-Filer/AppRun --compile || die "make failed"
-	(cd ROX-Filer/src; make clean) > /dev/null
-}
-
-src_install() {
-	doman rox.1
-
-	dodir /usr/bin
-	cp -rf ROX-Filer/ ${D}/usr/share/
-	echo "#!/bin/sh" > "${D}/usr/bin/rox"
-	echo "exec /usr/share/ROX-Filer/AppRun \"\$@\"" >> "${D}/usr/bin/rox"
-	chmod a+x ${D}/usr/bin/rox
-
-	insinto /usr/share/mime/packages
-	doins rox.xml
-
-	dodir /usr/share/
-	cp -rf Choices ${D}/usr/share/
-	dodir /usr/share/Choices/Mime-icons
-	keepdir /usr/share/Choices/Mime-icons
-
-	dodir /usr/share/icons
-	dosym /usr/share/ROX-Filer/ROX /usr/share/icons/ROX
-}
-
-pkg_postinst() {
-	update-mime-database /usr/share/mime
-}
diff --git a/app-misc/rox/rox-2.1.3.ebuild b/app-misc/rox/rox-2.1.3.ebuild
index 3a494212e50b..1bd418dd706c 100644
--- a/app-misc/rox/rox-2.1.3.ebuild
+++ b/app-misc/rox/rox-2.1.3.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/app-misc/rox/rox-2.1.3.ebuild,v 1.3 2004/10/05 13:34:52 pvdabeel Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.3.ebuild,v 1.4 2004/10/23 21:48:29 lanius Exp $
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -8,7 +8,7 @@ SRC_URI="mirror://sourceforge/rox/${P}.tgz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~x86 ppc ~alpha ~sparc ~amd64"
+KEYWORDS="x86 ppc ~alpha ~sparc ~amd64"
 
 DEPEND=">=x11-libs/gtk+-2.2
 	>=dev-libs/glib-2.2
diff --git a/app-misc/rox/rox-2.1.2-r1.ebuild b/app-misc/rox/rox-2.1.4.ebuild
index 8a65dc210e47..712c7d3cb274 100644
--- a/app-misc/rox/rox-2.1.2-r1.ebuild
+++ b/app-misc/rox/rox-2.1.4.ebuild
@@ -1,8 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.2-r1.ebuild,v 1.2 2004/09/25 15:27:10 weeve Exp $
-
-inherit eutils
+# $Header: /var/cvsroot/gentoo-x86/app-misc/rox/rox-2.1.4.ebuild,v 1.1 2004/10/23 21:48:29 lanius Exp $
 
 DESCRIPTION="ROX is a desktop environment, like GNOME, KDE and XFCE.  It is an attempt to bring some of the good features from RISC OS to Unix and Linux."
 HOMEPAGE="http://rox.sourceforge.net/"
@@ -12,20 +10,14 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~alpha ~sparc ~amd64"
 
-DEPEND=">=x11-libs/gtk+-2.0.5
-	>=dev-libs/glib-2.0.4
+DEPEND=">=x11-libs/gtk+-2.2
+	>=dev-libs/glib-2.2
 	>=dev-libs/libxml2-2.4.23
 	>=x11-misc/shared-mime-info-0.9
 	svg? ( gnome-base/librsvg )"
 
 IUSE="svg"
 
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	epatch ${FILESDIR}/2.1.2-crash-save-display-settings.patch.bz2
-}
-
 src_compile() {
 #	rm ROX-Filer/src/configure # see bug #26162