Prevent people from mixing brasero-2 with nautilus-3, bug #397469. Drop old.

(Portage version: 2.1.10.44/cvs/Linux x86_64)

3 files changed, 9 insertions, 117 deletions

diff --git a/app-cdr/brasero/ChangeLog b/app-cdr/brasero/ChangeLog
index 882821cf4188..fcb9d1d31b00 100644
--- a/app-cdr/brasero/ChangeLog
+++ b/app-cdr/brasero/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-cdr/brasero
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.139 2011/12/29 17:13:38 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/ChangeLog,v 1.140 2012/01/28 11:59:15 pacho Exp $
+
+  28 Jan 2012; Pacho Ramos <pacho@gentoo.org> -brasero-2.32.1.ebuild,
+  brasero-2.32.1-r1.ebuild:
+  Prevent people from mixing brasero-2 with nautilus-3, bug #397469. Drop old.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> brasero-2.32.1-r1.ebuild:
   amd64 stable, bug 393007
diff --git a/app-cdr/brasero/brasero-2.32.1-r1.ebuild b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
index a83c3e37ae86..eebcb63f54f3 100644
--- a/app-cdr/brasero/brasero-2.32.1-r1.ebuild
+++ b/app-cdr/brasero/brasero-2.32.1-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.7 2011/12/29 17:13:38 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1-r1.ebuild,v 1.8 2012/01/28 11:59:15 pacho Exp $
 
 EAPI="4"
 GNOME2_LA_PUNT="yes"
@@ -31,7 +31,7 @@ COMMON_DEPEND="
 	libburn? (
 		>=dev-libs/libburn-0.4
 		>=dev-libs/libisofs-0.6.4 )
-	nautilus? ( >=gnome-base/nautilus-2.31.3 )
+	nautilus? ( >=gnome-base/nautilus-2.31.3 <gnome-base/nautilus-3 )
 	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
 RDEPEND="${COMMON_DEPEND}
 	app-cdr/cdrdao
diff --git a/app-cdr/brasero/brasero-2.32.1.ebuild b/app-cdr/brasero/brasero-2.32.1.ebuild
deleted file mode 100644
index dcd8e4cc1cde..000000000000
--- a/app-cdr/brasero/brasero-2.32.1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-cdr/brasero/brasero-2.32.1.ebuild,v 1.12 2011/11/15 23:24:56 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit autotools eutils gnome2 multilib
-
-DESCRIPTION="Brasero (aka Bonfire) is yet another application to burn CD/DVD for the gnome desktop."
-HOMEPAGE="http://projects.gnome.org/brasero/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86"
-IUSE="+cdr +css doc +introspection +libburn nautilus playlist test"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.25.10:2
-	media-libs/libcanberra[gtk]
-	>=x11-libs/gtk+-2.21.9:2[introspection?]
-	>=gnome-base/gconf-2.31.1:2
-	>=media-libs/gstreamer-0.10.15:0.10
-	>=media-libs/gst-plugins-base-0.10:0.10
-	>=dev-libs/libxml2-2.6:2
-	>=dev-libs/libunique-1:1
-	x11-libs/libSM
-	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
-	libburn? (
-		>=dev-libs/libburn-0.4
-		>=dev-libs/libisofs-0.6.4 )
-	nautilus? ( >=gnome-base/nautilus-2.31.3 )
-	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
-RDEPEND="${COMMON_DEPEND}
-	app-cdr/cdrdao
-	app-cdr/dvd+rw-tools
-	media-plugins/gst-plugins-meta:0.10
-	x11-themes/hicolor-icon-theme
-	css? ( media-libs/libdvdcss:1.2 )
-	cdr? ( virtual/cdrtools )
-	!libburn? ( virtual/cdrtools )"
-DEPEND="${COMMON_DEPEND}
-	app-text/gnome-doc-utils
-	dev-util/pkgconfig
-	sys-devel/gettext
-	dev-util/intltool
-	gnome-base/gnome-common:3
-	>=dev-util/gtk-doc-am-1.12
-	doc? ( >=dev-util/gtk-doc-1.12 )
-	test? ( app-text/docbook-xml-dtd:4.3 )"
-# eautoreconf deps
-#	gnome-base/gnome-common
-#	dev-util/gtk-doc-am
-PDEPEND="gnome-base/gvfs"
-
-pkg_setup() {
-	G2CONF="${G2CONF}
-		--disable-scrollkeeper
-		--disable-caches
-		--disable-dependency-tracking
-		--with-gtk=2.0
-		--disable-search
-		$(use_enable cdr cdrtools)
-		$(use_enable cdr cdrkit)
-		$(use_enable introspection)
-		$(use_enable libburn libburnia)
-		$(use_enable nautilus)
-		$(use_enable playlist)"
-
-	if ! use libburn; then
-		G2CONF="${G2CONF} --enable-cdrtools --enable-cdrkit"
-	fi
-
-	DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README"
-}
-
-src_prepare() {
-	# Fix link against installed libraries, bug #340767
-	epatch "${FILESDIR}/${PN}-2.32.0-build-plugins-against-local-library.patch"
-
-	intltoolize --force --copy --automake || die "intltoolize failed"
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_install() {
-	gnome2_src_install
-
-	# Remove useless .la files
-	rm -f "${ED}"/usr/$(get_libdir)/brasero/plugins/*.la
-	rm -f "${ED}"/usr/$(get_libdir)/nautilus/extensions-2.0/*.la
-}
-
-pkg_preinst() {
-	gnome2_pkg_preinst
-
-	preserve_old_lib /usr/$(get_libdir)/libbrasero-burn.so.0
-	preserve_old_lib /usr/$(get_libdir)/libbrasero-media.so.0
-	preserve_old_lib /usr/$(get_libdir)/libbrasero-utils.so.0
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-burn.so.0
-	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-media.so.0
-	preserve_old_lib_notify /usr/$(get_libdir)/libbrasero-utils.so.0
-
-	echo
-	elog "If ${PN} doesn't handle some music or video format, please check"
-	elog "your USE flags on media-plugins/gst-plugins-meta"
-}