app-cdr/brasero: QAed, sync with gentoo-x86

(Portage version: 2.2.0_alpha29/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key C6085806)

3 files changed, 24 insertions, 46 deletions

diff --git a/app-cdr/brasero/Manifest b/app-cdr/brasero/Manifest
index 084e114c..41400369 100644
--- a/app-cdr/brasero/Manifest
+++ b/app-cdr/brasero/Manifest
@@ -1,24 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX brasero-2.91.6-build-plugins-against-local-library.patch 14905 RMD160 a84a15050c4b21999c4efdff520606d8d1d563f2 SHA1 bff5cd114b5f98a8b0a39132619a6d39a000d29e SHA256 5978545e14615c43d306e7eb134f1efd6dab9be2e1f80756bd9948e6d6a9db69
 DIST brasero-3.0.0.tar.bz2 4746147 RMD160 8a28a5f09ebcdc2638593fd0d16aa79ed2165577 SHA1 f8091b835aa9260a68de41c3b8f8bc47e9bea9de SHA256 aff1e900d6c68096e43a80443c8c367374fb980986d2f823d229606605a410e3
-EBUILD brasero-3.0.0.ebuild 2757 RMD160 b7cf2cebc919c0e5f7aa34ec5f16fd42f3c749af SHA1 9784dc12781c89c0c546e855ec5f025b7a3561e6 SHA256 5190cb9bc2e7e73d5a24b3ed64260ef5f71cf915ac24a744e222ca764909812e
-EBUILD brasero-9999.ebuild 2791 RMD160 3a8890ee277ac84667b9fa8ed9ea30b57f111900 SHA1 7a835482aaed86e65b99463d426dcd0c770f5436 SHA256 384810fadf313137e1e09e15022d23bcc43aa3a882b40fafb5b3e63782297780
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iQIcBAEBCAAGBQJNnvMPAAoJELHSF2kinlg4k2UP/0XrjWosFMO8L3fHEhmc7je3
-iSIpXs43cxu/SI/95McOilFsSfmPnvayT7FZdx1hErUTcgOzFbbCmeYK9MRz1u5+
-gaOdQQG67/80wRuvNYjOv6Mv6m3hor5LEumCrdJB1NpVVOGb7OC+h7ncVjR66vSd
-Mu3alX/5MVL4Njp67blghFm6+9d1c3XiX9FH1H419k0qicx0o1tdqVabXYJoIhrX
-Jw9xMYQBtATYchr61dGHk9o9OBtWtI06C3I8HdTE2Mzj99knJJvIlbnJDUbCEJP8
-O4pLlKBEDJkPgwP5YZwWsUEsSn7THuHF4n3yJVpg8ahTFyg7N6A7EFtKNub5gu9n
-ITHIrj9kf4NtzWsxcm3NjMxc6DnweOBVNXbCiVHhCmhxJ+6skQIsZ9TK9SCgg2sv
-Mxvssr7dXJ9bwF4GkNbhHV0d/A6mE40+l4dBqDiGukEpkmTXcjWMngpElsjREBgh
-ReeMyD3ObSpwORxDkMKEsTO1Fc75JDBiiEGJFMYlXi/uBqckr1+UwxjEpLwHlodP
-+mXC9udS2N97nxWmzNNM7RP5eeqJx9NNnyG/43PZOlgvYtNh5W1J2bFa+NldqDmp
-0UPpCSC/z8lb9tQgqQCvJlHptULtx7o4dSkjoWD7+l0xbuyRzphC5ipm0hwK8Ltw
-UjtByU9XLuLd4z4inK4p
-=dPKf
------END PGP SIGNATURE-----
+EBUILD brasero-3.0.0.ebuild 2734 RMD160 611202f2527555b96b0a3e96544cd44c98e9135b SHA1 38509b451fd4ffde8d62d74b6857da543633c448 SHA256 fa2f19146e0ee544c785897b26039f2d1ac5c8e7e5cf03d8ad97012cf02c48b1
+EBUILD brasero-9999.ebuild 2734 RMD160 611202f2527555b96b0a3e96544cd44c98e9135b SHA1 38509b451fd4ffde8d62d74b6857da543633c448 SHA256 fa2f19146e0ee544c785897b26039f2d1ac5c8e7e5cf03d8ad97012cf02c48b1
diff --git a/app-cdr/brasero/brasero-3.0.0.ebuild b/app-cdr/brasero/brasero-3.0.0.ebuild
index bf2b1e5a..453cfe03 100644
--- a/app-cdr/brasero/brasero-3.0.0.ebuild
+++ b/app-cdr/brasero/brasero-3.0.0.ebuild
@@ -16,15 +16,15 @@ HOMEPAGE="http://projects.gnome.org/brasero/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="beagle +css doc +introspection +libburn nautilus packagekit playlist test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
+IUSE="+css doc +introspection +libburn nautilus packagekit playlist test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.27.5:2
+	>=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=gnome-base/gconf-2.32.0:2
 	>=media-libs/gstreamer-0.10.15:0.10
@@ -36,7 +36,6 @@ COMMON_DEPEND="
 	x11-libs/libICE
 	x11-libs/libSM
 
-	beagle? ( >=dev-libs/libbeagle-0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
 	libburn? (
 		>=dev-libs/libburn-0.4
@@ -44,8 +43,9 @@ COMMON_DEPEND="
 	nautilus? ( >=gnome-base/nautilus-2.91.90 )
 	playlist? ( >=dev-libs/totem-pl-parser-2.29.1 )"
 RDEPEND="${COMMON_DEPEND}
-	media-plugins/gst-plugins-meta
-	css? ( media-libs/libdvdcss )
+	media-plugins/gst-plugins-meta:0.10
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
 	!libburn? (
 		app-cdr/cdrdao
 		app-cdr/dvd+rw-tools
@@ -56,7 +56,7 @@ DEPEND="${COMMON_DEPEND}
 	dev-util/pkgconfig
 	sys-devel/gettext
 	dev-util/intltool
-	gnome-base/gnome-common
+	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 )"
@@ -70,7 +70,7 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
-		$(use_enable beagle search beagle)
+		--disable-search
 		$(use_enable !libburn cdrtools)
 		$(use_enable !libburn cdrkit)
 		$(use_enable !libburn cdrdao)
diff --git a/app-cdr/brasero/brasero-9999.ebuild b/app-cdr/brasero/brasero-9999.ebuild
index bc63a13f..453cfe03 100644
--- a/app-cdr/brasero/brasero-9999.ebuild
+++ b/app-cdr/brasero/brasero-9999.ebuild
@@ -16,15 +16,15 @@ HOMEPAGE="http://projects.gnome.org/brasero/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="beagle cdr +css doc +introspection +libburn nautilus packagekit playlist test"
 if [[ ${PV} = 9999 ]]; then
 	KEYWORDS=""
 else
 	KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 fi
+IUSE="+css doc +introspection +libburn nautilus packagekit playlist test"
 
 COMMON_DEPEND="
-	>=dev-libs/glib-2.27.5:2
+	>=dev-libs/glib-2.28:2
 	>=x11-libs/gtk+-3.0.0:3[introspection?]
 	>=gnome-base/gconf-2.32.0:2
 	>=media-libs/gstreamer-0.10.15:0.10
@@ -36,7 +36,6 @@ COMMON_DEPEND="
 	x11-libs/libICE
 	x11-libs/libSM
 
-	beagle? ( >=dev-libs/libbeagle-0.3 )
 	introspection? ( >=dev-libs/gobject-introspection-0.6.3 )
 	libburn? (
 		>=dev-libs/libburn-0.4
@@ -44,19 +43,20 @@ COMMON_DEPEND="
 	nautilus? ( >=gnome-base/nautilus-2.91.90 )
 	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
-	css? ( media-libs/libdvdcss )
-	cdr? ( virtual/cdrtools )
-	!libburn? ( virtual/cdrtools )
+	media-plugins/gst-plugins-meta:0.10
+	x11-themes/hicolor-icon-theme
+	css? ( media-libs/libdvdcss:1.2 )
+	!libburn? (
+		app-cdr/cdrdao
+		app-cdr/dvd+rw-tools
+		virtual/cdrtools )
 	packagekit? ( app-portage/packagekit )"
 DEPEND="${COMMON_DEPEND}
 	app-text/gnome-doc-utils
 	dev-util/pkgconfig
 	sys-devel/gettext
 	dev-util/intltool
-	gnome-base/gnome-common
+	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 )"
@@ -70,18 +70,16 @@ pkg_setup() {
 		--disable-scrollkeeper
 		--disable-caches
 		--disable-dependency-tracking
-		$(use_enable beagle search beagle)
-		$(use_enable cdr cdrtools)
-		$(use_enable cdr cdrkit)
+		--disable-search
+		$(use_enable !libburn cdrtools)
+		$(use_enable !libburn cdrkit)
+		$(use_enable !libburn cdrdao)
+		$(use_enable !libburn growisofs)
 		$(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"
 }