Gentoo Archives: gentoo-commits

From: "M. B." <tomboy64@××××.cn>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/user/tbc:master commit in: dev-java/jcpp/, dev-java/jsemver/
Date: Tue, 31 May 2016 14:06:54
Message-Id: 1464703567.41e11899654391ff547102dd2d43ec46d6f9241d.tomboy64@gentoo
1 commit: 41e11899654391ff547102dd2d43ec46d6f9241d
2 Author: Matthew Brewer <tomboy64 <AT> sina <DOT> cn>
3 AuthorDate: Tue May 31 13:40:08 2016 +0000
4 Commit: M. B. <tomboy64 <AT> sina <DOT> cn>
5 CommitDate: Tue May 31 14:06:07 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/user/tbc.git/commit/?id=41e11899
7
8 update jcpp and jsemver
9
10 dev-java/jcpp/jcpp-1.4.12.ebuild | 27 +++++++++++----------------
11 dev-java/jsemver/jsemver-0.9.0.ebuild | 20 +++++++-------------
12 2 files changed, 18 insertions(+), 29 deletions(-)
13
14 diff --git a/dev-java/jcpp/jcpp-1.4.12.ebuild b/dev-java/jcpp/jcpp-1.4.12.ebuild
15 index 47fb011..94909b0 100644
16 --- a/dev-java/jcpp/jcpp-1.4.12.ebuild
17 +++ b/dev-java/jcpp/jcpp-1.4.12.ebuild
18 @@ -5,38 +5,33 @@
19 EAPI=5
20
21 JAVA_PKG_IUSE="doc source"
22 -
23 inherit java-pkg-2 java-pkg-simple vcs-snapshot
24
25 -DESCRIPTION="A complete, compliant, standalone, pure Java implementation of the C preprocessor"
26 +COMMIT="1119d798e56ca37f2f976f196e6c27f70f39508b"
27 +DESCRIPTION="A complete, compliant, standalone Java implementation of the C preprocessor"
28 HOMEPAGE="https://github.com/shevek/jcpp"
29 -SRC_URI="https://github.com/shevek/jcpp/archive/1119d798e56ca37f2f976f196e6c27f70f39508b.tar.gz
30 - -> jcpp-1.4.12.tar.gz"
31 -
32 +SRC_URI="https://github.com/shevek/${PN}/archive/${COMMIT}.tar.gz -> jcpp-1.4.12.tar.gz"
33 LICENSE="Apache-2.0"
34 SLOT="0"
35 KEYWORDS="~amd64 ~x86"
36 -
37 -IUSE="test"
38 +IUSE=""
39
40 COMMON_DEP="dev-util/findbugs:0
41 dev-java/ant-core:0
42 - dev-java/guava:18
43 dev-java/jopt-simple:0
44 dev-java/jsemver:0
45 dev-java/jsr305:0
46 - dev-java/junit:4
47 dev-java/slf4j-api:0"
48 -
49 -RDEPEND=">=virtual/jre-1.5
50 +RDEPEND=">=virtual/jre-1.7
51 ${COMMON_DEP}"
52 -DEPEND=">=virtual/jdk-1.5
53 +DEPEND=">=virtual/jdk-1.7
54 ${COMMON_DEP}"
55
56 -JAVA_GENTOO_CLASSPATH="ant-core findbugs guava-18 jopt-simple jsemver jsr305 junit-4 slf4j-api"
57 +S="${WORKDIR}/${P}"
58 +JAVA_SRC_DIR="src/main/java"
59 +JAVA_GENTOO_CLASSPATH="ant-core,findbugs,jopt-simple,jsemver,jsr305,slf4j-api"
60
61 src_install() {
62 - java-pkg_dojar "${PN}.jar"
63 - use doc && java-pkg_dojavadoc target/api
64 - use source && java-pkg_dosrc "${P}"/src/{main,test}/java/*
65 + java-pkg-simple_src_install
66 + dodoc README.md
67 }
68
69 diff --git a/dev-java/jsemver/jsemver-0.9.0.ebuild b/dev-java/jsemver/jsemver-0.9.0.ebuild
70 index a6af20c..cb5a3ef 100644
71 --- a/dev-java/jsemver/jsemver-0.9.0.ebuild
72 +++ b/dev-java/jsemver/jsemver-0.9.0.ebuild
73 @@ -11,27 +11,21 @@ inherit java-pkg-2 java-pkg-simple
74 DESCRIPTION="Java implementation of the Semantic Versioning Specification"
75 HOMEPAGE="https://github.com/zafarkhaja/jsemver"
76 SRC_URI="https://github.com/zafarkhaja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
77 -
78 LICENSE="MIT"
79 SLOT="0"
80 KEYWORDS="~amd64 ~x86"
81 -
82 IUSE=""
83
84 -COMMON_DEP="dev-java/junit:4"
85 -
86 -RDEPEND=">=virtual/jre-1.5
87 +COMMON_DEP=""
88 +RDEPEND=">=virtual/jre-1.7
89 ${COMMON_DEP}"
90 -DEPEND=">=virtual/jdk-1.5
91 +DEPEND=">=virtual/jdk-1.7
92 ${COMMON_DEP}"
93
94 -EANT_BUILD_TARGET=""
95 -EANT_DOC_TARGET=""
96 -
97 -JAVA_GENTOO_CLASSPATH="junit-4"
98 +S="${WORKDIR}/${P}"
99 +JAVA_SRC_DIR="src/main/java"
100
101 src_install() {
102 - java-pkg_dojar "${PN}.jar"
103 - use doc && java-pkg_dojavadoc target/api
104 - use source && java-pkg_dosrc "${P}"/src/{main,test}/java/*
105 + java-pkg-simple_src_install
106 + dodoc README.md
107 }