* [gentoo-commits] gentoo-x86 commit in dev-java/antlr: ChangeLog antlr-2.7.7.ebuild antlr-2.7.7-r2.ebuild
@ 2013-05-09 12:19 Tom Wijsman (tomwij)
0 siblings, 0 replies; only message in thread
From: Tom Wijsman (tomwij) @ 2013-05-09 12:19 UTC (permalink / raw
To: gentoo-commits
tomwij 13/05/09 12:19:24
Modified: ChangeLog antlr-2.7.7.ebuild antlr-2.7.7-r2.ebuild
Log:
Revert stable ebuilds.
(Portage version: 2.1.11.63/cvs/Linux x86_64, signed Manifest commit with key 6D34E57D)
Revision Changes Path
1.97 dev-java/antlr/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/ChangeLog?rev=1.97&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/ChangeLog?rev=1.97&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/ChangeLog?r1=1.96&r2=1.97
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- ChangeLog 9 May 2013 11:45:47 -0000 1.96
+++ ChangeLog 9 May 2013 12:19:24 -0000 1.97
@@ -1,6 +1,10 @@
# ChangeLog for dev-java/antlr
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.96 2013/05/09 11:45:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/ChangeLog,v 1.97 2013/05/09 12:19:24 tomwij Exp $
+
+ 09 May 2013; Tom Wijsman <TomWij@gentoo.org> antlr-2.7.7-r2.ebuild,
+ antlr-2.7.7.ebuild:
+ Revert stable ebuilds.
09 May 2013; Tom Wijsman <TomWij@gentoo.org> antlr-2.7.7-r1.ebuild,
antlr-2.7.7-r2.ebuild, antlr-2.7.7-r3.ebuild, antlr-2.7.7-r4.ebuild,
1.20 dev-java/antlr/antlr-2.7.7.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild?r1=1.19&r2=1.20
Index: antlr-2.7.7.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- antlr-2.7.7.ebuild 9 May 2013 11:45:47 -0000 1.19
+++ antlr-2.7.7.ebuild 9 May 2013 12:19:24 -0000 1.20
@@ -1,16 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.19 2013/05/09 11:45:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7.ebuild,v 1.20 2013/05/09 12:19:24 tomwij Exp $
-EAPI="5"
+EAPI="3"
+PYTHON_DEPEND="python? 2"
-PYTHON_COMPAT=( python2_{5,6,7} )
-
-DISTUTILS_OPTIONAL="y"
-DISTUTILS_SINGLE_IMPL="y"
-DISTUTILS_IN_SOURCE_BUILD="y"
-
-inherit base java-pkg-2 mono autotools distutils-r1 multilib
+inherit base java-pkg-2 mono distutils multilib
DESCRIPTION="A parser generator for C++, C#, Java, and Python"
HOMEPAGE="http://www.antlr2.org/"
@@ -22,8 +17,7 @@
IUSE="doc debug examples mono +cxx +java python script source"
# TODO do we actually need jdk at runtime?
-RDEPEND="python? ( ${PYTHON_DEPS} )
- >=virtual/jdk-1.3
+RDEPEND=">=virtual/jdk-1.3
mono? ( dev-lang/mono )"
DEPEND="${RDEPEND}
script? ( !dev-util/pccts )
@@ -34,17 +28,14 @@
pkg_setup() {
java-pkg-2_pkg_setup
- if use python ; then
- python-single-r1_pkg_setup
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
fi
}
src_prepare() {
base_src_prepare
-
- # See bug #468540, this can be removed once bug #469150 is fixed.
- sed -i 's/tlib lib ar/ar/' configure.in || die
- eautoreconf
}
src_configure() {
@@ -105,9 +96,8 @@
fi
if use python ; then
- pushd "${S}"/lib/python > /dev/null
- distutils-r1_python_install
- popd > /dev/null
+ cd "${S}"/lib/python
+ distutils_src_install
fi
if use examples ; then
@@ -124,3 +114,11 @@
newdoc "${S}"/README.txt README || die
}
+
+pkg_postinst() {
+ use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
1.8 dev-java/antlr/antlr-2.7.7-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild?r1=1.7&r2=1.8
Index: antlr-2.7.7-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- antlr-2.7.7-r2.ebuild 9 May 2013 11:45:47 -0000 1.7
+++ antlr-2.7.7-r2.ebuild 9 May 2013 12:19:24 -0000 1.8
@@ -1,16 +1,11 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v 1.7 2013/05/09 11:45:47 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/antlr/antlr-2.7.7-r2.ebuild,v 1.8 2013/05/09 12:19:24 tomwij Exp $
-EAPI="5"
+EAPI="3"
+PYTHON_DEPEND="python? 2"
-PYTHON_COMPAT=( python2_{5,6,7} )
-
-DISTUTILS_OPTIONAL="y"
-DISTUTILS_SINGLE_IMPL="y"
-DISTUTILS_IN_SOURCE_BUILD="y"
-
-inherit base java-pkg-2 mono autotools distutils-r1 multilib toolchain-funcs versionator
+inherit base java-pkg-2 mono distutils multilib toolchain-funcs versionator
DESCRIPTION="A parser generator for C++, C#, Java, and Python"
HOMEPAGE="http://www.antlr2.org/"
@@ -22,8 +17,7 @@
IUSE="doc debug examples mono +cxx +java python script source static-libs"
# TODO do we actually need jdk at runtime?
-RDEPEND="python? ( ${PYTHON_DEPS} )
- >=virtual/jdk-1.3
+RDEPEND=">=virtual/jdk-1.3
mono? ( dev-lang/mono )"
DEPEND="${RDEPEND}
script? ( !dev-util/pccts )
@@ -43,21 +37,17 @@
pkg_setup() {
java-pkg-2_pkg_setup
- if use python ; then
- python-single-r1_pkg_setup
+ if use python; then
+ python_set_active_version 2
+ python_pkg_setup
fi
}
src_prepare() {
base_src_prepare
-
sed -i \
-e 's/install:.*this-install/install:/' \
lib/cpp/src/Makefile.in || die
-
- # See bug #468540, this can be removed once bug #469150 is fixed.
- sed -i 's/tlib lib ar/ar/' configure.in || die
- eautoreconf
}
src_configure() {
@@ -129,9 +119,8 @@
fi
if use python ; then
- pushd "${S}"/lib/python > /dev/null
- distutils-r1_python_install
- popd > /dev/null
+ cd "${S}"/lib/python
+ distutils_src_install
fi
if use examples ; then
@@ -148,3 +137,11 @@
newdoc "${S}"/README.txt README || die
}
+
+pkg_postinst() {
+ use python && distutils_pkg_postinst
+}
+
+pkg_postrm() {
+ use python && distutils_pkg_postrm
+}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2013-05-09 12:19 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-05-09 12:19 [gentoo-commits] gentoo-x86 commit in dev-java/antlr: ChangeLog antlr-2.7.7.ebuild antlr-2.7.7-r2.ebuild Tom Wijsman (tomwij)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox