summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarkus Dittrich <markusle@gentoo.org>2007-09-11 12:52:59 +0000
committerMarkus Dittrich <markusle@gentoo.org>2007-09-11 12:52:59 +0000
commit9168696f9ff88ea6bbcbec4d25203d9484bdf7db (patch)
treeb77c3e0ca361e30032f4a46042bff4745cc3917f /dev-lang/R
parentPort to new GNUstep eclasses (diff)
downloadhistorical-9168696f9ff88ea6bbcbec4d25203d9484bdf7db.tar.gz
historical-9168696f9ff88ea6bbcbec4d25203d9484bdf7db.tar.bz2
historical-9168696f9ff88ea6bbcbec4d25203d9484bdf7db.zip
Fixed messed up paths in libR.pc pkgconfig file (see bug #191986).
Package-Manager: portage-2.1.3.9
Diffstat (limited to 'dev-lang/R')
-rw-r--r--dev-lang/R/ChangeLog5
-rw-r--r--dev-lang/R/Manifest26
-rw-r--r--dev-lang/R/R-2.5.1.ebuild6
3 files changed, 17 insertions, 20 deletions
diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog
index f6821c76015e..008ff69391fa 100644
--- a/dev-lang/R/ChangeLog
+++ b/dev-lang/R/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-lang/R
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.88 2007/07/22 08:47:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.89 2007/09/11 12:52:59 markusle Exp $
+
+ 11 Sep 2007; Markus Dittrich <markusle@gentoo.org> R-2.5.1.ebuild:
+ Fixed messed up paths in libR.pc pkgconfig file (see bug #191986).
22 Jul 2007; Hans de Graaff <graaff@gentoo.org> R-2.2.1.ebuild,
R-2.4.1.ebuild, R-2.5.0.ebuild, R-2.5.1.ebuild:
diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest
index 4afdd14b8c39..6c5306900456 100644
--- a/dev-lang/R/Manifest
+++ b/dev-lang/R/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX R-2.2.0-ifc-configure.patch 524 RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 SHA1 9bd2b339f539fe399fa5f12ad76c0b4a5299bbfd SHA256 6a255a8f92b9e38619210b78ed26288db6d7177ff1eb47f12ab9528f2ce461e8
MD5 8f28d07ba48615d7a496f31db3e9bf4d files/R-2.2.0-ifc-configure.patch 524
RMD160 0e56229f6e68c2a6c23d3f8104ae924f7b5307b5 files/R-2.2.0-ifc-configure.patch 524
@@ -37,14 +34,14 @@ EBUILD R-2.5.0.ebuild 3455 RMD160 68ccb9ce29672ca5701b14ea4802f3ecce30e78c SHA1
MD5 da4558fa67f0bfb88a8e4350cde559e5 R-2.5.0.ebuild 3455
RMD160 68ccb9ce29672ca5701b14ea4802f3ecce30e78c R-2.5.0.ebuild 3455
SHA256 41c94a52919eb99da86890068db98dfe2f9fc4894ad6e4f6f6d7ead6d7eb531f R-2.5.0.ebuild 3455
-EBUILD R-2.5.1.ebuild 3455 RMD160 68b5c9aa23b24d89c2c2f7dbc52a4de87fd44b61 SHA1 661675b98528c8f994b310618ddc21b6e2581ff6 SHA256 570ed18a2f4f79529559d53bfe34d6bac3596fa79634e504f20f2320521fa76c
-MD5 2405c43f1e205d7df6e5854ac93c0da8 R-2.5.1.ebuild 3455
-RMD160 68b5c9aa23b24d89c2c2f7dbc52a4de87fd44b61 R-2.5.1.ebuild 3455
-SHA256 570ed18a2f4f79529559d53bfe34d6bac3596fa79634e504f20f2320521fa76c R-2.5.1.ebuild 3455
-MISC ChangeLog 13707 RMD160 84d7da0e88a6cb2be5e36484e094872adc4fec9f SHA1 92052fafe7c184e14b65e67ec09e60b756f9438b SHA256 d675f76cd8bb6ca61a7e5ff3953e76db8ba69af1ac8578f27dc992df9a1fa319
-MD5 3c17c84a6e0932e6ada3c3aa0e4d167a ChangeLog 13707
-RMD160 84d7da0e88a6cb2be5e36484e094872adc4fec9f ChangeLog 13707
-SHA256 d675f76cd8bb6ca61a7e5ff3953e76db8ba69af1ac8578f27dc992df9a1fa319 ChangeLog 13707
+EBUILD R-2.5.1.ebuild 3600 RMD160 7d720174adbeeb3e6240c06ace7e88299475f6e8 SHA1 bbf81b88910b50e12e48fce0bcd655daa1f924f8 SHA256 31e060f9d4a81e90fe28cb74fd444436f1fff87fedbee64e8ed027a83c2f0212
+MD5 61dc9baaac8b991453c55feeec1862f2 R-2.5.1.ebuild 3600
+RMD160 7d720174adbeeb3e6240c06ace7e88299475f6e8 R-2.5.1.ebuild 3600
+SHA256 31e060f9d4a81e90fe28cb74fd444436f1fff87fedbee64e8ed027a83c2f0212 R-2.5.1.ebuild 3600
+MISC ChangeLog 13848 RMD160 63d09790b133f3225b6234711d92e4f932fcf0e8 SHA1 47150957adeb60e1c7c866032d242184f817796c SHA256 2e81106f8591f2cad3553f877f7c57cdd311ca77d06441d8de2f10a896cb39a5
+MD5 6aad49c910fa9b3e43f51cea9b2e74c5 ChangeLog 13848
+RMD160 63d09790b133f3225b6234711d92e4f932fcf0e8 ChangeLog 13848
+SHA256 2e81106f8591f2cad3553f877f7c57cdd311ca77d06441d8de2f10a896cb39a5 ChangeLog 13848
MISC metadata.xml 156 RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 SHA1 da2b240a255820145b7c83a5c48e45b96b7e9ee6 SHA256 5d22100902db7507a5b5493dd4a66cdb08025faf80a2c0b75e6392315c47f900
MD5 8c623e53daafa025137077c6b65815bd metadata.xml 156
RMD160 dc078172bfebcb25d69bdf8731714f9cce9d3e36 metadata.xml 156
@@ -61,10 +58,3 @@ SHA256 7f2bea9875f750ae98c1551484704ab88395098d177580cb385da7dfd5910d31 files/di
MD5 fa9ab3bdf3f18ddf3923e0381d622c4d files/digest-R-2.5.1 229
RMD160 d409e0a808b739c96304f8bf47853cbcb34b0a0c files/digest-R-2.5.1 229
SHA256 0b6a08e4211f60d1e321ab5a77c54f79fe80e74f0a2f1e17b5e7490d97ef8086 files/digest-R-2.5.1 229
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.7 (GNU/Linux)
-
-iD8DBQFGoxmp0BM77Tkv120RAqQ6AKDbF1YcoiquJy6jH6OlFePjOmRKHwCgg5xT
-2/o+AQm7TfG0bonxUdmwR2s=
-=q671
------END PGP SIGNATURE-----
diff --git a/dev-lang/R/R-2.5.1.ebuild b/dev-lang/R/R-2.5.1.ebuild
index 616570736216..db78d9d5a00b 100644
--- a/dev-lang/R/R-2.5.1.ebuild
+++ b/dev-lang/R/R-2.5.1.ebuild
@@ -1,6 +1,6 @@
# 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.5.1.ebuild,v 1.3 2007/07/22 08:47:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-2.5.1.ebuild,v 1.4 2007/09/11 12:52:59 markusle Exp $
inherit fortran toolchain-funcs flag-o-matic
@@ -105,6 +105,10 @@ src_install() {
-i ${D}/usr/$(get_libdir)/R/bin/R \
|| die "sed failed."
+ # fix paths in libR.pc pkgconfig file
+ sed -e "s:${D}::" -i ${D}/usr/$(get_libdir)/pkgconfig/libR.pc \
+ || die "Failed to fix libR.pc file"
+
# 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/