Updating liguros repo

4 files changed, 28 insertions, 24 deletions

diff --git a/dev-lang/go/go-1.14.13.ebuild b/dev-lang/go/go-1.14.13-r1.ebuild
index c81e94e12355..6bb792691ce1 100644
--- a/dev-lang/go/go-1.14.13.ebuild
+++ b/dev-lang/go/go-1.14.13-r1.ebuild
@@ -154,33 +154,37 @@ src_test()
 
 src_install()
 {
-	local bin_path f x
-
-	dodir /usr/lib/go
-
 	# There is a known issue which requires the source tree to be installed [1].
 	# Once this is fixed, we can consider using the doc use flag to control
 	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
 	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
+	dodir /usr/lib/go
 	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
 	# testdata directories are not needed on the installed system
 	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
 	if go_cross_compile; then
 		bin_path="bin/$(go_tuple)"
 	else
 		bin_path=bin
 	fi
+	local f x
 	for x in ${bin_path}/*; do
 		f=${x##*/}
 		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
 	done
-	einstalldocs
 
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+
+	# fix install_name for test object (binutils_test) on Darwin, it
+	# is never used in real circumstances
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
 		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
 		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
 		install_name_tool -id "${libmac64}" "${D}${libmac64}"
@@ -189,8 +193,6 @@ src_install()
 
 pkg_postinst() {
 	[[ -z ${REPLACING_VERSIONS} ]] && return
-	has_version "<sys-apps/portage-3.0.9" && return
-
 	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
 	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
 	einfo "due to the static linking nature of go."
diff --git a/dev-lang/go/go-1.15.6.ebuild b/dev-lang/go/go-1.15.6-r1.ebuild
index c81e94e12355..6bb792691ce1 100644
--- a/dev-lang/go/go-1.15.6.ebuild
+++ b/dev-lang/go/go-1.15.6-r1.ebuild
@@ -154,33 +154,37 @@ src_test()
 
 src_install()
 {
-	local bin_path f x
-
-	dodir /usr/lib/go
-
 	# There is a known issue which requires the source tree to be installed [1].
 	# Once this is fixed, we can consider using the doc use flag to control
 	# installing the doc and src directories.
+	# The use of cp is deliberate in order to retain permissions
 	# [1] https://golang.org/issue/2775
-	#
-	# deliberately use cp to retain permissions
+	dodir /usr/lib/go
 	cp -R api bin doc lib pkg misc src test "${ED}"/usr/lib/go
+	einstalldocs
+
 	# testdata directories are not needed on the installed system
 	rm -fr $(find "${ED}"/usr/lib/go -iname testdata -type d -print)
+
+	local bin_path
 	if go_cross_compile; then
 		bin_path="bin/$(go_tuple)"
 	else
 		bin_path=bin
 	fi
+	local f x
 	for x in ${bin_path}/*; do
 		f=${x##*/}
 		dosym ../lib/go/${bin_path}/${f} /usr/bin/${f}
 	done
-	einstalldocs
 
+	# install the @golang-rebuild set for Portage
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/go-sets.conf go.conf
+
+	# fix install_name for test object (binutils_test) on Darwin, it
+	# is never used in real circumstances
 	if [[ ${CHOST} == *-darwin* ]] ; then
-		# fix install_name for test object (binutils_test) on Darwin, it
-		# is never used in real circumstances
 		local libmac64="${EPREFIX}"/usr/lib/go/src/cmd/vendor/github.com/
 		      libmac64+=google/pprof/internal/binutils/testdata/lib_mac_64
 		install_name_tool -id "${libmac64}" "${D}${libmac64}"
@@ -189,8 +193,6 @@ src_install()
 
 pkg_postinst() {
 	[[ -z ${REPLACING_VERSIONS} ]] && return
-	has_version "<sys-apps/portage-3.0.9" && return
-
 	einfo "After ${CATEGORY}/${PN} is updated it is recommended to rebuild"
 	einfo "all packages compiled with previous versions of ${CATEGORY}/${PN}"
 	einfo "due to the static linking nature of go."
diff --git a/dev-lang/php/php-7.3.25.ebuild b/dev-lang/php/php-7.3.25.ebuild
index a714b65929ef..a29e8ad92308 100644
--- a/dev-lang/php/php-7.3.25.ebuild
+++ b/dev-lang/php/php-7.3.25.ebuild
@@ -19,7 +19,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"
 
diff --git a/dev-lang/php/php-7.4.13.ebuild b/dev-lang/php/php-7.4.13.ebuild
index f75fa1886abc..48460b25f65a 100644
--- a/dev-lang/php/php-7.4.13.ebuild
+++ b/dev-lang/php/php-7.4.13.ebuild
@@ -21,7 +21,7 @@ LICENSE="PHP-3.01
 	unicode? ( BSD-2 LGPL-2.1 )"
 
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 S="${WORKDIR}/${PN}-${MY_PV}"