projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9b78a3a)
Ebuild cleanup. Monolithic X is not supported any more.
authorPetteri Räty <betelgeuse@gentoo.org>
Sun, 11 Feb 2007 11:52:31 +0000 (11:52 +0000)
committerPetteri Räty <betelgeuse@gentoo.org>
Sun, 11 Feb 2007 11:52:31 +0000 (11:52 +0000)
Package-Manager: portage-2.1.2-r9

dev-java/sun-jdk/ChangeLog patch | blob | history
dev-java/sun-jdk/Manifest patch | blob | history
dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild patch | blob | history
dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild patch | blob | history
dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild patch | blob | history
dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild patch | blob | history

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index bce3aa9e259435054acd0a7c13670f34bbfc52d7..7ff0fa606550f008bf5437e737fe2c7bb9b20121 100644 (file)
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.185 2007/02/11 11:43:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.186 2007/02/11 11:52:31 betelgeuse Exp $
+
+  11 Feb 2007; Petteri Räty <betelgeuse@gentoo.org>
+  sun-jdk-1.4.2.13.ebuild, sun-jdk-1.5.0.10.ebuild, sun-jdk-1.5.0.11.ebuild,
+  sun-jdk-1.6.0-r1.ebuild:
+  Ebuild cleanup. Monolithic X is not supported any more.
 
 *sun-jdk-1.5.0.11 (11 Feb 2007)
 
diff --git a/dev-java/sun-jdk/Manifest b/dev-java/sun-jdk/Manifest
index 6c0089b67c2d3f12257807c8989123ca8763ee60..3280f38a569653c6c54159b1c6aafd6fdbd9d9ad 100644 (file)
--- a/dev-java/sun-jdk/Manifest
+++ b/dev-java/sun-jdk/Manifest
@@ -25,26 +25,26 @@ DIST jdk-1_5_0_11-dlj-linux-amd64.bin 43954177 RMD160 bd865019d3fb2268800696207d
 DIST jdk-1_5_0_11-dlj-linux-i586.bin 49598681 RMD160 74c5bd78450397006ea145580c3554d77b64a31d SHA1 965e4983da769b6c5d6ec79c942337bc8bee5c8a SHA256 da7c0217c1c6d47aad77a8b5ca0b30b01846c8090d5b1d5907862ef7122a1705
 DIST jdk-6-dlj-linux-amd64.bin 56347832 RMD160 b4d12bf55ea6baa465c227cff2d314d26de4876e SHA1 d51a60c80ac1a8173c53b9a389377b2774a50e92 SHA256 f1f35d331809487bb922bbd3ca46de4abc3e45c482f94127f4ac8f3c8b3321c3
 DIST jdk-6-dlj-linux-i586.bin 62718862 RMD160 4ff9f1f82b20f0dbd792e6765c02d87749e00aac SHA1 bc7a56952b362e472a0ec179e0852ca7bf0c0507 SHA256 1c4f98edb6c1b379807d9dab61971c0271b2b4cf1f1be914cc85354744408467
-EBUILD sun-jdk-1.4.2.13.ebuild 6310 RMD160 c05da39110b45b95820b4e47575f672f29c1f3db SHA1 7b28a74828fb683e84389ec9e245c0c73aa084af SHA256 7ff87aa6eaec9342d1a690e75a3ef4c94f2bf6b6a1f0265fb2e3b9bd9d2be47d
-MD5 f40a87fe0d39910fa54dfa7bf7ddaa31 sun-jdk-1.4.2.13.ebuild 6310
-RMD160 c05da39110b45b95820b4e47575f672f29c1f3db sun-jdk-1.4.2.13.ebuild 6310
-SHA256 7ff87aa6eaec9342d1a690e75a3ef4c94f2bf6b6a1f0265fb2e3b9bd9d2be47d sun-jdk-1.4.2.13.ebuild 6310
-EBUILD sun-jdk-1.5.0.10.ebuild 4604 RMD160 b128a32bf2994ee5a3c81b7c8fb00861f7e1ba49 SHA1 58cb625a885b81d594031ec75fc8de898f13c986 SHA256 daaf95772de1f2e78e891fc34a2eb8141ab3db24ea66f53232c70ca32021a0d8
-MD5 ecc67efc4733391bf1f30a63a9cb40c4 sun-jdk-1.5.0.10.ebuild 4604
-RMD160 b128a32bf2994ee5a3c81b7c8fb00861f7e1ba49 sun-jdk-1.5.0.10.ebuild 4604
-SHA256 daaf95772de1f2e78e891fc34a2eb8141ab3db24ea66f53232c70ca32021a0d8 sun-jdk-1.5.0.10.ebuild 4604
-EBUILD sun-jdk-1.5.0.11.ebuild 4641 RMD160 f1e6c3a407a3b447b842e144f9ec559e60c57514 SHA1 2bcfc3f22e6697b4d2882db892c73129d8bc9bed SHA256 8f74013e64edbc50a70ef5e76828fb8b6c01f26f45df9b356927f45a2f8e5131
-MD5 32c27455fa016a3df16f5c6f844b2cdb sun-jdk-1.5.0.11.ebuild 4641
-RMD160 f1e6c3a407a3b447b842e144f9ec559e60c57514 sun-jdk-1.5.0.11.ebuild 4641
-SHA256 8f74013e64edbc50a70ef5e76828fb8b6c01f26f45df9b356927f45a2f8e5131 sun-jdk-1.5.0.11.ebuild 4641
-EBUILD sun-jdk-1.6.0-r1.ebuild 4829 RMD160 c5a112df1b4a01f520cf0220da854cdf8caebb9f SHA1 176a5cfde85f19d1693756413f24c3f90e2634c6 SHA256 224304e8e2d000da71bc5c411a50e659b18c988285fcc476ac73a4bd6439c184
-MD5 e4769c71f1d5c1f4f5fdd55fca98b14a sun-jdk-1.6.0-r1.ebuild 4829
-RMD160 c5a112df1b4a01f520cf0220da854cdf8caebb9f sun-jdk-1.6.0-r1.ebuild 4829
-SHA256 224304e8e2d000da71bc5c411a50e659b18c988285fcc476ac73a4bd6439c184 sun-jdk-1.6.0-r1.ebuild 4829
-MISC ChangeLog 36454 RMD160 c1f1f4431b54ace26431aedb6f80377f67f8de2f SHA1 15c78a5977418cc1b775f69868905e87bca02f6c SHA256 dbcb9cd629cfdbd2aeee72a24a2c6f0f56e6478cbd33e0fae56547bf8f35c9b3
-MD5 54e61f7f82f8763f881b49dc1d0fa0eb ChangeLog 36454
-RMD160 c1f1f4431b54ace26431aedb6f80377f67f8de2f ChangeLog 36454
-SHA256 dbcb9cd629cfdbd2aeee72a24a2c6f0f56e6478cbd33e0fae56547bf8f35c9b3 ChangeLog 36454
+EBUILD sun-jdk-1.4.2.13.ebuild 6311 RMD160 4509d5ab6df64e94fbaa3aff27e8e9531608cc0d SHA1 ae82b8d97a6ff5f57daef7ca7cc2661994110e82 SHA256 ffed680930da4f61290b79ecadae909dd83ffbde0bf525d35a49aee6dc95a6f7
+MD5 32f196a83b862af4d06b9c1310f8d244 sun-jdk-1.4.2.13.ebuild 6311
+RMD160 4509d5ab6df64e94fbaa3aff27e8e9531608cc0d sun-jdk-1.4.2.13.ebuild 6311
+SHA256 ffed680930da4f61290b79ecadae909dd83ffbde0bf525d35a49aee6dc95a6f7 sun-jdk-1.4.2.13.ebuild 6311
+EBUILD sun-jdk-1.5.0.10.ebuild 4603 RMD160 53d5ec9888ab703a3e747dc5572eaccf5dfa9373 SHA1 4109f0e797d8db62fcbcf38eef6e6354540d9a93 SHA256 54f252579d64c2ae35b0601a4806c598932a93465949f07974cb819a2f5d49a8
+MD5 aea4f559a38fe9c5d5b5f470386d779a sun-jdk-1.5.0.10.ebuild 4603
+RMD160 53d5ec9888ab703a3e747dc5572eaccf5dfa9373 sun-jdk-1.5.0.10.ebuild 4603
+SHA256 54f252579d64c2ae35b0601a4806c598932a93465949f07974cb819a2f5d49a8 sun-jdk-1.5.0.10.ebuild 4603
+EBUILD sun-jdk-1.5.0.11.ebuild 4581 RMD160 ff9164c2b18e21c14d932cc906a7aeb7c905b5f8 SHA1 abe8838b94fcd065182a4b89d8f2db5270f20ffe SHA256 7304d461166058b39ac1ee4e6569fcb432e3fe450b64a83a73e3782da7ff0659
+MD5 e8bf2993056950cc6c8256b192e1cb28 sun-jdk-1.5.0.11.ebuild 4581
+RMD160 ff9164c2b18e21c14d932cc906a7aeb7c905b5f8 sun-jdk-1.5.0.11.ebuild 4581
+SHA256 7304d461166058b39ac1ee4e6569fcb432e3fe450b64a83a73e3782da7ff0659 sun-jdk-1.5.0.11.ebuild 4581
+EBUILD sun-jdk-1.6.0-r1.ebuild 4793 RMD160 2f27c223cfb548f7229a3c11a98585ebc47ce0ec SHA1 996ecea18fb8a04e3725d750b7871c0395a38a62 SHA256 9077b88f8e27a3d4172f04d57af23e624ab65e945e73a8ae43eb39d4fa8a30aa
+MD5 bee16ebb6712252065a8da192a8ca5c1 sun-jdk-1.6.0-r1.ebuild 4793
+RMD160 2f27c223cfb548f7229a3c11a98585ebc47ce0ec sun-jdk-1.6.0-r1.ebuild 4793
+SHA256 9077b88f8e27a3d4172f04d57af23e624ab65e945e73a8ae43eb39d4fa8a30aa sun-jdk-1.6.0-r1.ebuild 4793
+MISC ChangeLog 36670 RMD160 fc0214825da37cf9a63f442f523a5e817eb1377a SHA1 b77b5a77cc5d30da98521e43e0ca5d00d6f27eef SHA256 bd506c6f1b317d3b567a9d6f21f408e5f1516561d3680a138ca8405cfb5d0c54
+MD5 02691a3b347dff5fde4e6798e9188663 ChangeLog 36670
+RMD160 fc0214825da37cf9a63f442f523a5e817eb1377a ChangeLog 36670
+SHA256 bd506c6f1b317d3b567a9d6f21f408e5f1516561d3680a138ca8405cfb5d0c54 ChangeLog 36670
 MISC metadata.xml 237 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 SHA1 47fb9d11272aa2245df406c2156c2482e166a1c3 SHA256 3e53f0c8fb262a6751adb4c188e045e0be6de8739c02ec1af079cba5512e696d
 MD5 2f36c2b94fc9625e5c96d8e558f6ffba metadata.xml 237
 RMD160 e2fa73e8b206c77bc262fd54691289bf05696668 metadata.xml 237
@@ -64,7 +64,7 @@ SHA256 d5cebb938ce9873bffbdee08dfc2d4e46c0984e6d420221916b9acd94a0118c4 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.2 (GNU/Linux)
 
-iD8DBQFFzwGEcxLzpIGCsLQRAinsAJ9txiUoszsboMv8hJ58Op0lGXTv2gCgm2lA
-WrAGzpY7lGO1KvAFAist4Qg=
-=z9cs
+iD8DBQFFzwOQcxLzpIGCsLQRAoKRAJ9bIyKKwLUQ214/TeK5F1KJ+z281gCcDnra
+ymaz2XM+n3ppZ0e3/sY02cw=
+=MIB/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild
index 48b1c56e46c9ce8655e20d722c7fac21f423f666..1ab0dbd02e5ede279fbaa03a76f27f62abff720c 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.4.2.13.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-java/sun-jdk/sun-jdk-1.4.2.13.ebuild,v 1.4 2007/01/10 00:14:55 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.13.ebuild,v 1.5 2007/02/11 11:52:31 betelgeuse Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit java-vm-2 eutils
@@ -19,7 +19,7 @@ SRC_URI="${At}
                jce? ( ${jce_policy} )"
 SLOT="1.4"
 LICENSE="sun-bcla-java-vm"
-KEYWORDS="-* x86"
+KEYWORDS="x86"
 RESTRICT="fetch"
 IUSE="X alsa doc examples nsplugin jce"
 
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild
index afb987847147ed548346dfe5f1a71dce19e08439..0eab135fde356ab2eb0b0ae6716174da5ca7bdfe 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.10.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-java/sun-jdk/sun-jdk-1.5.0.10.ebuild,v 1.3 2007/01/23 10:35:39 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.10.ebuild,v 1.4 2007/02/11 11:52:31 betelgeuse Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
                amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.5"
 LICENSE="dlj-1.1"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="amd64 x86"
 RESTRICT="nostrip"
 IUSE="X alsa doc examples jce nsplugin"
 
@@ -41,7 +41,7 @@ RDEPEND="
                                x11-libs/libXp
                                x11-libs/libXt
                                x11-libs/libXtst
-                         )
+                               )
                                virtual/x11
                        )
                )"
diff --git a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
index 099eb5190de16cee377bc38443ce82ce2caef56a..160bcd4badcfa99fddd2f0298620dc2aa535cf14 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.5.0.11.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-java/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.1 2007/02/11 11:43:45 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.11.ebuild,v 1.2 2007/02/11 11:52:31 betelgeuse Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
                amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.5"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="nostrip"
 IUSE="X alsa doc examples jce nsplugin"
 
@@ -31,15 +31,12 @@ RDEPEND="
        sys-libs/glibc
        alsa? ( media-libs/alsa-lib )
        doc? ( =dev-java/java-sdk-docs-1.5.0* )
-       X? ( || ( ( x11-libs/libX11
-                               x11-libs/libXext
-                               x11-libs/libXi
-                               x11-libs/libXp
-                               x11-libs/libXt
-                               x11-libs/libXtst
-                         )
-                               virtual/x11
-                       )
+       X? (
+                       x11-libs/libX11
+                       x11-libs/libXext
+                       x11-libs/libXi
+                       x11-libs/libXp
+                       x11-libs/libXt
                )"
 
 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
index 9dbd735f0701e685b3915362588860180a0effb5..3f65c7d8f2db33c67fc5291338003bf111a3033a 100644 (file)
--- a/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-1.6.0-r1.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-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.5 2007/01/12 13:40:19 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0-r1.ebuild,v 1.6 2007/02/11 11:52:31 betelgeuse Exp $
 
 inherit java-vm-2 eutils pax-utils
 
@@ -21,7 +21,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
                amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 RESTRICT="nostrip"
 IUSE="X alsa doc examples jce nsplugin"
 
@@ -39,15 +39,13 @@ RDEPEND="
        x86? ( =virtual/libstdc++-3.3 )
        sys-libs/glibc
        alsa? ( media-libs/alsa-lib )
-       X? ( || ( ( x11-libs/libX11
-                               x11-libs/libXext
-                               x11-libs/libXi
-                               x11-libs/libXp
-                               x11-libs/libXt
-                               x11-libs/libXtst
-                         )
-                               virtual/x11
-                       )
+       X? (
+                       x11-libs/libX11
+                       x11-libs/libXext
+                       x11-libs/libXi
+                       x11-libs/libXp
+                       x11-libs/libXt
+                       x11-libs/libXtst
                )"
 
 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
Unnamed repository; edit this file 'description' to name the repository.