Removed old

(Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

5 files changed, 12 insertions, 132 deletions

diff --git a/sci-mathematics/glpk/ChangeLog b/sci-mathematics/glpk/ChangeLog
index 1d0fd12e4a15..6bf31739e341 100644
--- a/sci-mathematics/glpk/ChangeLog
+++ b/sci-mathematics/glpk/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-mathematics/glpk
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.58 2012/05/09 16:31:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/ChangeLog,v 1.59 2012/12/11 18:33:50 bicatali Exp $
+
+  11 Dec 2012; Sébastien Fabbro <bicatali@gentoo.org> -glpk-4.35.ebuild,
+  -glpk-4.44.ebuild, glpk-4.47.ebuild, metadata.xml:
+  Removed old
 
   09 May 2012; Alexis Ballier <aballier@gentoo.org> glpk-4.47.ebuild:
   keyword ~amd64-fbsd
@@ -260,4 +264,3 @@
   20 Nov 2003; Robin H. Johnson <robbat2@gentoo.org> glpk-4.2.ebuild,
   metadata.xml:
   Initial commit. ebuild written by robbat2@gentoo.org
-
diff --git a/sci-mathematics/glpk/glpk-4.35.ebuild b/sci-mathematics/glpk/glpk-4.35.ebuild
deleted file mode 100644
index c4560cee2058..000000000000
--- a/sci-mathematics/glpk/glpk-4.35.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.35.ebuild,v 1.9 2012/05/04 07:46:50 jdhore Exp $
-
-inherit flag-o-matic
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE="doc examples gmp odbc mysql"
-KEYWORDS="alpha amd64 hppa ppc ppc64 sparc x86"
-
-RDEPEND="odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	gmp? ( dev-libs/gmp )
-	mysql? ( virtual/mysql )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_compile() {
-	local myconf="--disable-dl"
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	fi
-
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $(pkg-config --cflags libiodbc)
-
-	econf \
-		--with-zlib \
-		$(use_with gmp) \
-		$(use_enable odbc) \
-		$(use_enable mysql) \
-		${myconf}
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# INSTALL include some usage docs
-	dodoc AUTHORS ChangeLog NEWS README || \
-		die "failed to install docs"
-
-	insinto /usr/share/doc/${PF}
-	if use examples; then
-		emake distclean
-		doins -r examples || die "failed to install examples"
-	fi
-	if use doc; then
-		cd "${S}"/doc
-		doins *.pdf notes/gomory.djvu || die "failed to instal djvu and pdf"
-		dodoc *.txt || die "failed to install manual files"
-	fi
-}
diff --git a/sci-mathematics/glpk/glpk-4.44.ebuild b/sci-mathematics/glpk/glpk-4.44.ebuild
deleted file mode 100644
index 05d4c9c125fc..000000000000
--- a/sci-mathematics/glpk/glpk-4.44.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.44.ebuild,v 1.2 2012/05/04 07:46:50 jdhore Exp $
-
-EAPI=2
-inherit flag-o-matic
-
-DESCRIPTION="GNU Linear Programming Kit"
-LICENSE="GPL-3"
-HOMEPAGE="http://www.gnu.org/software/glpk/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-SLOT="0"
-IUSE="doc examples gmp odbc mysql"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
-	gmp? ( dev-libs/gmp )
-	mysql? ( virtual/mysql )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf="--disable-dl"
-	if use mysql || use odbc; then
-		myconf="--enable-dl"
-	fi
-
-	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $(pkg-config --cflags libiodbc)
-
-	econf \
-		--with-zlib \
-		$(use_with gmp) \
-		$(use_enable odbc) \
-		$(use_enable mysql) \
-		${myconf}
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	dodoc AUTHORS ChangeLog NEWS README || \
-		die "failed to install docs"
-
-	insinto /usr/share/doc/${PF}
-	if use examples; then
-		emake distclean
-		doins -r examples || die "failed to install examples"
-	fi
-	if use doc; then
-		cd "${S}"/doc
-		doins *.pdf notes/*.pdf || die "failed to instal djvu and pdf"
-		dodoc *.txt || die "failed to install manual files"
-	fi
-}
diff --git a/sci-mathematics/glpk/glpk-4.47.ebuild b/sci-mathematics/glpk/glpk-4.47.ebuild
index b35a49736f23..8ddd5b057ea8 100644
--- a/sci-mathematics/glpk/glpk-4.47.ebuild
+++ b/sci-mathematics/glpk/glpk-4.47.ebuild
@@ -1,9 +1,9 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.47.ebuild,v 1.4 2012/05/09 16:31:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-mathematics/glpk/glpk-4.47.ebuild,v 1.5 2012/12/11 18:33:50 bicatali Exp $
 
 EAPI=4
-inherit flag-o-matic
+inherit flag-o-matic toolchain-funcs
 
 DESCRIPTION="GNU Linear Programming Kit"
 LICENSE="GPL-3"
@@ -14,9 +14,10 @@ SLOT="0"
 IUSE="doc examples gmp odbc mysql static-libs"
 KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 
-RDEPEND="odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )
+RDEPEND="
 	gmp? ( dev-libs/gmp )
-	mysql? ( virtual/mysql )"
+	mysql? ( virtual/mysql )
+	odbc? ( || ( dev-db/libiodbc dev-db/unixODBC ) )"
 
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
@@ -28,7 +29,7 @@ src_configure() {
 	fi
 
 	[[ -z $(type -P odbc-config) ]] && \
-		append-cppflags $(pkg-config --cflags libiodbc)
+		append-cppflags $($(tc-getPKG_CONFIG) --cflags libiodbc)
 
 	econf \
 		$(use_enable mysql) \
@@ -45,5 +46,5 @@ src_install() {
 		insinto /usr/share/doc/${PF}
 		doins -r examples
 	fi
-	use doc && cd "${S}"/doc && dodoc *.pdf notes/*.pdf *.txt
+	use doc && dodoc doc/*.pdf doc/notes/*.pdf doc/*.txt
 }
diff --git a/sci-mathematics/glpk/metadata.xml b/sci-mathematics/glpk/metadata.xml
index 34c36ade81c4..00e9a6f8b81b 100644
--- a/sci-mathematics/glpk/metadata.xml
+++ b/sci-mathematics/glpk/metadata.xml
@@ -10,14 +10,5 @@
   large-scale linear programming (LP), mixed integer programming
   (MIP), and other related problems. It is a set of routines written
   in ANSI C and organized in the form of a callable library. 
-  GLPK supports the GNU MathProg language, which is a subset of the
-  AMPL language.  The GLPK package includes the following main
-  components: 
-  * Revised simplex method. 
-  * Primal-dual interior point method. 
-  * Branch-and-bound method. 
-  * Translator for GNU MathProg. 
-  * Application program interface (API). 
-  * Stand-alone LP/MIP solver.
 </longdescription>
 </pkgmetadata>