From 07ba5482dee3425f3330581e665acf433421c480 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Fri, 8 Dec 2006 01:33:38 +0000 Subject: [PATCH] Add jdk-defaults.conf for x86-fbsd, bug #157380 was partially caused by this file missing. Package-Manager: portage-2.1.2_rc2-r5 --- dev-java/java-config/ChangeLog | 7 ++++++- dev-java/java-config/Manifest | 20 +++++++++++-------- .../files/jdk-defaults-x86-fbsd.conf | 2 ++ .../java-config/java-config-2.0.30.ebuild | 7 +++++-- 4 files changed, 25 insertions(+), 11 deletions(-) create mode 100644 dev-java/java-config/files/jdk-defaults-x86-fbsd.conf diff --git a/dev-java/java-config/ChangeLog b/dev-java/java-config/ChangeLog index 3fdadf279494..0a3f38a27732 100644 --- a/dev-java/java-config/ChangeLog +++ b/dev-java/java-config/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-java/java-config # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.131 2006/10/15 18:23:57 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/ChangeLog,v 1.132 2006/12/08 01:33:38 caster Exp $ + + 08 Dec 2006; Vlastimil Babka + +files/jdk-defaults-x86-fbsd.conf, java-config-2.0.30.ebuild: + Add jdk-defaults.conf for x86-fbsd, bug #157380 was partially caused by this + file missing. 15 Oct 2006; Tobias Scherbaum java-config-1.3.7.ebuild, java-config-2.0.30.ebuild: diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 1838b8baafac..07fed28fed0c 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -18,6 +18,10 @@ AUX java-config-2.profiled 762 RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e S MD5 93060fff650a2b3577256baebaf8ea64 files/java-config-2.profiled 762 RMD160 07d9d403a9adb62ecb5bb10a91bee81e6be1ac4e files/java-config-2.profiled 762 SHA256 47a56170921e2f806efa0b3cc76f84db75f212cf687f019052cfb56de49c6e81 files/java-config-2.profiled 762 +AUX jdk-defaults-x86-fbsd.conf 61 RMD160 8bb737a332b445c375aa955f8961eaf587f3903a SHA1 73428cb74571048a86bd9d60fdf64c555a659c7d SHA256 e92e1111a26364f915a6588701f94527f7b3f25bb381edcd490a495393a9b598 +MD5 f4a4c2656a71a460f2515085cd37f55a files/jdk-defaults-x86-fbsd.conf 61 +RMD160 8bb737a332b445c375aa955f8961eaf587f3903a files/jdk-defaults-x86-fbsd.conf 61 +SHA256 e92e1111a26364f915a6588701f94527f7b3f25bb381edcd490a495393a9b598 files/jdk-defaults-x86-fbsd.conf 61 DIST java-config-1.2.11.tar.bz2 15743 RMD160 e1175474e87f234f9428d7db6827a3a4435e6aba SHA1 fd2ffdda515005ef7a9358b650f59674c13bc0b7 SHA256 f17bdce2b97dca14daf77dbefb6d6c0935fbc444b67e9a0d7cc68538575a6b83 DIST java-config-1.3.7.tar.bz2 14362 RMD160 243739cdef9ea5b2baa708eabd5358d1804631de SHA1 48a46198ceace1a27d49c5176b2b6d720aaa9eff SHA256 bed302b9643d19caa3f1bbb75ebb8d9373a4ccf68a0b437a158f7265171f56d1 DIST java-config-2.0.30.tar.bz2 16515 RMD160 8eefa3a8bca334c61c3cca1429fcdd0339167b6a SHA1 b6ed21c95f674e8c9fd277b04b6282edd56f26f2 SHA256 934fd8fe9498e5158f91e6f48d604ee15750737918cddcd92c187ed3dfac36d4 @@ -29,14 +33,14 @@ EBUILD java-config-1.3.7.ebuild 1227 RMD160 0dec35995dcabb5686e8beccc96902ef51ec MD5 9fc3d788c05b569d25b4e30ecc34f791 java-config-1.3.7.ebuild 1227 RMD160 0dec35995dcabb5686e8beccc96902ef51ec68fd java-config-1.3.7.ebuild 1227 SHA256 824bc38c726edf67db308a18c5b974317a2df50c8f7c0b5ad80bf115549c719f java-config-1.3.7.ebuild 1227 -EBUILD java-config-2.0.30.ebuild 1795 RMD160 ca609ad9cc00d22b3bb2bcf016e04bc045e242df SHA1 834ea9d4772b1d3c2a8b7f6a8a7a81974a509816 SHA256 b6e2d2af227d97a2f3422326424d3b9b6786cf625d946d0aa3b660844a0f4524 -MD5 54cd8554a1c5b9a9e2852b483f72f6f7 java-config-2.0.30.ebuild 1795 -RMD160 ca609ad9cc00d22b3bb2bcf016e04bc045e242df java-config-2.0.30.ebuild 1795 -SHA256 b6e2d2af227d97a2f3422326424d3b9b6786cf625d946d0aa3b660844a0f4524 java-config-2.0.30.ebuild 1795 -MISC ChangeLog 24886 RMD160 3b5a2a7da7400b26562ea3595301ba7b98069f41 SHA1 f9dff9d38ce4c2f1294a5f92bddaf34c63c39c3f SHA256 8cebddb17475b823ba9e7e6527d42d51a2c4998a01fa4a7d06123e99bcc4f41c -MD5 7b367b54274b4f1ea7af0bb39859ef23 ChangeLog 24886 -RMD160 3b5a2a7da7400b26562ea3595301ba7b98069f41 ChangeLog 24886 -SHA256 8cebddb17475b823ba9e7e6527d42d51a2c4998a01fa4a7d06123e99bcc4f41c ChangeLog 24886 +EBUILD java-config-2.0.30.ebuild 1913 RMD160 1ea749951943b870b544e000b5fb60d70b4ec8dc SHA1 65fe53ecef609b3693b1edf0feed46105f69bf19 SHA256 66fe9c5427382f6bd0edd563cc11c47eb55cd17ce08bdbd3958808e2471cb4c2 +MD5 cb1818d428e3e71be1f8a02c486dd222 java-config-2.0.30.ebuild 1913 +RMD160 1ea749951943b870b544e000b5fb60d70b4ec8dc java-config-2.0.30.ebuild 1913 +SHA256 66fe9c5427382f6bd0edd563cc11c47eb55cd17ce08bdbd3958808e2471cb4c2 java-config-2.0.30.ebuild 1913 +MISC ChangeLog 25093 RMD160 2b02603b3d26d439635935cd8eceadda6af8fac0 SHA1 5147103545571f3af85aa8a59a780a23162527f1 SHA256 d8f558e41e0355721b759a3229c34523a998b5d11941f6189a8f55aba8cbdbda +MD5 da43e5575f7440329041e8bd97df9389 ChangeLog 25093 +RMD160 2b02603b3d26d439635935cd8eceadda6af8fac0 ChangeLog 25093 +SHA256 d8f558e41e0355721b759a3229c34523a998b5d11941f6189a8f55aba8cbdbda ChangeLog 25093 MISC metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 SHA1 b154d3e425be12942f183a7ad1a37fecc215e4b4 SHA256 f80d3cd5afabd0dc4d177925c3715c464288e5ec3ed1ca809a7f7a66ee3907a5 MD5 b4d3814b9ce4be88a25d99b3cfe2c076 metadata.xml 482 RMD160 b060f8a2492170d8513e1b2d03512d8b565b5045 metadata.xml 482 diff --git a/dev-java/java-config/files/jdk-defaults-x86-fbsd.conf b/dev-java/java-config/files/jdk-defaults-x86-fbsd.conf new file mode 100644 index 000000000000..2af5546093a4 --- /dev/null +++ b/dev-java/java-config/files/jdk-defaults-x86-fbsd.conf @@ -0,0 +1,2 @@ +# This files contain the default support jdk's +*= diablo-jdk diff --git a/dev-java/java-config/java-config-2.0.30.ebuild b/dev-java/java-config/java-config-2.0.30.ebuild index 780536c57e7d..33d2b0d9fac0 100644 --- a/dev-java/java-config/java-config-2.0.30.ebuild +++ b/dev-java/java-config/java-config-2.0.30.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.0.30.ebuild,v 1.8 2006/10/15 18:23:57 dertobi123 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/java-config-2.0.30.ebuild,v 1.9 2006/12/08 01:33:38 caster Exp $ inherit base distutils eutils @@ -20,8 +20,11 @@ RDEPEND="${DEPEND} src_install() { distutils_src_install + # this file will be included directly in the next version + cp "${FILESDIR}/jdk-defaults-x86-fbsd.conf" config/ + insinto /usr/share/java-config-2/config/ - for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86; do + for i in alpha amd64 hppa ia64 ppc ppc64 sparc x86 x86-fbsd; do if use ${i}; then newins config/jdk-defaults-${i}.conf jdk-defaults.conf || die "arch config not found" fi -- 2.26.2