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 BE769138BED for ; Wed, 14 Oct 2015 15:22:39 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 900C8E07AE; Wed, 14 Oct 2015 15:22:35 +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 B3ED0E07AE for ; Wed, 14 Oct 2015 15:22:34 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A43D0340A1B for ; Wed, 14 Oct 2015 15:22:33 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 662F8F8E for ; Wed, 14 Oct 2015 15:22:32 +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: <1444836134.28eb80ad21b60fd4b785d0397bd8ae00a016c8a9.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-cpp/antlr-cpp/, dev-cpp/antlr-cpp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-cpp/antlr-cpp/Manifest dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild dev-cpp/antlr-cpp/files/2.7.7-gcc.patch dev-cpp/antlr-cpp/files/2.7.7-libtool.patch dev-cpp/antlr-cpp/metadata.xml X-VCS-Directories: dev-cpp/antlr-cpp/ dev-cpp/antlr-cpp/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 28eb80ad21b60fd4b785d0397bd8ae00a016c8a9 X-VCS-Branch: master Date: Wed, 14 Oct 2015 15:22:32 +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: 99ef811b-69f3-4f90-8351-bb280aac9a1c X-Archives-Hash: 0bb0484e565ed24131c64630cf62e859 commit: 28eb80ad21b60fd4b785d0397bd8ae00a016c8a9 Author: James Le Cuirot gentoo org> AuthorDate: Wed Oct 14 13:35:05 2015 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Wed Oct 14 15:22:14 2015 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28eb80ad dev-cpp/antlr-cpp: New package, split from dev-java/antlr The old ANTLR 2 ebuild tried to cram all the runtimes together, which was messy. The C++ runtime does not need any Java components at build time or runtime so it makes sense to split this out. The C++ runtime for ANTLR 4 is maintained separately by upstream anyway. This new package does a better job of building the shared library with the help of libtool. It also supports multilib. Package-Manager: portage-2.2.20.1 dev-cpp/antlr-cpp/Manifest | 1 + dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild | 105 ++++++++++++++++++++++++++++ dev-cpp/antlr-cpp/files/2.7.7-gcc.patch | 12 ++++ dev-cpp/antlr-cpp/files/2.7.7-libtool.patch | 21 ++++++ dev-cpp/antlr-cpp/metadata.xml | 5 ++ 5 files changed, 144 insertions(+) diff --git a/dev-cpp/antlr-cpp/Manifest b/dev-cpp/antlr-cpp/Manifest new file mode 100644 index 0000000..220142f --- /dev/null +++ b/dev-cpp/antlr-cpp/Manifest @@ -0,0 +1 @@ +DIST antlr-2.7.7.tar.gz 1816180 SHA256 853aeb021aef7586bda29e74a6b03006bcb565a755c86b66032d8ec31b67dbb9 SHA512 faa72d2ddcba434ef1233e70c1549e63eba67c00793966322e821cf7f015cccb804448cb92d8fbef0429f59928fad65ec954f8ffbda0acbb8e983de0806d349d WHIRLPOOL def5ac0ddfe5a65f9f7d5489d039048c5d630b46cd5626593bd12e9b393d5ec26884f90b013bcdf58511e26abbf06e0d7b3789a11298b017f7e70af2ec8dde4a diff --git a/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild new file mode 100644 index 0000000..b425c2d --- /dev/null +++ b/dev-cpp/antlr-cpp/antlr-cpp-2.7.7.ebuild @@ -0,0 +1,105 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# Upstream only installs a static library. The original antlr ebuild +# built a shared library manually, which isn't so great either. This +# ebuild applies libtool instead and therefore an autoreconf is +# required. A couple of errors concerning tr have been seen but the +# final result still looks good. This also sidesteps bug #554344 plus +# the need to call einstall. +AUTOTOOLS_AUTORECONF=1 + +inherit eutils autotools-multilib + +MY_P="${PN%-cpp}-${PV}" +DESCRIPTION="The ANTLR 2 C++ Runtime" +HOMEPAGE="http://www.antlr2.org/" +SRC_URI="http://www.antlr2.org/download/${MY_P}.tar.gz" +LICENSE="public-domain" +SLOT="2" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="doc examples static-libs" + +DEPEND="doc? ( app-doc/doxygen )" +RDEPEND="!!dev-java/antlr:0[cxx]" + +S="${WORKDIR}/${MY_P}" +DOCS=( lib/cpp/AUTHORS lib/cpp/ChangeLog lib/cpp/README lib/cpp/TODO ) + +src_prepare() { + epatch "${FILESDIR}"/${PV}-{gcc,libtool}.patch + + mv -v configure.in configure.ac || die + mv -v aclocal.m4 acinclude.m4 || die + + # These silly test -z lines break badly under recent autoconfs. + sed -i '/AC_PATH_PROG/s/test -z "\$[^"]*" *&& *//' configure.ac || die + + # Delete build files from examples. + find examples -name Makefile.in -delete || die + + # Fix make invocations. See bug #256880. + find -name "*.in" -exec sed -i 's/@MAKE@/$(MAKE)/g' {} + || die + + # Turn Makefile.in files into libtool-style Makefile.am + # files. Countable.hpp is actually missing. + local HPP=$(grep -E -o "\w+\.hpp" lib/cpp/antlr/Makefile.in | grep -v "Countable\.hpp" | tr "\n" " " || die) + local CPP=$(grep -E -o "\w+\.cpp" lib/cpp/src/Makefile.in | tr "\n" " " || die) + + cat < lib/cpp/antlr/Makefile.am || die +antlr_includedir = \$(includedir)/antlr +antlr_include_HEADERS = ${HPP} +EOF + + cat < lib/cpp/src/Makefile.am || die +AM_CPPFLAGS = -I\$(abs_top_srcdir)/lib/cpp +lib_LTLIBRARIES = libantlr.la +libantlr_la_LDFLAGS = -version-info 2 +libantlr_la_SOURCES = ${CPP} +EOF + + autotools-multilib_src_prepare +} + +multilib_src_configure() { + local myeconfargs=( + --disable-csharp + --enable-cxx + --disable-examples + --disable-java + --disable-python + --enable-verbose + ) + + autotools-utils_src_configure +} + +src_compile() { + autotools-multilib_src_compile + + if use doc; then + cd "${S}/lib/cpp" || die + doxygen -u doxygen.cfg || die + doxygen doxygen.cfg || die + fi +} + +multilib_src_install() { + # We only care about the C++ stuff. + emake -C lib/cpp install DESTDIR="${D}" +} + +src_install() { + autotools-multilib_src_install + + cd "${S}" || die + use doc && dohtml -r lib/cpp/gen_doc/html/ + + if use examples; then + docinto examples + dodoc -r examples/cpp/* + fi +} diff --git a/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch b/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch new file mode 100644 index 0000000..c67d5b6 --- /dev/null +++ b/dev-cpp/antlr-cpp/files/2.7.7-gcc.patch @@ -0,0 +1,12 @@ +diff -Naur antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp +--- antlr-2.7.7.orig/lib/cpp/antlr/CharScanner.hpp 2006-11-01 21:37:17.000000000 +0000 ++++ antlr-2.7.7/lib/cpp/antlr/CharScanner.hpp 2015-10-06 23:01:53.083655950 +0100 +@@ -10,6 +10,8 @@ + + #include + ++#include ++#include + #include + + #ifdef HAS_NOT_CCTYPE_H diff --git a/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch b/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch new file mode 100644 index 0000000..ea5e809 --- /dev/null +++ b/dev-cpp/antlr-cpp/files/2.7.7-libtool.patch @@ -0,0 +1,21 @@ +diff -Naur antlr-2.7.7.orig/configure.in antlr-2.7.7/configure.in +--- antlr-2.7.7.orig/configure.in 2006-11-01 21:37:18.000000000 +0000 ++++ antlr-2.7.7/configure.in 2015-10-11 13:49:09.166308712 +0100 +@@ -13,6 +13,9 @@ + AC_CONFIG_SRCDIR([LICENSE.txt]) + AC_CONFIG_AUX_DIR(scripts) + ++LT_INIT ++AM_INIT_AUTOMAKE ++ + ## This shall be the very first config file. Do not change + ## this. + AC_CONFIG_FILES([scripts/config.vars]) +@@ -841,7 +844,6 @@ + AC_PROG_RANLIB + + test -z "$MKDIR" && AC_PATH_PROG(MKDIR, mkdir$EXEEXT, mkdir$EXEEXT ) +-test -z "$RM" && AC_PATH_PROG(RM, rm$EXEEXT, rm$EXEEXT ) + + AX_PATH_PROGS( + [TAR], diff --git a/dev-cpp/antlr-cpp/metadata.xml b/dev-cpp/antlr-cpp/metadata.xml new file mode 100644 index 0000000..7303cef --- /dev/null +++ b/dev-cpp/antlr-cpp/metadata.xml @@ -0,0 +1,5 @@ + + + + java +