Removed older versions, and duplicate license files (see bug #211534)

Package-Manager: portage-2.1.4.4

6 files changed, 20 insertions, 250 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 1037b08f0dd0..c8ddd2e8a899 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.116 2008/02/19 14:20:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.117 2008/02/26 17:32:40 bicatali Exp $
+
+  26 Feb 2008; Sébastien Fabbro <bicatali@gentoo.org> -R-2.2.1-r1.ebuild,
+  -R-2.6.1.ebuild, R-2.6.1-r1.ebuild, R-2.6.2.ebuild:
+  Removed older versions, and duplicate license files (see bug #211534)
 
   19 Feb 2008; Brent Baude <ranger@gentoo.org> R-2.6.1-r1.ebuild:
   stable ppc64, bug 210229
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index bc8cb00c3116..a2f7c5b21e61 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,10 +1,17 @@
-DIST R-2.2.1.tar.gz 13665367 RMD160 b63b6c5ef1db27a879783460b0ecb6de0d4bba18 SHA1 537e0b89b8de55c1156474c76c19c1fcc210f756 SHA256 db442c769e5e8ecbdb33c771e41bdac4330b565652c5ca730f26f975df30c624
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST R-2.6.1.tar.gz 15519691 RMD160 0e50237916e03c9b88ab558c39a9a587aabf4991 SHA1 6f2c8694f1935fda382796d225e45bd6f8f7755b SHA256 8fe505cbd9562cc84422475bc5c0b8e1b88b14d0c9e11d0de4f9e83ae8ce2563
 DIST R-2.6.2.tar.gz 15569391 RMD160 7956c284aad3c2d4fc85d566b45e2ba308dffefb SHA1 3d06b12cbf1dab25ddd759522157e6cc6a8eae19 SHA256 7364415bb2b382110a0b94c4c894b1c7b032561dad8b1456cc27382ad496fe03
 DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85
-EBUILD R-2.2.1-r1.ebuild 3272 RMD160 246152a6ef62d78e380b568e0b7a3ce28b863f60 SHA1 cf00a26ea83b4af9b1c8aee0524fa52962069db5 SHA256 3885859470254b88503b186ed08274d346916e0e54cf4820f6cf31b5c1d9ea29
-EBUILD R-2.6.1-r1.ebuild 3734 RMD160 b11b410104d4c30b1e52813e0c7f140688ec623f SHA1 dbae5779176759666bf671dde7bd6fe0f48390cc SHA256 2cde8704c0442941d575db568e140a33673c76874a7154642de049be55b16713
-EBUILD R-2.6.1.ebuild 2926 RMD160 72f0104124b62801686ffff516950aab35ea4eec SHA1 34c44e76e9edc8dc32d59be1566024ab29d8bb91 SHA256 c82233dd5d9ad3718ba1c6c1d8174d7831bc62ffe284d8ed88e571f23bb05e1e
-EBUILD R-2.6.2.ebuild 3640 RMD160 e69ee299345fe7e060d5794e5fc9ed75aba357ca SHA1 36b748d86e3d58ba6e5f0c4d6a3ec8bbe4d85f30 SHA256 2bbdada9d8a414de927606d8b88d08182907cbce18fcaaa77f77607739a68132
-MISC ChangeLog 17638 RMD160 b648b5c16ad646990dcc46a493fb6abebb512fdd SHA1 988e83e6c54eadf6290551e0de29406df1ef4e49 SHA256 c15969fa6c882dea09fa90655067183ba19aedc85eb8ed297ad740dec17a51b1
+EBUILD R-2.6.1-r1.ebuild 3403 RMD160 00e299f6025331fd488593fbfd4769e3ef824703 SHA1 c9f82e4a513eed99783c253ef3d546b200fe0269 SHA256 10a77acf6a424c95914052e5c3173f6f8dd5c42bebd7aa77c52860cb2f40b3f7
+EBUILD R-2.6.2.ebuild 3307 RMD160 a85d1b2f18cb4743c5fbd4d058548caebbf942b9 SHA1 074ebe6ec27ee0c7cd55aa4c34ce75301d9934c5 SHA256 6a1776092f35312942b29a03e706cd5bc7bc1b7a32b74daa612b7945013b402d
+MISC ChangeLog 17842 RMD160 dbf48679e780074fa5b9b187adbc6bf23bda3ffc SHA1 770b28a61275c432caa5b1921fac3d413f39e5d0 SHA256 73d78f63b43bcd3614ada8583c76cb67a743fe283599aa474414819f6fa5e5e3
 MISC metadata.xml 1019 RMD160 7bafb2129d1666600d4324d7979f98d4afe896e8 SHA1 7f8e029d6edce5402c81eb9b6fb088e545dc91b4 SHA256 8dbe1befd1f6009b4c346f090c07edb79ca14b04ca5cd02dbd5ba0a4c0106ace
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHxE1C1ycZbhPLE2ARApEbAJ9MnSmCvmI3wFVN5mXCBSRbtNnPjwCgpP/L
++dkgemp2z4pdz1OmX8UqLRk=
+=NMv3
+-----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.2.1-r1.ebuild b/dev-lang/R/R-2.2.1-r1.ebuild
deleted file mode 100644
index 578e44bd4308..000000000000
--- a/dev-lang/R/R-2.2.1-r1.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.2.1-r1.ebuild,v 1.8 2007/11/20 21:56:47 wolf31o2 Exp $
-
-inherit fortran toolchain-funcs flag-o-matic
-
-DESCRIPTION="R is GNU S - A 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"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ia64 ppc ppc64 sparc x86"
-IUSE="blas jpeg nls png readline tk X lapack"
-
-RDEPEND=">=dev-lang/perl-5.6.1-r3
-	>=dev-libs/libpcre-7.3
-	app-arch/bzip2
-	readline? ( >=sys-libs/readline-4.1-r3 )
-	jpeg? ( >=media-libs/jpeg-6b-r2 )
-	png? ( >=media-libs/libpng-1.2.1 )
-	blas? ( virtual/blas )
-	lapack? ( virtual/lapack )
-	tk? ( dev-lang/tk
-		dev-lang/tcl )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	X? ( x11-proto/xproto
-		x11-libs/libXt
-		x11-libs/libX11 )"
-
-AT_M4DIR="${S}/m4"
-
-pkg_setup() {
-	# Test for a 64 bit architecture - f2c won't work on 64 bit archs with R.
-	# Thanks to vapier for providing the test.
-	cd "${T}"
-	echo 'int main(){}' > test.c
-	$(tc-getCC) -c test.c -o test.o
-	if file test.o | grep -qs 64-bit ; then
-		einfo "64 bit architecture detected, using g77 or gfortran."
-		FORTRAN="gfortran g77 ifc"
-	else
-		FORTRAN="gfortran g77 f2c"
-	fi
-	rm -f test.{c,o}
-	fortran_pkg_setup
-
-	filter-ldflags -Wl,-Bdirect -Bdirect
-}
-
-src_compile() {
-	local myconf="--enable-R-profiling --enable-R-shlib --enable-linux-lfs"
-
-	if use tk; then
-		#configure needs to find the files tclConfig.sh and tkConfig.sh
-		myconf="${myconf} --with-tcltk --with-tcl-config=/usr/lib/tclConfig.sh
-			--with-tk-config=/usr/lib/tkConfig.sh"
-	else
-		myconf="${myconf} --without-tcltk"
-	fi
-
-	econf \
-		--with-system-zlib \
-		--with-system-bzlib \
-		--with-system-pcre \
-		$(use_enable nls) \
-		$(use_with blas) \
-		$(use_with lapack) \
-		$(use_with jpeg jpeglib) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with X x) \
-		${myconf} || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make \
-		prefix="${D}"/usr \
-		mandir="${D}"/usr/share/man \
-		infodir="${D}"/usr/share/info \
-		rhome="${D}"/usr/$(get_libdir)/R \
-		install || die "Installation Failed"
-
-	# fix the R wrapper script to have the correct R_HOME_DIR
-	# sed regexp borrowed from included debian rules
-	sed \
-		-e "/^R_HOME_DIR=.*/s::R_HOME_DIR=/usr/$(get_libdir)/R:" \
-		-i "${D}"/usr/$(get_libdir)/R/bin/R \
-		|| die "sed failed."
-
-	# The same kinds of seds are needed for these variables too, see bug 115140
-	sed \
-		-e "/^R_SHARE_DIR=.*/s::R_SHARE_DIR=/usr/$(get_libdir)/R/share:" \
-		-e "/^R_INCLUDE_DIR=.*/s::R_INCLUDE_DIR=/usr/$(get_libdir)/R/include:" \
-		-e "/^R_DOC_DIR=.*/s::R_DOC_DIR=/usr/$(get_libdir)/R/doc:" \
-		-i "${D}"/usr/$(get_libdir)/R/bin/R \
-		|| die "sed failed."
-
-	# R installs two identical wrappers under /usr/bin and /usr/lib/R/bin/
-	# the 2nd one is corrected by above sed, the first is replaced by a symlink
-	cd "${D}"/usr/bin/
-	rm R
-	dosym ../$(get_libdir)/R/bin/R /usr/bin/R
-	dodir /etc/env.d
-	echo -n \
-		"LDPATH=\"/usr/$(get_libdir)/R/lib\"" \
-		> "${D}"/etc/env.d/99R
-	cd "${S}"
-
-	dodoc AUTHORS BUGS COPYING* ChangeLog FAQ *NEWS README \
-		RESOURCES THANKS VERSION Y2K
-}
diff --git a/dev-lang/R/R-2.6.1-r1.ebuild b/dev-lang/R/R-2.6.1-r1.ebuild
index 5afce64b2e1c..2bb10b600906 100644
--- a/dev-lang/R/R-2.6.1-r1.ebuild
+++ b/dev-lang/R/R-2.6.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.1-r1.ebuild,v 1.10 2008/02/19 14:20:01 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.1-r1.ebuild,v 1.11 2008/02/26 17:32:40 bicatali Exp $
 
 inherit fortran flag-o-matic bash-completion
 
@@ -123,13 +123,6 @@ src_install() {
 	EOF
 	doenvd 99R || die "doenvd failed"
 
-	# avoid copying licenses but link then because of html docs
-	rm -f "${D}"usr/share/doc/${PF}/{COPYING,COPYING.LIB} \
-		"${D}"${R_HOME}/COPYING
-	dosym "${PORTDIR}"/licenses/GPL-2 /usr/share/doc/${PF}/COPYING
-	dosym "${PORTDIR}"/licenses/LGPL-2.1 /usr/share/doc/${PF}/COPYING.LIB
-	dosym "${PORTDIR}"/licenses/GPL-2 ${R_HOME}/COPYING
-
 	dobashcompletion "${WORKDIR}"/R.bash_completion
 }
 
diff --git a/dev-lang/R/R-2.6.1.ebuild b/dev-lang/R/R-2.6.1.ebuild
deleted file mode 100644
index 37e7d7e74168..000000000000
--- a/dev-lang/R/R-2.6.1.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.1.ebuild,v 1.2 2008/01/16 16:26:19 bicatali Exp $
-
-inherit fortran flag-o-matic
-
-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"
-
-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 png readline tk X"
-
-# common depends
-CDEPEND="dev-lang/perl
-	>=dev-libs/libpcre-7.3
-	app-arch/bzip2
-	virtual/blas
-	virtual/ghostscript
-	readline? ( sys-libs/readline )
-	jpeg? ( media-libs/jpeg )
-	png? ( media-libs/libpng )
-	lapack? ( virtual/lapack )
-	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 virtual/tetex ) )"
-
-RDEPEND="${CDEPEND}
-	java? ( >=virtual/jre-1.5 )"
-
-pkg_setup() {
-	FORTRAN="gfortran ifc g77"
-	fortran_pkg_setup
-	export FFLAGS="${FFLAGS:--O2}"
-	[[ ${FORTRANC} = gfortran || ${FORTRANC} = if* ]] && \
-		export FCFLAGS="${FCFLAGS:-${FFLAGS}}"
-
-	filter-ldflags -Wl,-Bdirect -Bdirect
-
-	# this is needed to properly compile additional R packages
-	# (see bug #152379)
-	append-flags -std=gnu99
-}
-
-src_compile() {
-	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
-
-	econf \
-		--enable-R-profiling \
-		--enable-memory-profiling \
-		--enable-R-shlib \
-		--enable-linux-lfs \
-		--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_with lapack) \
-		$(use_with tk tcltk) \
-		$(use_with jpeg jpeglib) \
-		$(use_with !minimal recommended-packages) \
-		$(use_with png libpng) \
-		$(use_with readline) \
-		$(use_with X x) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use doc; then
-		export VARTEXFONTS="${T}/fonts"
-		emake info pdf || die "emake docs failed"
-	fi
-}
-
-src_install() {
-	# -j1 because creates various dirs sequentially (hit should be small)
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	if use doc; then
-		emake DESTDIR="${D}" \
-			install-info install-pdf || die "emake install docs failed"
-	fi
-
-	# env files
-	echo "LDPATH=\"/usr/$(get_libdir)/R/lib\"" > 99R
-	doenvd 99R || die "doenvd failed"
-
-	# dealing with licenses
-	rm -f "${D}"usr/share/doc/${PF}/{COPYING,COPYING.LIB}
-	dosym "${PORTDIR}"/licenses/GPL-2 /usr/share/doc/${PF}/COPYING
-	dosym "${PORTDIR}"/licenses/LGPL-2.1 /usr/share/doc/${PF}/COPYING.LIB
-}
-
-pkg_config() {
-	if use java; then
-		einfo "Re-initializing java paths for ${P}"
-		R CMD javareconf
-	fi
-}
diff --git a/dev-lang/R/R-2.6.2.ebuild b/dev-lang/R/R-2.6.2.ebuild
index c388663695a0..4ccaefc8cf00 100644
--- a/dev-lang/R/R-2.6.2.ebuild
+++ b/dev-lang/R/R-2.6.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.2.ebuild,v 1.1 2008/02/14 14:00:54 markusle Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.6.2.ebuild,v 1.2 2008/02/26 17:32:40 bicatali Exp $
 
 inherit fortran flag-o-matic bash-completion
 
@@ -120,13 +120,6 @@ src_install() {
 	EOF
 	doenvd 99R || die "doenvd failed"
 
-	# avoid copying licenses but link then because of html docs
-	rm -f "${D}"usr/share/doc/${PF}/{COPYING,COPYING.LIB} \
-		"${D}"${R_HOME}/COPYING
-	dosym "${PORTDIR}"/licenses/GPL-2 /usr/share/doc/${PF}/COPYING
-	dosym "${PORTDIR}"/licenses/LGPL-2.1 /usr/share/doc/${PF}/COPYING.LIB
-	dosym "${PORTDIR}"/licenses/GPL-2 ${R_HOME}/COPYING
-
 	dobashcompletion "${WORKDIR}"/R.bash_completion
 }