gentoo resync : 02.03.2018

1 files changed, 25 insertions, 13 deletions

diff --git a/sys-devel/automake/automake-9999.ebuild b/sys-devel/automake/automake-9999.ebuild
index ee87a2b2eb15..fe0a51c196a7 100644
--- a/sys-devel/automake/automake-9999.ebuild
+++ b/sys-devel/automake/automake-9999.ebuild
@@ -2,12 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
+PYTHON_COMPAT=( python2_7 )
 
-inherit eutils versionator
+inherit python-any-r1 versionator
 
 if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="git://git.savannah.gnu.org/${PN}.git
-		http://git.savannah.gnu.org/r/${PN}.git"
+	EGIT_REPO_URI="https://git.savannah.gnu.org/r/${PN}.git"
 
 	inherit git-r3
 else
@@ -15,13 +15,13 @@ else
 	if [[ ${PV/_beta} == ${PV} ]]; then
 		MY_P=${P}
 		SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-			ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+			https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	else
 		MY_PV="$(get_major_version).$(($(get_version_component_range 2)-1))b"
 		MY_P="${PN}-${MY_PV}"
 
 		# Alpha/beta releases are not distributed on the usual mirrors.
-		SRC_URI="ftp://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
+		SRC_URI="https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
 	fi
 	S="${WORKDIR}/${MY_P}"
 fi
@@ -32,14 +32,21 @@ HOMEPAGE="https://www.gnu.org/software/automake/"
 LICENSE="GPL-2"
 # Use Gentoo versioning for slotting.
 SLOT="${PV:0:4}"
-IUSE=""
+IUSE="test"
 
 RDEPEND="dev-lang/perl
 	>=sys-devel/automake-wrapper-10
 	>=sys-devel/autoconf-2.69:*
 	sys-devel/gnuconfig"
 DEPEND="${RDEPEND}
-	sys-apps/help2man"
+	sys-apps/help2man
+	test? ( ${PYTHON_DEPS} )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.15-install-sh-avoid-low-risk-race-in-tmp.patch )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
 
 src_prepare() {
 	default
@@ -48,13 +55,18 @@ src_prepare() {
 	# to be a bit esoteric, and the script does `set -e` itself.
 	./bootstrap || die
 	sed -i -e "/APIVERSION=/s:=.*:=${SLOT}:" configure || die
+
+	# Bug 628912
+	if ! has_version sys-apps/texinfo ; then
+		touch doc/{stamp-vti,version.texi,automake.info} || die
+	fi
 }
 
 # slot the info pages.  do this w/out munging the source so we don't have
 # to depend on texinfo to regen things.  #464146 (among others)
 slot_info_pages() {
-	pushd "${ED}"/usr/share/info >/dev/null || die
-	rm -f dir || dir
+	pushd "${ED%/}"/usr/share/info >/dev/null || die
+	rm -f dir || die
 
 	# Rewrite all the references to other pages.
 	# before: * aclocal-invocation: (automake)aclocal Invocation.   Generating aclocal.m4.
@@ -83,11 +95,11 @@ src_install() {
 	default
 
 	slot_info_pages
-	rm "${ED}"/usr/share/aclocal/README || die
-	rmdir "${ED}"/usr/share/aclocal || die
+	rm "${ED%/}"/usr/share/aclocal/README || die
+	rmdir "${ED%/}"/usr/share/aclocal || die
 	rm \
-		"${ED}"/usr/bin/{aclocal,automake} \
-		"${ED}"/usr/share/man/man1/{aclocal,automake}.1 || die
+		"${ED%/}"/usr/bin/{aclocal,automake} \
+		"${ED%/}"/usr/share/man/man1/{aclocal,automake}.1 || die
 
 	# remove all config.guess and config.sub files replacing them
 	# w/a symlink to a specific gnuconfig version