Pin libunique dependency to slot 1. Clean up old revisions.

(Portage version: 2.2.0_alpha25/cvs/Linux x86_64)

4 files changed, 7 insertions, 163 deletions

diff --git a/gnome-base/nautilus/ChangeLog b/gnome-base/nautilus/ChangeLog
index b7862ffbc715..e4dd2a565a11 100644
--- a/gnome-base/nautilus/ChangeLog
+++ b/gnome-base/nautilus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-base/nautilus
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.368 2011/02/24 19:21:57 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/ChangeLog,v 1.369 2011/02/27 15:10:14 eva Exp $
+
+  27 Feb 2011; Gilles Dartiguelongue <eva@gentoo.org> -nautilus-2.32.1.ebuild,
+  -nautilus-2.32.2.ebuild, nautilus-2.32.2.1.ebuild:
+  Pin libunique dependency to slot 1. Clean up old revisions.
 
   24 Feb 2011; Thomas Kahle <tomka@gentoo.org> nautilus-2.32.2.1.ebuild:
   x86 stable per bug 353436
diff --git a/gnome-base/nautilus/nautilus-2.32.1.ebuild b/gnome-base/nautilus/nautilus-2.32.1.ebuild
deleted file mode 100644
index 01b21be084ee..000000000000
--- a/gnome-base/nautilus/nautilus-2.32.1.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.1.ebuild,v 1.1 2010/11/18 21:45:10 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc gnome +introspection xmp"
-
-RDEPEND=">=dev-libs/glib-2.25.9
-	>=gnome-base/gnome-desktop-2.29.91:2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
-	dev-libs/libunique
-	x11-libs/libXext
-	x11-libs/libXrender
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable introspection)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}
diff --git a/gnome-base/nautilus/nautilus-2.32.2.1.ebuild b/gnome-base/nautilus/nautilus-2.32.2.1.ebuild
index b4addafcb3f3..79469a810cb5 100644
--- a/gnome-base/nautilus/nautilus-2.32.2.1.ebuild
+++ b/gnome-base/nautilus/nautilus-2.32.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1.ebuild,v 1.3 2011/02/24 19:21:57 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.1.ebuild,v 1.4 2011/02/27 15:10:14 eva Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -22,7 +22,7 @@ RDEPEND=">=dev-libs/glib-2.25.9
 	>=dev-libs/libxml2-2.4.7
 	>=media-libs/libexif-0.5.12
 	>=gnome-base/gconf-2
-	dev-libs/libunique
+	dev-libs/libunique:1
 	x11-libs/libXext
 	x11-libs/libXrender
 	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
diff --git a/gnome-base/nautilus/nautilus-2.32.2.ebuild b/gnome-base/nautilus/nautilus-2.32.2.ebuild
deleted file mode 100644
index 68560d81b3ad..000000000000
--- a/gnome-base/nautilus/nautilus-2.32.2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/nautilus/nautilus-2.32.2.ebuild,v 1.1 2010/12/10 19:33:53 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 virtualx
-
-DESCRIPTION="A file manager for the GNOME desktop"
-HOMEPAGE="http://live.gnome.org/Nautilus"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux"
-IUSE="doc gnome +introspection xmp"
-
-RDEPEND=">=dev-libs/glib-2.25.9
-	>=gnome-base/gnome-desktop-2.29.91:2
-	>=x11-libs/pango-1.1.2
-	>=x11-libs/gtk+-2.22:2[introspection?]
-	>=dev-libs/libxml2-2.4.7
-	>=media-libs/libexif-0.5.12
-	>=gnome-base/gconf-2
-	dev-libs/libunique
-	x11-libs/libXext
-	x11-libs/libXrender
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4 )
-	xmp? ( >=media-libs/exempi-2 )"
-
-DEPEND="${RDEPEND}
-	>=dev-lang/perl-5
-	sys-devel/gettext
-	>=dev-util/pkgconfig-0.9
-	>=dev-util/intltool-0.40.1
-	doc? ( >=dev-util/gtk-doc-1.4 )"
-# For eautoreconf
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am"
-
-PDEPEND="gnome? ( >=x11-themes/gnome-icon-theme-1.1.91 )
-	>=gnome-base/gvfs-0.1.2"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-update-mimedb
-		--disable-packagekit
-		$(use_enable introspection)
-		$(use_enable xmp)"
-	DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README THANKS TODO"
-}
-
-src_prepare() {
-	gnome2_src_prepare
-
-	# Remove crazy CFLAGS
-	sed 's:-DG.*DISABLE_DEPRECATED::g' -i configure.in configure \
-		|| die "sed 1 failed"
-}
-
-src_test() {
-	addpredict "/root/.gnome2_private"
-	unset SESSION_MANAGER
-	unset ORBIT_SOCKETDIR
-	unset DBUS_SESSION_BUS_ADDRESS
-	Xemake check || die "Test phase failed"
-}
-
-src_install() {
-	gnome2_src_install
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	elog "nautilus can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview"
-}