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

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

4 files changed, 14 insertions, 123 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/Manifest b/app-cdr/brasero/Manifest
index 8042461b7a5e..4d56f7853c54 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -12,15 +12,14 @@ AUX brasero-3.2.0-brasero.desktop.patch 1195 RMD160 d4efc603d8e7370c64b9a4c53b15
 AUX brasero-3.2.0-drive-not-selected.patch 1111 RMD160 73db6908d150f83b0a03fa35c7ff64dfa7579100 SHA1 d7a3a25c99b6ae7d046360448f1d5cbb2bb0b5fc SHA256 cfcee75b004d618ca9e6bf1b7522814f3d2bef13887b12e908b305170014dd53
 DIST brasero-2.32.1.tar.bz2 4530933 RMD160 0acfcc53077cbbdaa5e0e593f290c41825f72838 SHA1 56141108561f2b8d45998662b86cf6e20f0ff4f2 SHA256 7b1056b6f19398912d51e3e583bc1b4d2a75ce2a8e15a96e1514fe6edb79df3b
 DIST brasero-3.2.0.tar.xz 2923972 RMD160 73e5cf390e390aa9e10742462384541944b385e5 SHA1 2dc4deeaeb357b96969ac9aaaf23cef68fe81bec SHA256 2e34309caefa9b2ca179e11c4501c5bfd2bcd5b8ed20bd959a249e034f54455c
-EBUILD brasero-2.32.1-r1.ebuild 3519 RMD160 5c572b5eace309899bd106e55cc0319456999bcf SHA1 fa5821a774432971f5de8f9d6e161299c0f7080f SHA256 683f2dd52e495705a386952bb0688d50082afa591f8fe65b702ff9abeba53ddc
-EBUILD brasero-2.32.1.ebuild 3135 RMD160 2938b7545cd6f1978b99067a38e0b70e8eee1450 SHA1 54e70cfa02a534afc033edda85756db931e03ed1 SHA256 499273f48602de240ce03666aea6b21127049a25174d03b5bdcc8b15e2ffc7de
+EBUILD brasero-2.32.1-r1.ebuild 3542 RMD160 090b4886fb149a450ab742f0de3b8959dce82f19 SHA1 6beeab5bf8d5d57bbb764a6d5c8d9542158c35be SHA256 5e49d611cb96273ade772dcf92664257cdf1c0c5b67d5b3e380bafa0fb6a43b0
 EBUILD brasero-3.2.0-r1.ebuild 3000 RMD160 1d21c6501d214320e695dc7cd64cc19bd6b6b2d7 SHA1 8708394724b5609068d013428afe223f1211ee83 SHA256 1dff0ba030bf675f6aa50c26098f76636241bb7cd3054783ba9732f2f3367638
-MISC ChangeLog 22251 RMD160 b9f0c9d8b9e3f2b4d83ef5da058a2c1869d1ae40 SHA1 2caebd73c30678d16550b5bf89ee5598c266fbdb SHA256 e2a8396b8ecf9965906ee4ba3aac2084775c3f5042b9635be2a6b5810467e1d4
+MISC ChangeLog 22429 RMD160 c50ccd5034b90d85e44762955e1b4b10c644e5cb SHA1 ac3a1012d7b839746e84ed8b3cf9b5c78ff33c11 SHA256 8997e28102b47d1cd833cabf2fbca629a4e7e579fffa1c4e79a2cc73a6b654f7
 MISC metadata.xml 804 RMD160 2b0255b1f898a373cf8b4ae0ae7c798515729d1d SHA1 26866824bdbd33577a9bc68b341a575031608380 SHA256 5cf5e6975460ecc9b4611798e81f3d299c3e808792ff1e553140a940cfa739bb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk78n8gACgkQCaWpQKGI+9SToACcCIZgrhxQxa1MPuijZ0F1HgWi
-8HcAnRZ6nAvGiwl+uMgAi1CsnOWRg3b5
-=EzAY
+iEYEARECAAYFAk8j4xkACgkQCaWpQKGI+9RNhQCcC0DkcFGkDnQ/dPlONQZh+Ra3
+qrgAnjlMX/xhdUAYP9MRBvMZD1MnsT29
+=4ub+
 -----END PGP SIGNATURE-----
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"
-}