* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2011-02-19 2:39 Sebastian Pipping
0 siblings, 0 replies; 9+ messages in thread
From: Sebastian Pipping @ 2011-02-19 2:39 UTC (permalink / raw
To: gentoo-commits
commit: dbc87d25b7c5dd5ef2df550fb2151ca1fdb7d4b1
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 19 02:39:13 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 02:39:13 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=dbc87d25
net-misc/mocha: Deleting once is as good as twice
---
net-misc/mocha/mocha-1.1.1.ebuild | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index d7d6cc7..b13ffc6 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -45,7 +45,6 @@ src_prepare() {
src_compile() {
eant linux || die
- rm -Rf build/{com/sun/,javax} || die
# Make sure that only mocha code goes into the .jar
rm -Rf build/{com/sun,javax} || die
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2011-02-19 16:20 Sebastian Pipping
0 siblings, 0 replies; 9+ messages in thread
From: Sebastian Pipping @ 2011-02-19 16:20 UTC (permalink / raw
To: gentoo-commits
commit: c3181389bd6a1edced278b9d7dcd18f6788a30ee
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 19 16:19:27 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:19:27 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=c3181389
net-misc/mocha: Be happy with jaf (not sun-jaf in particular)
---
net-misc/mocha/mocha-1.1.1.ebuild | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index b13ffc6..f15cd17 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -19,8 +19,6 @@ COMMON_DEP="java-virtuals/javamail
java-virtuals/jaf
dev-java/swing-layout"
-COMMON_DEP="${COMMON_DEP} dev-java/sun-jaf" # FIXME
-
DEPEND=">=virtual/jdk-1.5
${COMMON_DEP}"
RDEPEND=">=virtual/jre-1.5
@@ -38,7 +36,7 @@ src_prepare() {
cd extLibs || die
rm *.jar || die
java-pkg_jar-from javamail
- java-pkg_jar-from sun-jaf # FIXME
+ java-pkg_jar-from jaf
java-pkg_jar-from swing-layout-1
java-pkg_ensure-no-bundled-jars
}
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2011-02-19 16:28 Sebastian Pipping
0 siblings, 0 replies; 9+ messages in thread
From: Sebastian Pipping @ 2011-02-19 16:28 UTC (permalink / raw
To: gentoo-commits
commit: 458d73b618af4c0338c1b078ae60d78777c1457e
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 19 16:28:03 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:28:03 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=458d73b6
net-misc/mocha: Do not depend on JAF if Java 6 is around
---
net-misc/mocha/mocha-1.1.1.ebuild | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index f15cd17..15a4058 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -16,12 +16,13 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEP="java-virtuals/javamail
- java-virtuals/jaf
dev-java/swing-layout"
-DEPEND=">=virtual/jdk-1.5
+DEPEND="|| ( >=virtual/jdk-1.6
+ ( >=virtual/jdk-1.5 java-virtuals/jaf ) )
${COMMON_DEP}"
-RDEPEND=">=virtual/jre-1.5
+RDEPEND="|| ( >=virtual/jre-1.6
+ ( >=virtual/jre-1.5 java-virtuals/jaf ) )
sys-apps/net-tools
${COMMON_DEP}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2011-02-19 16:52 Sebastian Pipping
0 siblings, 0 replies; 9+ messages in thread
From: Sebastian Pipping @ 2011-02-19 16:52 UTC (permalink / raw
To: gentoo-commits
commit: 5813e1a68a1ecfa696ca4de004bb276c023c7b65
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 19 16:51:44 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 16:51:44 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=5813e1a6
net-misc/mocha: Always use slots in dependencies, flip src_prepare to java_prepare
---
net-misc/mocha/mocha-1.1.1.ebuild | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index 15a4058..c217baa 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -15,20 +15,20 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-COMMON_DEP="java-virtuals/javamail
- dev-java/swing-layout"
+COMMON_DEP="java-virtuals/javamail:0
+ dev-java/swing-layout:1"
DEPEND="|| ( >=virtual/jdk-1.6
- ( >=virtual/jdk-1.5 java-virtuals/jaf ) )
+ ( >=virtual/jdk-1.5 java-virtuals/jaf:0 ) )
${COMMON_DEP}"
RDEPEND="|| ( >=virtual/jre-1.6
- ( >=virtual/jre-1.5 java-virtuals/jaf ) )
+ ( >=virtual/jre-1.5 java-virtuals/jaf:0 ) )
sys-apps/net-tools
${COMMON_DEP}"
S=${WORKDIR}/nakkaya-${PN}-e0200a7
-src_prepare() {
+java_prepare() {
epatch "${FILESDIR}"/${P}-gtk.patch \
"${FILESDIR}"/${P}-gentoo.patch
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2011-02-19 17:58 Sebastian Pipping
0 siblings, 0 replies; 9+ messages in thread
From: Sebastian Pipping @ 2011-02-19 17:58 UTC (permalink / raw
To: gentoo-commits
commit: 754bfdaaf6a36a0cd8a67b40af793c417ac306df
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Sat Feb 19 17:56:45 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 17:56:45 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=754bfdaa
net-misc/mocha: Simplify dependency on JAF
---
net-misc/mocha/mocha-1.1.1.ebuild | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index c217baa..70cb9f2 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -16,13 +16,12 @@ KEYWORDS="~amd64 ~x86"
IUSE=""
COMMON_DEP="java-virtuals/javamail:0
+ java-virtuals/jaf:0
dev-java/swing-layout:1"
-DEPEND="|| ( >=virtual/jdk-1.6
- ( >=virtual/jdk-1.5 java-virtuals/jaf:0 ) )
+DEPEND=">=virtual/jdk-1.5
${COMMON_DEP}"
-RDEPEND="|| ( >=virtual/jre-1.6
- ( >=virtual/jre-1.5 java-virtuals/jaf:0 ) )
+RDEPEND=">=virtual/jre-1.5
sys-apps/net-tools
${COMMON_DEP}"
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2011-08-12 13:34 Sebastian Pipping
0 siblings, 0 replies; 9+ messages in thread
From: Sebastian Pipping @ 2011-08-12 13:34 UTC (permalink / raw
To: gentoo-commits
commit: e5c65a9c2a34395f9afdc27736de3ca0089e7c61
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
AuthorDate: Fri Aug 12 13:33:07 2011 +0000
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
CommitDate: Fri Aug 12 13:33:07 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=e5c65a9c
net-misc/mocha: Fix 1.1.1, bump to 1.1.2
---
net-misc/mocha/mocha-1.1.1.ebuild | 4 +---
.../{mocha-1.1.1.ebuild => mocha-1.1.2.ebuild} | 8 +++-----
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index 70cb9f2..f76964b 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -25,14 +25,12 @@ RDEPEND=">=virtual/jre-1.5
sys-apps/net-tools
${COMMON_DEP}"
-S=${WORKDIR}/nakkaya-${PN}-e0200a7
+S=${WORKDIR}/nakkaya-${PN}-f3601d4
java_prepare() {
epatch "${FILESDIR}"/${P}-gtk.patch \
"${FILESDIR}"/${P}-gentoo.patch
- mkdir build # or ant fails
-
cd extLibs || die
rm *.jar || die
java-pkg_jar-from javamail
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.2.ebuild
similarity index 88%
copy from net-misc/mocha/mocha-1.1.1.ebuild
copy to net-misc/mocha/mocha-1.1.2.ebuild
index 70cb9f2..9f15160 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.2.ebuild
@@ -25,13 +25,11 @@ RDEPEND=">=virtual/jre-1.5
sys-apps/net-tools
${COMMON_DEP}"
-S=${WORKDIR}/nakkaya-${PN}-e0200a7
+S=${WORKDIR}/nakkaya-${PN}-914b1aa
java_prepare() {
- epatch "${FILESDIR}"/${P}-gtk.patch \
- "${FILESDIR}"/${P}-gentoo.patch
-
- mkdir build # or ant fails
+ epatch "${FILESDIR}"/${PN}-1.1.1-gtk.patch \
+ "${FILESDIR}"/${PN}-1.1.1-gentoo.patch
cd extLibs || die
rm *.jar || die
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2011-10-27 18:02 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2011-10-27 18:02 UTC (permalink / raw
To: gentoo-commits
commit: f723568df37be54b284412b91b450ac43f0be4a4
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 27 17:20:47 2011 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Thu Oct 27 17:20:47 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/betagarden.git;a=commit;h=f723568d
Removed no-herd from herd tag in metadata.xml
(Portage version: 2.2.0_alpha71/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 70EB7916)
---
net-misc/mocha/ChangeLog | 7 +++++++
net-misc/mocha/metadata.xml | 1 -
2 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/net-misc/mocha/ChangeLog b/net-misc/mocha/ChangeLog
new file mode 100644
index 0000000..b2a8d05
--- /dev/null
+++ b/net-misc/mocha/ChangeLog
@@ -0,0 +1,7 @@
+# ChangeLog for net-misc/mocha
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+ 27 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ Removed no-herd from herd tag in metadata.xml
+
diff --git a/net-misc/mocha/metadata.xml b/net-misc/mocha/metadata.xml
index 328fbd1..16bcc9f 100644
--- a/net-misc/mocha/metadata.xml
+++ b/net-misc/mocha/metadata.xml
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <herd>no-herd</herd>
<maintainer>
<email>sping@gentoo.org</email>
<name>Sebastian Pipping</name>
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2015-06-06 10:37 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-06-06 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 8bf5151f86da9f2ef3cb92870cb26440cabcbb9f
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 6 10:35:32 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 6 10:35:32 2015 +0000
URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=8bf5151f
net-misc/mocha: Bump to EAPI=5
Package-Manager: portage-2.2.20
net-misc/mocha/ChangeLog | 4 ++++
net-misc/mocha/mocha-1.1.1.ebuild | 18 ++++++++++--------
net-misc/mocha/mocha-1.1.2.ebuild | 15 ++++++++-------
3 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/net-misc/mocha/ChangeLog b/net-misc/mocha/ChangeLog
index 67a0e8c..282dbff 100644
--- a/net-misc/mocha/ChangeLog
+++ b/net-misc/mocha/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Jun 2015; Justin Lecher <jlec@gentoo.org> mocha-1.1.1.ebuild,
+ mocha-1.1.2.ebuild:
+ net-misc/mocha: Bump to EAPI=5
+
06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
net-misc/mocha: Add github to remote-id in metadata.xml
diff --git a/net-misc/mocha/mocha-1.1.1.ebuild b/net-misc/mocha/mocha-1.1.1.ebuild
index f76964b..18b7def 100644
--- a/net-misc/mocha/mocha-1.1.1.ebuild
+++ b/net-misc/mocha/mocha-1.1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI=5
inherit eutils java-pkg-2 java-ant-2
@@ -15,7 +15,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
-COMMON_DEP="java-virtuals/javamail:0
+COMMON_DEP="
+ java-virtuals/javamail:0
java-virtuals/jaf:0
dev-java/swing-layout:1"
@@ -28,8 +29,9 @@ RDEPEND=">=virtual/jre-1.5
S=${WORKDIR}/nakkaya-${PN}-f3601d4
java_prepare() {
- epatch "${FILESDIR}"/${P}-gtk.patch \
- "${FILESDIR}"/${P}-gentoo.patch
+ epatch \
+ "${FILESDIR}"/${P}-gtk.patch \
+ "${FILESDIR}"/${P}-gentoo.patch
cd extLibs || die
rm *.jar || die
@@ -40,15 +42,15 @@ java_prepare() {
}
src_compile() {
- eant linux || die
+ eant linux
# Make sure that only mocha code goes into the .jar
rm -Rf build/{com/sun,javax} || die
# FIXME: Currently bundling system's dev-java/swing-layout
- # rm -Rf build/org || die
+ # rm -Rf build/org || die
- eant jar || die
+ eant jar
}
src_install() {
diff --git a/net-misc/mocha/mocha-1.1.2.ebuild b/net-misc/mocha/mocha-1.1.2.ebuild
index 9f15160..a8a0927 100644
--- a/net-misc/mocha/mocha-1.1.2.ebuild
+++ b/net-misc/mocha/mocha-1.1.2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI="2"
+EAPI=5
inherit eutils java-pkg-2 java-ant-2
@@ -28,8 +28,9 @@ RDEPEND=">=virtual/jre-1.5
S=${WORKDIR}/nakkaya-${PN}-914b1aa
java_prepare() {
- epatch "${FILESDIR}"/${PN}-1.1.1-gtk.patch \
- "${FILESDIR}"/${PN}-1.1.1-gentoo.patch
+ epatch \
+ "${FILESDIR}"/${PN}-1.1.1-gtk.patch \
+ "${FILESDIR}"/${PN}-1.1.1-gentoo.patch
cd extLibs || die
rm *.jar || die
@@ -40,15 +41,15 @@ java_prepare() {
}
src_compile() {
- eant linux || die
+ eant linux
# Make sure that only mocha code goes into the .jar
rm -Rf build/{com/sun,javax} || die
# FIXME: Currently bundling system's dev-java/swing-layout
- # rm -Rf build/org || die
+ # rm -Rf build/org || die
- eant jar || die
+ eant jar
}
src_install() {
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/
@ 2015-06-06 10:37 Justin Lecher
0 siblings, 0 replies; 9+ messages in thread
From: Justin Lecher @ 2015-06-06 10:37 UTC (permalink / raw
To: gentoo-commits
commit: 95f1f17fc058f20bdd387d1269b0a7e509e92de0
Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 6 10:33:51 2015 +0000
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Sat Jun 6 10:33:51 2015 +0000
URL: https://gitweb.gentoo.org/proj/betagarden.git/commit/?id=95f1f17f
net-misc/mocha: Add github to remote-id in metadata.xml
Package-Manager: portage-2.2.20
net-misc/mocha/ChangeLog | 6 ++++--
net-misc/mocha/metadata.xml | 11 +++++++----
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/net-misc/mocha/ChangeLog b/net-misc/mocha/ChangeLog
index b2a8d05..67a0e8c 100644
--- a/net-misc/mocha/ChangeLog
+++ b/net-misc/mocha/ChangeLog
@@ -1,7 +1,9 @@
# ChangeLog for net-misc/mocha
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 06 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
+ net-misc/mocha: Add github to remote-id in metadata.xml
+
27 Oct 2011; Justin Lecher <jlec@gentoo.org> metadata.xml:
Removed no-herd from herd tag in metadata.xml
-
diff --git a/net-misc/mocha/metadata.xml b/net-misc/mocha/metadata.xml
index 16bcc9f..7391d90 100644
--- a/net-misc/mocha/metadata.xml
+++ b/net-misc/mocha/metadata.xml
@@ -1,8 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer>
- <email>sping@gentoo.org</email>
- <name>Sebastian Pipping</name>
- </maintainer>
+ <maintainer>
+ <email>sping@gentoo.org</email>
+ <name>Sebastian Pipping</name>
+ </maintainer>
+ <upstream>
+ <remote-id type="github">nakkaya/mocha</remote-id>
+ </upstream>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2015-06-06 10:37 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-06 10:37 [gentoo-commits] proj/betagarden:master commit in: net-misc/mocha/ Justin Lecher
-- strict thread matches above, loose matches on Subject: below --
2015-06-06 10:37 Justin Lecher
2011-10-27 18:02 Justin Lecher
2011-08-12 13:34 Sebastian Pipping
2011-02-19 17:58 Sebastian Pipping
2011-02-19 16:52 Sebastian Pipping
2011-02-19 16:28 Sebastian Pipping
2011-02-19 16:20 Sebastian Pipping
2011-02-19 2:39 Sebastian Pipping
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox