commented patches with upstream reports

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

3 files changed, 37 insertions, 16 deletions

diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index 2a41b0e85c26..9a9c3a5b7208 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-lang/R
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.200 2012/06/19 16:55:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.201 2012/06/19 19:16:55 bicatali Exp $
+
+  19 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.15.0.ebuild:
+  commented patches with upstream reports
 
   19 Jun 2012; Sébastien Fabbro <bicatali@gentoo.org> R-2.15.0.ebuild:
   Update bash completion file with newer one and fix installation
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index e1b48ee6cc51..c20190cdd1f0 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -19,13 +19,13 @@ DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993
 EBUILD R-2.10.1.ebuild 4525 RMD160 fb0226c2a3521698f71e460832552e0b6f58ad98 SHA1 490b0bc3731330e389cbe8bdcb54b894bd830b9c SHA256 9d02913f707accb1a91a07704b118cdd6376af0ed1f661d8038af7eab6cdae4a
 EBUILD R-2.14.1.ebuild 4334 RMD160 b85c8c99869c40b793b9b82352cb9cf16047366b SHA1 65b9e8c63ebbfd2d1302a397d2e7b7049fdbc436 SHA256 4caa551320de5ea8b8e0acf252eb54cb502862dcc993dab5e2d63899e11461f8
 EBUILD R-2.14.2.ebuild 4421 RMD160 1902a7206c803fb3e09e3b6417e0fd865a1f6784 SHA1 1cb666269bd92e0f4acd79cb93b5556512c50675 SHA256 235ba61fc1f0e6c4062d971381426538119d476ac016a093f0b4e176028e7175
-EBUILD R-2.15.0.ebuild 4468 RMD160 c88785d6ba975e092d5a7bcbd57ef6f5a0b9dec9 SHA1 bdd5d829582cfb566670c5c5b63fb24dcb07eadd SHA256 1d98f43e005c43877d83e823021e8a8d90b47bb2f148968ae321e0cdecce41d9
-MISC ChangeLog 30286 RMD160 1444eecca5730517e76e23d59b195f11d3c51db5 SHA1 dda05ccccd652a0b54ef133c5a16d28d1fea08dd SHA256 053213bf5ed9fbb69b4d1dddf803c38914229645b202e32da7c9a432300a06d2
+EBUILD R-2.15.0.ebuild 5088 RMD160 1338516cd0e9a153f187c735dcd9e24e1185a6a2 SHA1 ffcc47029f63a300a81d51b44020d5b2e95c59d5 SHA256 b1a8734c98b370c9633b6ba839de2b3d6e0f3d86a9485ec7dc0abcbb0bbab28f
+MISC ChangeLog 30401 RMD160 d67470846d1550c29c24d3f8d01d02ce2349cb05 SHA1 4e574fcdd24d9609d85da1730cfbd5e1403d4702 SHA256 673758c5d3d35b2eb9823e5e4d8604ba1698b003dfafd85c911c39a01b4cb6e2
 MISC metadata.xml 1124 RMD160 b1816af77325d46cb8670e0d23ea8b367b0b67f2 SHA1 631740a32ccdd45b3991d855b9cc44cd5e570507 SHA256 8f06d05ef29fdd4960269413a7e3e6ed5cfbdf32fa7cac5ed4c2750d58a4785b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk/gruwACgkQ1ycZbhPLE2CGFgCfWbsFj/sYzP/OAvhAzNISiI2z
-LjQAoIAJYvLVJWgljBturotOhoApTMeW
-=3J13
+iEYEARECAAYFAk/g0DAACgkQ1ycZbhPLE2DjRgCggVhOvqwdoeYGfhv8MuYthMDm
+/NEAn2hZN9ugIpqh3+x9fnPMyL5UnhG1
+=1cB/
 -----END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.15.0.ebuild b/dev-lang/R/R-2.15.0.ebuild
index 89fa4bb1094f..e796cddcbec3 100644
--- a/dev-lang/R/R-2.15.0.ebuild
+++ b/dev-lang/R/R-2.15.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.0.ebuild,v 1.4 2012/06/19 16:55:00 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.15.0.ebuild,v 1.5 2012/06/19 19:16:55 bicatali Exp $
 
 EAPI=4
 
@@ -61,27 +61,45 @@ pkg_setup() {
 }
 
 src_prepare() {
+	# gentoo bug #322965 (not applied upstream)
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505
+	epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch
+
+	# respect ldflags (not applied upstream)
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506
+	epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch
+
+	# gentoo bug #383431
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951
+	epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch
+
+	# tiff automagic
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14952
+	epatch "${FILESDIR}"/${PN}-2.14.1-tiff.patch
+
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953
+	epatch "${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch
+
+	# too many warning crash, bug #405463
+	# https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14954
+	epatch "${FILESDIR}"/${PN}-2.14.1-warnings-buffer-overflow.patch
+
+	# applied upstream for next R
 	epatch \
-		"${FILESDIR}"/${PN}-2.11.1-parallel.patch \
-		"${FILESDIR}"/${PN}-2.12.1-ldflags.patch \
-		"${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch \
-		"${FILESDIR}"/${PN}-2.14.1-tiff.patch \
-		"${FILESDIR}"/${PN}-2.14.1-rmath-shared.patch \
-		"${FILESDIR}"/${PN}-2.14.1-warnings-buffer-overflow.patch \
 		"${FILESDIR}"/${PN}-2.14.2-library-writability.patch \
 		"${FILESDIR}"/${PN}-2.14.2-prune-package-update.patch
 
-	# fix packages.html for doc (bug #205103)
+	# fix packages.html for doc (gentoo bug #205103)
 	sed -i \
 		-e "s:../../../library:../../../../$(get_libdir)/R/library:g" \
 		src/library/tools/R/Rd.R || die
 
-	# fix Rscript path when installed (bug #221061)
+	# fix Rscript path when installed (gentoo bug #221061)
 	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)
+	# fix HTML links to manual (gentoo bug #273957)
 	sed -i \
 		-e 's:\.\./manual/:manual/:g' \
 		$(grep -Flr ../manual/ doc) || die "sed for HTML links failed"