From: Ilya Tumaykin <itumaykin@gmail.com>
Date: Wed, 9 Mar 2016 23:37:40 +0000 (+0300)
Subject: media-video/aegisub: copy config.rpath via autotools eclass in 3.2.2_p20160306, 9999
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=66ca77a931530f1ed1498831e563f4d2f0afa3f1;p=gentoo.git

media-video/aegisub: copy config.rpath via autotools eclass in 3.2.2_p20160306, 9999

Replace a custom config.rpath hack with the legalized one from autotools
eclass. See also http://devel.aegisub.org/ticket/1914

Package-Manager: portage-2.2.27
---

diff --git a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
index b9263720216f..ef73e9d32243 100644
--- a/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
+++ b/media-video/aegisub/aegisub-3.2.2_p20160306.ebuild
@@ -72,8 +72,6 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cp /usr/share/gettext/config.rpath . || die
-
 	remove_locale() {
 		rm "po/${1}.po" || die
 	}
@@ -81,6 +79,9 @@ src_prepare() {
 	l10n_find_plocales_changes 'po' '' '.po'
 	l10n_for_each_disabled_locale_do remove_locale
 
+	# See http://devel.aegisub.org/ticket/1914
+	config_rpath_update "${S}/config.rpath"
+
 	autotools-utils_src_prepare
 
 	cat <<- EOF > "${S}/build/git_version.h" || die
diff --git a/media-video/aegisub/aegisub-9999.ebuild b/media-video/aegisub/aegisub-9999.ebuild
index 32ba8278ab71..5789168b501a 100644
--- a/media-video/aegisub/aegisub-9999.ebuild
+++ b/media-video/aegisub/aegisub-9999.ebuild
@@ -71,8 +71,6 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	cp /usr/share/gettext/config.rpath . || die
-
 	remove_locale() {
 		rm "po/${1}.po" || die
 	}
@@ -80,6 +78,9 @@ src_prepare() {
 	l10n_find_plocales_changes 'po' '' '.po'
 	l10n_for_each_disabled_locale_do remove_locale
 
+	# See http://devel.aegisub.org/ticket/1914
+	config_rpath_update "${S}/config.rpath"
+
 	autotools-utils_src_prepare
 }