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

Package-Manager: portage-2.1.9.24/cvs/Linux x86_64

5 files changed, 17 insertions, 169 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 1a7fc7fb991c..a16e2db68c51 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.179 2010/10/25 18:18:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.180 2010/11/08 18:44:41 xarthisius Exp $
+
+  08 Nov 2010; Kacper Kowalik <xarthisius@gentoo.org> R-2.10.1.ebuild,
+  -R-2.11.1.ebuild, R-2.12.0.ebuild:
+  media-libs/jpeg -> virtual/jpeg. Drop old.
 
 *R-2.12.0 (25 Oct 2010)
 
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 0a1a11d9a030..0f8ca1a135c8 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -3,18 +3,18 @@ Hash: SHA1
 
 AUX R-2.11.1-parallel.patch 488 RMD160 d693776b4650bc151f977f7c75234e582ad379c1 SHA1 02ea92a7ef3c2b87a9b1f3c929cb8eb828cd06db SHA256 d17c52fcda732908954aa4bbf690085402a4027ef905bc456e5101602e2bcf4f
 DIST R-2.10.1.tar.gz 19705604 RMD160 7acf060192f205da4731d0ea3c2cc318b65b7e91 SHA1 f5b1969fde3642c233f5198e44a7bf17a7b85ab6 SHA256 5ca1780d9f47f2f4a9b52ba44fed9ee6e7d3547f18ed2c05192b0dbc56038e9d
-DIST R-2.11.1.tar.gz 19729300 RMD160 a5223a3f784ad0f808d893d82a4e0a130c9a9b3a SHA1 0b36780627f3cc5cea3f41e0b717ed7ee92ba086 SHA256 48c1b96426f5b588763652b0b633cadccf410bae34300c22fd40524662bc23bb
 DIST R-2.12.0.tar.gz 20521448 RMD160 e10511bc360284d3876b147a0351b662d80d22a4 SHA1 07b90a728e36585742603beccdee30b6864ef5af SHA256 93d72d845b01c6cd00e58f04b5e78fd6c83de96a8620505ad2a016772af02179
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
-EBUILD R-2.10.1.ebuild 4078 RMD160 135e9344cf5de1ca710f216822075ffc35dc3b0e SHA1 e58976ba3ffb4473f120d293c036e97114e02908 SHA256 2296760ff1357e60475cff72c7715e92fcfc50ec2c3271b9d5a9b094123b2e6e
-EBUILD R-2.11.1.ebuild 4144 RMD160 23e9f44bb0df82ca9d5fdb494d0a9484cfe811d7 SHA1 44cc4e41f8d0747565fd96b89dfa1eb5cdf89bfd SHA256 f3c5e1cacfa0866e538fe8445013675cbe3c9241457eddce758d11a268860ee5
-EBUILD R-2.12.0.ebuild 4151 RMD160 52ee442c8bec5d030f8b8e7cc320265b99bbf248 SHA1 5a3e33b47a26eec2c9b0b73f70e0cec750d3b331 SHA256 80eefbdd020b30099b77830a22c69206a4a6a47999868278adebb1efca502e1d
-MISC ChangeLog 25878 RMD160 77e96551240e052562cd8724dd50479a9eefb53d SHA1 c13f7d021831d68bd9ca99d8b646037271d25096 SHA256 b5941f0d7e5b905fa3e676784c1dec0450102c49d7f6932d7332c7e8b97c7a5c
+EBUILD R-2.10.1.ebuild 4081 RMD160 26cb35991a195a796e04843c1e3661c832b67242 SHA1 04e91251e2de6d7f4a2017366b8054c8f72628a8 SHA256 74e52a2124448a71a9a26a497605f83056406ea02cbf005212109e67a85a4a73
+EBUILD R-2.12.0.ebuild 4150 RMD160 a47ea629281ba19243cfb3850d8f9b8bdd639446 SHA1 9a085346bdba91820dcb2ca1fff3b0c5ca447bef SHA256 f487186c7b005400c27ac24335096927341251fe5a4d9d3c3afbb9ccc0be0d23
+MISC ChangeLog 26034 RMD160 31f1fc7cc3d0dba2b73be4e9ac30836f835cc742 SHA1 dd7fad903ed4b3e41b35671c0c7fa46a3cd97eb6 SHA256 2f4023f226d6841cdbfb3c9e31472789cdea735ed48e7131c6abe79df1c16a0f
 MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzFyfQACgkQ1ycZbhPLE2C5PgCgrRSvUNQ7mkuRbABL/+ECbWMx
-HVkAn3SIjYWVYVy659dsGXIej3H2tuZQ
-=V+BC
+iJwEAQECAAYFAkzYRSIACgkQIiMqcbOVdxTAyQP/Y4Mc44LlHAkXtG+Hy8OyqA23
+ZNNhs2UA8cCRW+h2jS5WmUBTBetAE09ZKtpMSEn1JayDGAMoLr8wpP4XFlf5XIaH
+CfAsXJeXz7OAVQvEXrNfisuEMw5wfkQ9fnKyDqB4UyzlEuXeZIVR7krtB0ALpFoG
+iTHFElTbMR8DK1rX6e4=
+=3N6x
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.10.1.ebuild b/dev-lang/R/R-2.10.1.ebuild
index 691401417f97..5ef76fb0929f 100644
--- a/dev-lang/R/R-2.10.1.ebuild
+++ b/dev-lang/R/R-2.10.1.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/dev-lang/R/R-2.10.1.ebuild,v 1.9 2010/05/23 17:52:16 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.10.1.ebuild,v 1.10 2010/11/08 18:44:41 xarthisius Exp $
 
 EAPI=2
 inherit eutils flag-o-matic bash-completion versionator
@@ -23,7 +23,7 @@ CDEPEND="dev-libs/libpcre
 	app-text/ghostscript-gpl
 	cairo? ( x11-libs/cairo[X]
 		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( virtual/jpeg )
 	lapack? ( virtual/lapack )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )
diff --git a/dev-lang/R/R-2.11.1.ebuild b/dev-lang/R/R-2.11.1.ebuild
deleted file mode 100644
index a165420ec00c..000000000000
--- a/dev-lang/R/R-2.11.1.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.11.1.ebuild,v 1.2 2010/06/16 15:36:14 bicatali Exp $
-
-EAPI=2
-inherit eutils flag-o-matic bash-completion versionator
-
-DESCRIPTION="Language and environment for statistical computing and graphics"
-HOMEPAGE="http://www.r-project.org/"
-SRC_URI="mirror://cran/src/base/R-2/${P}.tar.gz
-	bash-completion? ( mirror://gentoo/R.bash_completion.bz2 )"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-IUSE="doc java jpeg lapack minimal nls perl png readline threads tk X cairo"
-
-# common depends
-CDEPEND="dev-libs/libpcre
-	app-arch/bzip2
-	virtual/blas
-	app-text/ghostscript-gpl
-	cairo? ( x11-libs/cairo[X]
-		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
-	jpeg? ( media-libs/jpeg )
-	lapack? ( virtual/lapack )
-	perl? ( dev-lang/perl )
-	png? ( media-libs/libpng )
-	readline? ( sys-libs/readline )
-	tk? ( dev-lang/tk )
-	X? ( x11-libs/libXmu x11-misc/xdg-utils )"
-
-DEPEND="${CDEPEND}
-	dev-util/pkgconfig
-	doc? ( virtual/latex-base
-	  || ( dev-texlive/texlive-fontsrecommended
-		   app-text/ptex ) )"
-
-RDEPEND="${CDEPEND}
-	app-arch/unzip
-	app-arch/zip
-	java? ( >=virtual/jre-1.5 )"
-
-RESTRICT="minimal? ( test )"
-
-R_DIR=/usr/$(get_libdir)/${PN}
-
-pkg_setup() {
-	filter-ldflags -Wl,-Bdirect -Bdirect
-	# avoid using existing R installation
-	unset R_HOME
-}
-
-src_prepare() {
-	# fix ocasional failure with parallel install (bug #322965)
-	epatch "${FILESDIR}"/${P}-parallel.patch
-
-	# fix packages.html for doc (bug #205103)
-	# check in later versions if fixed
-	sed -i \
-		-e "s:../../library:../../../../$(get_libdir)/R/library:g" \
-		src/library/tools/R/packageshtml.R \
-		|| die "sed failed"
-
-	# fix Rscript
-	sed -i \
-		-e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \
-		src/unix/Makefile.in || die "sed unix Makefile failed"
-
-	# fix HTML links to manual (bug #273957)
-	sed -i -e 's:\.\./manual/:manual/:g' $(grep -Flr ../manual/ doc) \
-		|| die "sed for HTML links to manual failed"
-
-	use lapack && \
-		export LAPACK_LIBS="$(pkg-config --libs lapack)"
-
-	if use X; then
-		export R_BROWSER="$(type -p xdg-open)"
-		export R_PDFVIEWER="$(type -p xdg-open)"
-	fi
-	use perl && \
-		export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}"
-}
-
-src_configure() {
-	econf \
-		--enable-R-profiling \
-		--enable-memory-profiling \
-		--enable-R-shlib \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		--with-blas="$(pkg-config --libs blas)" \
-		--docdir=/usr/share/doc/${PF} \
-		rdocdir=/usr/share/doc/${PF} \
-		$(use_enable nls) \
-		$(use_enable threads) \
-		$(use_with lapack) \
-		$(use_with tk tcltk) \
-		$(use_with jpeg jpeglib) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with cairo) \
-		$(use_with X x)
-}
-
-src_compile(){
-	emake || die "emake failed"
-	RMATH_V=0.0.0
-	emake -C src/nmath/standalone \
-		libRmath_la_LDFLAGS=-Wl,-soname,libRmath.so.${RMATH_V} \
-		|| die "emake math library failed"
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake info pdf || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" \
-			install-info install-pdf || die "emake install docs failed"
-		dosym /usr/share/doc/${PF}/manual /usr/share/doc/${PF}/html/manual
-	fi
-
-	# standalone math lib install (-j1 basically harmless)
-	emake \
-		-C src/nmath/standalone \
-		DESTDIR="${D}" install \
-		|| die "emake install math library failed"
-
-	local mv=$(get_major_version ${RMATH_V})
-	mv  "${D}"/usr/$(get_libdir)/libRmath.so \
-		"${D}"/usr/$(get_libdir)/libRmath.so.${RMATH_V}
-	dosym libRmath.so.${RMATH_V} /usr/$(get_libdir)/libRmath.so.${mv}
-	dosym libRmath.so.${mv} /usr/$(get_libdir)/libRmath.so
-
-	# env file
-	cat > 99R <<-EOF
-		LDPATH=${R_DIR}/lib
-		R_HOME=${R_DIR}
-	EOF
-	doenvd 99R || die "doenvd failed"
-	dobashcompletion "${WORKDIR}"/R.bash_completion
-}
-
-pkg_postinst() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-2.12.0.ebuild b/dev-lang/R/R-2.12.0.ebuild
index 5328be53afa4..987827f5433a 100644
--- a/dev-lang/R/R-2.12.0.ebuild
+++ b/dev-lang/R/R-2.12.0.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/dev-lang/R/R-2.12.0.ebuild,v 1.1 2010/10/25 18:18:19 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.12.0.ebuild,v 1.2 2010/11/08 18:44:41 xarthisius Exp $
 
 EAPI=2
 inherit eutils flag-o-matic bash-completion versionator
@@ -23,7 +23,7 @@ CDEPEND="dev-libs/libpcre
 	app-text/ghostscript-gpl
 	cairo? ( x11-libs/cairo[X]
 		|| ( >=x11-libs/pango-1.20[X] <x11-libs/pango-1.20 ) )
-	jpeg? ( media-libs/jpeg )
+	jpeg? ( virtual/jpeg )
 	lapack? ( virtual/lapack )
 	perl? ( dev-lang/perl )
 	png? ( media-libs/libpng )