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 0DFBE1382C5 for ; Fri, 18 Jun 2021 14:56:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4331DE0837; Fri, 18 Jun 2021 14:56:28 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 129EEE0837 for ; Fri, 18 Jun 2021 14:56:28 +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 BAB3E335D16 for ; Fri, 18 Jun 2021 14:56:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 48CFA78E for ; Fri, 18 Jun 2021 14:56:25 +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: <1624028171.a17a038ba653cf52039460cf79adca71ef4a2326.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild X-VCS-Directories: media-libs/libcaca/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a17a038ba653cf52039460cf79adca71ef4a2326 X-VCS-Branch: master Date: Fri, 18 Jun 2021 14:56:25 +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: 3da14cba-1fc4-4fab-9042-2ea6cd05b562 X-Archives-Hash: ae96cd7acc8bad6651b8a23e73039d6c commit: a17a038ba653cf52039460cf79adca71ef4a2326 Author: Sam James gentoo org> AuthorDate: Fri Jun 18 14:55:58 2021 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 18 14:56:11 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a17a038b media-libs/libcaca: drop 0.99_beta19-r5, 0.99_beta19-r6 Bug: https://bugs.gentoo.org/772317 Signed-off-by: Sam James gentoo.org> media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild | 151 -------------------- media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild | 173 ----------------------- 2 files changed, 324 deletions(-) diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild deleted file mode 100644 index 1b649c63160..00000000000 --- a/media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -RUBY_OPTIONAL=yes -#USE_RUBY=ruby20 -inherit autotools ruby-ng epatch eutils flag-o-matic mono-env multilib java-pkg-opt-2 multilib-minimal - -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" - -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="doc imlib java mono ncurses opengl ruby slang static-libs test truetype X" -RESTRICT="!test? ( test )" -REQUIRED_USE="" -# ruby? ( ruby_targets_${USE_RUBY} ) - -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 )" - -S=${WORKDIR}/${MY_P} - -DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS ) - -pkg_setup() { - java-pkg-opt-2_pkg_setup - use mono && mono-env_pkg_setup -} - -src_unpack() { - default -} - -src_prepare() { - sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die #339962 - - 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 - - # Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this - # patch before wrt #517474 - epatch "${FILESDIR}"/${PN}-0.99_beta18-latex_hacks.patch - - # fix out of source tests - epatch "${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch - - 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 - - use mono && export CSC="$(type -P gmcs)" #329651 - export VARTEXFONTS="${T}/fonts" #44128 - use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY}) - fi - - ECONF_SOURCE="${S}" \ - econf \ - $(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) \ - --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) -} - -multilib_src_compile() { - local _java_makeopts - use java && _java_makeopts="-j1" #480864 - 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 "${D}"/usr/share/java - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild deleted file mode 100644 index a6e06f3e038..00000000000 --- a/media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild +++ /dev/null @@ -1,173 +0,0 @@ -# Copyright 1999-2021 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 java-pkg-opt-2 mono-env toolchain-funcs multilib-minimal - -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="doc imlib java mono ncurses opengl ruby slang static-libs test truetype X" -RESTRICT="!test? ( test )" - -# ruby? ( ruby_targets_${USE_RUBY} ) -REQUIRED_USE="" - -# ruby? ( $(ruby_implementations_depend) ) -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}] - ) -" -RDEPEND="java? ( >=virtual/jre-1.5 )" -BDEPEND=" - 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) - --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 - - # Note: broken, see bug #508564 and bug #773913 - 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 -}