1 |
ssuominen 12/04/06 19:43:33 |
2 |
|
3 |
Modified: metadata.xml jay-1.1.1-r2.ebuild ChangeLog |
4 |
Log: |
5 |
Upload binary file mono.snk to mirrors wrt #373253 by Matt Turner |
6 |
|
7 |
(Portage version: 2.2.0_alpha99/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.4 dev-util/jay/metadata.xml |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/metadata.xml?rev=1.4&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/metadata.xml?rev=1.4&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/metadata.xml?r1=1.3&r2=1.4 |
15 |
|
16 |
Index: metadata.xml |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/jay/metadata.xml,v |
19 |
retrieving revision 1.3 |
20 |
retrieving revision 1.4 |
21 |
diff -u -r1.3 -r1.4 |
22 |
--- metadata.xml 29 Apr 2011 18:22:27 -0000 1.3 |
23 |
+++ metadata.xml 6 Apr 2012 19:43:33 -0000 1.4 |
24 |
@@ -1,7 +1,6 @@ |
25 |
<?xml version="1.0" encoding="UTF-8"?> |
26 |
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
27 |
<pkgmetadata> |
28 |
- <herd>java</herd> |
29 |
- <herd>dotnet</herd> |
30 |
+<herd>java</herd> |
31 |
+<herd>dotnet</herd> |
32 |
</pkgmetadata> |
33 |
- |
34 |
|
35 |
|
36 |
|
37 |
1.6 dev-util/jay/jay-1.1.1-r2.ebuild |
38 |
|
39 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild?rev=1.6&view=markup |
40 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild?rev=1.6&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild?r1=1.5&r2=1.6 |
42 |
|
43 |
Index: jay-1.1.1-r2.ebuild |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild,v |
46 |
retrieving revision 1.5 |
47 |
retrieving revision 1.6 |
48 |
diff -u -r1.5 -r1.6 |
49 |
--- jay-1.1.1-r2.ebuild 15 Mar 2012 17:27:18 -0000 1.5 |
50 |
+++ jay-1.1.1-r2.ebuild 6 Apr 2012 19:43:33 -0000 1.6 |
51 |
@@ -1,34 +1,29 @@ |
52 |
# Copyright 1999-2012 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild,v 1.5 2012/03/15 17:27:18 sera Exp $ |
55 |
- |
56 |
-EAPI="2" |
57 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/jay-1.1.1-r2.ebuild,v 1.6 2012/04/06 19:43:33 ssuominen Exp $ |
58 |
|
59 |
+EAPI=4 |
60 |
inherit mono java-pkg-opt-2 toolchain-funcs |
61 |
|
62 |
DESCRIPTION="A LALR(1) parser generator: Berkeley yacc retargeted to C# and Java" |
63 |
HOMEPAGE="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/package-summary.html" |
64 |
-SRC_URI="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> ${P}.zip" |
65 |
+SRC_URI="http://www.cs.rit.edu/~ats/projects/lp/doc/jay/doc-files/src.zip -> ${P}.zip |
66 |
+ http://dev.gentoo.org/~ssuominen/${P}-mono.snk.bz2" |
67 |
+ |
68 |
LICENSE="as-is" |
69 |
SLOT="0" |
70 |
KEYWORDS="amd64 ~ppc x86" |
71 |
IUSE="java mono" |
72 |
|
73 |
-COMMON_DEPEND=" |
74 |
- !<=dev-lang/mono-2.4 |
75 |
- mono? ( >dev-lang/mono-2.4 ) |
76 |
- " |
77 |
-RDEPEND=" |
78 |
- ${COMMOND_DEPEND} |
79 |
- java? ( >=virtual/jre-1.4 ) |
80 |
- " |
81 |
-DEPEND=" |
82 |
- ${COMMON_DEPEND} |
83 |
+COMMON_DEPEND="!<=dev-lang/mono-2.4 |
84 |
+ mono? ( >dev-lang/mono-2.4 )" |
85 |
+RDEPEND="${COMMOND_DEPEND} |
86 |
+ java? ( >=virtual/jre-1.4 )" |
87 |
+DEPEND="${COMMON_DEPEND} |
88 |
java? ( >=virtual/jdk-1.4 ) |
89 |
- app-arch/unzip |
90 |
- " |
91 |
+ app-arch/unzip" |
92 |
|
93 |
-S="${WORKDIR}/${PN}" |
94 |
+S=${WORKDIR}/${PN} |
95 |
|
96 |
RESTRICT="test" |
97 |
|
98 |
@@ -40,44 +35,41 @@ |
99 |
} |
100 |
|
101 |
src_prepare() { |
102 |
- # Fix up ugly makefiles. |
103 |
sed -i -r \ |
104 |
-e "s:^CC\s*=.*:CC = `tc-getCC`:" \ |
105 |
-e 's/^jay:.* \$e /\0$(LDFLAGS) /' \ |
106 |
-e '/^CFLAGS\s*=/d' \ |
107 |
src/makefile || die |
108 |
+ |
109 |
java-utils-2_src_prepare |
110 |
} |
111 |
|
112 |
src_compile() { |
113 |
- emake -C src jay || die "failed to build jay executable" |
114 |
- |
115 |
- if use java |
116 |
- then |
117 |
- emake -C yydebug yydebug.jar || die "failed to build yydebug.jar" |
118 |
- fi |
119 |
+ emake -C src jay |
120 |
+ use java && emake -C yydebug yydebug.jar |
121 |
|
122 |
- if use mono |
123 |
- then |
124 |
- cd cs |
125 |
- /usr/bin/gmcs /target:library /out:yydebug.dll /keyfile:"${FILESDIR}/mono.snk" yyDebug.cs || die "Failed to compile yyDebug.cs" |
126 |
+ if use mono; then |
127 |
+ pushd cs >/dev/null |
128 |
+ /usr/bin/gmcs /target:library /out:yydebug.dll /keyfile:"${WORKDIR}"/${P}-mono.snk yyDebug.cs || die |
129 |
+ popd >/dev/null |
130 |
fi |
131 |
} |
132 |
|
133 |
src_install() { |
134 |
- dobin src/jay || die |
135 |
- doman jay.1 || die |
136 |
- dodoc README || die |
137 |
- if use java |
138 |
- then |
139 |
+ dobin src/jay |
140 |
+ |
141 |
+ doman jay.1 |
142 |
+ dodoc README |
143 |
+ |
144 |
+ if use java; then |
145 |
java-pkg_dojar yydebug/yydebug.jar |
146 |
insinto /usr/share/jay |
147 |
- doins java/skeleton.{java,tables} || die |
148 |
+ doins java/skeleton.{java,tables} |
149 |
fi |
150 |
- if use mono |
151 |
- then |
152 |
+ |
153 |
+ if use mono; then |
154 |
egacinstall cs/yydebug.dll |
155 |
insinto /usr/share/jay |
156 |
- doins cs/skeleton.cs || die |
157 |
+ doins cs/skeleton.cs |
158 |
fi |
159 |
} |
160 |
|
161 |
|
162 |
|
163 |
1.8 dev-util/jay/ChangeLog |
164 |
|
165 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/ChangeLog?rev=1.8&view=markup |
166 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/ChangeLog?rev=1.8&content-type=text/plain |
167 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/jay/ChangeLog?r1=1.7&r2=1.8 |
168 |
|
169 |
Index: ChangeLog |
170 |
=================================================================== |
171 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/jay/ChangeLog,v |
172 |
retrieving revision 1.7 |
173 |
retrieving revision 1.8 |
174 |
diff -u -r1.7 -r1.8 |
175 |
--- ChangeLog 15 Mar 2012 17:27:18 -0000 1.7 |
176 |
+++ ChangeLog 6 Apr 2012 19:43:33 -0000 1.8 |
177 |
@@ -1,6 +1,10 @@ |
178 |
# ChangeLog for dev-util/jay |
179 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
180 |
-# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/ChangeLog,v 1.7 2012/03/15 17:27:18 sera Exp $ |
181 |
+# $Header: /var/cvsroot/gentoo-x86/dev-util/jay/ChangeLog,v 1.8 2012/04/06 19:43:33 ssuominen Exp $ |
182 |
+ |
183 |
+ 06 Apr 2012; Samuli Suominen <ssuominen@g.o> jay-1.1.1-r2.ebuild, |
184 |
+ -files/mono.snk: |
185 |
+ Upload binary file mono.snk to mirrors wrt #373253 by Matt Turner |
186 |
|
187 |
15 Mar 2012; Ralph Sennhauser <sera@g.o> jay-1.1.1-r2.ebuild: |
188 |
Add missing build dep app-arch/unzip. #372621 |