diff options
| author |   Markus Dittrich <markusle@gentoo.org> | 2008-10-31 13:05:36 +0000 |
|---|---|---|
| committer | Markus Dittrich <markusle@gentoo.org> | 2008-10-31 13:05:36 +0000 |
| commit | 376e217a620da96d9f2af2727e4e4ef2d644aaa6 (patch) | |
| tree | 3c60a500a5b080c6e7284f916a00689400d0d8cc /dev-lang | |
| parent | Updated .DirIcon file type detection to match new output I'm getting from a (diff) | |
| download | historical-376e217a620da96d9f2af2727e4e4ef2d644aaa6.tar.gz historical-376e217a620da96d9f2af2727e4e4ef2d644aaa6.tar.bz2 historical-376e217a620da96d9f2af2727e4e4ef2d644aaa6.zip | |
Fixed bug in source code preventing building with USE=-X (see bug #245027).
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-SENTINEL-1 i686
Diffstat (limited to 'dev-lang')
| -rw-r--r-- | dev-lang/R/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-lang/R/Manifest | 5 | ||||
| -rw-r--r-- | dev-lang/R/R-2.8.0.ebuild | 8 | ||||
| -rw-r--r-- | dev-lang/R/files/R-2.8.0-without-X.patch | 14 |
4 files changed, 30 insertions, 4 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 0d895a8739bb..8954d478d2e2 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,11 @@ # 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.140 2008/10/30 10:23:33 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.141 2008/10/31 13:05:36 markusle Exp $ + + 31 Oct 2008; Markus Dittrich <markusle@gentoo.org> + +files/R-2.8.0-without-X.patch, R-2.8.0.ebuild: + Fixed bug in source code preventing building with USE="-X" (see bug + #245027). Thanks much to Andrew Savchenko for his patch. 30 Oct 2008; Raúl Porcel <armin76@gentoo.org> R-2.7.2.ebuild: alpha/ia64 stable #244621 diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 6e24b4f75f00..3444e376fb7a 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,4 +1,5 @@ AUX R-2.7.1-test-fix.patch 4049 RMD160 ea331226db3feda862009724a74cb98b08a6be91 SHA1 0b386fb4f173770820903ac4dd72a7f3d54556b5 SHA256 a641846b359f54fc254293f1ec74c0505297c5b1c7227de6c2bcba267592fa91 +AUX R-2.8.0-without-X.patch 430 RMD160 9601d7fb97146196e7a56201ccdcc099a56327b1 SHA1 8281a76bb192990305ab209cf69bf60474652978 SHA256 62ec24c65e60c5ce6205ae4c110bc845166826f07a5cb9ec621e2afe969751c0 AUX R-javareconf.patch 1242 RMD160 667445da01c51438deef5d876929985858507d30 SHA1 0af91b826b969afb54462569cc210b8d16b0d482 SHA256 1667dc70b39197e1b77fbaab74a5fce078067f43da248d650a84d4cf494b15bd DIST R-2.7.1.tar.gz 16413667 RMD160 ac98e39d46ebc7581dd53da7f69a1e7abad269a4 SHA1 cdf5f6f85463c7be007306add2f4ca7cf7babfb7 SHA256 f0449d23257f98d71ed7749a2ed30f69023a05259f392e4c5fd8fac9db485de7 DIST R-2.7.2.tar.gz 16466658 RMD160 948e379f07cbfeda13c46947791f755e1faabbf7 SHA1 0de9f00ae58e67840fc2daab8973d37d97d78535 SHA256 7184c1f85fafce518e6dbccb5a64ba47a62d8694c7019da0e1c1e83ff98c3ff4 @@ -6,6 +7,6 @@ DIST R-2.8.0.tar.gz 16558443 RMD160 1e1fd7c76af150f20d403fb085cd7ac8d909eb55 SHA DIST R.bash_completion.bz2 4019 RMD160 796951fb32e9ea4074dcd5ba3da5955ec0193993 SHA1 05ddebef0df16f0bf35aecc8fcb702ad5d106e5e SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 EBUILD R-2.7.1.ebuild 4190 RMD160 5b0637b88a216923a39de5637e46513dee258905 SHA1 47b0db9e8eb3f9cde8db89a7b478dd9e106a65f2 SHA256 3f229509c86efa3a511d7af812f4104dbba7ed727e38e72adbfe584cd273b79f EBUILD R-2.7.2.ebuild 4547 RMD160 09df909a7fbe1d675ca0b023f06f6c44cbca0686 SHA1 340f4a6efffa776318f0c2468282971b66742e3e SHA256 8ef3c674de5343c778703b887d2faa5c741022a931bc42225fe1b710b91399a8 -EBUILD R-2.8.0.ebuild 4020 RMD160 769b57263b19074428e34adebfe5f657ca231053 SHA1 cb7da73c769889414c0c580d63a4fbf645da2384 SHA256 b95ec372d45b2bfd1f3eed18ba637d2f2ee5c5fc45120e1d3223d238a4648317 -MISC ChangeLog 20844 RMD160 b0535ed4ba370c15cc695899da9beb124d111e2d SHA1 f4a7c769cd565852ba404b7ef8159ae5bf9a2616 SHA256 9aad1f5df1ff405967f094ac8b10d3e431ce08ca6e54baacc8ad874a33bc6737 +EBUILD R-2.8.0.ebuild 4105 RMD160 550c16f5c0e79f8215b1e7f6f0905a588343d1f4 SHA1 24371b6914fca52031a010a42f7a362d294c7618 SHA256 df0a3a7b82725bb6ffad098bb5e85108370339e5a511478186bc3429e7fc6e1c +MISC ChangeLog 21078 RMD160 2adcb0663760a9ccfd785f12db453a9540003c1d SHA1 512c5487331d843b1307dc1a9534dd3abe1bcf5d SHA256 2155903471c51d8dd106c16fad9955652ebe447a4b07c275a63188202d1b936a MISC metadata.xml 1031 RMD160 375436b81f2969a32b673a47fdcd7a8ddadb6fa3 SHA1 fefc629218f970fc24f6b4e30c482112ea6e6129 SHA256 6f692bb80f78dfd8987ae3f70c12c40924ef5e0596267d928953f37f44223968 diff --git a/dev-lang/R/R-2.8.0.ebuild b/dev-lang/R/R-2.8.0.ebuild index 00093b0c7fd7..91020759c2e4 100644 --- a/dev-lang/R/R-2.8.0.ebuild +++ b/dev-lang/R/R-2.8.0.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.8.0.ebuild,v 1.1 2008/10/27 10:32:14 bicatali Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.8.0.ebuild,v 1.2 2008/10/31 13:05:36 markusle Exp $ EAPI=2 inherit eutils fortran flag-o-matic bash-completion versionator @@ -76,6 +76,12 @@ src_prepare() { fi } +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${FILESDIR}"/${P}-without-X.patch +} + src_configure() { econf \ --disable-rpath \ diff --git a/dev-lang/R/files/R-2.8.0-without-X.patch b/dev-lang/R/files/R-2.8.0-without-X.patch new file mode 100644 index 000000000000..0fefc65083ef --- /dev/null +++ b/dev-lang/R/files/R-2.8.0-without-X.patch @@ -0,0 +1,14 @@ +# missing ; in source code causes build failure when configured via +# --without-X +diff -Naur R-2.8.0/src/main/platform.c R-2.8.0.new/src/main/platform.c +--- R-2.8.0/src/main/platform.c 2008-10-07 22:05:05.000000000 -0400 ++++ R-2.8.0.new/src/main/platform.c 2008-10-31 08:44:10.000000000 -0400 +@@ -1654,7 +1654,7 @@ + # ifdef HAVE_X11 + int X11 = NA_LOGICAL; + # else +- int X11 = FALSE ++ int X11 = FALSE; + # endif + #endif + |