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