summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2009-03-29 17:35:02 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2009-03-29 17:35:02 +0000
commitabc995f80aca8bb42026d6818db3c14937c99bdc (patch)
tree6f153f008280263459f62e8053dce5a4c2bedd87 /dev-java
parentRemove --extra_linker_flags (#264155,#264186) again (diff)
downloadhistorical-abc995f80aca8bb42026d6818db3c14937c99bdc.tar.gz
historical-abc995f80aca8bb42026d6818db3c14937c99bdc.tar.bz2
historical-abc995f80aca8bb42026d6818db3c14937c99bdc.zip
Use ln instead of dosym as dosym seems to be making the build fail.
Package-Manager: portage-2.2_rc27/cvs/Linux i686
Diffstat (limited to 'dev-java')
-rw-r--r--dev-java/jaxp/ChangeLog5
-rw-r--r--dev-java/jaxp/Manifest12
-rw-r--r--dev-java/jaxp/jaxp-1.4-r1.ebuild8
3 files changed, 14 insertions, 11 deletions
diff --git a/dev-java/jaxp/ChangeLog b/dev-java/jaxp/ChangeLog
index 90b3430e1fc5..4c03ce2c62fd 100644
--- a/dev-java/jaxp/ChangeLog
+++ b/dev-java/jaxp/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jaxp
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/ChangeLog,v 1.14 2009/02/11 15:22:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/ChangeLog,v 1.15 2009/03/29 17:35:02 betelgeuse Exp $
+
+ 29 Mar 2009; Petteri Räty <betelgeuse@gentoo.org> jaxp-1.4-r1.ebuild:
+ Use ln instead of dosym as dosym seems to be making the build fail.
*jaxp-1.4-r1 (11 Feb 2009)
diff --git a/dev-java/jaxp/Manifest b/dev-java/jaxp/Manifest
index c8c0ad09ad47..283d959e013a 100644
--- a/dev-java/jaxp/Manifest
+++ b/dev-java/jaxp/Manifest
@@ -3,14 +3,14 @@ Hash: SHA1
AUX build.xml-1.4 458 RMD160 8e0b598f7c02ed915c9243ae086d1e3681304f58 SHA1 1becba813a4bf002b9ef66dc9e3b483f2f27d79d SHA256 8c2c00c17923070530bfd92f6e8dccce617f121e181024d804cb74f2a259aa66
DIST jaxp-1.4.tar.bz2 644928 RMD160 c338f965447b4fa616ec605e8d56cbd96d33c0a6 SHA1 f778650ddc9a6f6729087da27213e5e71570e1d0 SHA256 bc516f8d0673014ed9532eeda67d876996440f7a578f0e4fb464d9aa7d1bb3fe
-EBUILD jaxp-1.4-r1.ebuild 1000 RMD160 9beb0fd096c09320cfc9b64270fcea3171c5df06 SHA1 a272e47921d06008433698a0f00bfba7fe712c77 SHA256 939da801febd419498f3bb8e692f10b155f2b56a7c98a66f69ad4c1af6c70eb1
+EBUILD jaxp-1.4-r1.ebuild 996 RMD160 caab26f45f948a28ee945f82272c9c8a81f7ca08 SHA1 acb02e55099ae10e8121339cd200fa8ca7d377e2 SHA256 4ae9d9b8fe80acc01e798be9f4e9c9cda0ce2fe11656f14fe4676725690dda4d
EBUILD jaxp-1.4.ebuild 877 RMD160 a8884b3d4dfd0707494cf69877716ec91cec7ce9 SHA1 be8b317cdfc5828e609d96306c87a1ed967fe100 SHA256 4b3c0053fc5be0e2a34c01bd104c6156d0c51ee4c6637ba48d25f4dbdc592204
-MISC ChangeLog 1417 RMD160 2b87650f73f46161d37c6a42f52691e86d3f6f48 SHA1 78cb16df50f59a63c2f74ef52850e0ce22acde03 SHA256 0a08df81bf7ad2fa1f7896b5dec4a20bccad268de2bf26570830ccd536c92045
+MISC ChangeLog 1561 RMD160 3d4b95b71700e0b6217516cc74775e00842bf387 SHA1 81be852972cbc0d2ca04ed98509a86acc495d45a SHA256 85d00a7a44e04efe9d323eb8c2bb9a8603cb31baa9881df24c2003678e688a66
MISC metadata.xml 159 RMD160 7da5c733c224383ffe350605bc36721a3ff2536f SHA1 99c2655c7bbee2cbc8c79edb2d00d481d62faf95 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
-iEYEARECAAYFAkmS7cQACgkQcxLzpIGCsLRBxgCffgAdNB6ByKxQXHI1mI2DRQHI
-JTMAnj1YhnFlT4VfDe7IFlsNvViO1Byk
-=fOfg
+iEYEARECAAYFAknPsU4ACgkQcxLzpIGCsLTZlACfbj+3ESNNXAs05y193IveXdbs
+LzwAn1qxrpelmeS5ot5U9nVeshBKASe1
+=9A6p
-----END PGP SIGNATURE-----
diff --git a/dev-java/jaxp/jaxp-1.4-r1.ebuild b/dev-java/jaxp/jaxp-1.4-r1.ebuild
index efc208d9292d..dff41f390697 100644
--- a/dev-java/jaxp/jaxp-1.4-r1.ebuild
+++ b/dev-java/jaxp/jaxp-1.4-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.4-r1.ebuild,v 1.1 2009/02/11 15:22:23 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jaxp/jaxp-1.4-r1.ebuild,v 1.2 2009/03/29 17:35:02 betelgeuse Exp $
JAVA_PKG_IUSE="doc source"
@@ -26,10 +26,7 @@ src_unpack() {
EANT_DOC_TARGET=""
src_install() {
-
java-pkg_dojar jaxp-ri.jar
- dosym /usr/share/${PN}/lib/jaxp-ri.jar /usr/share/${PN}/lib/jaxp.jar
- java-pkg_regjar /usr/share/${PN}/lib/jaxp.jar
use source && java-pkg_dosrc jaxp-1_4-api/src/{javax,org}
dohtml \
@@ -37,4 +34,7 @@ src_install() {
docs/ReleaseNotes.html || die
use doc && java-pkg_dojavadoc docs/api
+ cd "${D}/usr/share/${PN}/lib/"
+ ln -s jaxp-ri.jar jaxp.jar || die
+ java-pkg_regjar /usr/share/${PN}/lib/jaxp.jar
}