From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id B1ACB1384B4 for ; Mon, 2 Nov 2015 23:56:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 517F5E0858; Mon, 2 Nov 2015 23:56:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D122CE0858 for ; Mon, 2 Nov 2015 23:56:55 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BD69334078E for ; Mon, 2 Nov 2015 23:56:52 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1DEF11EE9 for ; Mon, 2 Nov 2015 23:56:49 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1446508578.c37141f5d3e1cef5d58855b8c30a1bfaa62e774c.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/qdox/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-java/qdox/qdox-1.12-r2.ebuild dev-java/qdox/qdox-1.12.1.ebuild X-VCS-Directories: dev-java/qdox/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: c37141f5d3e1cef5d58855b8c30a1bfaa62e774c X-VCS-Branch: master Date: Mon, 2 Nov 2015 23:56:49 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: d872b1f5-34b5-468d-942f-e7d511e1cb5c X-Archives-Hash: b714c5a3b2ac030a39f63d1266898a00 commit: c37141f5d3e1cef5d58855b8c30a1bfaa62e774c Author: James Le Cuirot gentoo org> AuthorDate: Mon Nov 2 23:48:45 2015 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Mon Nov 2 23:56:18 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c37141f5 dev-java/qdox: Remove old This drops ~ppc64 back to 1.12-r1. Sorry about that but the versions inbetween won't work against jflex 1.6.1. This situation will be remedied shortly. It is only a build time issue so should not affect existing installations. Package-Manager: portage-2.2.20.1 dev-java/qdox/qdox-1.12-r2.ebuild | 85 --------------------------------------- dev-java/qdox/qdox-1.12.1.ebuild | 82 ------------------------------------- 2 files changed, 167 deletions(-) diff --git a/dev-java/qdox/qdox-1.12-r2.ebuild b/dev-java/qdox/qdox-1.12-r2.ebuild deleted file mode 100644 index 140ace0..0000000 --- a/dev-java/qdox/qdox-1.12-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Parser for extracting class/interface/method definitions" -HOMEPAGE="https://github.com/codehaus/qdox" -SRC_URI="http://snapshots.repository.codehaus.org/com/thoughtworks/qdox/qdox/1.12-SNAPSHOT/qdox-1.12-20100531.205010-5-project.tar.gz " - -LICENSE="Apache-2.0" -SLOT="1.12" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" - -S="${WORKDIR}/${P}-SNAPSHOT" - -CDEPEND="dev-java/ant-core:0" - -DEPEND=">=virtual/jdk-1.6 - app-arch/unzip:0 - dev-java/byaccj:0 - dev-java/jflex:0 - dev-java/jmock:1.0 - test? ( dev-java/junit:0 ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.6 - ${CDEPEND}" - -java_prepare() { - if ! use test ; then - rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java - rm -rf src/java/com/thoughtworks/qdox/junit - rm -rf src/test - fi -} - -src_compile() { - jflex \ - src/grammar/lexer.flex \ - --skel src/grammar/skeleton.inner \ - -d src/java/com/thoughtworks/qdox/parser/impl/ || die - byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die - mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die - - # create jar - mkdir -p build/classes || die - - local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)" - - if use test ; then - cp="${cp}:$(java-pkg_getjars --build-only junit)" - fi - - ejavac -sourcepath . -d build/classes -classpath "${cp}" \ - $(find . -name "*.java") || die "Cannot compile sources" - - mkdir dist || die - cd build/classes || die - jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR" - - # generate javadoc - if use doc ; then - cd "${S}" - mkdir javadoc || die - javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}" - fi -} - -src_test() { - java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \ - com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!" -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - java-pkg_register-ant-task - - use source && java-pkg_dosrc src/java/com - use doc && java-pkg_dojavadoc javadoc -} diff --git a/dev-java/qdox/qdox-1.12.1.ebuild b/dev-java/qdox/qdox-1.12.1.ebuild deleted file mode 100644 index 7f99e23..0000000 --- a/dev-java/qdox/qdox-1.12.1.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -JAVA_PKG_IUSE="doc source test" - -inherit java-pkg-2 java-ant-2 - -DESCRIPTION="Parser for extracting class/interface/method definitions" -HOMEPAGE="https://github.com/codehaus/qdox" -SRC_URI="https://github.com/codehaus/qdox/archive/${P}.tar.gz" - -LICENSE="Apache-2.0" -SLOT="1.12" -KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~ppc-macos ~x64-macos ~x86-macos" - -S="${WORKDIR}/${PN}-${PN}-${PV}" - -CDEPEND="dev-java/ant-core:0" - -DEPEND=">=virtual/jdk-1.4 - app-arch/unzip:0 - dev-java/byaccj:0 - >=dev-java/jflex-1.4.3:0 - dev-java/jmock:1.0 - test? ( dev-java/junit:0 ) - ${CDEPEND}" - -RDEPEND=">=virtual/jre-1.4 - ${CDEPEND}" - -java_prepare() { - if ! use test ; then - rm src/java/com/thoughtworks/qdox/tools/QDoxTester.java - rm -rf src/java/com/thoughtworks/qdox/junit - rm -rf src/test - fi -} - -src_compile() { - jflex src/grammar/lexer.flex --skel src/grammar/skeleton.inner -d src/java/com/thoughtworks/qdox/parser/impl/ || die - byaccj -v -Jnorun -Jnoconstruct -Jclass=Parser -Jsemantic=Value -Jpackage=com.thoughtworks.qdox.parser.impl src/grammar/parser.y || die - mv Parser.java src/java/com/thoughtworks/qdox/parser/impl/ || die - - # create jar - mkdir -p build/classes || die - - local cp="$(java-pkg_getjars --build-only ant-core,jmock-1.0)" - - if use test ; then - cp="${cp}:$(java-pkg_getjars --build-only junit)" - fi - - ejavac -sourcepath . -d build/classes -classpath "${cp}" \ - $(find . -name "*.java") || die "Cannot compile sources" - - mkdir dist || die - cd build/classes || die - jar -cvf "${S}"/dist/${PN}.jar com || die "Cannot create JAR" - - # generate javadoc - if use doc ; then - cd "${S}" - mkdir javadoc || die - javadoc -d javadoc -sourcepath src/java -subpackages com -classpath "${cp}" - fi -} - -src_test() { - java -cp "${S}"/dist/${PN}.jar:$(java-pkg_getjars --build-only ant-core,junit,jmock-1.0) \ - com.thoughtworks.qdox.tools.QDoxTester src || die "Tests failed!" -} - -src_install() { - java-pkg_dojar dist/${PN}.jar - java-pkg_register-ant-task - - use source && java-pkg_dosrc src/java/com - use doc && java-pkg_dojavadoc javadoc -}