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

Package-Manager: portage-2.2.28
johu · May 22, 2016 · 19eecc8 · 19eecc8
1 parent 0522ca6
commit 19eecc8
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 165 deletions.
diff --git 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
diff --git 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
@@ -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
@@ -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>
Original file line number	Diff line number	Diff line change
		@@ -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