From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4E0561382C5 for ; Mon, 1 Mar 2021 17:34:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 97DF3E093D; Mon, 1 Mar 2021 17:34:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6A903E093D for ; Mon, 1 Mar 2021 17:34:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F00B1340FD2 for ; Mon, 1 Mar 2021 17:33:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 69AB046B for ; Mon, 1 Mar 2021 17:33:58 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1614620018.3fa25c71ca75f3f5353813553b61bd5c934dcad8.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/, media-libs/libcaca/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild X-VCS-Directories: media-libs/libcaca/ media-libs/libcaca/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3fa25c71ca75f3f5353813553b61bd5c934dcad8 X-VCS-Branch: master Date: Mon, 1 Mar 2021 17:33:58 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 283c25f9-90ce-4f49-b80b-8d9d22895abc X-Archives-Hash: 3f6c4ec66ee891b85f27708366761ee6 commit: 3fa25c71ca75f3f5353813553b61bd5c934dcad8 Author: Sam James gentoo org> AuthorDate: Mon Mar 1 17:33:10 2021 +0000 Commit: Sam James gentoo org> CommitDate: Mon Mar 1 17:33:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fa25c71 media-libs/libcaca: modernise ebuild, fix ncurses linkage Closes: https://bugs.gentoo.org/601902 Signed-off-by: Sam James gentoo.org> .../files/libcaca-0.99_beta18-fix-tests.patch | 12 +- .../files/libcaca-0.99_beta18-latex_hacks.patch | 4 +- media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild | 167 +++++++++++++++++++++ 3 files changed, 175 insertions(+), 8 deletions(-) diff --git a/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch b/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch index f9ff8090c21..1bfb931a75a 100644 --- a/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch +++ b/media-libs/libcaca/files/libcaca-0.99_beta18-fix-tests.patch @@ -1,13 +1,13 @@ ---- test/Makefile.am -+++ test/Makefile.am +--- a/test/Makefile.am ++++ b/test/Makefile.am @@ -1,3 +1,5 @@ +AM_TESTS_ENVIRONMENT = \ + top_srcdir="$(top_srcdir)" AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca ---- test/check-copyright -+++ test/check-copyright +--- a/test/check-copyright ++++ b/test/check-copyright @@ -3,10 +3,11 @@ # # Check that the copyright information is valid @@ -30,8 +30,8 @@ echo "error: $dir/$x lacks proper copyright information" nfails=$(($nfails + 1)) elif [ -d ../.git ]; then ---- test/check-source -+++ test/check-source +--- a/test/check-source ++++ b/test/check-source @@ -3,6 +3,7 @@ # # Check that we have no tabs or trailing spaces in the source code diff --git a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch b/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch index 060822e6dcc..15e17d2f95e 100644 --- a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch +++ b/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch @@ -1,8 +1,8 @@ Hack it a bit differently so that it works with texlive 2013, see http://bugs.gentoo.org/480862 Turns out this patch is required also for texlive 2012, see http://bugs.gentoo.org/517474 ---- doc/Makefile.am -+++ doc/Makefile.am +--- a/doc/Makefile.am ++++ b/doc/Makefile.am @@ -29,7 +29,7 @@ if BUILD_DOCUMENTATION if USE_LATEX rm -f latex/libcaca.tex latex/libcaca.pdf diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild new file mode 100644 index 00000000000..c1ec14de152 --- /dev/null +++ b/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild @@ -0,0 +1,167 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +RUBY_OPTIONAL=yes +#USE_RUBY=ruby20 + +inherit autotools ruby-ng flag-o-matic mono-env java-pkg-opt-2 multilib-minimal toolchain-funcs + +MY_P=${P/_/.} +DESCRIPTION="A library that creates colored ASCII-art graphics" +HOMEPAGE="http://libcaca.zoy.org/" +SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X" +RESTRICT="!test? ( test )" + +# ruby? ( ruby_targets_${USE_RUBY} ) +REQUIRED_USE="" + +COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] ) + mono? ( dev-lang/mono ) + ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] ) + opengl? ( + >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}] + >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] + >=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}] + truetype? ( >=media-libs/ftgl-2.1.3_rc5 ) + ) + slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] ) + X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )" +# ruby? ( $(ruby_implementations_depend) ) +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.5 )" +DEPEND="${COMMON_DEPEND} + virtual/pkgconfig + doc? ( + app-doc/doxygen + virtual/latex-base + >=dev-texlive/texlive-fontsrecommended-2012 + >=dev-texlive/texlive-latexextra-2012 + dev-texlive/texlive-latexrecommended + ) + java? ( >=virtual/jdk-1.5 ) + test? ( dev-util/cppunit )" + +DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS ) + +PATCHES=( + # Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this + # patch before wrt #517474 + "${FILESDIR}"/${PN}-0.99_beta18-latex_hacks.patch + # Fix out of source tests + "${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch +) + +pkg_setup() { + java-pkg-opt-2_pkg_setup + use mono && mono-env_pkg_setup +} + +src_unpack() { + default +} + +src_prepare() { + # bug #339962 + sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die + + sed -i \ + -e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \ + -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ + configure.ac || die + + sed -i \ + -e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \ + -e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \ + java/Makefile.am || die + + if ! use truetype; then + sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die + fi + + if use imlib && ! use X; then + append-cflags -DX_DISPLAY_MISSING + fi + + # bug #653400 + append-cxxflags -std=c++11 + + # bug #601902 + append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)" + + default + eautoreconf + + java-pkg-opt-2_src_prepare +} + +multilib_src_configure() { + if multilib_is_native_abi; then + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)" + fi + + # bug #44128 + export VARTEXFONTS="${T}/fonts" + + # bug #329651 + use mono && export CSC="$(type -P gmcs)" + use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY}) + fi + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable slang) + $(use_enable ncurses) + $(use_enable X x11) + $(use_with X x) + --x-libraries=/usr/$(get_libdir) + $(use_enable opengl gl) + $(use_enable cxx) + $(use_enable imlib imlib2) + $(use_enable test cppunit) + $(multilib_native_use_enable java) + $(multilib_native_use_enable ruby) + --disable-python + $(multilib_native_use_enable mono csharp) + $(multilib_native_use_enable doc) + ) + + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_compile() { + local _java_makeopts + + # bug #480864 + use java && _java_makeopts="-j1" + emake V=1 ${_java_makeopts} +} + +multilib_src_test() { + emake V=1 -j1 check +} + +multilib_src_install() { + emake V=1 DESTDIR="${D}" install + + if multilib_is_native_abi && use java; then + java-pkg_newjar java/libjava.jar + fi +} + +multilib_src_install_all() { + einstalldocs + + rm -rf "${ED}"/usr/share/java || die + + find "${ED}" -name '*.la' -delete || die +}