media-video/handbrake: Fix dupe postinst, remove old #571142

Package-Manager: portage-2.2.28

5 files changed, 5 insertions, 165 deletions

diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index 82b86cfd839e..734a9ebc4cdd 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1,2 +1 @@
-DIST handbrake-0.10.2.tar.bz2 10442635 SHA256 4cc3828393b26a982dbe00febd700c5090d3443c1d45492e0b373e02da73c699 SHA512 7059a88fac1e4810c54880eb4afe58716af7ac81e5b098e34f3a68c19d7c03e51b57e1a196603e2c8d377e94bb3a910d20f1d9ed62d3eab6422031e62730d4a2 WHIRLPOOL cd34833035e3fc866d7a69994717709fd7a808545f6cbaeda1447d6b528010b500f5ef0371b66d4b5c81c958d39d053178595fe32bc6236fdac7003cacd9f7d9
 DIST handbrake-0.10.5.tar.bz2 10452839 SHA256 fb9230dd121b456f6829d1d25ac8bbf76e503b51c4efc70f0a7fd2bb8607e2f0 SHA512 30aa09f5bf2ceb45500f316aa2bc070f630dbe399c9be739f60fd73bbb97d52157498ba7a1e7d024f7fa5b75aa0154976df3c346abda43168c881b1ad0a858ea WHIRLPOOL 190923ade8b28685d9b2ae275ec0806b74235d3644715f90f3993b7d113e3b65c28caa5c839da507913f8a4cf63d0f89f1d2e77fca65e65308b6091003a9f1f9
diff --git a/media-video/handbrake/handbrake-0.10.2-r1.ebuild b/media-video/handbrake/handbrake-0.10.2-r1.ebuild
deleted file mode 100644
index adb5fc3076a9..000000000000
--- a/media-video/handbrake/handbrake-0.10.2-r1.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2-utils python-any-r1
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/HandBrake/HandBrake.git"
-	inherit git-r3
-	KEYWORDS=""
-else
-	SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
-	S="${WORKDIR}/HandBrake-${PV}"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder"
-HOMEPAGE="http://handbrake.fr/"
-LICENSE="GPL-2"
-
-SLOT="0"
-IUSE="+fdk gstreamer gtk libav libav-aac x265"
-
-REQUIRED_USE="^^ ( fdk libav-aac )"
-
-RDEPEND="
-	dev-libs/jansson
-	media-libs/a52dec
-	media-libs/libass
-	media-libs/libbluray
-	media-libs/libdvdnav
-	media-libs/libdvdread
-	media-libs/libsamplerate
-	media-libs/libtheora
-	media-libs/libvorbis
-	media-libs/libvpx
-	media-libs/x264:=
-	media-sound/lame
-	sys-libs/zlib
-	libav? ( >=media-video/libav-10.1:0= )
-	!libav? ( >=media-video/ffmpeg-2.3:0= )
-	gstreamer? (
-		media-libs/gstreamer:1.0
-		media-libs/gst-plugins-base:1.0
-		media-libs/gst-plugins-good:1.0
-		media-libs/gst-plugins-bad:1.0
-		media-libs/gst-plugins-ugly:1.0
-		media-plugins/gst-plugins-a52dec:1.0
-		media-plugins/gst-plugins-libav:1.0
-		media-plugins/gst-plugins-x264:1.0
-	)
-	gtk? (
-		>=x11-libs/gtk+-3.10
-		dev-libs/dbus-glib
-		dev-libs/glib:2
-		x11-libs/cairo
-		x11-libs/gdk-pixbuf:2
-		x11-libs/libnotify
-		x11-libs/pango
-		virtual/libgudev:=
-	)
-	fdk? ( media-libs/fdk-aac )
-	x265? ( >=media-libs/x265-1.7 )
-	"
-
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}
-	dev-lang/yasm
-	dev-util/intltool
-	sys-devel/automake"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	epatch_user
-
-	# Get rid of leftover bundled library build definitions,
-	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
-		"${S}"/make/include/main.defs \
-		|| die "Contrib removal failed."
-
-	# Remove libdvdnav duplication and call it on the original instead.
-	# It may work this way; if not, we should try to mimic the duplication.
-	epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch
-
-	# Remove faac dependency; TODO: figure out if we need to do this at all.
-	epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch
-
-	# Fix missing x265 link flag
-	epatch "${FILESDIR}"/${PN}-9999-fix-missing-x265-link-flag.patch
-
-	cd "${S}/gtk"
-	# Don't run autogen.sh.
-	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
-	eautoreconf
-}
-
-src_configure() {
-	./configure \
-		--force \
-		--verbose \
-		--prefix="${EPREFIX}/usr" \
-		--disable-gtk-update-checks \
-		$(use_enable libav-aac) \
-		$(use_enable fdk fdk-aac) \
-		$(use_enable gtk) \
-		$(usex !gstreamer --disable-gst) \
-		$(use_enable x265) || die "Configure failed."
-}
-
-src_compile() {
-	emake -C build
-
-	# TODO: Documentation building is currently broken, try to fix it.
-	#
-	# if use doc ; then
-	# 	emake -C build doc
-	# fi
-}
-
-src_install() {
-	emake -C build DESTDIR="${D}" install
-
-	dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
-}
-
-pkg_postinst() {
-	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
-
-	if use gtk ; then
-		einfo ""
-		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/media-video/handbrake/handbrake-0.10.5.ebuild b/media-video/handbrake/handbrake-0.10.5.ebuild
index 55cc45dde3bd..fb77b015a986 100644
--- a/media-video/handbrake/handbrake-0.10.5.ebuild
+++ b/media-video/handbrake/handbrake-0.10.5.ebuild
@@ -98,9 +98,6 @@ src_prepare() {
 
 	default
 
-	# Get rid of libav specific code when using ffmpeg
-	use libav || eapply -R "${FILESDIR}/${PN}-0.10.3-nolibav.patch"
-
 	cd "${S}/gtk"
 	# Don't run autogen.sh.
 	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
@@ -143,16 +140,14 @@ pkg_postinst() {
 		einfo ""
 		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
 	fi
+
+	gnome2_icon_cache_update
 }
 
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
 pkg_postrm() {
 	gnome2_icon_cache_update
 }
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 8fb14e62356a..fb77b015a986 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-9999.ebuild
@@ -140,16 +140,14 @@ pkg_postinst() {
 		einfo ""
 		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
 	fi
+
+	gnome2_icon_cache_update
 }
 
 pkg_preinst() {
 	gnome2_icon_savelist
 }
 
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
 pkg_postrm() {
 	gnome2_icon_cache_update
 }
diff --git a/media-video/handbrake/metadata.xml b/media-video/handbrake/metadata.xml
index 7669a95dc699..1c5819c4e49a 100644
--- a/media-video/handbrake/metadata.xml
+++ b/media-video/handbrake/metadata.xml
@@ -10,7 +10,7 @@
   </longdescription>
   <use>
     <flag name="gstreamer">Support for the streaming media framework from <pkg>media-libs/gstreamer</pkg>.</flag>
-    <flag name="gtk">Support for Gimp ToolKit + from <pkg>x11-libs/gtk+</pkg>, requirement for a GUI-based HandBrake.</flag>
+    <flag name="gtk">Install the GTK UI, ghb.</flag>
     <flag name="fdk">Support for encoding AAC using <pkg>media-libs/fdk-aac</pkg>.</flag>
     <flag name="libav-aac">Support for encoding AAC using <pkg>media-video/libav</pkg>'s internal encoder.</flag>
 	<flag name="x265">Support for encoding h265 using <pkg>media-libs/x265</pkg>.</flag>