From 41e11899654391ff547102dd2d43ec46d6f9241d Mon Sep 17 00:00:00 2001
From: Matthew Brewer <tomboy64@sina.cn>
Date: Tue, 31 May 2016 15:40:08 +0200
Subject: update jcpp and jsemver

---
 dev-java/jcpp/jcpp-1.4.12.ebuild      | 27 +++++++++++----------------
 dev-java/jsemver/jsemver-0.9.0.ebuild | 20 +++++++-------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/dev-java/jcpp/jcpp-1.4.12.ebuild b/dev-java/jcpp/jcpp-1.4.12.ebuild
index 47fb011..94909b0 100644
--- a/dev-java/jcpp/jcpp-1.4.12.ebuild
+++ b/dev-java/jcpp/jcpp-1.4.12.ebuild
@@ -5,38 +5,33 @@
 EAPI=5
 
 JAVA_PKG_IUSE="doc source"
-
 inherit java-pkg-2 java-pkg-simple vcs-snapshot
 
-DESCRIPTION="A complete, compliant, standalone, pure Java implementation of the C preprocessor"
+COMMIT="1119d798e56ca37f2f976f196e6c27f70f39508b"
+DESCRIPTION="A complete, compliant, standalone Java implementation of the C preprocessor"
 HOMEPAGE="https://github.com/shevek/jcpp"
-SRC_URI="https://github.com/shevek/jcpp/archive/1119d798e56ca37f2f976f196e6c27f70f39508b.tar.gz
-	-> jcpp-1.4.12.tar.gz"
-
+SRC_URI="https://github.com/shevek/${PN}/archive/${COMMIT}.tar.gz -> jcpp-1.4.12.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
-IUSE="test"
+IUSE=""
 
 COMMON_DEP="dev-util/findbugs:0
 	dev-java/ant-core:0
-	dev-java/guava:18
 	dev-java/jopt-simple:0
 	dev-java/jsemver:0
 	dev-java/jsr305:0
-	dev-java/junit:4
 	dev-java/slf4j-api:0"
-
-RDEPEND=">=virtual/jre-1.5
+RDEPEND=">=virtual/jre-1.7
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.7
 	${COMMON_DEP}"
 
-JAVA_GENTOO_CLASSPATH="ant-core findbugs guava-18 jopt-simple jsemver jsr305 junit-4 slf4j-api"
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
+JAVA_GENTOO_CLASSPATH="ant-core,findbugs,jopt-simple,jsemver,jsr305,slf4j-api"
 
 src_install() {
-	java-pkg_dojar "${PN}.jar"
-	use doc && java-pkg_dojavadoc target/api
-	use source && java-pkg_dosrc "${P}"/src/{main,test}/java/*
+	java-pkg-simple_src_install
+	dodoc README.md
 }
diff --git a/dev-java/jsemver/jsemver-0.9.0.ebuild b/dev-java/jsemver/jsemver-0.9.0.ebuild
index a6af20c..cb5a3ef 100644
--- a/dev-java/jsemver/jsemver-0.9.0.ebuild
+++ b/dev-java/jsemver/jsemver-0.9.0.ebuild
@@ -11,27 +11,21 @@ inherit java-pkg-2 java-pkg-simple
 DESCRIPTION="Java implementation of the Semantic Versioning Specification"
 HOMEPAGE="https://github.com/zafarkhaja/jsemver"
 SRC_URI="https://github.com/zafarkhaja/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-
 IUSE=""
 
-COMMON_DEP="dev-java/junit:4"
-
-RDEPEND=">=virtual/jre-1.5
+COMMON_DEP=""
+RDEPEND=">=virtual/jre-1.7
 	${COMMON_DEP}"
-DEPEND=">=virtual/jdk-1.5
+DEPEND=">=virtual/jdk-1.7
 	${COMMON_DEP}"
 
-EANT_BUILD_TARGET=""
-EANT_DOC_TARGET=""
-
-JAVA_GENTOO_CLASSPATH="junit-4"
+S="${WORKDIR}/${P}"
+JAVA_SRC_DIR="src/main/java"
 
 src_install() {
-	java-pkg_dojar "${PN}.jar"
-	use doc && java-pkg_dojavadoc target/api
-	use source && java-pkg_dosrc "${P}"/src/{main,test}/java/*
+	java-pkg-simple_src_install
+	dodoc README.md
 }
-- 
cgit v1.2.3-65-gdbad