From c449241c01405f7f18384b4c59bc3b21dfb9ab13 Mon Sep 17 00:00:00 2001 From: Vlastimil Babka Date: Tue, 19 Sep 2006 17:07:57 +0000 Subject: Move JAVACABS export to src_compile() to make it actually work. Package-Manager: portage-2.1.2_pre1 --- sys-libs/db/ChangeLog | 5 ++++- sys-libs/db/Manifest | 26 ++++++++------------------ sys-libs/db/db-3.2.9-r10.ebuild | 6 +++--- 3 files changed, 15 insertions(+), 22 deletions(-) (limited to 'sys-libs/db') diff --git a/sys-libs/db/ChangeLog b/sys-libs/db/ChangeLog index 73f19093afc7..37499b83d28e 100644 --- a/sys-libs/db/ChangeLog +++ b/sys-libs/db/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-libs/db # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.170 2006/08/31 11:47:00 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/ChangeLog,v 1.171 2006/09/19 17:07:57 caster Exp $ + + 19 Sep 2006; Vlastimil Babka db-3.2.9-r10.ebuild: + Move JAVACABS export to src_compile() to make it actually work. *db-3.2.9-r11 (31 Aug 2006) diff --git a/sys-libs/db/Manifest b/sys-libs/db/Manifest index de7968af8c17..ef8374608044 100644 --- a/sys-libs/db/Manifest +++ b/sys-libs/db/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf SHA1 42a105f2503315a28b1e7f7aad71ee3bd4a56a13 SHA256 049052c74c544ac1c1f3b1b91c3e43df76b135c610148212679dfd324470cf2f MD5 86aca9a49a082dc56e4103ec8112f344 files/db-1.85-gentoo-paths.patch 684 RMD160 cbfb484127600e180eb432d3f5aa31deba43e8bf files/db-1.85-gentoo-paths.patch 684 @@ -124,10 +121,10 @@ EBUILD db-1.85-r3.ebuild 1221 RMD160 70c96e76760c138e8bd51a61d20540302c7199dc SH MD5 f63d1e3bb30c46a75c47bd3460a1703a db-1.85-r3.ebuild 1221 RMD160 70c96e76760c138e8bd51a61d20540302c7199dc db-1.85-r3.ebuild 1221 SHA256 da2904b46920c495a73d1e2a2e4d6087d2088ededd7ae39a539c14fdaa87b71f db-1.85-r3.ebuild 1221 -EBUILD db-3.2.9-r10.ebuild 4404 RMD160 b0762e68e3119dc25223bd5a3a544c2bf38434fb SHA1 00909d6077690dd57fdbba5a68078b3fed355558 SHA256 dff25a108941401742dfdcf9417c9a04b74dcc14413f6334435a7735571a8af4 -MD5 262ee75c93b9f52bcb055f64d50ac923 db-3.2.9-r10.ebuild 4404 -RMD160 b0762e68e3119dc25223bd5a3a544c2bf38434fb db-3.2.9-r10.ebuild 4404 -SHA256 dff25a108941401742dfdcf9417c9a04b74dcc14413f6334435a7735571a8af4 db-3.2.9-r10.ebuild 4404 +EBUILD db-3.2.9-r10.ebuild 4395 RMD160 cd1429c6d32123aa68c88dd24d4e4adba3f162b4 SHA1 f6a261f0b8f62791e2ba230a673cf539d6e5abdf SHA256 c013488735966e81e3e77becdb4ee797ae339e0f251e14ff7558830ef7132b88 +MD5 040d204dedcf287852d1ef5ca1247a07 db-3.2.9-r10.ebuild 4395 +RMD160 cd1429c6d32123aa68c88dd24d4e4adba3f162b4 db-3.2.9-r10.ebuild 4395 +SHA256 c013488735966e81e3e77becdb4ee797ae339e0f251e14ff7558830ef7132b88 db-3.2.9-r10.ebuild 4395 EBUILD db-3.2.9-r11.ebuild 4429 RMD160 f0381e2f801440df44c9f4ec4654db5441e8045f SHA1 ca26b660e2770886c4effa28e41e47cf83f9e527 SHA256 5e0d9418682f23cd4763b3953045c311f930ddbb95c9e377d30d14f5af14dc14 MD5 d7fca14df252a7b1696df3d3bb03d332 db-3.2.9-r11.ebuild 4429 RMD160 f0381e2f801440df44c9f4ec4654db5441e8045f db-3.2.9-r11.ebuild 4429 @@ -184,10 +181,10 @@ EBUILD db-4.4.20_p2.ebuild 3566 RMD160 ce14a5621010d22c1f59d2bd161059488603871c MD5 b806745e1f3c850a2539e2fbeb472752 db-4.4.20_p2.ebuild 3566 RMD160 ce14a5621010d22c1f59d2bd161059488603871c db-4.4.20_p2.ebuild 3566 SHA256 167d7490452d34215a43fc073d6919271ee1cc51cbe05552debda3e21362e79d db-4.4.20_p2.ebuild 3566 -MISC ChangeLog 26887 RMD160 aeaed87a0a23de9545912cc942588c1a9784597a SHA1 b9be882beea5ef7900bbe92008783ac696573e62 SHA256 e5c3fe8e5524949be9ee2caec9a54616086c607bcaa8efc39069a5252252cede -MD5 2c2475d5451b6c59090f0c634aafe692 ChangeLog 26887 -RMD160 aeaed87a0a23de9545912cc942588c1a9784597a ChangeLog 26887 -SHA256 e5c3fe8e5524949be9ee2caec9a54616086c607bcaa8efc39069a5252252cede ChangeLog 26887 +MISC ChangeLog 27029 RMD160 90abdb191fd912c076121c2669255ec2a2df3517 SHA1 1e650a2c14cceb756546f2d3b6a0440f65c83173 SHA256 5108ffe1b5d3ba74dda4bc6b6043b1445d1279df3ed68f523bbcd6f0ef28c254 +MD5 3857ef8d52cb416f32e81c436c9f039a ChangeLog 27029 +RMD160 90abdb191fd912c076121c2669255ec2a2df3517 ChangeLog 27029 +SHA256 5108ffe1b5d3ba74dda4bc6b6043b1445d1279df3ed68f523bbcd6f0ef28c254 ChangeLog 27029 MISC metadata.xml 1460 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 SHA1 a29a6ed2d9dfbe3b686a9281a1909d9fc7bd61e9 SHA256 ad820b0fe2d8ec2aac1eb181f2e3e2769392e1ae6c5f6afb7e1603bdd0bb7405 MD5 e1753ef0eb3e9614fadff321ecd1b082 metadata.xml 1460 RMD160 6f73dd6370c976b947d939633aa6f67d078e4fc7 metadata.xml 1460 @@ -246,10 +243,3 @@ SHA256 43f814e2ff2cd9d7ca6f40f336a9eacefb8b3d2d0aa3fdd5046369a07aa00251 files/di MD5 c36ac17ff6e664f9a8f5bd2fe3534dd5 files/digest-db-4.4.20_p2 660 RMD160 fa3804c13649e3d5d0bc42c5a7822764be74a674 files/digest-db-4.4.20_p2 660 SHA256 dcce09c08cdfddd585acc3b07685a92d1f78dad6ce7936b85728cf782b4c2096 files/digest-db-4.4.20_p2 660 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5 (GNU/Linux) - -iD8DBQFE+m3vamhnQswr0vIRAvA1AJ9wsbeIj7QLT0BCOXHLsksz0MsVjwCffceH -RV9mFzETFkbEcg6CN2UuCzY= -=6DI6 ------END PGP SIGNATURE----- diff --git a/sys-libs/db/db-3.2.9-r10.ebuild b/sys-libs/db/db-3.2.9-r10.ebuild index 653a2e0e6afd..e357039b0bb2 100644 --- a/sys-libs/db/db-3.2.9-r10.ebuild +++ b/sys-libs/db/db-3.2.9-r10.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/sys-libs/db/db-3.2.9-r10.ebuild,v 1.25 2006/08/31 11:47:00 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-libs/db/db-3.2.9-r10.ebuild,v 1.26 2006/09/19 17:07:57 caster Exp $ inherit gnuconfig libtool eutils db java-pkg @@ -33,8 +33,6 @@ pkg_setup() { src_unpack() { unpack ${A} - use java && export JAVACABS=$(java-config --javac) - chmod -R ug+w * cd ${WORKDIR}/${P} @@ -72,6 +70,8 @@ src_compile() { local conf_shared= local conf_static= + use java && export JAVACABS="${JAVAC}" + conf="${conf} --host=${CHOST} \ --build=${CHOST} \ -- cgit v1.2.3-65-gdbad