1 |
tomwij 13/06/05 09:30:15 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: jss-4.3-r1.ebuild |
5 |
Log: |
6 |
Revision bump to 4.3-r1. EAPI 5. Fix Java environment, see bug #472198. Fix use of CFLAGS, see bug #428188. Possibly bug #463582 is fixed as a side effect. |
7 |
|
8 |
(Portage version: 2.1.12.2/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.27 dev-java/jss/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/ChangeLog?rev=1.27&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/ChangeLog?rev=1.27&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/ChangeLog?r1=1.26&r2=1.27 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v |
20 |
retrieving revision 1.26 |
21 |
retrieving revision 1.27 |
22 |
diff -u -r1.26 -r1.27 |
23 |
--- ChangeLog 3 May 2012 07:42:50 -0000 1.26 |
24 |
+++ ChangeLog 5 Jun 2013 09:30:15 -0000 1.27 |
25 |
@@ -1,6 +1,14 @@ |
26 |
# ChangeLog for dev-java/jss |
27 |
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.26 2012/05/03 07:42:50 jdhore Exp $ |
29 |
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
30 |
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/ChangeLog,v 1.27 2013/06/05 09:30:15 tomwij Exp $ |
31 |
+ |
32 |
+*jss-4.3-r1 (05 Jun 2013) |
33 |
+ |
34 |
+ 05 Jun 2013; Tom Wijsman <TomWij@g.o> +files/jss-4.3-cflags.patch, |
35 |
+ +files/jss-4.3-secitem.patch, +jss-4.3-r1.ebuild: |
36 |
+ Revision bump to 4.3-r1. EAPI 5. Fix Java environment, see bug #472198. Fix |
37 |
+ use of CFLAGS, see bug #428188. Possibly bug #463582 is fixed as a side |
38 |
+ effect. |
39 |
|
40 |
03 May 2012; Jeff Horelick <jdhore@g.o> jss-4.2.5.ebuild, |
41 |
jss-4.3.ebuild: |
42 |
|
43 |
|
44 |
|
45 |
1.1 dev-java/jss/jss-4.3-r1.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: jss-4.3-r1.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2013 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/dev-java/jss/jss-4.3-r1.ebuild,v 1.1 2013/06/05 09:30:15 tomwij Exp $ |
55 |
|
56 |
EAPI="5" |
57 |
|
58 |
JAVA_PKG_IUSE="doc examples source" |
59 |
|
60 |
inherit base java-pkg-2 linux-info versionator |
61 |
|
62 |
RTM_NAME="JSS_${PV//./_}_RTM" |
63 |
|
64 |
DESCRIPTION="Network Security Services for Java (JSS)" |
65 |
HOMEPAGE="http://www.mozilla.org/projects/security/pki/jss/" |
66 |
# To prepare this tarball |
67 |
# cvs -d :pserver:anonymous@××××××××××××××××××.org:/cvsroot export \ |
68 |
# -r JSS_4_3_RTM mozilla/security/coreconf |
69 |
# cvs -d :pserver:anonymous@××××××××××××××××××.org:/cvsroot export \ |
70 |
# -r JSS_4_3_RTM mozilla/security/jss |
71 |
# tar cvjf jss-4.3.tar.bz2 mozilla |
72 |
SRC_URI="mirror://gentoo/${P}.tar.bz2" |
73 |
|
74 |
LICENSE="MPL-1.1" |
75 |
SLOT="3.4" |
76 |
KEYWORDS="~amd64 ~x86" |
77 |
|
78 |
CDEPEND=">=dev-libs/nspr-4.7 |
79 |
>=dev-libs/nss-3.12" |
80 |
|
81 |
DEPEND=">=virtual/jdk-1.4 |
82 |
app-arch/zip |
83 |
virtual/pkgconfig |
84 |
${CDEPEND}" |
85 |
|
86 |
RDEPEND=">=virtual/jre-1.4 |
87 |
${CDEPEND}" |
88 |
|
89 |
S="${WORKDIR}/mozilla" |
90 |
|
91 |
java_prepare() { |
92 |
epatch "${FILESDIR}"/${PN}-3.4-target_source.patch |
93 |
epatch "${FILESDIR}"/${PN}-4.2.5-use_pkg-config.patch |
94 |
epatch "${FILESDIR}"/${P}-cflags.patch |
95 |
epatch "${FILESDIR}"/${P}-ldflags.patch |
96 |
epatch "${FILESDIR}"/${P}-secitem.patch |
97 |
} |
98 |
|
99 |
src_compile() { |
100 |
export JAVA_GENTOO_OPTS="-source $(java-pkg_get-source) -target $(java-pkg_get-target)" |
101 |
|
102 |
use amd64 && export USE_64=1 |
103 |
|
104 |
cd "${S}/security/coreconf" || die |
105 |
# Hotfix for kernel 3.x #379283 |
106 |
get_running_version || die "Failed to determine kernel version" |
107 |
if [[ ${KV_MAJOR} -ge 3 ]]; then |
108 |
cp Linux2.6.mk Linux${KV_MAJOR}.${KV_MINOR}.mk || die |
109 |
fi |
110 |
|
111 |
emake -j1 BUILD_OPT=1 |
112 |
|
113 |
cd "${S}/security/jss" || die |
114 |
emake -j1 BUILD_OPT=1 USE_PKGCONFIG=1 NSS_PKGCONFIG=nss NSPR_PKGCONFIG=nspr |
115 |
|
116 |
if use doc; then |
117 |
emake -j1 BUILD_OPT=1 javadoc |
118 |
fi |
119 |
} |
120 |
|
121 |
# Investigate why this fails. |
122 |
# |
123 |
# cp: cannot stat ‘/var/tmp/portage/dev-java/jss-4.3-r1/work/mozilla/dist/Linux3.8_x86_64_glibc_PTH_64_OPT.OBJ//lib/*nssckbi*’: No such file or directory |
124 |
# Failed to copy builtins library at security/jss/org/mozilla/jss/tests/all.pl line 453. |
125 |
# |
126 |
# There is indeed no nssckbi file, investigation needed if that file can be |
127 |
# generated or whether we can remove the broken test; possibly inform upstream. |
128 |
RESTRICT="test" |
129 |
|
130 |
src_test() { |
131 |
BUILD_OPT=1 perl security/jss/org/mozilla/jss/tests/all.pl dist \ |
132 |
"${S}"/dist/Linux*.OBJ/ |
133 |
} |
134 |
|
135 |
src_install() { |
136 |
java-pkg_dojar dist/*.jar |
137 |
|
138 |
# Use this instead of the one in dist because it is a symlink |
139 |
# and doso handles symlinks by just symlinking to the original |
140 |
java-pkg_doso ./security/${PN}/lib/*/*.so |
141 |
|
142 |
use doc && java-pkg_dojavadoc dist/jssdoc |
143 |
use source && java-pkg_dosrc ./security/jss/org |
144 |
use examples && java-pkg_doexamples ./security/jss/samples |
145 |
} |