From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 13 Oct 2011 20:00:44 +0000 (+0000)
Subject: old
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=26489af38a84dd69a759962736fd3e7f4f7f6c0f;p=gentoo.git

old

Package-Manager: portage-2.2.0_alpha64/cvs/Linux x86_64
---

diff --git a/dev-util/pkgconfig/ChangeLog b/dev-util/pkgconfig/ChangeLog
index d0123c795c4d..ebbc7f2f4000 100644
--- a/dev-util/pkgconfig/ChangeLog
+++ b/dev-util/pkgconfig/ChangeLog
@@ -1,9 +1,9 @@
 # ChangeLog for dev-util/pkgconfig
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.100 2011/10/13 19:59:44 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/ChangeLog,v 1.101 2011/10/13 20:00:44 ssuominen Exp $
 
   13 Oct 2011; Samuli Suominen <ssuominen@gentoo.org>
-  -pkgconfig-0.25-r2.ebuild:
+  -pkgconfig-0.25-r2.ebuild, -files/pkgconfig-0.25-dnl.patch:
   old
 
   31 Jul 2011; Jeroen Roovers <jer@gentoo.org> pkgconfig-0.26.ebuild:
diff --git a/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch b/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch
deleted file mode 100644
index 00e450e777b4..000000000000
--- a/dev-util/pkgconfig/files/pkgconfig-0.25-dnl.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-http://bugs.gentoo.org/326939
-http://repos.archlinux.org/wsvn/packages/pkg-config/trunk/autoconf-2.66.patch
-
---- pkg.m4
-+++ pkg.m4
-@@ -135,7 +135,7 @@
- Consider adjusting the PKG_CONFIG_PATH environment variable if you
- installed software in a non-standard prefix.
- 
--_PKG_TEXT])dnl
-+_PKG_TEXT])[]dnl
-         ])
- elif test $pkg_failed = untried; then
-      	AC_MSG_RESULT([no])
diff --git a/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild b/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild
deleted file mode 100644
index 22ade5d7ad14..000000000000
--- a/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/pkgconfig/pkgconfig-0.25-r2.ebuild,v 1.11 2011/05/20 07:31:38 ssuominen Exp $
-
-EAPI=2
-inherit eutils flag-o-matic
-
-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 ~sparc-fbsd ~x86-fbsd"
-IUSE="elibc_FreeBSD hardened"
-
-RDEPEND=">=dev-libs/popt-1.15"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-dnl.patch
-}
-
-src_configure() {
-	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=/usr/share/doc/${PF}/html \
-		--with-installed-popt \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc AUTHORS ChangeLog NEWS README
-}