* [gentoo-commits] dev/heroxbd:master commit in: sys-devel/automake/, sys-devel/automake/files/
@ 2016-05-23 6:18 Benda XU
0 siblings, 0 replies; only message in thread
From: Benda XU @ 2016-05-23 6:18 UTC (permalink / raw
To: gentoo-commits
commit: 8fd750e2bab0f77ec886aa817aed94ecc57a3b79
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu May 19 03:09:24 2016 +0000
Commit: Benda XU <heroxbd <AT> gentoo <DOT> org>
CommitDate: Thu May 19 03:09:24 2016 +0000
URL: https://gitweb.gentoo.org/dev/heroxbd.git/commit/?id=8fd750e2
sys-devel/automake: merged.
sys-devel/automake/Manifest | 5 --
sys-devel/automake/automake-1.15-r2.ebuild | 98 ----------------------
.../automake/files/automake-1.15-mdate-tz.patch | 53 ------------
.../automake-1.15-perl-escape-curly-bracket.patch | 37 --------
sys-devel/automake/metadata.xml | 8 --
5 files changed, 201 deletions(-)
diff --git a/sys-devel/automake/Manifest b/sys-devel/automake/Manifest
deleted file mode 100644
index 1fbdd89..0000000
--- a/sys-devel/automake/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX automake-1.15-mdate-tz.patch 1757 SHA256 6409933549df0afcf9dcece8b2036140290999512b32a6554a6d898ae1d80fee SHA512 c4fc5a2ed4d7d6e0dc06f0e90fa84bea99f35145a885485fef072c4e0dfc979f696959e1d54381f78de429a11d5ee9b061686cca8fd1c85469245d5b4d2cdc52 WHIRLPOOL 217c2ca5a15cfa159b473aea0691f8b0f494b4b1be1845b2f39ec0c0ccb5a392b53f00a2de496076094f878db583432d75f22e2c5e858897b97b052933168c67
-AUX automake-1.15-perl-escape-curly-bracket.patch 1129 SHA256 1f5c086733cdb7b64c5a160fea22ab90eaec45664db47a7fedf82051eb7f6b56 SHA512 d6c2078e7eebd4e5104e7c9d9b5623cab322689b520e28b788a0e6fc52d795ef24e246f72ada9be6aae7d4904e34e4a6f2b6dc94abb3ed70b338d89985ed2164 WHIRLPOOL 7e2916b62811b79d80ac03cbe96b1c2fb32ba64747e93e5913931a7c10efb5560d9cfb81d5c4c953d0894f97382ceb62a264ab627b123c9323a03b0e9591a7d1
-DIST automake-1.15.tar.xz 1496708 SHA256 9908c75aabd49d13661d6dcb1bc382252d22cc77bf733a2d55e87f2aa2db8636 SHA512 200a13f49a3f492ed27bc2eb615aa2f47e775e470a781f6821cd43e0f7b927d091e690b4a23fe5cc8fa79c48daaa9436be4b968784696c3bdbf1634b456cda47 WHIRLPOOL 5c7878f46fd3d0104b5fa6a17f985d5cb57ac4a1c956763953acce411756a94b3e8e3b5a701f28c0a4b8c3cd60d60ab34561ae88706e6ccc54f0d76e1174502c
-EBUILD automake-1.15-r2.ebuild 2658 SHA256 4a2063c9f9b7f378e25a4db2551c34ab75f3016f520305801043f3e0602c020b SHA512 2a9534fdd3065109957e37ffa6451b4c0601de2b76ac94571eb3c6f0ad0097d283a0fccfdb61df93c7ecadb789b75ac2fbc9b6a77413c7b0c9065c0eca809a64 WHIRLPOOL b94bab7ca73c8df38b528fbe536671393ce9a5fd89f6d60dc9fb410e520689ccf125f27d41241b111c3be6aa9eaa22f1f8a140ec9237be4144c7a1463c560d55
-MISC metadata.xml 253 SHA256 d82c33ef453113a5c1ebe250dcba373c22934a69b0a86c6ab15a5ca589c25b91 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 WHIRLPOOL e5aee23acff864609953a1e4de768f0e4aef704b44c53c021f28573e1ca5c99f1a46d92935ecec2449f7b4419a36d8373127d0ecfa8d7bae72d835e1839eb3f8
diff --git a/sys-devel/automake/automake-1.15-r2.ebuild b/sys-devel/automake/automake-1.15-r2.ebuild
deleted file mode 100644
index f4349c2..0000000
--- a/sys-devel/automake/automake-1.15-r2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils versionator
-
-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"
-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"
-fi
-
-DESCRIPTION="Used to generate Makefile.in from Makefile.am"
-HOMEPAGE="https://www.gnu.org/software/automake/"
-
-LICENSE="GPL-2"
-# Use Gentoo versioning for slotting.
-SLOT="${PV:0:4}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/perl
- >=sys-devel/automake-wrapper-10
- >=sys-devel/autoconf-2.69
- sys-devel/gnuconfig"
-DEPEND="${RDEPEND}
- sys-apps/help2man"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.15-perl-escape-curly-bracket.patch
- epatch "${FILESDIR}"/${PN}-1.15-mdate-tz.patch #520818 #574492
-}
-
-src_configure() {
- econf --docdir="\$(datarootdir)/doc/${PF}"
-}
-
-src_test() {
- emake check
-}
-
-# 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
- rm -f dir
-
- # Rewrite all the references to other pages.
- # before: * aclocal-invocation: (automake)aclocal Invocation. Generating aclocal.m4.
- # after: * aclocal-invocation v1.13: (automake-1.13)aclocal Invocation. Generating aclocal.m4.
- local p pages=( *.info ) args=()
- for p in "${pages[@]/%.info}" ; do
- args+=(
- -e "/START-INFO-DIR-ENTRY/,/END-INFO-DIR-ENTRY/s|: (${p})| v${SLOT}&|"
- -e "s:(${p}):(${p}-${SLOT}):g"
- )
- done
- sed -i "${args[@]}" * || die
-
- # Rewrite all the file references, and rename them in the process.
- local f d
- for f in * ; do
- d=${f/.info/-${SLOT}.info}
- mv "${f}" "${d}" || die
- sed -i -e "s:${f}:${d}:g" * || die
- done
-
- popd >/dev/null
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- slot_info_pages
- rm "${ED}"/usr/share/aclocal/README || die
- rmdir "${ED}"/usr/share/aclocal || die
- dodoc AUTHORS ChangeLog NEWS README THANKS
-
- rm \
- "${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
- local x
- for x in guess sub ; do
- dosym ../gnuconfig/config.${x} /usr/share/${PN}-${SLOT}/config.${x}
- done
-}
diff --git a/sys-devel/automake/files/automake-1.15-mdate-tz.patch b/sys-devel/automake/files/automake-1.15-mdate-tz.patch
deleted file mode 100644
index e00f2bf..0000000
--- a/sys-devel/automake/files/automake-1.15-mdate-tz.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/520818
-https://bugs.gentoo.org/574492
-https://lists.gnu.org/archive/html/bug-automake/2014-10/msg00003.html
-https://lists.gnu.org/archive/html/bug-automake/2014-10/msg00004.html
-
-https://debbugs.gnu.org/20314
-https://bugs.debian.org/782345
-https://lists.gnu.org/archive/html/automake-patches/2015-04/msg00000.html
-
-From: Reiner Herrmann <reiner@reiner-h.de>
-Date: Sat, 18 Jul 2015 14:10:35 -0400
-Subject: Make output of mdate-sh deterministic
-
-mdate-sh pretty-prints the modification time of a file.
-But it's output can vary depending on the timezone of
-the caller. Someone in timezone GMT-12 will get a different
-result (day) than someone in timezone GMT+12.
-
-As this output is also used to create/update stamp files,
-which influence the further build process, the build result
-can vary.
-To enable reproducible builds and to have a more deterministic
-build behavior, this change fixes the timezone to UTC.
-
-Signed-off-by: Reiner Herrmann <reiner at reiner-h.de>
----
- lib/mdate-sh | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/lib/mdate-sh b/lib/mdate-sh
-index e8dfaca..9e2c0c9 100755
---- a/lib/mdate-sh
-+++ b/lib/mdate-sh
-@@ -1,7 +1,7 @@
- #!/bin/sh
- # Get modification time of a file or directory and pretty-print it.
-
--scriptversion=2010-08-21.06; # UTC
-+scriptversion=2015-04-09.19; # UTC
-
- # Copyright (C) 1995-2014 Free Software Foundation, Inc.
- # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995
-@@ -74,6 +74,10 @@ export LC_ALL
- LC_TIME=C
- export LC_TIME
-
-+# Use UTC to get reproducible result
-+TZ=UTC
-+export TZ
-+
- # GNU ls changes its time format in response to the TIME_STYLE
- # variable. Since we cannot assume 'unset' works, revert this
- # variable to its documented default.
diff --git a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch b/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
deleted file mode 100644
index 268548d..0000000
--- a/sys-devel/automake/files/automake-1.15-perl-escape-curly-bracket.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-http://debbugs.gnu.org/cgi/bugreport.cgi?bug=21001
-
-From 34163794a58b5bd91c5d6bd9adf5437571c7a479 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 7 Jul 2015 10:54:24 +0200
-Subject: [PATCH] bin/automake: escape '{' in regexp pattern
-
-Based on perlre(1) documentation:
-.. in Perl v5.26, literal uses of a curly bracket will be required
-to be escaped, say by preceding them with a backslash ("\{" ) or
-enclosing them within square brackets ("[{]") ..
-
-References:
-https://bugzilla.redhat.com/1239379
-
-* bin/automake.in (substitute_ac_subst_variables): Escape the
-occurrence of '{' character.
----
- bin/automake.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bin/automake.in b/bin/automake.in
-index 0c29184..c294ced 100644
---- a/bin/automake.in
-+++ b/bin/automake.in
-@@ -3898,7 +3898,7 @@ sub substitute_ac_subst_variables_worker
- sub substitute_ac_subst_variables
- {
- my ($text) = @_;
-- $text =~ s/\${([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
-+ $text =~ s/\$\{([^ \t=:+{}]+)}/substitute_ac_subst_variables_worker ($1)/ge;
- return $text;
- }
-
---
-2.1.0
-
diff --git a/sys-devel/automake/metadata.xml b/sys-devel/automake/metadata.xml
deleted file mode 100644
index 56c1244..0000000
--- a/sys-devel/automake/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
- <email>base-system@gentoo.org</email>
- <name>Gentoo Base System</name>
-</maintainer>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2016-05-23 6:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-23 6:18 [gentoo-commits] dev/heroxbd:master commit in: sys-devel/automake/, sys-devel/automake/files/ Benda XU
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox