Add dev-util/pkgconfig-0.29.1, dev-vcs/cvs-1.12.13.1-r2, update README.md with details of macOS 10.13 printf() fixes

3 files changed, 152 insertions, 0 deletions

diff --git a/dev-util/pkgconfig/Manifest b/dev-util/pkgconfig/Manifest
new file mode 100644
index 00000000..c5518c94
--- /dev/null
+++ b/dev-util/pkgconfig/Manifest
@@ -0,0 +1,4 @@
+AUX pkgconfig-0.29-vasnprintf.patch 478 SHA256 dddd1c513f455023433ddb1f5c6a529365d2bab510c0f75216435d4048e6e5a5 SHA512 aeb40856a76bd439d1678ca614b1ad58dcbc31ed82b69d30cd0ac19865982bc9edbfeb7557aff3adab868a9c720f98ce71cdf0c849d1d67e25953f138fb22c86 WHIRLPOOL 959eb1d79190acf12952b2bb96d52ceb6ebda320b0b5c26cf415f5fe88933770e0830ee09dd92803c6b15ac1b16269d97682a03973a27f1dea0df64f313e8962
+DIST pkg-config-0.29.1.tar.gz 2013454 SHA256 beb43c9e064555469bd4390dcfd8030b1536e0aa103f08d7abf7ae8cac0cb001 SHA512 d2963355929d7aae0fbadad445d67b5c6762934fc4963a10a4b72ae90f7f6df4e6a38694884b924ff37eedaf636b49f3f521fe4eb3009e0322a402f330f1b4c2 WHIRLPOOL 6e7ff88253a4ff2e5b8c7e07bd9b5ab9b78b7f13dfe3af0a8607a8a20205a2340d02a400857d43aca5265ddb299c889b4a71c0c840c2d1b0e956434eb1980341
+DIST pkgconfig-glib-cygwin-patches-2.38.2.zip 7057 SHA256 08a006bc73175cb942179be3cfc38656e855c71c012aaf284271237a4803db13 SHA512 a9b8c0bfec83b022cfb74a4a4b53b17f29ea3b3b0cb12fed8e34a27258b5524c87ddbae1e2d88e452408948795a09506e6782dc87916cb4748a455261f583b62 WHIRLPOOL 390b040d9d1f16a427ffa04a8820cd7de9a756ba9c1f32cbe22d560b385f9eb38441569b68ec1ac38319123bd585f82dd52d19764e6a2520b74bbc9dcd37c631
+EBUILD pkgconfig-0.29.1.ebuild 4221 SHA256 e0d6e5096735acb8e4613c7052a8e26dfb4d0001c2c4e09b8f823c195d5e0f0a SHA512 9a3de79ab2b7ea3e6b9a581295cb0cc27ba4359b2d9d3aeaa3940ad0af4d628ca069dbd4da7a135daf9945d6c94244ad8b27155d52cdf80ddfed396e0f5a3310 WHIRLPOOL 23d04ea11b1a56de7dee1c4b6de2aa34a7a4371d18816dac7deeab93a818a4ab79e8e37c6b94d7dd6a430af634f41d4cc9a15bdd7c60a8781608734f4d890eae
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.29-vasnprintf.patch b/dev-util/pkgconfig/files/pkgconfig-0.29-vasnprintf.patch
new file mode 100644
index 00000000..fd865ed9
--- /dev/null
+++ b/dev-util/pkgconfig/files/pkgconfig-0.29-vasnprintf.patch
@@ -0,0 +1,16 @@
+--- a/glib/glib/gnulib/vasnprintf.c
++++ b/glib/glib/gnulib/vasnprintf.c
+@@ -696,9 +696,13 @@ vasnprintf (char *resultbuf, size_t *len
+ 		  }
+ 		*p = dp->conversion;
+ #if HAVE_SNPRINTF
++# if !defined(__APPLE__) && !(((__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 3)) && !defined __UCLIBC__) || ((defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__))
+ 		p[1] = '%';
+ 		p[2] = 'n';
+ 		p[3] = '\0';
++# else
++		p[1] = '\0';
++# endif
+ #else
+ 		p[1] = '\0';
+ #endif
diff --git a/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
new file mode 100644
index 00000000..bcac8d5f
--- /dev/null
+++ b/dev-util/pkgconfig/pkgconfig-0.29.1.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+# Do not inherit autotools in non-live ebuild - causes circular dependency, bug #550856
+inherit eutils flag-o-matic libtool multilib multilib-minimal
+
+MY_P=pkg-config-${PV}
+
+if [[ ${PV} == *9999* ]]; then
+	# 1.12 is only needed for tests due to some am__check_pre / LOG_DRIVER
+	# weirdness with "/bin/bash /bin/sh" in arguments chain with >=1.13
+	WANT_AUTOMAKE=1.12
+	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
+	EGIT_CHECKOUT_DIR=${WORKDIR}/${MY_P}
+	inherit autotools git-r3
+else
+	KEYWORDS="~ppc-aix ~x64-cygwin ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	SRC_URI="https://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
+	INTERNAL_GLIB_CYGWIN_PATCHES=2.38.2
+fi
+
+[[ -n ${INTERNAL_GLIB_CYGWIN_PATCHES} ]] &&
+SRC_URI+=" internal-glib? ( elibc_Cygwin? (
+	https://github.com/haubi/pkgconfig-glib-cygwin-patches/archive/v${INTERNAL_GLIB_CYGWIN_PATCHES}.zip
+	-> pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES}.zip
+) )"
+
+DESCRIPTION="Package config system that manages compile/link flags"
+HOMEPAGE="https://pkgconfig.freedesktop.org/wiki/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="elibc_FreeBSD elibc_glibc elibc_Cygwin hardened internal-glib"
+
+RDEPEND="!internal-glib? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] )
+	!dev-util/pkgconf[pkg-config]
+	!dev-util/pkg-config-lite
+	!dev-util/pkgconfig-openbsd[pkg-config]
+	virtual/libintl"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+DOCS=( AUTHORS NEWS README )
+
+src_prepare() {
+	sed -i -e "s|^prefix=/usr\$|prefix=${EPREFIX}/usr|" check/simple.pc || die #434320
+
+	[[ -n ${INTERNAL_GLIB_CYGWIN_PATCHES} ]] &&
+	use internal-glib && use elibc_Cygwin &&
+	EPATCH_FORCE=yes EPATCH_SUFFIX=patch \
+	epatch "${WORKDIR}"/pkgconfig-glib-cygwin-patches-${INTERNAL_GLIB_CYGWIN_PATCHES}
+
+	epatch "${FILESDIR}"/${PN}-0.29-vasnprintf.patch
+
+	eapply_user
+
+	if [[ ${PV} == *9999* ]]; then
+		eautoreconf
+	else
+		elibtoolize # Required for FreeMiNT wrt #333429
+	fi
+
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		# fix standards conflicts
+		sed -i \
+			-e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/\1_DISABLED/' \
+			-e '/\<_XOPEN_SOURCE\>/s/2/600/' \
+			glib/configure || die
+	fi
+}
+
+multilib_src_configure() {
+	local myconf
+
+	if use internal-glib; then
+		myconf+=' --with-internal-glib'
+		# non-glibc platforms use GNU libiconv, but configure needs to
+		# know about that not to get confused when it finds something
+		# outside the prefix too
+		if use prefix && use !elibc_glibc ; then
+			myconf+=" --with-libiconv=gnu"
+			# add the libdir for libtool, otherwise it'll make love with system
+			# installed libiconv
+			append-ldflags "-L${EPREFIX}/usr/$(get_libdir)"
+			# the glib objects reference symbols from these frameworks,
+			# not good, esp. since Carbon should be deprecated
+			[[ ${CHOST} == *-darwin* ]] && \
+				append-ldflags -framework CoreFoundation -framework Carbon
+			if [[ ${CHOST} == *-solaris* ]] ; then
+				# required due to __EXTENSIONS__
+				append-cppflags -DENABLE_NLS
+				# similar to Darwin
+				append-ldflags -lintl
+			fi
+		fi
+	else
+		if ! has_version dev-util/pkgconfig; then
+			export GLIB_CFLAGS="-I${EPREFIX}/usr/include/glib-2.0 -I${EPREFIX}/usr/$(get_libdir)/glib-2.0/include"
+			export GLIB_LIBS="-lglib-2.0"
+		fi
+	fi
+
+	use ppc64 && use hardened && replace-flags -O[2-3] -O1
+
+	# Force using all the requirements when linking, so that needed -pthread
+	# lines are inherited between libraries
+	use elibc_FreeBSD && myconf+=' --enable-indirect-deps'
+
+	[[ ${PV} == *9999* ]] && myconf+=' --enable-maintainer-mode'
+
+	ECONF_SOURCE=${S} \
+	econf \
+		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		--with-system-include-path="${EPREFIX}"/usr/include \
+		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
+		${myconf}
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if use prefix; then
+		# Add an explicit reference to $EPREFIX to PKG_CONFIG_PATH to
+		# simplify cross-prefix builds
+		echo "PKG_CONFIG_PATH=${EPREFIX}/usr/$(get_libdir)/pkgconfig:${EPREFIX}/usr/share/pkgconfig" >> "${T}"/99${PN}
+		doenvd "${T}"/99${PN}
+	fi
+}