old

(Portage version: 2.2.0_alpha127/cvs/Linux x86_64)

3 files changed, 5 insertions, 150 deletions

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index f6759b7c38ee..ed2e7e2b69f3 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.122 2012/09/15 18:27:30 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.123 2012/09/16 15:42:36 ssuominen Exp $
+
+  16 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> -pkgconfig-0.26.ebuild,
+  -pkgconfig-0.27.ebuild:
+  old
 
   15 Sep 2012; Raúl Porcel <armin76@gentoo.org> pkgconfig-0.27.1.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #433780
diff --git a/dev-util/pkgconfig/pkgconfig-0.26.ebuild b/dev-util/pkgconfig/pkgconfig-0.26.ebuild
deleted file mode 100644
index 66d9afa119e4..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.26.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.26.ebuild,v 1.12 2012/05/04 13:12:37 ssuominen Exp $
-
-EAPI=4
-inherit flag-o-matic multilib libtool
-
-MY_P=pkg-config-${PV}
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
-SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="elibc_FreeBSD hardened"
-
-RDEPEND=">=dev-libs/glib-2.28
-	>=dev-libs/popt-1.16
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	elibtoolize # for FreeMiNT, bug #333429
-}
-
-src_configure() {
-	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
-
-	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
-	local myconf
-	use elibc_FreeBSD && myconf="--enable-indirect-deps"
-
-	econf \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		--with-installed-popt \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	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
-}
diff --git a/dev-util/pkgconfig/pkgconfig-0.27.ebuild b/dev-util/pkgconfig/pkgconfig-0.27.ebuild
deleted file mode 100644
index a5b96cac9e60..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.27.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.27.ebuild,v 1.8 2012/09/02 19:00:28 armin76 Exp $
-
-EAPI=4
-
-inherit flag-o-matic libtool multilib
-
-MY_P=pkg-config-${PV}
-
-if [[ ${PV} == *9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/pkg-config"
-	inherit autotools git-2
-else
-	KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-	SRC_URI="http://pkgconfig.freedesktop.org/releases/${MY_P}.tar.gz"
-fi
-
-DESCRIPTION="Package config system that manages compile/link flags"
-HOMEPAGE="http://pkgconfig.freedesktop.org/wiki/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="elibc_FreeBSD hardened internal-glib"
-
-RDEPEND="!internal-glib? ( >=dev-libs/glib-2.30 )
-	!dev-util/pkgconf[pkg-config]
-	!dev-util/pkg-config-lite
-	!dev-util/pkgconfig-openbsd[pkg-config]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS NEWS README )
-
-src_prepare() {
-	if [[ ${PV} == *9999* ]]; then
-		eautoreconf
-	else
-		elibtoolize # Required for FreeMiNT wrt #333429
-	fi
-}
-
-src_configure() {
-	local myconf
-
-	if use internal-glib; then
-		myconf+=' --with-internal-glib'
-	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 \
-		--docdir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		--disable-silent-rules \
-		--with-system-include-path="${EPREFIX}"/usr/include \
-		--with-system-library-path="${EPREFIX}"/usr/$(get_libdir) \
-		${myconf}
-}
-
-src_install() {
-	default
-
-	# http://bugs.freedesktop.org/show_bug.cgi?id=52031
-	# http://cgit.freedesktop.org/pkg-config/commit/?id=40dc57fb41205c80f5ab69023669efb31edf840d
-	rm -f "${ED}"/usr/share/aclocal/g{settings,lib-gettext,lib-2.0}.m4
-
-	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
-}