From: Ian Stakenvicius <axs@gentoo.org>
Date: Mon, 15 Jan 2018 14:43:39 +0000 (-0500)
Subject: media-libs/openh264: rename utils to avoid file collisions
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=16c2853397bbd0cc422aece6a75d329222a605d0;p=gentoo.git

media-libs/openh264: rename utils to avoid file collisions

The binaries h264enc and h264dec are now installed with names openh264enc
and openh264dec, respectively, to avoid file collisions with media-video/h264enc

Bug: http://bugs.gentoo.org/634914
Package-Manager: Portage-2.3.13, Repoman-2.3.3
---

diff --git a/media-libs/openh264/openh264-1.7.0.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild
similarity index 89%
rename from media-libs/openh264/openh264-1.7.0.ebuild
rename to media-libs/openh264/openh264-1.7.0-r1.ebuild
index 1c42837a9727..ef0c663fca56 100644
--- a/media-libs/openh264/openh264-1.7.0.ebuild
+++ b/media-libs/openh264/openh264-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -57,7 +57,10 @@ multilib_src_compile() {
 multilib_src_install() {
 	emakecmd DESTDIR="${D}" install-shared
 
-	use utils && dobin h264{enc,dec}
+	if use utils ; then
+		newbin h264enc openh264enc
+		newbin h264dec openh264dec
+	fi
 
 	if use plugin; then
 		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
@@ -92,4 +95,9 @@ pkg_postinst() {
 		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
 		elog ""
 	fi
+	if use utils; then
+		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
+		elog "to avoid file collisions with media-video/h264enc"
+		elog ""
+	fi
 }