Fix bad sed, bug #250644. Clean up old revisions.

(Portage version: 2.2_rc18/cvs/Linux 2.6.24-gentoo-r8-mactel x86_64)

4 files changed, 8 insertions, 152 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index c9be21b0dd4f..120d87e44e80 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.245 2008/11/24 20:51:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.246 2008/12/21 15:32:27 eva Exp $
+
+  21 Dec 2008; Gilles Dartiguelongue <eva@gentoo.org>
+  -file-roller-2.20.3.ebuild, -file-roller-2.24.1.ebuild,
+  file-roller-2.24.2.ebuild:
+  Fix bad sed, bug #250644. Clean up old revisions.
 
 *file-roller-2.24.2 (24 Nov 2008)
 
diff --git a/app-arch/file-roller/file-roller-2.20.3.ebuild b/app-arch/file-roller/file-roller-2.20.3.ebuild
deleted file mode 100644
index 377510608d2a..000000000000
--- a/app-arch/file-roller/file-roller-2.20.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.20.3.ebuild,v 1.8 2008/02/04 03:54:45 jer Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="gnome"
-
-RDEPEND=">=dev-libs/glib-2.12
-	>=x11-libs/gtk+-2.10
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/gnome-vfs-2.10
-	>=gnome-base/libglade-2.4
-	gnome? ( >=gnome-base/nautilus-2.10 )
-	>=gnome-base/gconf-2"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	>=dev-util/intltool-0.35
-	>=app-text/scrollkeeper-0.3.11
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-
-	if ! use gnome ; then
-		G2CONF="${G2CONF} --disable-nautilus-actions"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use absolute path to GNU tar since star doesn't have the same
-	# options.  On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
-	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
-
-	# use a local rpm2cpio script to avoid the dep
-	epatch "${FILESDIR}"/${PN}-2.10-use_fr_rpm2cpio.patch
-}
-
-src_install() {
-	gnome2_src_install
-	dobin "${FILESDIR}"/rpm2cpio-file-roller
-}
-
-pkg_postinst() {
-	elog "${PN} is a frontend for several archiving utility. If you want a"
-	elog "particular achive format support, see ${HOMEPAGE}"
-	elog "and install the relevant package."
-	elog
-	elog "for example:"
-	elog "  7-zip   - app-arch/p7zip"
-	elog "  ace     - app-arch/unace"
-	elog "  arj     - app-arch/arj"
-	elog "  lzma    - app-arch/lzma"
-	elog "  lzop    - app-arch/lzop"
-	elog "  cpio    - app-arch/cpio"
-	elog "  iso     - app-arch/cdrtools"
-	elog "  jar,zip - app-arch/zip and app-arch/unzip"
-	elog "  lha     - app-arch/lha"
-	elog "  rar     - app-arch/unrar"
-	elog "  rpm     - app-arch/rpm"
-	elog "  unstuff - app-arch/stuffit"
-	elog "  zoo     - app-arch/zoo"
-}
diff --git a/app-arch/file-roller/file-roller-2.24.1.ebuild b/app-arch/file-roller/file-roller-2.24.1.ebuild
deleted file mode 100644
index daf0e21cb977..000000000000
--- a/app-arch/file-roller/file-roller-2.24.1.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.24.1.ebuild,v 1.1 2008/10/21 22:26:24 leio Exp $
-
-inherit eutils gnome2
-
-DESCRIPTION="archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="nautilus"
-
-RDEPEND=">=dev-libs/glib-2.16.0
-	>=x11-libs/gtk+-2.13
-	>=gnome-base/libgnome-2.6
-	>=gnome-base/libgnomeui-2.6
-	>=gnome-base/libglade-2.4
-	>=gnome-base/gconf-2
-	nautilus? ( >=gnome-base/nautilus-2.22.2 )"
-DEPEND="${RDEPEND}
-	gnome-base/gnome-common
-	sys-devel/gettext
-	>=dev-util/intltool-0.35
-	>=dev-util/pkgconfig-0.19
-	>=app-text/gnome-doc-utils-0.3.2"
-
-DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-
-pkg_setup() {
-	G2CONF="${G2CONF} --disable-scrollkeeper"
-
-	if ! use nautilus ; then
-		G2CONF="${G2CONF} --disable-nautilus-actions"
-	fi
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Use absolute path to GNU tar since star doesn't have the same
-	# options.  On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
-	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
-
-	# use a local rpm2cpio script to avoid the dep
-	sed -e "s/rpm2cdio/rpm2cdio-file-roller/g" \
-		-i src/fr-command-rpm.c || die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-	dobin "${FILESDIR}/rpm2cpio-file-roller"
-}
-
-pkg_postinst() {
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format support, see ${HOMEPAGE}"
-	elog "and install the relevant package."
-	elog
-	elog "for example:"
-	elog "  7-zip   - app-arch/p7zip"
-	elog "  ace     - app-arch/unace"
-	elog "  arj     - app-arch/arj"
-	elog "  lzma    - app-arch/lzma"
-	elog "  lzop    - app-arch/lzop"
-	elog "  cpio    - app-arch/cpio"
-	elog "  iso     - app-arch/cdrtools"
-	elog "  jar,zip - app-arch/zip and app-arch/unzip"
-	elog "  lha     - app-arch/lha"
-	elog "  rar     - app-arch/unrar"
-	elog "  rpm     - app-arch/rpm"
-	elog "  unstuff - app-arch/stuffit"
-	elog "  zoo     - app-arch/zoo"
-}
diff --git a/app-arch/file-roller/file-roller-2.24.2.ebuild b/app-arch/file-roller/file-roller-2.24.2.ebuild
index 67e68e54225d..1c3cd094bd31 100644
--- a/app-arch/file-roller/file-roller-2.24.2.ebuild
+++ b/app-arch/file-roller/file-roller-2.24.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.24.2.ebuild,v 1.1 2008/11/24 20:51:58 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.24.2.ebuild,v 1.2 2008/12/21 15:32:27 eva Exp $
 
 inherit eutils gnome2
 
@@ -44,7 +44,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
 
 	# use a local rpm2cpio script to avoid the dep
-	sed -e "s/rpm2cdio/rpm2cdio-file-roller/g" \
+	sed -e "s/rpm2cpio/rpm2cpio-file-roller/g" \
 		-i src/fr-command-rpm.c || die "sed failed"
 }