diff options
| author | abcd <abcd@gentoo.org> | 2011-04-11 00:43:18 -0400 |
|---|---|---|
| committer | abcd <abcd@gentoo.org> | 2011-04-11 00:46:27 -0400 |
| commit | c13fb353d0394fb8426cc2e5b76f34101c39e25d (patch) | |
| tree | bc871b753dd3cf01f15bd5189c9c845c21dee65a | |
| parent | 3620202aedc4d13fa99f4eb3e9cf970f9d620bff (diff) | |
| download | kde-c13fb353d0394fb8426cc2e5b76f34101c39e25d.tar.gz kde-c13fb353d0394fb8426cc2e5b76f34101c39e25d.tar.bz2 kde-c13fb353d0394fb8426cc2e5b76f34101c39e25d.zip | |
[kde-base/krossjava] Include fixes from gx86
(Portage version: 2.2.0_alpha29_p11/git/Linux i686, signed Manifest commit with key 229E5838)
| -rw-r--r-- | kde-base/krossjava/Manifest | 24 | ||||
| -rw-r--r-- | kde-base/krossjava/krossjava-4.6.9999.ebuild | 11 | ||||
| -rw-r--r-- | kde-base/krossjava/krossjava-9999.ebuild | 11 |
3 files changed, 42 insertions, 4 deletions
diff --git a/kde-base/krossjava/Manifest b/kde-base/krossjava/Manifest index c1cc8d650c6..7050728d81c 100644 --- a/kde-base/krossjava/Manifest +++ b/kde-base/krossjava/Manifest @@ -1,4 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX krossjava-4.2.3_includes.patch 573 RMD160 17511c084bb188113546cf5e867a511715cee6f9 SHA1 b6d9d52d862f1aaf27bd8e0cb502cda537b2463e SHA256 5bd9bdbb9336d3800aa6cd143c3d9bea4379d52b96066ddca6cd8690113c25f7 -EBUILD krossjava-4.6.9999.ebuild 1266 RMD160 3ca8f48cc73aedd4e1aba082c8030f02564aae03 SHA1 95b6f764166a422820a0d8c0c9cc3ead205722e9 SHA256 cf3a86697dbe5c165b7848947ecb8f6dc68058bd1d2b878ea628f084888cd343 -EBUILD krossjava-9999.ebuild 1266 RMD160 3ca8f48cc73aedd4e1aba082c8030f02564aae03 SHA1 95b6f764166a422820a0d8c0c9cc3ead205722e9 SHA256 cf3a86697dbe5c165b7848947ecb8f6dc68058bd1d2b878ea628f084888cd343 +EBUILD krossjava-4.6.9999.ebuild 1346 RMD160 d7ddf51992bed12e1b4517780156f3a06455e608 SHA1 b0acc45b3e62f5a65969cdd08d78bcc493cca3ca SHA256 e4377fcf03ef60acdad7e30193f8a067973ee6b64d1a31db9b8db1ce53d668ea +EBUILD krossjava-9999.ebuild 1346 RMD160 d7ddf51992bed12e1b4517780156f3a06455e608 SHA1 b0acc45b3e62f5a65969cdd08d78bcc493cca3ca SHA256 e4377fcf03ef60acdad7e30193f8a067973ee6b64d1a31db9b8db1ce53d668ea MISC metadata.xml 321 RMD160 1c9bbcab13cb180c109d2f9057fa7617023ddc3b SHA1 de6893f3efb267f4f5e8ccdbc610b6176a1980e2 SHA256 8807987b34c460c021e243de234498b311431850245a438b453084192db06133 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.17 (GNU/Linux) + +iQIcBAEBCAAGBQJNooblAAoJELHSF2kinlg4P7YP/ibIMNZgP3C66n0pI1t0qO7b +42z21xu5VbtMAfvjZmAB2s4tiDz6szqtTJNdpJFmQVpu64CRy6BSf3kzAyQxkyva +ENUNDpj2GPNIilM5D6xkfwEkATT8EjMeSqZs9CyFgcLIDjvPq2egnJxUA7Q/moME +XDey2uNlflRqso1HOJkLYHDFWgu/qYFhKIa6DCm3Y/tJRIvFQiy6Yj7EPRuoUZ/+ +fP6B8Bm+/ot/4A6sIRWW0T8hITCQrjz8MrPJLw0FuTI3WdOwYDs9NpIQNZdAFFA2 +YwS3ZwWzx57HseX5KuBth6zLcw3KHJST5qD4wh9//zUKj+dA4SofghPTXs7GVzOk +Q2un4hd4+CumkWdmZFVgoRMd/oZIjDb3Fd9NwjWlwj/3dDhEWfCmKRXInWYjOKBY ++Q6eZeZHc9/fYEJgSJfdQZCmzIv29J0kv2icdZ7Grc5pHKHpVUe0bVgXuvUeOlL1 +PXtmz2PA8gRGLbLlD6QIbqOpkgp823paRDGZBBj/NcSdw5rYOPHRglGtcu/Liayy +BKPojms7LMlP3sHJxutioi9x4nX1pp2wY7MGpvT0kn+m1z+KBrxIcuYB+7gIqXzV +qIEFCW93ZGWFp/HSsO/ET7STnBWLIWr8JJr5FGXBIpzxE/EFtiNY1q29sM50+gd8 +E83mIoFe26z124PRa2v7 +=r2ce +-----END PGP SIGNATURE----- diff --git a/kde-base/krossjava/krossjava-4.6.9999.ebuild b/kde-base/krossjava/krossjava-4.6.9999.ebuild index b7bae3f8d17..ec603a94361 100644 --- a/kde-base/krossjava/krossjava-4.6.9999.ebuild +++ b/kde-base/krossjava/krossjava-4.6.9999.ebuild @@ -23,6 +23,11 @@ RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-4.2.3_includes.patch" ) +pkg_setup() { + kde4-meta_pkg_setup + java-pkg-2_pkg_setup +} + src_prepare() { find "${S}" -iname '*.jar' | xargs rm -v kde4-meta_src_prepare @@ -31,7 +36,6 @@ src_prepare() { src_configure() { mycmakeargs=(-DENABLE_KROSSJAVA=ON) - export JAVA_HOME=$(java-config -g JAVA_HOME) kde4-meta_src_configure java-ant-2_src_configure } @@ -57,3 +61,8 @@ src_install() { "${KDEDIR}/$(get_libdir)/kde4/kross/kross.jar" java-pkg_regso "${ED}/${KDEDIR}/$(get_libdir)/kde4/libkrossjava.so" } + +pkg_preinst() { + kde4-meta_pkg_preinst + java-pkg-2_pkg_preinst +} diff --git a/kde-base/krossjava/krossjava-9999.ebuild b/kde-base/krossjava/krossjava-9999.ebuild index b7bae3f8d17..ec603a94361 100644 --- a/kde-base/krossjava/krossjava-9999.ebuild +++ b/kde-base/krossjava/krossjava-9999.ebuild @@ -23,6 +23,11 @@ RESTRICT="test" PATCHES=( "${FILESDIR}/${PN}-4.2.3_includes.patch" ) +pkg_setup() { + kde4-meta_pkg_setup + java-pkg-2_pkg_setup +} + src_prepare() { find "${S}" -iname '*.jar' | xargs rm -v kde4-meta_src_prepare @@ -31,7 +36,6 @@ src_prepare() { src_configure() { mycmakeargs=(-DENABLE_KROSSJAVA=ON) - export JAVA_HOME=$(java-config -g JAVA_HOME) kde4-meta_src_configure java-ant-2_src_configure } @@ -57,3 +61,8 @@ src_install() { "${KDEDIR}/$(get_libdir)/kde4/kross/kross.jar" java-pkg_regso "${ED}/${KDEDIR}/$(get_libdir)/kde4/libkrossjava.so" } + +pkg_preinst() { + kde4-meta_pkg_preinst + java-pkg-2_pkg_preinst +} |