media-libs/jpeg -> virtual/jpeg. Drop old.

(Portage version: 2.1.9.24/cvs/Linux x86_64)

5 files changed, 8 insertions, 291 deletions

diff --git a/sci-libs/mathgl/ChangeLog b/sci-libs/mathgl/ChangeLog
index e640f6b58546..224e0bb0b0bb 100644
--- a/sci-libs/mathgl/ChangeLog
+++ b/sci-libs/mathgl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sci-libs/mathgl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.19 2010/09/16 18:17:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/ChangeLog,v 1.20 2010/11/08 17:44:56 xarthisius Exp $
+
+  08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -mathgl-1.10.1-r1.ebuild, -files/mathgl-1.10.1-gcc43.patch,
+  -mathgl-1.10.2-r1.ebuild, mathgl-1.10.2.1-r1.ebuild:
+  media-libs/jpeg -> virtual/jpeg. Drop old.
 
   16 Sep 2010; Tomáš Chvátal <scarabeus@gentoo.org>
   mathgl-1.10.1-r1.ebuild, mathgl-1.10.2-r1.ebuild,
diff --git a/sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch b/sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch
deleted file mode 100644
index 7a639bb9a4ab..000000000000
--- a/sci-libs/mathgl/files/mathgl-1.10.1-gcc43.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- utils/mgl2gif.cpp.ORIG	2009-03-04 14:22:12.000000000 +0100
-+++ utils/mgl2gif.cpp	2009-04-22 10:15:02.000000000 +0200
-@@ -19,6 +19,7 @@
-  ***************************************************************************/
- #include <stdio.h>
- #include <string.h>
-+#include <cstdlib>
- #include <locale.h>
- #include <wchar.h>
- #include "mgl/mgl_zb.h"
diff --git a/sci-libs/mathgl/mathgl-1.10.1-r1.ebuild b/sci-libs/mathgl/mathgl-1.10.1-r1.ebuild
deleted file mode 100644
index 20e8895a1bcd..000000000000
--- a/sci-libs/mathgl/mathgl-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.1-r1.ebuild,v 1.4 2010/09/16 18:17:13 scarabeus Exp $
-
-EAPI=3
-
-WX_GTK_VER=2.8
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit autotools wxwidgets python versionator toolchain-funcs
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwidgets"
-
-RDEPEND="media-libs/libpng
-	virtual/opengl
-	python? ( dev-python/numpy )
-	glut? ( media-libs/freeglut )
-	fltk? ( x11-libs/fltk:1.1 )
-	gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )
-	hdf5? ( >=sci-libs/hdf5-1.8 )
-	gsl? ( sci-libs/gsl )
-	octave? ( sci-mathematics/octave )
-	qt4? ( x11-libs/qt-gui:4 )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.4
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	python? ( dev-lang/swig )
-	octave? ( dev-lang/swig )"
-
-pkg_setup() {
-	if ! version_is_at_least "4.3.0" "$(gcc-version)"; then
-		eerror "You need >=gcc-4.3.0 to compile this package"
-		die "Wrong gcc version"
-	fi
-	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
-		export CC=mpicc
-		export CXX=mpicxx
-	fi
-	use python && python_pkg_setup
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	mkdir "${S}"/fonts
-	cd "${S}"/fonts
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# bug #267061
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	# correct location of numpy/arrayobject.h
-	if use python; then
-		sed \
-			-e '/SUBDIRS/s:lang::g' \
-			-i Makefile.am || die
-		python_src_prepare
-	fi
-	echo "#!${EPREFIX}/bin/sh" > config/py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${ROOT}"usr/share/doc/${PF} \
-		$(use_enable glut) \
-		$(use_enable qt4 qt) \
-		$(use_enable wxwidgets wx) \
-		$(use_enable fltk) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable hdf5 hdf5_18) \
-		$(use_enable python) \
-		$(use_enable octave) \
-		$(use_enable gsl) \
-		$(use_enable doc docs)
-}
-
-src_compile() {
-	# see bug #249627
-	local JOBS
-	use doc && JOBS=-j1
-	emake ${JOBS} || die "emake failed"
-	if use python; then
-		python_copy_sources lang
-		compilation() {
-			local numpy_h
-			numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h
-			einfo "fixing numpy.i for Python-${PYTHON_ABI}"
-			sed -e "s|<numpy/arrayobject.h>|\"${numpy_h}\"|" \
-				-i numpy.i \
-				|| die "sed failed"
-			emake PYTHON_HEADERS="-I$(python_get_includedir)" pyexecdir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir lang compilation
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use python; then
-		installation() {
-			emake DESTDIR="${D}" PYTHON="$(PYTHON)" pyexecdir="$(python_get_sitedir)" pythondir="$(python_get_sitedir)" install
-		}
-		python_execute_function -s --source-dir lang installation
-		python_clean_installation_image
-	fi
-	dodoc README AUTHORS || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install /usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-	use python && python_mod_cleanup ${PN}.py
-}
diff --git a/sci-libs/mathgl/mathgl-1.10.2-r1.ebuild b/sci-libs/mathgl/mathgl-1.10.2-r1.ebuild
deleted file mode 100644
index 40411144be4d..000000000000
--- a/sci-libs/mathgl/mathgl-1.10.2-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.2-r1.ebuild,v 1.4 2010/09/16 18:17:13 scarabeus Exp $
-
-EAPI=3
-WX_GTK_VER=2.8
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-inherit autotools wxwidgets python versionator toolchain-funcs
-
-DESCRIPTION="Math Graphics Library"
-HOMEPAGE="http://mathgl.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz mirror://sourceforge/${PN}/STIX_font.tgz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc fltk gif glut gsl hdf5 jpeg octave python qt4 wxwidgets"
-
-RDEPEND="media-libs/libpng
-	virtual/opengl
-	python? ( dev-python/numpy )
-	glut? ( media-libs/freeglut )
-	fltk? ( x11-libs/fltk:1.1 )
-	gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )
-	hdf5? ( >=sci-libs/hdf5-1.8 )
-	gsl? ( sci-libs/gsl )
-	octave? ( sci-mathematics/octave )
-	qt4? ( x11-libs/qt-gui:4 )
-	wxwidgets? ( x11-libs/wxGTK:2.8 )"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-2.2.4
-	doc? ( app-text/texi2html virtual/texi2dvi )
-	python? ( dev-lang/swig )
-	octave? ( dev-lang/swig )"
-
-pkg_setup() {
-	if ! version_is_at_least "4.3.0" "$(gcc-version)"; then
-		eerror "You need >=gcc-4.3.0 to compile this package"
-		die "Wrong gcc version"
-	fi
-	if use hdf5 && has_version sci-libs/hdf5[mpi]; then
-		export CC=mpicc
-		export CXX=mpicxx
-	fi
-	use python && python_pkg_setup
-	use wxwidgets && wxwidgets_pkg_setup
-}
-
-src_unpack() {
-	unpack ${A}
-	mkdir "${S}"/fonts
-	cd "${S}"/fonts
-	unpack STIX_font.tgz
-}
-
-src_prepare() {
-	# bug #267061
-	epatch "${FILESDIR}"/${P}-gcc43.patch
-
-	# correct location of numpy/arrayobject.h
-	if use python; then
-		sed \
-			-e '/SUBDIRS/s:lang::g' \
-			-i Makefile.am || die
-		python_src_prepare
-	fi
-	echo "#!${EPREFIX}/bin/sh" > config/py-compile
-
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${ROOT}"usr/share/doc/${PF} \
-		$(use_enable glut) \
-		$(use_enable qt4 qt) \
-		$(use_enable wxwidgets wx) \
-		$(use_enable fltk) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable hdf5 hdf5_18) \
-		$(use_enable python) \
-		$(use_enable octave) \
-		$(use_enable gsl) \
-		$(use_enable doc docs)
-}
-
-src_compile() {
-	# see bug #249627
-	local JOBS
-	use doc && JOBS=-j1
-	emake ${JOBS} || die "emake failed"
-	if use python; then
-		python_copy_sources lang
-		compilation() {
-			local numpy_h
-			numpy_h=$(python_get_sitedir)/numpy/core/include/numpy/arrayobject.h
-			einfo "fixing numpy.i for Python-${PYTHON_ABI}"
-			sed -e "s|<numpy/arrayobject.h>|\"${numpy_h}\"|" \
-				-i numpy.i \
-				|| die "sed failed"
-			emake PYTHON_HEADERS="-I$(python_get_includedir)" pyexecdir="$(python_get_sitedir)"
-		}
-		python_execute_function -s --source-dir lang compilation
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	if use python; then
-		installation() {
-			emake DESTDIR="${D}" PYTHON="$(PYTHON)" pyexecdir="$(python_get_sitedir)" pythondir="$(python_get_sitedir)" install
-		}
-		python_execute_function -s --source-dir lang installation
-		python_clean_installation_image
-	fi
-	dodoc README AUTHORS || die "dodoc failed"
-}
-
-pkg_postinst() {
-	if use octave; then
-		octave <<-EOF
-		pkg install /usr/share/${PN}/octave/${PN}.tar.gz
-		EOF
-	fi
-	use python && python_mod_optimize ${PN}.py
-}
-
-pkg_prerm() {
-	if use octave; then
-		octave <<-EOF
-		pkg uninstall ${PN}
-		EOF
-	fi
-	use python && python_mod_cleanup ${PN}.py
-}
diff --git a/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild b/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild
index 8e826b3c928a..7ab7d083b2b3 100644
--- a/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild
+++ b/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild,v 1.5 2010/09/16 18:17:13 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mathgl/mathgl-1.10.2.1-r1.ebuild,v 1.6 2010/11/08 17:44:56 xarthisius Exp $
 
 EAPI=3
 
@@ -26,7 +26,7 @@ RDEPEND="media-libs/libpng
 	glut? ( media-libs/freeglut )
 	fltk? ( x11-libs/fltk:1.1 )
 	gif? ( media-libs/giflib )
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( virtual/jpeg )
 	hdf5? ( >=sci-libs/hdf5-1.8 )
 	gsl? ( sci-libs/gsl )
 	octave? ( sci-mathematics/octave )