[gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/, sys-devel/autogen/files/

2024-04-14 Thread Sam James
commit: d969579642f6abd6846bf188e7b5161d5618f7eb
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 15 01:55:03 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 15 02:03:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9695796

sys-devel/autogen: drop use of which

Signed-off-by: Sam James  gentoo.org>

 sys-devel/autogen/autogen-5.18.16-r4.ebuild| 76 ++
 .../autogen/files/autogen-5.18.16-no-which.patch   | 15 +
 2 files changed, 91 insertions(+)

diff --git a/sys-devel/autogen/autogen-5.18.16-r4.ebuild 
b/sys-devel/autogen/autogen-5.18.16-r4.ebuild
new file mode 100644
index ..d767e53a32bf
--- /dev/null
+++ b/sys-devel/autogen/autogen-5.18.16-r4.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic autotools toolchain-funcs
+
+DESCRIPTION="Program and text file generation"
+HOMEPAGE="https://www.gnu.org/software/autogen/";
+SRC_URI="
+   mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
+   
https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589
 -> ${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libopts static-libs"
+
+RDEPEND="
+   >=dev-scheme/guile-2.0:=
+   dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+
+# We don't pass the flag explicitly, bug #796776.
+# Let's fix it upstream after next autogen release if it happens.
+QA_CONFIGURE_OPTIONS+=" --enable-snprintfv-convenience"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.18.16-no-werror.patch
+   "${FILESDIR}"/${PN}-5.18.16-rpath.patch
+   "${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
+   "${FILESDIR}"/${PN}-5.18.16-make-4.3.patch
+   "${FILESDIR}"/${PN}-5.18.16-guile-3.patch
+   "${FILESDIR}"/${PN}-5.18.16-configure-c99.patch
+   "${FILESDIR}"/${PN}-5.18.16-FORTIFY_SOURCE.patch
+   "${FILESDIR}"/${PN}-5.18.16-no-which.patch
+)
+
+src_prepare() {
+   default
+
+   # missing tarball file
+   cp 
"${DISTDIR}"/${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 
autoopts/verify.h || die
+
+   # May be able to drop this on next release (>5.18.16)
+   eautoreconf
+}
+
+src_configure() {
+   # suppress possibly incorrect -R flag
+   export ag_cv_test_ldflags=
+
+   # autogen requires run-time sanity of regex and string functions.
+   # Use defaults of linux-glibc until we need somethig more advanced.
+   if tc-is-cross-compiler ; then
+   export ag_cv_run_strcspn=no
+   export libopts_cv_with_libregex=yes
+   fi
+
+   # bug 920174
+   use elibc_musl && append-cppflags -D_LARGEFILE64_SOURCE
+
+   econf $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+
+   find "${ED}" -name '*.la' -delete || die
+
+   if ! use libopts ; then
+   rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
+   fi
+}

diff --git a/sys-devel/autogen/files/autogen-5.18.16-no-which.patch 
b/sys-devel/autogen/files/autogen-5.18.16-no-which.patch
new file mode 100644
index ..c4b462cba420
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-no-which.patch
@@ -0,0 +1,15 @@
+--- a/configure.ac
 b/configure.ac
+@@ -149,9 +149,9 @@ GDnam=getdefs${ac_exeext}
+ CLnam=columns${ac_exeext}
+ if test "X$cross_compiling" = Xyes
+ then
+-  AGexe=`which ${AGnam}`
+-  GDexe=`which ${GDnam}`
+-  CLexe=`which ${CLnam}`
++  AGexe=`command -v ${AGnam}`
++  GDexe=`command -v ${GDnam}`
++  CLexe=`command -v ${CLnam}`
+ else
+   AGexe=${ag_top_builddir}/agen5/${AGnam}
+   GDexe=${ag_top_builddir}/getdefs/${GDnam}



[gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/, sys-devel/autogen/files/

2023-12-01 Thread Sam James
commit: bc1a2e327998227c5537b25bd81a146c17b3431c
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  2 07:09:52 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  2 07:10:16 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc1a2e32

sys-devel/autogen: fix configure modern c issues, fix FORTIFY_SOURCE=3 test 
issue

Closes: https://bugs.gentoo.org/889394
Closes: https://bugs.gentoo.org/898590
Signed-off-by: Sam James  gentoo.org>

 sys-devel/autogen/autogen-5.18.16-r3.ebuild|  74 +++
 .../files/autogen-5.18.16-FORTIFY_SOURCE.patch | 100 +
 .../files/autogen-5.18.16-configure-c99.patch  |  42 +
 3 files changed, 216 insertions(+)

diff --git a/sys-devel/autogen/autogen-5.18.16-r3.ebuild 
b/sys-devel/autogen/autogen-5.18.16-r3.ebuild
new file mode 100644
index ..462f4d2b5059
--- /dev/null
+++ b/sys-devel/autogen/autogen-5.18.16-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+DESCRIPTION="Program and text file generation"
+HOMEPAGE="https://www.gnu.org/software/autogen/";
+SRC_URI="
+   mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
+   
https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589
 -> ${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="libopts static-libs"
+
+RDEPEND="
+   >=dev-scheme/guile-2.0:=
+   dev-libs/libxml2
+"
+DEPEND="${RDEPEND}"
+# TODO: investigate & drop this!
+BDEPEND="sys-apps/which"
+
+# We don't pass the flag explicitly, bug #796776.
+# Let's fix it upstream after next autogen release if it happens.
+QA_CONFIGURE_OPTIONS+=" --enable-snprintfv-convenience"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.18.16-no-werror.patch
+   "${FILESDIR}"/${PN}-5.18.16-rpath.patch
+   "${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
+   "${FILESDIR}"/${PN}-5.18.16-make-4.3.patch
+   "${FILESDIR}"/${PN}-5.18.16-guile-3.patch
+   "${FILESDIR}"/${PN}-5.18.16-configure-c99.patch
+   "${FILESDIR}"/${PN}-5.18.16-FORTIFY_SOURCE.patch
+)
+
+src_prepare() {
+   default
+
+   # missing tarball file
+   cp 
"${DISTDIR}"/${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 
autoopts/verify.h || die
+
+   # May be able to drop this on next release (>5.18.16)
+   eautoreconf
+}
+
+src_configure() {
+   # suppress possibly incorrect -R flag
+   export ag_cv_test_ldflags=
+
+   # autogen requires run-time sanity of regex and string functions.
+   # Use defaults of linux-glibc until we need somethig more advanced.
+   if tc-is-cross-compiler ; then
+   export ag_cv_run_strcspn=no
+   export libopts_cv_with_libregex=yes
+   fi
+
+   econf $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+
+   find "${ED}" -name '*.la' -delete || die
+
+   if ! use libopts ; then
+   rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
+   fi
+}

diff --git a/sys-devel/autogen/files/autogen-5.18.16-FORTIFY_SOURCE.patch 
b/sys-devel/autogen/files/autogen-5.18.16-FORTIFY_SOURCE.patch
new file mode 100644
index ..b8108c1c0ed1
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-FORTIFY_SOURCE.patch
@@ -0,0 +1,100 @@
+https://bugs.gentoo.org/889394
+https://sourceforge.net/p/autogen/bugs/212/
+https://bugzilla.redhat.com/2173623
+https://siddhesh.in/posts/that-is-not-a-number-that-is-a-freed-object.html
+https://gcc.gnu.org/PR105217
+https://src.fedoraproject.org/rpms/autogen/blob/684b717191dd8bcd4e01a7775e62d50bc41b8ccb/f/autogen-fortify.patch
+
+commit 772b282a4e858a27af610bcdcc8b66925cbf1a83
+Author: Tomas Korbar 
+Date:   Tue Feb 28 16:08:13 2023 +0100
+
+avoid GCC code analysis bug
+
+--- a/agen5/defLoad.c
 b/agen5/defLoad.c
+@@ -448,17 +448,28 @@ read_defs(void)
+ FILE *fp;
+ def_input_mode_t in_mode = ready_def_input(&def_fname, &data_sz);
+ 
++/*
++ * "ready_def_input" has a lot of side effects. It's possible that
++ * there are no definitions, so "in_mode" is set to DONE and there's
++ * nothing to do.
++ */
+ if (in_mode == INPUT_DONE)
+ return;
+ 
+ /*
+  *  Allocate the space we need for our definitions.
++ * "data_sz" was set by read_def_input to the size of the
++ * definitions file (or 4096 if we're reading from a fifo file).
++ * In that alternate case, we'll start the input size at 4096 bytes.
++ * The allocation includes space for context and a NUL byte or two
+  */
+-rem_sz = data_sz+4+sizeof(*base_ctx);
+-base

[gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/, sys-devel/autogen/files/

2020-01-04 Thread Sergei Trofimovich
commit: 5105f322b3ff910d5d0ded2d485d5c33398eaf1c
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Jan  4 23:01:52 2020 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Jan  4 23:02:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5105f322

sys-devel/autogen: respect TMPDIR, bug #704740

Reported-by: Fedja Beader
Fixed-by: Fedja Beader
Closes: https://bugs.gentoo.org/704740
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/autogen/autogen-5.18.16-r1.ebuild|  3 ++-
 .../files/autogen-5.18.16-respect-TMPDIR.patch | 29 ++
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild 
b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
index ac34681e749..9949ee08937 100644
--- a/sys-devel/autogen/autogen-5.18.16-r1.ebuild
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -22,6 +22,7 @@ DEPEND="${RDEPEND}"
 PATCHES=(
"${FILESDIR}"/${PN}-5.18.16-no-werror.patch
"${FILESDIR}"/${PN}-5.18.16-rpath.patch
+   "${FILESDIR}"/${PN}-5.18.16-respect-TMPDIR.patch
 )
 
 src_prepare() {

diff --git a/sys-devel/autogen/files/autogen-5.18.16-respect-TMPDIR.patch 
b/sys-devel/autogen/files/autogen-5.18.16-respect-TMPDIR.patch
new file mode 100644
index 000..792214e476d
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-respect-TMPDIR.patch
@@ -0,0 +1,29 @@
+User ebuild's ${T} instead of /tmp to hide leftover files from ./configure.
+
+'run-ag.sh' does not clean temporary directories after itself and makes
+it hard to implement it cleanly without changing 'run-ag.sh' structure.
+
+Reported-by: Fedja Beader
+Bug: https://bugs.gentoo.org/704740
+--- a/build-aux/run-ag.sh
 b/build-aux/run-ag.sh
+@@ -45,7 +45,7 @@ find_exe() {
+   return 0
+ }
+ 
+-STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d /tmp/run-ag-)
++STAMP_TEMP_DIR=$(mktemp --suffix=.tdir -d -t run-ag-)
+ exec 9>&2 2>> ${STAMP_TEMP_DIR}/mk-stamps.log
+ VERBOSE=1
+ 
+--- a/config/mk-shdefs.in
 b/config/mk-shdefs.in
+@@ -130,7 +130,7 @@
+ 
+ set -x
+ exec 9>&2
+-tmp=$(mktemp --suffix=.tdir -d /tmp/shdefs-X)
++tmp=$(mktemp --suffix=.tdir -d -t shdefs-X)
+ exec 2>> $tmp/mk-shdef.log
+ init $0 $1
+ mk_config



[gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/, sys-devel/autogen/files/

2019-02-02 Thread Sergei Trofimovich
commit: 0e5f4be65afbd78b427fde3116ad74057e3297a4
Author: Sergei Trofimovich  gentoo  org>
AuthorDate: Sat Feb  2 20:07:03 2019 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Sat Feb  2 20:07:03 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e5f4be6

sys-devel/autogen: fix RPATH poisoning, bug #676692

autogen sets '-no-install' on installed binaries:
autogen_LDFLAGS = ... -no-install
columns_LDFLAGS = -no-install
getdefs_LDFLAGS = -no-install

Reported-by: Progenyx
Closes: https://bugs.gentoo.org/676692
Package-Manager: Portage-2.3.59, Repoman-2.3.12
Signed-off-by: Sergei Trofimovich  gentoo.org>

 sys-devel/autogen/autogen-5.18.16-r1.ebuild| 56 +++
 .../autogen/files/autogen-5.18.16-rpath.patch  | 80 ++
 2 files changed, 136 insertions(+)

diff --git a/sys-devel/autogen/autogen-5.18.16-r1.ebuild 
b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
new file mode 100644
index 000..b45f7a1bc1a
--- /dev/null
+++ b/sys-devel/autogen/autogen-5.18.16-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit toolchain-funcs
+
+DESCRIPTION="Program and text file generation"
+HOMEPAGE="https://www.gnu.org/software/autogen/";
+SRC_URI="mirror://gnu/${PN}/rel${PV}/${P}.tar.xz
+   
https://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=lib/verify.h;h=3b57ddee0acffd23cc51bc8910a15cf879f90619;hb=537a5511ab0b1326e69b32f87593a50aedb8a589
 -> ${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux 
~x64-macos ~x86-macos"
+IUSE="libopts static-libs"
+
+RDEPEND=">=dev-scheme/guile-2.0:=
+   dev-libs/libxml2"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-5.18.16-no-werror.patch
+   "${FILESDIR}"/${PN}-5.18.16-rpath.patch
+)
+
+src_prepare() {
+   # no-werror.patch fixes both configure{.ac,}
+   # avoid configure echeck
+   touch -r configure.ac orig.configure.ac || die
+   touch -r configureorig.configure || die
+
+   default
+
+   touch -r orig.configure.ac configure.ac || die
+   touch -r orig.configureconfigure || die
+
+   # missing tarball file
+   cp 
"${DISTDIR}"/${P}-gnulib-3b57ddee0acffd23cc51bc8910a15cf879f90619-lib-verify.h 
autoopts/verify.h || die
+}
+
+src_configure() {
+   # suppress possibly incorrect -R flag
+   export ag_cv_test_ldflags=
+
+   econf $(use_enable static-libs static)
+}
+
+src_install() {
+   default
+   find "${D}" -name '*.la' -delete || die
+
+   if ! use libopts ; then
+   rm "${ED}"/usr/share/autogen/libopts-*.tar.gz || die
+   fi
+}

diff --git a/sys-devel/autogen/files/autogen-5.18.16-rpath.patch 
b/sys-devel/autogen/files/autogen-5.18.16-rpath.patch
new file mode 100644
index 000..8d2019121eb
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.16-rpath.patch
@@ -0,0 +1,80 @@
+https://bugs.gentoo.org/676692
+
+'make install' actually installs 'getdefs', 'columns', 'autogen'
+and gentoo's 'scanelf' QA checker tool detects it as:
+
+ * QA Notice: The following files contain insecure RUNPATHs
+ *  Please file a bug about this at https://bugs.gentoo.org/
+ *  with the maintainer of the package.
+ *   /tmp/portage/sys-devel/autogen-5.18.16/image/usr/bin/getdefs
+ * RPATH: 
/tmp/portage/sys-devel/autogen-5.18.16/work/autogen-5.18.16/autoopts/.libs
+ *   /tmp/portage/sys-devel/autogen-5.18.16/image/usr/bin/columns
+ * RPATH: 
/tmp/portage/sys-devel/autogen-5.18.16/work/autogen-5.18.16/autoopts/.libs
+ *   /tmp/portage/sys-devel/autogen-5.18.16/image/usr/bin/autogen
+ * RPATH: 
/tmp/portage/sys-devel/autogen-5.18.16/work/autogen-5.18.16/autoopts/.libs
+--- a/agen5/Makefile.am
 b/agen5/Makefile.am
+@@ -63,7 +63,7 @@ SNV_LIB = $(top_builddir)/snprintfv/libsnprintfv.la
+ nodist_autogen_SOURCES = ag.c
+ autogen_SOURCES = $(gen_csrc)
+ autogen_LDADD   = $(LO_LIB) $(SNV_LIB) $(GUILE_LIBS)
+-autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN) -no-install
++autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN)
+ autogen_CFLAGS  = $(GUILE_CFLAGS)
+ stamp_script= $(srcdir)/mk-stamps.sh
+
+--- a/agen5/Makefile.in
 b/agen5/Makefile.in
+@@ -482,7 +482,7 @@ SNV_LIB = $(top_builddir)/snprintfv/libsnprintfv.la
+ nodist_autogen_SOURCES = ag.c
+ autogen_SOURCES = $(gen_csrc)
+ autogen_LDADD = $(LO_LIB) $(SNV_LIB) $(GUILE_LIBS)
+-autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN) -no-install
++autogen_LDFLAGS = $(DYNAMIC_AG) $(AG_STATIC_AUTOGEN)
+ autogen_CFLAGS = $(GUILE_CFLAGS)
+ stamp_script = $(srcdir)/mk-stamps.sh
+ AM_YFLAGS = -d
+--- a/columns/Makefile.am
 b/columns/Makefile.am
+@@ -20,7 +20,7 @@
+ ## with this program.  If not, see 

[gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/, sys-devel/autogen/files/

2017-12-04 Thread Lars Wendler
commit: 2b5e4127a29101caf452f81263532016764a264f
Author: Lars Wendler  gentoo  org>
AuthorDate: Mon Dec  4 14:50:48 2017 +
Commit: Lars Wendler  gentoo  org>
CommitDate: Mon Dec  4 14:51:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b5e4127

sys-devel/autogen: Fixed build with =dev-scheme/guile-2.2*

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 sys-devel/autogen/autogen-5.18.12.ebuild| 10 ++--
 sys-devel/autogen/files/autogen-guile-2.2.patch | 34 +
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/sys-devel/autogen/autogen-5.18.12.ebuild 
b/sys-devel/autogen/autogen-5.18.12.ebuild
index 9d29603d3e7..65274d31baa 100644
--- a/sys-devel/autogen/autogen-5.18.12.ebuild
+++ b/sys-devel/autogen/autogen-5.18.12.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit ltprune toolchain-funcs
 
 DESCRIPTION="Program and text file generation"
 HOMEPAGE="https://www.gnu.org/software/autogen/";
@@ -20,7 +20,13 @@ RDEPEND=">=dev-scheme/guile-2.0:=
dev-libs/libxml2"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+   "${FILESDIR}/${PN}-guile-2.2.patch"
+)
+
 src_prepare() {
+   default
+
# https://savannah.gnu.org/support/index.php?109050
sed -i \
-e "/--cflags-only-I/s:pkg-config:$(tc-getPKG_CONFIG):" \

diff --git a/sys-devel/autogen/files/autogen-guile-2.2.patch 
b/sys-devel/autogen/files/autogen-guile-2.2.patch
new file mode 100644
index 000..8ef904adb02
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-guile-2.2.patch
@@ -0,0 +1,34 @@
+https://raw.githubusercontent.com/Homebrew/formula-patches/master/autogen/allow-guile-2.2.diff
+
+--- a/agen5/guile-iface.h
 b/agen5/guile-iface.h
+@@ -9,7 +9,7 @@
+ # error AutoGen does not work with this version of Guile
+   choke me.
+ 
+-#elif GUILE_VERSION < 201000
++#else
+ # define AG_SCM_IS_PROC(_p)   scm_is_true( scm_procedure_p(_p))
+ # define AG_SCM_LIST_P(_l)scm_is_true( scm_list_p(_l))
+ # define AG_SCM_PAIR_P(_p)scm_is_true( scm_pair_p(_p))
+@@ -24,9 +24,6 @@
+ # define AG_SCM_TO_ULONG(_v)  ((unsigned long)scm_to_ulong(_v))
+ # define AG_SCM_VEC_P(_v) scm_is_vector(_v)
+ 
+-#else
+-# error unknown GUILE_VERSION
+-  choke me.
+ #endif
+ 
+ #endif /* MUTATING_GUILE_IFACE_H_GUARD */
+--- a/configure
 b/configure
+@@ -14191,7 +14191,7 @@ $as_echo "no" >&6; }
+   PKG_CONFIG=""
+   fi
+ fi
+-  _guile_versions_to_search="2.0 1.8"
++  _guile_versions_to_search="2.2 2.0 1.8"
+   if test -n "$GUILE_EFFECTIVE_VERSION"; then
+ _guile_tmp=""
+ for v in $_guile_versions_to_search; do



[gentoo-commits] repo/gentoo:master commit in: sys-devel/autogen/, sys-devel/autogen/files/

2015-11-23 Thread Mike Frysinger
commit: d2e0d720fd9440e55f2dab5eddecf4dd1f74364b
Author: Mike Frysinger  gentoo  org>
AuthorDate: Mon Nov 23 11:26:29 2015 +
Commit: Mike Frysinger  gentoo  org>
CommitDate: Mon Nov 23 11:26:33 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e0d720

sys-devel/autogen: fix use of hardcoded /tmp paths during build #563352

 sys-devel/autogen/autogen-5.18.4.ebuild  |  4 
 sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch | 17 +
 2 files changed, 21 insertions(+)

diff --git a/sys-devel/autogen/autogen-5.18.4.ebuild 
b/sys-devel/autogen/autogen-5.18.4.ebuild
index c1d55b9..a3969ab 100644
--- a/sys-devel/autogen/autogen-5.18.4.ebuild
+++ b/sys-devel/autogen/autogen-5.18.4.ebuild
@@ -19,6 +19,10 @@ RDEPEND=">=dev-scheme/guile-1.8
dev-libs/libxml2"
 DEPEND="${RDEPEND}"
 
+src_prepare() {
+   epatch "${FILESDIR}"/${PN}-5.18.4-tmp-log.patch #563352
+}
+
 src_configure() {
# suppress possibly incorrect -R flag
export ag_cv_test_ldflags=

diff --git a/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch 
b/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch
new file mode 100644
index 000..89e0277
--- /dev/null
+++ b/sys-devel/autogen/files/autogen-5.18.4-tmp-log.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/563352
+https://sourceforge.net/p/autogen/bugs/172/
+
+this is fixed upstream in commit f303a1d5d8d8e002974eb64818f74041325f2433
+
+--- a/pkg/libopts/mklibsrc.sh
 b/pkg/libopts/mklibsrc.sh
+@@ -18,8 +18,7 @@
+ ##  You should have received a copy of the GNU General Public License along
+ ##  with this program.  If not, see .
+ 
+-set -ex
+-exec 2> /tmp/mklibsrc-log.tx
++set -e
+ 
+ top_builddir=`cd $top_builddir ; pwd`
+ top_srcdir=`cd $top_srcdir ; pwd`