* [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/
@ 2015-09-28 16:12 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2015-09-28 16:12 UTC (permalink / raw
To: gentoo-commits
commit: 7498a5bc6a1fd248dde55840569eeae8081cd5d7
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 28 15:43:18 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Sep 28 16:10:39 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7498a5bc
dev-java/annogen: Removes java-virtual/stax-api and fixes bug 561504.
Package-Manager: portage-2.2.18
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/annogen/annogen-0.1.0-r1.ebuild | 72 ++++++++++++++++++++++++++++++++
1 file changed, 72 insertions(+)
diff --git a/dev-java/annogen/annogen-0.1.0-r1.ebuild b/dev-java/annogen/annogen-0.1.0-r1.ebuild
new file mode 100644
index 0000000..4c09b7b
--- /dev/null
+++ b/dev-java/annogen/annogen-0.1.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+JAVA_PKG_IUSE="doc source examples"
+
+inherit eutils java-pkg-2 java-ant-2
+
+DESCRIPTION="A tool which helps you work with JSR175 annotations"
+HOMEPAGE="https://github.com/codehaus/annogen"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+CDEPEND="java-virtuals/jdk-with-com-sun:0
+ dev-java/ant-core:0
+ dev-java/qdox:1.6"
+
+RDEPEND=">=virtual/jdk-1.6
+ ${CDEPEND}"
+
+DEPEND=">=virtual/jre-1.6
+ app-arch/unzip
+ ${CDEPEND}"
+
+S="${WORKDIR}"
+
+# com.sun.mirror.declaration was removed from JDK 7 onwards.
+# These two files are just interfaces anyway.
+JAVA_RM_FILES=(
+ org/codehaus/annogen/view/MirrorAnnoViewer.java
+ org/codehaus/annogen/override/MirrorElementIdPool.java
+)
+
+src_unpack() {
+ default
+ unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
+}
+
+java_prepare() {
+ find -name '*.jar' -exec rm -v {} + || die
+ mkdir "${S}"/classes || die
+}
+
+# Well. I don't like this way of doing things but it works.
+# I've tried to rewrite this ebuild using the java-ant-2 eclass.
+# It was an unfruitful try.
+src_compile() {
+ find org -name "*.java" > "${T}/src.list" || die
+
+ ejavac -d "${S}"/classes \
+ -classpath $(java-pkg_getjars qdox-1.6,ant-core):$(java-config --tools) \
+ "@${T}/src.list"
+
+ cd "${S}"/classes || die
+ jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
+}
+
+src_install() {
+ java-pkg_dojar ${PN}.jar
+
+ # For if this is ever needed:
+ # java-pkg_register-ant-task
+
+ use doc && java-pkg_dojavadoc docs
+ use source && java-pkg_dosrc org
+ use examples && java-pkg_doexamples "examples"
+}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/
@ 2015-11-11 22:57 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2015-11-11 22:57 UTC (permalink / raw
To: gentoo-commits
commit: fa8dcfd46a0b544c4378e971b2a6f9ab286792f0
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 19:32:48 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 22:54:23 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8dcfd4
dev-java/annogen: Do away with hacks and make use of java-pkg-simple. Keywords for ppc+ppc64+x86.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/annogen/annogen-0.1.0-r1.ebuild | 72 --------------------------------
dev-java/annogen/annogen-0.1.0-r2.ebuild | 58 +++++++++++++++++++++++++
dev-java/annogen/annogen-0.1.0.ebuild | 71 -------------------------------
3 files changed, 58 insertions(+), 143 deletions(-)
diff --git a/dev-java/annogen/annogen-0.1.0-r1.ebuild b/dev-java/annogen/annogen-0.1.0-r1.ebuild
deleted file mode 100644
index 4c09b7b..0000000
--- a/dev-java/annogen/annogen-0.1.0-r1.ebuild
+++ /dev/null
@@ -1,72 +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 examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="https://github.com/codehaus/annogen"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64"
-
-CDEPEND="java-virtuals/jdk-with-com-sun:0
- dev-java/ant-core:0
- dev-java/qdox:1.6"
-
-RDEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jre-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-S="${WORKDIR}"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
- org/codehaus/annogen/view/MirrorAnnoViewer.java
- org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-src_unpack() {
- default
- unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
- find -name '*.jar' -exec rm -v {} + || die
- mkdir "${S}"/classes || die
-}
-
-# Well. I don't like this way of doing things but it works.
-# I've tried to rewrite this ebuild using the java-ant-2 eclass.
-# It was an unfruitful try.
-src_compile() {
- find org -name "*.java" > "${T}/src.list" || die
-
- ejavac -d "${S}"/classes \
- -classpath $(java-pkg_getjars qdox-1.6,ant-core):$(java-config --tools) \
- "@${T}/src.list"
-
- cd "${S}"/classes || die
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- # For if this is ever needed:
- # java-pkg_register-ant-task
-
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc org
- use examples && java-pkg_doexamples "examples"
-}
diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r2.ebuild
new file mode 100644
index 0000000..6bb9641
--- /dev/null
+++ b/dev-java/annogen/annogen-0.1.0-r2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A tool which helps you work with JSR175 annotations"
+HOMEPAGE="https://github.com/codehaus/annogen"
+SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+CDEPEND="
+ dev-java/qdox:1.6
+ dev-java/ant-core:0
+ java-virtuals/jdk-with-com-sun:0"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6"
+
+DEPEND="
+ ${CDEPEND}
+ app-arch/unzip
+ >=virtual/jre-1.6"
+
+# com.sun.mirror.declaration was removed from JDK 7 onwards.
+# These two files are just interfaces anyway.
+JAVA_RM_FILES=(
+ org/codehaus/annogen/view/MirrorAnnoViewer.java
+ org/codehaus/annogen/override/MirrorElementIdPool.java
+)
+
+JAVA_GENTOO_CLASSPATH="
+ ant-core
+ qdox-1.6
+"
+
+src_unpack() {
+ default
+ unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
+}
+
+java_prepare() {
+ java-pkg_clean
+ rm -rf examples || die
+}
+
+src_compile() {
+ # Needed for com.sun.* imports
+ JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
+ java-pkg-simple_src_compile
+}
diff --git a/dev-java/annogen/annogen-0.1.0.ebuild b/dev-java/annogen/annogen-0.1.0.ebuild
deleted file mode 100644
index d03f59e..0000000
--- a/dev-java/annogen/annogen-0.1.0.ebuild
+++ /dev/null
@@ -1,71 +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 examples"
-
-inherit eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="http://annogen.codehaus.org/"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64"
-
-CDEPEND="java-virtuals/stax-api:0
- java-virtuals/jdk-with-com-sun:0
- dev-java/ant-core:0
- dev-java/qdox:1.6"
-
-RDEPEND=">=virtual/jdk-1.6
- ${CDEPEND}"
-
-DEPEND=">=virtual/jre-1.6
- app-arch/unzip
- ${CDEPEND}"
-
-S="${WORKDIR}"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
- org/codehaus/annogen/view/MirrorAnnoViewer.java
- org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-src_unpack() {
- default
- unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
- find -name '*.jar' -exec rm -v {} + || die
-
- mkdir "${S}"/classes || die
-}
-
-src_compile() {
- find org -name "*.java" > "${T}/src.list" || die
-
- ejavac -d "${S}"/classes \
- -classpath $(java-pkg_getjars stax-api,qdox-1.6,ant-core):$(java-config --tools) \
- "@${T}/src.list"
-
- cd "${S}"/classes || die
- jar -cf "${S}/${PN}.jar" * || die "failed to create jar"
-}
-
-src_install() {
- java-pkg_dojar ${PN}.jar
-
- # For if this is ever needed:
- # java-pkg_register-ant-task
-
- use doc && java-pkg_dojavadoc docs
- use source && java-pkg_dosrc org
- use examples && java-pkg_doexamples "examples"
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/
@ 2015-11-11 22:57 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2015-11-11 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 8ed8f59be97bbf8f643bbb2ad5bf9381ec08834f
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 11 19:34:28 2015 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 22:54:26 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ed8f59b
dev-java/annogen: Stable for amd64.
Package-Manager: portage-2.2.20.1
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>
dev-java/annogen/annogen-0.1.0-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r2.ebuild
index 6bb9641..ca46888 100644
--- a/dev-java/annogen/annogen-0.1.0-r2.ebuild
+++ b/dev-java/annogen/annogen-0.1.0-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
CDEPEND="
dev-java/qdox:1.6
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/
@ 2016-02-18 22:11 James Le Cuirot
0 siblings, 0 replies; 6+ messages in thread
From: James Le Cuirot @ 2016-02-18 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 913abde5997fd06e4f6666770624c3bb09f9b3c5
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 18 22:07:50 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 22:08:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=913abde5
dev-java/annogen: Drop jdk-with-com-sun dep, fix jdk/jre reversal
Straight to stable as it shouldn't affect the build and
jdk-with-com-sun really needs to go. It still can't just yet but at
least ppc64 is clear now.
Package-Manager: portage-2.2.27
.../annogen/{annogen-0.1.0-r2.ebuild => annogen-0.1.0-r3.ebuild} | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/dev-java/annogen/annogen-0.1.0-r2.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
similarity index 95%
rename from dev-java/annogen/annogen-0.1.0-r2.ebuild
rename to dev-java/annogen/annogen-0.1.0-r3.ebuild
index e37bbd6..96d70fd 100644
--- a/dev-java/annogen/annogen-0.1.0-r2.ebuild
+++ b/dev-java/annogen/annogen-0.1.0-r3.ebuild
@@ -17,17 +17,16 @@ KEYWORDS="amd64 ~ppc64 ~x86"
CDEPEND="
dev-java/qdox:1.6
- dev-java/ant-core:0
- java-virtuals/jdk-with-com-sun:0"
+ dev-java/ant-core:0"
RDEPEND="
${CDEPEND}
- >=virtual/jdk-1.6"
+ >=virtual/jre-1.6"
DEPEND="
${CDEPEND}
app-arch/unzip
- >=virtual/jre-1.6"
+ >=virtual/jdk-1.6"
# com.sun.mirror.declaration was removed from JDK 7 onwards.
# These two files are just interfaces anyway.
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/
@ 2017-07-04 21:44 Patrice Clement
0 siblings, 0 replies; 6+ messages in thread
From: Patrice Clement @ 2017-07-04 21:44 UTC (permalink / raw
To: gentoo-commits
commit: 0b797745f0c9c00b304a008e5c541c0a5e7d9438
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 4 21:44:19 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Tue Jul 4 21:44:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b797745
dev-java/annogen: remove hard dependecy on unzip.
Package-Manager: Portage-2.3.5, Repoman-2.3.1
dev-java/annogen/annogen-0.1.0-r3.ebuild | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/dev-java/annogen/annogen-0.1.0-r3.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
index 46ffd305b87..f6d31072bfe 100644
--- a/dev-java/annogen/annogen-0.1.0-r3.ebuild
+++ b/dev-java/annogen/annogen-0.1.0-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@@ -24,7 +24,6 @@ RDEPEND="
DEPEND="
${CDEPEND}
- app-arch/unzip
>=virtual/jdk-1.6"
# com.sun.mirror.declaration was removed from JDK 7 onwards.
@@ -46,7 +45,7 @@ src_unpack() {
java_prepare() {
java-pkg_clean
- rm -rf examples || die
+ rm -rv examples || die
}
src_compile() {
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/
@ 2021-08-09 5:31 Miroslav Šulc
0 siblings, 0 replies; 6+ messages in thread
From: Miroslav Šulc @ 2021-08-09 5:31 UTC (permalink / raw
To: gentoo-commits
commit: d79df45bfa3963fa8feef13ef0300b21ce09020f
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sun Aug 8 10:43:05 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Aug 9 05:31:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d79df45b
dev-java/annogen: remove last rited package
Bug: https://bugs.gentoo.org/796587
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/annogen/Manifest | 1 -
dev-java/annogen/annogen-0.1.0-r3.ebuild | 55 --------------------------------
dev-java/annogen/metadata.xml | 11 -------
3 files changed, 67 deletions(-)
diff --git a/dev-java/annogen/Manifest b/dev-java/annogen/Manifest
deleted file mode 100644
index f60ebe50d3a..00000000000
--- a/dev-java/annogen/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST annogen-0.1.0.zip 1008931 BLAKE2B ca0da18f095c0db0aedfca1b83c5df6bc8fd348be3764e9ed182807189e151302f88f10c78c05a44dace66509a5a4d0e532541356758373a76932b8d284101dc SHA512 f5c4eeb92ef8c87874df6619ef701b99dace01bd3ebc87f201ee3ab523fe612b6d143da2646c280d4831bc8e3051887514aa06b8bad6928b68ddd6cd6357fa16
diff --git a/dev-java/annogen/annogen-0.1.0-r3.ebuild b/dev-java/annogen/annogen-0.1.0-r3.ebuild
deleted file mode 100644
index f6d31072bfe..00000000000
--- a/dev-java/annogen/annogen-0.1.0-r3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-JAVA_PKG_IUSE="doc source"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="A tool which helps you work with JSR175 annotations"
-HOMEPAGE="https://github.com/codehaus/annogen"
-SRC_URI="http://dist.codehaus.org/${PN}/distributions/${P}.zip"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~x86"
-
-CDEPEND="
- dev-java/qdox:1.6
- dev-java/ant-core:0"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6"
-
-# com.sun.mirror.declaration was removed from JDK 7 onwards.
-# These two files are just interfaces anyway.
-JAVA_RM_FILES=(
- org/codehaus/annogen/view/MirrorAnnoViewer.java
- org/codehaus/annogen/override/MirrorElementIdPool.java
-)
-
-JAVA_GENTOO_CLASSPATH="
- ant-core
- qdox-1.6
-"
-
-src_unpack() {
- default
- unzip -o -q "${S}/${PN}-src-${PV}.zip" || die
-}
-
-java_prepare() {
- java-pkg_clean
- rm -rv examples || die
-}
-
-src_compile() {
- # Needed for com.sun.* imports
- JAVA_GENTOO_CLASSPATH_EXTRA="$(java-config -t)" \
- java-pkg-simple_src_compile
-}
diff --git a/dev-java/annogen/metadata.xml b/dev-java/annogen/metadata.xml
deleted file mode 100644
index 3073b0da13b..00000000000
--- a/dev-java/annogen/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>java@gentoo.org</email>
- <name>Java</name>
- </maintainer>
- <upstream>
- <remote-id type="github">codehaus/annogen</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2021-08-09 5:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-11-11 22:57 [gentoo-commits] repo/gentoo:master commit in: dev-java/annogen/ Patrice Clement
-- strict thread matches above, loose matches on Subject: below --
2021-08-09 5:31 Miroslav Šulc
2017-07-04 21:44 Patrice Clement
2016-02-18 22:11 James Le Cuirot
2015-11-11 22:57 Patrice Clement
2015-09-28 16:12 Patrice Clement
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox