1 |
commit: a6d3b0beb193ab31044f4bb791c855e420691f4e |
2 |
Author: Austin English <wizardedit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Aug 21 17:15:50 2018 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 27 19:51:52 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/gentoo-syntax.git/commit/?id=a6d3b0be |
7 |
|
8 |
update sample java ebuild |
9 |
|
10 |
Closes: https://bugs.gentoo.org/664190 |
11 |
|
12 |
plugin/newebuild.vim | 24 +++++++----------------- |
13 |
1 file changed, 7 insertions(+), 17 deletions(-) |
14 |
|
15 |
diff --git a/plugin/newebuild.vim b/plugin/newebuild.vim |
16 |
index 7000fde..dd195ee 100644 |
17 |
--- a/plugin/newebuild.vim |
18 |
+++ b/plugin/newebuild.vim |
19 |
@@ -94,10 +94,10 @@ fun! <SID>MakeNewEbuild() |
20 |
put ='need_apache2' |
21 |
" }}} |
22 |
elseif l:category ==# "dev-java" |
23 |
- " {{{ dev-java generation-2 default ant ebuild |
24 |
+ " {{{ dev-java generation-2 default java-pkg-simple ebuild |
25 |
put ='JAVA_PKG_IUSE=\"doc source\"' |
26 |
put ='' |
27 |
- put ='inherit java-pkg-2 java-ant-2' |
28 |
+ put ='inherit java-pkg-2 java-pkg-simple' |
29 |
put ='' |
30 |
put ='DESCRIPTION=\"\"' |
31 |
put ='HOMEPAGE=\"\"' |
32 |
@@ -109,22 +109,12 @@ fun! <SID>MakeNewEbuild() |
33 |
put ='' |
34 |
put ='IUSE=\"\"' |
35 |
put ='' |
36 |
- put ='COMMON_DEP=\"\"' |
37 |
+ put ='CP_DEPEND=\"\"' |
38 |
put ='' |
39 |
- put ='RDEPEND=\">=virtual/jre-1.5' |
40 |
- put =' ${COMMON_DEP}\"' |
41 |
- put ='DEPEND=\">=virtual/jdk-1.5' |
42 |
- put =' app-arch/unzip' |
43 |
- put =' ${COMMON_DEP}\"' |
44 |
- put ='' |
45 |
- put ='EANT_BUILD_TARGET=\"\"' |
46 |
- put ='EANT_DOC_TARGET=\"\"' |
47 |
- put ='' |
48 |
- put ='src_install() {' |
49 |
- put =' java-pkg_dojar \"${PN}.jar\"' |
50 |
- put =' use doc && java-pkg_dojavadoc build/javadoc' |
51 |
- put =' use source && java-pkg_dosrc src' |
52 |
- put ='}' |
53 |
+ put ='RDEPEND=\">=virtual/jre-1.8' |
54 |
+ put =' ${CP_DEPEND}\"' |
55 |
+ put ='DEPEND=\">=virtual/jdk-1.8' |
56 |
+ put =' ${CP_DEPEND}\"' |
57 |
elseif l:category ==# "dev-perl" || l:category ==# "perl-core" |
58 |
" {{{ perl modules default setup |
59 |
put ='DIST_AUTHOR=\"\"' |