[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/files/, media-libs/libcaca/

2024-03-12 Thread Sam James
commit: 1e0b8f0d7458644b7e5ef8f697de9c52ec36e4ea
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 12 07:16:16 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 12 07:16:48 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e0b8f0d

media-libs/libcaca: fix build w/ LTO on some arches

Avoid configure test getting optimised out.

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/files/configure-lto.patch  | 44 +++
 media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild |  1 +
 2 files changed, 45 insertions(+)

diff --git a/media-libs/libcaca/files/configure-lto.patch 
b/media-libs/libcaca/files/configure-lto.patch
new file mode 100644
index ..c60989b3c8f4
--- /dev/null
+++ b/media-libs/libcaca/files/configure-lto.patch
@@ -0,0 +1,44 @@
+https://github.com/cacalabs/libcaca/pull/76
+
+[Modified to just save/restore flags.]
+
+From 07cb730bf3dc49170f0c387d9edcf5537a4e26b6 Mon Sep 17 00:00:00 2001
+From: kxxt 
+Date: Wed, 21 Jun 2023 00:06:04 +0800
+Subject: [PATCH] Disable LTO when checking for fsin/fcos/fldln2/...
+
+LTO might interfere with the instruction detection and produce false positives.
+(The conftest.c compiles with `-flto=auto` but fails without it)
+
+The build for riscv64 arch linux fails because of this:
+https://archriscv.felixc.at/.status/log.htm?url=logs/libcaca/libcaca-0.99.beta20-2.log
+
+This PR fixes it.
+---
+ configure.ac | 5 +
+ 1 file changed, 5 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 27b8d5b4..ee38ead3 100644
+--- a/configure.ac
 b/configure.ac
+@@ -145,6 +145,9 @@ AC_COMPILE_IFELSE(
+   AC_DEFINE(HAVE_SLEEP, 1, [Define to 1 if you have the ‘Sleep’ function.])],
+  [AC_MSG_RESULT(no)])
+ 
++OLD_CFLAGS="${CFLAGS}" # Disable LTO when checking for the instructions
++CFLAGS="${CFLAGS} -fno-lto"
++
+ AC_MSG_CHECKING(for fsin/fcos)
+ AC_COMPILE_IFELSE(
+  [AC_LANG_PROGRAM(
+@@ -163,6 +166,8 @@ AC_COMPILE_IFELSE(
+   AC_DEFINE(HAVE_FLDLN2, 1, [Define to 1 if you have the ‘fldln2’ and other 
floating point instructions.])],
+  [AC_MSG_RESULT(no)])
+ 
++CFLAGS="${OLD_CFLAGS}"
++
+ AC_CHECK_HEADERS(zlib.h)
+ AC_CHECK_LIB(z, gzopen, [ZLIB_LIBS="${ZLIB_LIBS} -lz"])
+ 
+

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index 32b14aa901c4..917b1e972fc7 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -61,6 +61,7 @@ PATCHES=(
"${FILESDIR}/100_doxygen.diff"
# Fix doxygen docs install, bug 543870
"${FILESDIR}/fix-css-path.patch"
+   "${FILESDIR}/configure-lto.patch"
 )
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2023-03-30 Thread 罗百科
commit: 6561a6f0d25201d28d2495eb1a8c0ee00b0fcc93
Author: Patrick Lauer  gentoo  org>
AuthorDate: Fri Mar 31 05:30:52 2023 +
Commit: 罗百科  gentoo  org>
CommitDate: Fri Mar 31 05:30:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6561a6f0

media-libs/libcaca: Fix S

Closes: https://bugs.gentoo.org/903625
Signed-off-by: Patrick Lauer  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index 25ffa5d82c40..16b2b1278595 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -9,7 +9,7 @@ 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}/all/${MY_P}"
+S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/, profiles/base/

2023-03-30 Thread Sam James
commit: 1f0bb79f67cb4d4466867b3d0db94e6ee75baae5
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar 31 00:43:19 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar 31 00:55:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f0bb79f

media-libs/libcaca: drop broken + masked Ruby support

Empty USE_RUBY isn't valid and USE=ruby was masked anyway. It's just that
this is now exposed by the eclass dying on invalid USE_RUBY.

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild | 17 -
 profiles/base/package.use.mask|  4 
 2 files changed, 4 insertions(+), 17 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index fe075d869285..25ffa5d82c40 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-RUBY_OPTIONAL=yes
-
-inherit autotools ruby-ng flag-o-matic toolchain-funcs multilib-minimal
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -16,7 +14,7 @@ S="${WORKDIR}/all/${MY_P}"
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
-IUSE="doc imlib ncurses opengl ruby slang static-libs test truetype X"
+IUSE="doc imlib ncurses opengl slang static-libs test truetype X"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE=""
@@ -65,10 +63,6 @@ PATCHES=(
"${FILESDIR}/fix-css-path.patch"
 )
 
-pkg_setup() {
-   use ruby && ruby-ng_pkg_setup
-}
-
 src_prepare() {
# bug #339962
sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
@@ -103,9 +97,6 @@ multilib_src_configure() {
if multilib_is_native_abi; then
# bug #44128
export VARTEXFONTS="${T}/fonts"
-
-   # bug #329651
-   use ruby && use ruby_targets_${USE_RUBY} && export 
RUBY=$(ruby_implementation_command ${USE_RUBY})
fi
 
local myeconfargs=(
@@ -120,7 +111,7 @@ multilib_src_configure() {
$(use_enable imlib imlib2)
$(use_enable test cppunit)
--disable-java
-   $(multilib_native_use_enable ruby)
+   --disable-ruby
--disable-python
--disable-csharp
$(multilib_native_use_enable doc)

diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index 35f06b4ef11e..158be19da4d4 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -695,10 +695,6 @@ sys-boot/refind custom-cflags
 # Does not build
 sci-libs/linux-gpib php
 
-# Michał Górny  (2017-05-15)
-# Mask ruby20-only compatible packages
-~media-libs/libcaca-0.99_beta19 ruby
-
 # Mike Gilbert  (2017-02-16)
 # Multiple test failures.
 sys-boot/grub:2 test



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2022-11-18 Thread WANG Xuerui
commit: 979c311e7a4d5338dcb8489e9a590c9bd51ea0ce
Author: WANG Xuerui  gentoo  org>
AuthorDate: Sat Nov 19 02:42:07 2022 +
Commit: WANG Xuerui  gentoo  org>
CommitDate: Sat Nov 19 04:50:20 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=979c311e

media-libs/libcaca: keyword 0.99_beta19-r11 for ~loong

Signed-off-by: WANG Xuerui  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index 9466208ef8c1..fe075d869285 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/all/${MY_P}"
 
 LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 
~riscv ~s390 sparc x86"
 IUSE="doc imlib ncurses opengl ruby slang static-libs test truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2022-11-07 Thread Ionen Wolkens
commit: 35683548ca97455f295f52aed45cdf357b878794
Author: Ionen Wolkens  gentoo  org>
AuthorDate: Mon Nov  7 21:04:40 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Mon Nov  7 21:08:46 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=35683548

media-libs/libcaca: avoid mixing ncurses with ncursesw

Also only do this with USE=ncurses and use || die

(fixes runtime with mpv wrt bug #825058)

Closes: https://bugs.gentoo.org/825058
Signed-off-by: Ionen Wolkens  gentoo.org>

 ...{libcaca-0.99_beta19-r10.ebuild => libcaca-0.99_beta19-r11.ebuild} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
similarity index 97%
rename from media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
index 86ee32249914..9466208ef8c1 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r11.ebuild
@@ -89,8 +89,8 @@ src_prepare() {
# bug #653400
append-cxxflags -std=c++11
 
-   # bug #601902
-   append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
+   # bug #601902, bug #825058
+   use ncurses && append-libs $($(tc-getPKG_CONFIG) --libs tinfow || die)
 
# fix docs install path, bug 543870#c14
sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2022-10-10 Thread Sam James
commit: 1e3020768c73f2deb0f191182ce21b8f8f80ebf3
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 10 22:01:20 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 10 22:06:07 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e302076

media-libs/libcaca: drop 0.99_beta19-r8

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild | 182 ---
 1 file changed, 182 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
deleted file mode 100644
index 07175fc779eb..
--- a/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
+++ /dev/null
@@ -1,182 +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 ~m68k ~mips ppc ppc64 ~riscv 
~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.8:* )"
-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.8:* )
-   test? ( dev-util/cppunit )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-PATCHES=(
-   # Fix out of source tests
-   "${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
-   # Debian patches
-   "${FILESDIR}/CVE-2018-20544.patch"
-   "${FILESDIR}/CVE-2018-20545+20547+20549.patch"
-   "${FILESDIR}/CVE-2018-20546+20547.patch"
-   "${FILESDIR}/canvas-fix-an-integer-overflow-in-caca_resize.patch"
-   "${FILESDIR}/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch"
-   "${FILESDIR}/100_doxygen.diff"
-   # Fix doxygen docs install, bug 543870
-   "${FILESDIR}/fix-css-path.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)"
-
-   # fix docs install path, bug 543870#c14
-   sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
-
-   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 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2022-10-10 Thread Sam James
commit: ffce9b894fca9840e433b255e63fc2ad6a8203b6
Author: Sam James  gentoo  org>
AuthorDate: Mon Oct 10 21:59:48 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Oct 10 22:06:06 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ffce9b89

media-libs/libcaca: fix RDEPEND

Closes: https://bugs.gentoo.org/868285
Signed-off-by: Sam James  gentoo.org>

 .../{libcaca-0.99_beta19-r9.ebuild => libcaca-0.99_beta19-r10.ebuild}| 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
similarity index 99%
rename from media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
index 29de0d6f6dee..86ee32249914 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r10.ebuild
@@ -36,6 +36,7 @@ DEPEND="
>=x11-libs/libXt-1.1.4
)
 "
+RDEPEND="${DEPEND}"
 BDEPEND="
virtual/pkgconfig
doc? (



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2022-09-09 Thread David Seifert
commit: 899d5b5e60fe55be227ca30d0267e54c7665e0c3
Author: Sam James  gentoo  org>
AuthorDate: Fri Sep  9 07:59:08 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Fri Sep  9 07:59:08 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=899d5b5e

media-libs/libcaca: limit multilib features, drop masked java & mono support

No reverse dependencies need these.

Gist is:
```
-   $(use_enable slang)
-   $(use_enable ncurses)
-   $(use_enable X x11)
-   $(use_with X x)
+   $(multilib_native_use_enable slang)
+   $(multilib_native_use_enable ncurses)
+   $(multilib_native_use_enable X x11)
+   $(multilib_native_use_with X x)
```

Java and mono support in this package have been broken
for a long time, so hard-disable it.

Signed-off-by: Sam James  gentoo.org>
Signed-off-by: David Seifert  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild | 143 +++
 1 file changed, 143 insertions(+)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild
new file mode 100644
index ..29de0d6f6dee
--- /dev/null
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r9.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+RUBY_OPTIONAL=yes
+
+inherit autotools ruby-ng flag-o-matic 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}/all/${MY_P}"
+
+LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
+IUSE="doc imlib ncurses opengl ruby slang static-libs test truetype X"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE=""
+
+DEPEND="
+   imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
+   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 )
+   X? (
+   >=x11-libs/libX11-1.6.2
+   >=x11-libs/libXt-1.1.4
+   )
+"
+BDEPEND="
+   virtual/pkgconfig
+   doc? (
+   app-doc/doxygen
+   virtual/latex-base
+   >=dev-texlive/texlive-fontsrecommended-2012
+   >=dev-texlive/texlive-latexextra-2012
+   dev-texlive/texlive-latexrecommended
+   )
+   test? ( dev-util/cppunit )
+"
+
+DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
+
+PATCHES=(
+   # Fix out of source tests
+   "${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
+   # Debian patches
+   "${FILESDIR}/CVE-2018-20544.patch"
+   "${FILESDIR}/CVE-2018-20545+20547+20549.patch"
+   "${FILESDIR}/CVE-2018-20546+20547.patch"
+   "${FILESDIR}/canvas-fix-an-integer-overflow-in-caca_resize.patch"
+   "${FILESDIR}/Fix-a-problem-in-the-caca_resize-overflow-detection-.patch"
+   "${FILESDIR}/100_doxygen.diff"
+   # Fix doxygen docs install, bug 543870
+   "${FILESDIR}/fix-css-path.patch"
+)
+
+pkg_setup() {
+   use ruby && ruby-ng_pkg_setup
+}
+
+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
+
+   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)"
+
+   # fix docs install path, bug 543870#c14
+   sed -i "s/libcaca-dev/${PF}/g" doc/Makefile.am || die
+
+   default
+   eautoreconf
+}
+
+multilib_src_configure() {
+   if multilib_is_native_abi; then
+   # bug #44128
+   export VARTEXFONTS="${T}/fonts"
+
+   # bug #329651
+   use ruby && use ruby_targets_${USE_RUBY} && export 
RUBY=$(ruby_implementation_command ${USE_RUBY})
+   fi
+
+   local myeconfargs=(
+   $(use_enable static-libs static)
+   $(multilib_native_use_enable slang)
+   $(multilib_native_use_enable ncurses)
+   $(multilib_native_use_enable X x11)
+   $(multilib_native_use_with X x)

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2022-07-28 Thread Sam James
commit: 33d99224a20d5baedd28672561f65def54b4f5e6
Author: Sam James  gentoo  org>
AuthorDate: Fri Jul 29 03:57:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jul 29 04:17:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33d99224

media-libs/libcaca: add github upstream metadata

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/metadata.xml | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/media-libs/libcaca/metadata.xml b/media-libs/libcaca/metadata.xml
index 41735f1b73a8..417dca0517d5 100644
--- a/media-libs/libcaca/metadata.xml
+++ b/media-libs/libcaca/metadata.xml
@@ -1,7 +1,10 @@
 
 https://www.gentoo.org/dtd/metadata.dtd;>
 
-
-media-vi...@gentoo.org
-
+   
+   media-vi...@gentoo.org
+   
+   
+   cacalabs/libcaca
+   
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/files/

2021-10-23 Thread Sam James
commit: 14fc2e8417f7cc70736135da8286a716438bba17
Author: Sam James  gentoo  org>
AuthorDate: Sun Oct 24 04:22:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 04:22:35 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14fc2e84

media-libs/libcaca: drop mistakenly committed patch

Fixes: e4d9018ad6d87a731a9fd621561cad1b170aec89 (my fault)
Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/files/foo | 77 
 1 file changed, 77 deletions(-)

diff --git a/media-libs/libcaca/files/foo b/media-libs/libcaca/files/foo
deleted file mode 100644
index d35de1aa7d2..000
--- a/media-libs/libcaca/files/foo
+++ /dev/null
@@ -1,77 +0,0 @@
-diff --git a/src/common-image.c b/src/common-image.c
-index 7059bf4..d40eba1 100644
 a/src/common-image.c
-+++ b/src/common-image.c
-@@ -22,6 +22,7 @@
- #endif
- 
- #include "caca.h"
-+#include "caca_internals.h"
- 
- #include "common-image.h"
- 
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 5f0b22f..2f48f27 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -11,7 +11,7 @@ noinst_PROGRAMS = cacadraw
- 
- cacademo_SOURCES = cacademo.c texture.h
- cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
--cacademo_LDFLAGS = @MATH_LIBS@
-+cacademo_LIBS = @MATH_LIBS@
- 
- cacafire_SOURCES = aafire.c
- cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-@@ -19,7 +19,7 @@ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
- cacaview_SOURCES = cacaview.c common-image.c common-image.h
- cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
- cacaview_CFLAGS = $(IMLIB2_CFLAGS)
--cacaview_LDFLAGS = $(IMLIB2_LIBS)
-+cacaview_LIBS = $(IMLIB2_LIBS)
- 
- cacadraw_SOURCES = cacadraw.c
- cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-@@ -37,7 +37,7 @@ cacaclock_LDADD = ../caca/libcaca.la
- img2txt_SOURCES = img2txt.c common-image.c common-image.h
- img2txt_LDADD = ../caca/libcaca.la
- img2txt_CFLAGS = $(IMLIB2_CFLAGS)
--img2txt_LDFLAGS = $(IMLIB2_LIBS)
-+img2txt_LIBS = $(IMLIB2_LIBS)
- 
- if USE_NETWORK
- fcntl_programs = cacaserver
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 2f48f27..725ad36 100644
 a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -10,16 +10,14 @@ bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt 
cacaclock $(fcntl_pro
- noinst_PROGRAMS = cacadraw
- 
- cacademo_SOURCES = cacademo.c texture.h
--cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
--cacademo_LIBS = @MATH_LIBS@
-+cacademo_LDADD = ../caca/libcaca.la @MATH_LIBS@
- 
- cacafire_SOURCES = aafire.c
- cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
- 
- cacaview_SOURCES = cacaview.c common-image.c common-image.h
--cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-+cacaview_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS)
- cacaview_CFLAGS = $(IMLIB2_CFLAGS)
--cacaview_LIBS = $(IMLIB2_LIBS)
- 
- cacadraw_SOURCES = cacadraw.c
- cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-@@ -35,9 +33,8 @@ cacaclock_LDADD = ../caca/libcaca.la
- 
- 
- img2txt_SOURCES = img2txt.c common-image.c common-image.h
--img2txt_LDADD = ../caca/libcaca.la
-+img2txt_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS)
- img2txt_CFLAGS = $(IMLIB2_CFLAGS)
--img2txt_LIBS = $(IMLIB2_LIBS)
- 
- if USE_NETWORK
- fcntl_programs = cacaserver



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/files/, media-libs/libcaca/

2021-10-23 Thread Sam James
commit: e4d9018ad6d87a731a9fd621561cad1b170aec89
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Oct 23 08:42:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Oct 24 04:05:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4d9018a

media-libs/libcaca: min java 1.8:*

Closes: https://bugs.gentoo.org/786807

Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/22681
Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/files/foo   | 77 ++
 ...a19-r7.ebuild => libcaca-0.99_beta19-r8.ebuild} |  4 +-
 2 files changed, 79 insertions(+), 2 deletions(-)

diff --git a/media-libs/libcaca/files/foo b/media-libs/libcaca/files/foo
new file mode 100644
index 000..d35de1aa7d2
--- /dev/null
+++ b/media-libs/libcaca/files/foo
@@ -0,0 +1,77 @@
+diff --git a/src/common-image.c b/src/common-image.c
+index 7059bf4..d40eba1 100644
+--- a/src/common-image.c
 b/src/common-image.c
+@@ -22,6 +22,7 @@
+ #endif
+ 
+ #include "caca.h"
++#include "caca_internals.h"
+ 
+ #include "common-image.h"
+ 
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 5f0b22f..2f48f27 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -11,7 +11,7 @@ noinst_PROGRAMS = cacadraw
+ 
+ cacademo_SOURCES = cacademo.c texture.h
+ cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+-cacademo_LDFLAGS = @MATH_LIBS@
++cacademo_LIBS = @MATH_LIBS@
+ 
+ cacafire_SOURCES = aafire.c
+ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+@@ -19,7 +19,7 @@ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+ cacaview_SOURCES = cacaview.c common-image.c common-image.h
+ cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+ cacaview_CFLAGS = $(IMLIB2_CFLAGS)
+-cacaview_LDFLAGS = $(IMLIB2_LIBS)
++cacaview_LIBS = $(IMLIB2_LIBS)
+ 
+ cacadraw_SOURCES = cacadraw.c
+ cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+@@ -37,7 +37,7 @@ cacaclock_LDADD = ../caca/libcaca.la
+ img2txt_SOURCES = img2txt.c common-image.c common-image.h
+ img2txt_LDADD = ../caca/libcaca.la
+ img2txt_CFLAGS = $(IMLIB2_CFLAGS)
+-img2txt_LDFLAGS = $(IMLIB2_LIBS)
++img2txt_LIBS = $(IMLIB2_LIBS)
+ 
+ if USE_NETWORK
+ fcntl_programs = cacaserver
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 2f48f27..725ad36 100644
+--- a/src/Makefile.am
 b/src/Makefile.am
+@@ -10,16 +10,14 @@ bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt 
cacaclock $(fcntl_pro
+ noinst_PROGRAMS = cacadraw
+ 
+ cacademo_SOURCES = cacademo.c texture.h
+-cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+-cacademo_LIBS = @MATH_LIBS@
++cacademo_LDADD = ../caca/libcaca.la @MATH_LIBS@
+ 
+ cacafire_SOURCES = aafire.c
+ cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+ 
+ cacaview_SOURCES = cacaview.c common-image.c common-image.h
+-cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
++cacaview_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS)
+ cacaview_CFLAGS = $(IMLIB2_CFLAGS)
+-cacaview_LIBS = $(IMLIB2_LIBS)
+ 
+ cacadraw_SOURCES = cacadraw.c
+ cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+@@ -35,9 +33,8 @@ cacaclock_LDADD = ../caca/libcaca.la
+ 
+ 
+ img2txt_SOURCES = img2txt.c common-image.c common-image.h
+-img2txt_LDADD = ../caca/libcaca.la
++img2txt_LDADD = ../caca/libcaca.la $(IMLIB2_LIBS)
+ img2txt_CFLAGS = $(IMLIB2_CFLAGS)
+-img2txt_LIBS = $(IMLIB2_LIBS)
+ 
+ if USE_NETWORK
+ fcntl_programs = cacaserver

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
similarity index 98%
rename from media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
index 1fbb143b911..07175fc779e 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r8.ebuild
@@ -40,7 +40,7 @@ DEPEND="
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
)
 "
-RDEPEND="java? ( >=virtual/jre-1.5 )"
+RDEPEND="java? ( >=virtual/jre-1.8:* )"
 BDEPEND="
virtual/pkgconfig
doc? (
@@ -50,7 +50,7 @@ BDEPEND="
>=dev-texlive/texlive-latexextra-2012
dev-texlive/texlive-latexrecommended
)
-   java? ( >=virtual/jdk-1.5 )
+   java? ( >=virtual/jdk-1.8:* )
test? ( dev-util/cppunit )
 "
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-10-02 Thread James Le Cuirot
commit: 85bc0b096ebc721e1e2f90ab9ada91a9258766ab
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sat Oct  2 22:49:55 2021 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sat Oct  2 22:52:25 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85bc0b09

media-libs/libcaca: Keyword 0.99_beta19-r7 for ~m68k

The tests pass.

Signed-off-by: James Le Cuirot  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
index bc7b204dd36..1fbb143b911 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv 
~s390 sparc x86"
 IUSE="doc imlib java mono ncurses opengl ruby slang static-libs test truetype 
X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/files/

2021-07-11 Thread Conrad Kostecki
commit: 3f0669e8922eb65e31cd4f28fb7cbfb83c0945ae
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sun Jul 11 11:35:32 2021 +
Commit: Conrad Kostecki  gentoo  org>
CommitDate: Sun Jul 11 14:42:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f0669e8

media-libs/libcaca: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/21599
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: Conrad Kostecki  gentoo.org>

 .../libcaca/files/libcaca-0.99_beta18-latex_hacks.patch| 14 --
 1 file changed, 14 deletions(-)

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
deleted file mode 100644
index 15e17d2f95e..000
--- a/media-libs/libcaca/files/libcaca-0.99_beta18-latex_hacks.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-
 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
-   mv latex/refman.tex latex/libcaca.tex
--  sed 's/setlength{/renewcommand{/' latex/libcaca.tex \
-+  sed 's/\\setlength{/%\0/' latex/libcaca.tex \
- | sed 's/.*usepackage.*times.*//' > latex/refman.tex
-   cd latex && $(MAKE) $(AM_CFLAGS) refman.pdf || (cat refman.log; exit 1)
-   mv latex/refman.pdf latex/libcaca.pdf



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-06-18 Thread Sam James
commit: a17a038ba653cf52039460cf79adca71ef4a2326
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 18 14:55:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 18 14:56:11 2021 +
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..000
--- 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 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-06-18 Thread Sam James
commit: e0536997044f13a74b246f569571af7a1e86a637
Author: Sam James  gentoo  org>
AuthorDate: Fri Jun 18 13:39:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Jun 18 14:33:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0536997

media-libs/libcaca: drop IUSE=cxx (always on)

No consumers explicitly depend on this flag being enabled and the flag
makes a minimal difference to build time + size.

Signed-off-by: Sam James  gentoo.org>

 ...ibcaca-0.99_beta19-r1.ebuild => libcaca-0.99_beta19-r5.ebuild} | 8 +---
 ...ibcaca-0.99_beta19-r3.ebuild => libcaca-0.99_beta19-r6.ebuild} | 4 ++--
 ...ibcaca-0.99_beta19-r4.ebuild => libcaca-0.99_beta19-r7.ebuild} | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild
similarity index 95%
rename from media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild
index a7e21adb2ad..1b649c63160 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r5.ebuild
@@ -15,7 +15,7 @@ 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="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
+IUSE="doc imlib java mono ncurses opengl ruby slang static-libs test truetype 
X"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=""
 #  ruby? ( ruby_targets_${USE_RUBY} )
@@ -112,9 +112,11 @@ multilib_src_configure() {
$(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 X x11) \
+   $(use_with X x) \
+   --x-libraries=/usr/$(get_libdir) \
$(use_enable opengl gl) \
-   $(use_enable cxx) \
+   --enable-cxx \
$(use_enable imlib imlib2) \
$(use_enable test cppunit) \
$(multilib_native_use_enable java) \

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild
similarity index 97%
rename from media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild
index 9e244534237..a6e06f3e038 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r6.ebuild
@@ -17,7 +17,7 @@ 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"
+IUSE="doc imlib java mono ncurses opengl ruby slang static-libs test truetype 
X"
 RESTRICT="!test? ( test )"
 
 # ruby? ( ruby_targets_${USE_RUBY} )
@@ -130,7 +130,7 @@ multilib_src_configure() {
$(use_with X x)
--x-libraries=/usr/$(get_libdir)
$(use_enable opengl gl)
-   $(use_enable cxx)
+   --enable-cxx
$(use_enable imlib imlib2)
$(use_enable test cppunit)
$(multilib_native_use_enable java)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
similarity index 97%
rename from media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
index f0eece5142c..bc7b204dd36 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
@@ -17,7 +17,7 @@ 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 ~riscv ~s390 
sparc x86"
-IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
+IUSE="doc imlib java mono ncurses opengl ruby slang static-libs test truetype 
X"
 RESTRICT="!test? ( test )"
 
 # ruby? ( ruby_targets_${USE_RUBY} )
@@ -139,7 +139,7 @@ multilib_src_configure() {
$(use_with X x)
--x-libraries=/usr/$(get_libdir)
$(use_enable opengl gl)
-   $(use_enable cxx)
+   --enable-cxx
$(use_enable imlib imlib2)
$(use_enable test cppunit)
$(multilib_native_use_enable java)



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-06-03 Thread Sam James
commit: 41700444003226b0690c41df6f6304ee676782c7
Author: Sam James  gentoo  org>
AuthorDate: Thu Jun  3 22:51:49 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jun  3 22:51:49 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41700444

media-libs/libcaca: Stabilize 0.99_beta19-r4 arm64, #772317

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index 7fe4815820c..f0eece5142c 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-05-28 Thread Sergei Trofimovich
commit: 1017f4e145bc57a1521eb6ef6f54c1df9525e61b
Author: Rolf Eike Beer  sf-mail  de>
AuthorDate: Fri May 28 12:31:02 2021 +
Commit: Sergei Trofimovich  gentoo  org>
CommitDate: Fri May 28 14:39:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1017f4e1

media-libs/libcaca: stable 0.99_beta19-r4 for sparc, bug #772317

Package-Manager: Portage-3.0.18, Repoman-3.0.2
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Rolf Eike Beer  sf-mail.de>
Signed-off-by: Sergei Trofimovich  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index 0befac43636..7fe4815820c 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-05-27 Thread Sam James
commit: 108e68fb8f1c4275104ccf4da0553dc2d6ca521b
Author: Sam James  gentoo  org>
AuthorDate: Fri May 28 00:28:08 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri May 28 00:28:08 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=108e68fb

media-libs/libcaca: Stabilize 0.99_beta19-r4 arm, #772317

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index efe765a6f57..0befac43636 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-05-27 Thread Sam James
commit: 434762262db5941d3e50647275f801de5b094d39
Author: Sam James  gentoo  org>
AuthorDate: Thu May 27 19:21:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu May 27 19:21:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43476226

media-libs/libcaca: Stabilize 0.99_beta19-r4 ppc, #772317

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index c09fe9cca89..efe765a6f57 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 
~sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-05-25 Thread Agostino Sarubbo
commit: 0ebb69aca13aefc5592c9e70b1b6f69d05b22bda
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 25 19:09:52 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 25 19:09:52 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ebb69ac

media-libs/libcaca: x86 stable wrt bug #772317

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index 3cdf1f78cde..c09fe9cca89 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-05-25 Thread Agostino Sarubbo
commit: 1f9d9d9db0f0585547a8bd78b2188eac5a72118a
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Tue May 25 18:57:20 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Tue May 25 18:58:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f9d9d9d

media-libs/libcaca: amd64 stable wrt bug #772317

Package-Manager: Portage-3.0.13, Repoman-3.0.2
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index 0ec37439beb..3cdf1f78cde 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-05-25 Thread Sam James
commit: 9cfdddbe47cf91e5cc1fedc837094e3f7c5c8fb9
Author: Sam James  gentoo  org>
AuthorDate: Tue May 25 16:54:29 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue May 25 16:54:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cfdddbe

media-libs/libcaca: Stabilize 0.99_beta19-r4 ppc64, #772317

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index 656935c131d..0ec37439beb 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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 ~riscv ~s390 
~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-05-25 Thread Yixun Lan
commit: f144aa96ec0dd1ad4be860117febda7b4f2d1fee
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue May 25 05:39:19 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue May 25 08:24:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f144aa96

media-libs/libcaca: add riscv keyword

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index a84afaa8b83..656935c131d 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 
~sparc ~x86"
 IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/, media-libs/libcaca/files/

2021-05-22 Thread Andrew Savchenko
commit: 9e49df085dded48b58473bc2fd6347f8352f
Author: Andrew Savchenko  gentoo  org>
AuthorDate: Sat May 22 11:36:04 2021 +
Commit: Andrew Savchenko  gentoo  org>
CommitDate: Sat May 22 11:39:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e49df22

media-libs/libcaca: fix multiple CVEs and docs build failure

CVE fixed (using Debian patchset):
CVE-2018-20544, CVE-2018-20545, CVE-2018-20546,
CVE-2018-20547, CVE-2018-20549, CVE-2021-3410.

Fix docs build failure (doxygen and latex issues) using both Debian
patch and patch from bug 543870#c11.

Install docs into proper path.

Bug: https://bugs.gentoo.org/543870
Bug: https://bugs.gentoo.org/772317
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Andrew Savchenko  gentoo.org>

 media-libs/libcaca/files/100_doxygen.diff  | 170 +++
 media-libs/libcaca/files/CVE-2018-20544.patch  |  45 +
 .../libcaca/files/CVE-2018-20545+20547+20549.patch |  34 
 .../libcaca/files/CVE-2018-20546+20547.patch   |  36 
 ...em-in-the-caca_resize-overflow-detection-.patch | 135 +++
 ...as-fix-an-integer-overflow-in-caca_resize.patch | 141 
 media-libs/libcaca/files/fix-css-path.patch|  12 ++
 media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild   | 182 +
 8 files changed, 755 insertions(+)

diff --git a/media-libs/libcaca/files/100_doxygen.diff 
b/media-libs/libcaca/files/100_doxygen.diff
new file mode 100644
index 000..f537f37b6d3
--- /dev/null
+++ b/media-libs/libcaca/files/100_doxygen.diff
@@ -0,0 +1,170 @@
+Description: Don't mess with Doxygen's output
+Author: Balint Reczey 
+Index: libcaca-0.99.beta19/doc/Makefile.am
+===
+--- libcaca-0.99.beta19.orig/doc/Makefile.am
 libcaca-0.99.beta19/doc/Makefile.am
+@@ -28,10 +28,7 @@ stamp-latex: stamp-doxygen
+ if BUILD_DOCUMENTATION
+ if USE_LATEX
+   rm -f latex/libcaca.tex latex/libcaca.pdf
+-  mv latex/refman.tex latex/libcaca.tex
+-  sed 's/setlength{/renewcommand{/' latex/libcaca.tex \
+-| sed 's/.*usepackage.*times.*//' > latex/refman.tex
+-  cd latex && $(MAKE) $(AM_CFLAGS) refman.pdf || (cat refman.log; exit 1)
++  (cd latex &&  pdflatex refman ; makeindex refman.idx ; pdflatex refman 
; pdflatex refman ; pdflatex refman ; pdflatex refman ; pdflatex refman; echo 
"pdflatex exit code: $$?")
+   mv latex/refman.pdf latex/libcaca.pdf
+   touch stamp-latex
+ endif
+Index: libcaca-0.99.beta19/doc/doxygen.cfg.in
+===
+--- libcaca-0.99.beta19.orig/doc/doxygen.cfg.in
 libcaca-0.99.beta19/doc/doxygen.cfg.in
+@@ -1,4 +1,4 @@
+-# Doxyfile 1.8.6
++# Doxyfile 1.8.7
+ 
+ # This file describes the settings to be used by the documentation system
+ # doxygen (www.doxygen.org) for a project.
+@@ -70,6 +70,14 @@ OUTPUT_DIRECTORY   = .
+ 
+ CREATE_SUBDIRS = NO
+ 
++# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII
++# characters to appear in the names of generated files. If set to NO, 
non-ASCII
++# characters will be escaped, for example _xE3_x81_x84 will be used for 
Unicode
++# U+3044.
++# The default value is: NO.
++
++ALLOW_UNICODE_NAMES= NO
++
+ # The OUTPUT_LANGUAGE tag is used to specify the language in which all
+ # documentation generated by doxygen is written. Doxygen will use this
+ # information to generate all constant output in the proper language.
+@@ -261,9 +269,12 @@ OPTIMIZE_OUTPUT_VHDL   = NO
+ # extension. Doxygen has a built-in mapping, but you can override or extend it
+ # using this tag. The format is ext=language, where ext is a file extension, 
and
+ # language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+-# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+-# doxygen treat .inc files as Fortran files (default is PHP), and .f files as 
C
+-# (default is Fortran), use: inc=Fortran f=C.
++# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran:
++# FortranFixed, free formatted Fortran: FortranFree, unknown formatted 
Fortran:
++# Fortran. In the later case the parser tries to guess whether the code is 
fixed
++# or free formatted code, this is the default for Fortran type files), VHDL. 
For
++# instance to make doxygen treat .inc files as Fortran files (default is PHP),
++# and .f files as C (default is Fortran), use: inc=Fortran f=C.
+ #
+ # Note For files without extension you can use no_extension as a placeholder.
+ #
+@@ -1242,7 +1253,8 @@ GENERATE_CHI   = NO
+ CHM_INDEX_ENCODING =
+ 
+ # The BINARY_TOC flag controls whether a binary table of contents is 
generated (
+-# YES) or a normal table of contents ( NO) in the .chm file.
++# YES) or a normal table of contents ( NO) in the .chm file. Furthermore it
++# enables the Previous and Next buttons.
+ # The default 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-03-01 Thread Sam James
commit: 7f7862d996dbf59b460a35358d383823c9fbb5a7
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar  2 05:45:37 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar  2 05:47:10 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f7862d9

media-libs/libcaca: make clear that USE=java is broken in ebuild

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
index c20865ef30e..9e244534237 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
@@ -6,7 +6,7 @@ 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
+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"
@@ -158,6 +158,7 @@ multilib_src_test() {
 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



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-03-01 Thread Sam James
commit: 00d2441c90045a12b2bcc3c8c1a1f4c38d2cfd9d
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  1 17:40:42 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  1 17:40:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00d2441c

media-libs/libcaca: copyright year

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
index 740d72d09ac..c20865ef30e 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-03-01 Thread Sam James
commit: 0e03ae4461dbb2dbc90ea762453fb945b438709f
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  1 17:40:09 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  1 17:40:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e03ae44

media-libs/libcaca: swap to BDEPEND

Signed-off-by: Sam James  gentoo.org>

 ...beta19-r2.ebuild => libcaca-0.99_beta19-r3.ebuild} | 19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
similarity index 92%
rename from media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild
rename to media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
index 123618a9430..740d72d09ac 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
@@ -23,7 +23,9 @@ RESTRICT="!test? ( test )"
 # ruby? ( ruby_targets_${USE_RUBY} )
 REQUIRED_USE=""
 
-COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
+# 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? (
@@ -33,11 +35,13 @@ COMMON_DEPEND="imlib? ( 
>=media-libs/imlib2-1.4.6-r2[${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}
+   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
@@ -47,7 +51,8 @@ DEPEND="${COMMON_DEPEND}
dev-texlive/texlive-latexrecommended
)
java? ( >=virtual/jdk-1.5 )
-   test? ( dev-util/cppunit )"
+   test? ( dev-util/cppunit )
+"
 
 DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
 



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2021-03-01 Thread Sam James
commit: d14395e05efb4d3a4e96283ea50783a1c5171a1e
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  1 17:34:39 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  1 17:34:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d14395e0

media-libs/libcaca: fix WhitespaceFound

Signed-off-by: Sam James  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild
index c1ec14de152..123618a9430 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r2.ebuild
@@ -56,7 +56,7 @@ PATCHES=(
# 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
+   "${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
 )
 
 pkg_setup() {



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/, media-libs/libcaca/files/

2021-03-01 Thread Sam James
commit: 3fa25c71ca75f3f5353813553b61bd5c934dcad8
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar  1 17:33:10 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar  1 17:33:38 2021 +
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 000..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() {
+   

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2020-08-22 Thread Michał Górny
commit: 6809241c0e716f0181908ddfbdbff3718813e5eb
Author: Michał Górny  gentoo  org>
AuthorDate: Sat Aug 22 07:42:47 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Aug 22 08:04:16 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6809241c

media-libs/libcaca: Eradicate python2

Closes: https://bugs.gentoo.org/705942
Signed-off-by: Michał Górny  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild | 13 -
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index f1b7568c43a..0bc4e2321bd 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -2,11 +2,10 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-PYTHON_COMPAT=( python2_7 )
 RUBY_OPTIONAL=yes
 #USE_RUBY=ruby20
 
-inherit autotools ruby-ng eutils flag-o-matic ltprune mono-env multilib 
java-pkg-opt-2 python-single-r1 multilib-minimal
+inherit autotools ruby-ng eutils flag-o-matic ltprune mono-env multilib 
java-pkg-opt-2 multilib-minimal
 
 MY_P=${P/_/.}
 DESCRIPTION="A library that creates colored ASCII-art graphics"
@@ -16,11 +15,9 @@ 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="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
+IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test 
truetype X"
 RESTRICT="!test? ( test )"
-REQUIRED_USE="
-   python? ( ${PYTHON_REQUIRED_USE} )
-"
+REQUIRED_USE=""
 #  ruby? ( ruby_targets_${USE_RUBY} )
 
 COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
@@ -32,7 +29,6 @@ COMMON_DEPEND="imlib? ( 
>=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
)
-   python? ( ${PYTHON_DEPS} )
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) )
@@ -55,7 +51,6 @@ S=${WORKDIR}/${MY_P}
 DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
 
 pkg_setup() {
-   use python && python-single-r1_pkg_setup
java-pkg-opt-2_pkg_setup
use mono && mono-env_pkg_setup
 }
@@ -124,7 +119,7 @@ multilib_src_configure() {
$(use_enable test cppunit) \
$(multilib_native_use_enable java) \
$(multilib_native_use_enable ruby) \
-   $(multilib_native_use_enable python) \
+   --disable-python \
$(multilib_native_use_enable mono csharp) \
$(multilib_native_use_enable doc)
 }



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2019-11-05 Thread Michał Górny
commit: f1074170466ae870c018efd6806d1f6626f1337b
Author: Michał Górny  gentoo  org>
AuthorDate: Tue Nov  5 18:30:27 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Tue Nov  5 18:30:27 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f1074170

media-libs/libcaca: [QA] Add RESTRICT="!test? ( test )"

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
index e173dd94144..42917a03505 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -17,6 +17,7 @@ LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
 SLOT="0"
 KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
+RESTRICT="!test? ( test )"
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )
 "



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2019-11-04 Thread Mikle Kolyada
commit: 1b913f9dd029c51ac4856f75ff89505500aa8273
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov  4 12:10:10 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov  4 12:19:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b913f9d

media-libs/libcaca: Drop old

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 153 --
 1 file changed, 153 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
deleted file mode 100644
index 941b299aae7..000
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-RUBY_OPTIONAL=yes
-#USE_RUBY=ruby20
-
-inherit autotools ruby-ng eutils flag-o-matic mono-env multilib java-pkg-opt-2 
python-single-r1 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 ~sh sparc x86"
-IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
-REQUIRED_USE="
-   python? ( ${PYTHON_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 )
-   )
-   python? ( ${PYTHON_DEPS} )
-   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-tex/xcolor
-   )
-   java? ( >=virtual/jdk-1.5 )
-   test? ( dev-util/cppunit )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-pkg_setup() {
-   use python && python-single-r1_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) \
-   

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2019-11-04 Thread Mikle Kolyada
commit: 17926890d484691ab648e8bedf47e300f78c7fd2
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov  4 12:09:36 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov  4 12:19:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17926890

media-libs/libcaca: migrate from dev-tex/xcolor

Package-Manager: Portage-2.3.76, Repoman-2.3.16
Signed-off-by: Mikle Kolyada  gentoo.org>

 media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild | 153 +++
 1 file changed, 153 insertions(+)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
new file mode 100644
index 000..e173dd94144
--- /dev/null
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+RUBY_OPTIONAL=yes
+#USE_RUBY=ruby20
+
+inherit autotools ruby-ng eutils flag-o-matic mono-env multilib java-pkg-opt-2 
python-single-r1 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 ~sh sparc x86"
+IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
+REQUIRED_USE="
+   python? ( ${PYTHON_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 )
+   )
+   python? ( ${PYTHON_DEPS} )
+   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() {
+   use python && python-single-r1_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) \
+  

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2018-06-30 Thread David Seifert
commit: 2de7688161f15e8b57c8eb31ed4b212d9e952990
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun 30 11:27:18 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun 30 11:27:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2de76881

media-libs/libcaca: Force C++11

Closes: https://bugs.gentoo.org/653400
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index c57546e7c40..95e1897cc71 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -84,6 +84,9 @@ src_prepare() {
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



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2018-06-30 Thread David Seifert
commit: 8f7e30e3882709d6254b8bba8c2713700d5dcabf
Author: David Seifert  gentoo  org>
AuthorDate: Sat Jun 30 11:29:02 2018 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jun 30 11:29:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f7e30e3

media-libs/libcaca: Remove old

Package-Manager: Portage-2.3.41, Repoman-2.3.9

 media-libs/libcaca/Manifest  |   1 -
 media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild | 137 ---
 2 files changed, 138 deletions(-)

diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 9be192e4ed2..efdb5d15538 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,2 +1 @@
-DIST libcaca-0.99.beta18.tar.gz 1168552 BLAKE2B 
6becacc8b6ae7f8b90eaadf9fe9682f3b35e986c8319907f6336e0b118adc7abc813f95c2ee6a6eac954dc3d8eb304389652489ba881e9004d1f7bfb79aba4cb
 SHA512 
b2a8264ec36b74a01ff415a1fd7cb1806c76e28795b73607d4f8fa5ed5cc776b215f2817f45f06c672688f010622ee5c5e2f9dc4d0c43417dedbff545d575ca5
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 
65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798
 SHA512 
780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15

diff --git a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
deleted file mode 100644
index 131cf1d73ae..000
--- a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils flag-o-matic mono multilib java-pkg-opt-2 
python-single-r1 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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd"
-IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
-REQUIRED_USE="python? ( ${PYTHON_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 )
-   )
-   python? ( ${PYTHON_DEPS} )
-   ruby? ( =dev-lang/ruby-1.8* )
-   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="${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-tex/xcolor
-   )
-   java? ( >=virtual/jdk-1.5 )
-   test? ( dev-util/cppunit )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-pkg_setup() {
-   use python && python-single-r1_pkg_setup
-}
-
-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
-
-   # Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that 
prefixed this
-   # patch before wrt #517474
-   epatch "${FILESDIR}"/${P}-latex_hacks.patch
-
-   # fix out of source tests
-   epatch "${FILESDIR}"/${P}-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)"
-   append-cflags "$(java-pkg_get-jni-cflags)"
-   fi
-
-   use mono && export CSC="$(type -P gmcs)" 

[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2018-06-28 Thread Mikle Kolyada
commit: 10a6a579a3ffbec883ee517f37569fc550bdd46e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Jun 28 13:45:07 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Jun 28 13:55:25 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=10a6a579

media-libs/libcaca: mark s390 stable

Package-Manager: Portage-2.3.40, Repoman-2.3.9

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index b099168ad92..c57546e7c40 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ 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 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2017-06-16 Thread Alexis Ballier
commit: c21563bd2b670f01a5877dd1c93f5ac17ba703c8
Author: Alexis Ballier  gentoo  org>
AuthorDate: Fri Jun 16 10:25:07 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Fri Jun 16 10:25:07 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21563bd

media-libs/libcaca: keyword ~arm64

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index 589d14316c6..b099168ad92 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -15,7 +15,7 @@ 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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2017-01-15 Thread Jeroen Roovers
commit: 3b6fad92a8013db2eb61330f1c35975e9e935bef
Author: Jeroen Roovers  gentoo  org>
AuthorDate: Sun Jan 15 20:45:15 2017 +
Commit: Jeroen Roovers  gentoo  org>
CommitDate: Sun Jan 15 20:45:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b6fad92

media-libs/libcaca: Stable for HPPA (bug #596660).

Package-Manager: Portage-2.3.3, Repoman-2.3.1
RepoMan-Options: --ignore-arches

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index ae18146..62c2225 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -16,7 +16,7 @@ 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 ~hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd 
~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2016-12-20 Thread Tobias Klausmann
commit: 9fc0df821d27960fa21350adce6afabee51a849f
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Tue Dec 20 19:18:54 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Tue Dec 20 19:18:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fc0df82

media-libs/libcaca-0.99_beta19-r0: stable on amd64

Gentoo-Bug: 596660

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index 526ddd4..171933b 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -16,7 +16,7 @@ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2016-12-06 Thread Jason Zaman
commit: 5ab6db1760889cb1bf5da7893595dcb02f05c9f9
Author: Jason Zaman  gentoo  org>
AuthorDate: Wed Dec  7 06:09:31 2016 +
Commit: Jason Zaman  gentoo  org>
CommitDate: Wed Dec  7 06:09:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ab6db17

media-libs/libcaca: add ncurses subslot dep

Package-Manager: portage-2.3.0

 media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild | 4 ++--
 media-libs/libcaca/libcaca-0.99_beta19.ebuild| 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
index 8afe49a..29b5722 100644
--- a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -19,7 +19,7 @@ REQUIRED_USE="python? ( ${PYTHON_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[${MULTILIB_USEDEP}] )
+   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}]

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index 27aec2c..526ddd4 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -25,7 +25,7 @@ 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[${MULTILIB_USEDEP}] )
+   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}]



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2016-10-27 Thread Markus Meier
commit: f0a607e14257f622ef9dabe8eb59e8794bb11629
Author: Markus Meier  gentoo  org>
AuthorDate: Fri Oct 28 04:53:49 2016 +
Commit: Markus Meier  gentoo  org>
CommitDate: Fri Oct 28 04:53:49 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0a607e1

media-libs/libcaca: arm stable, bug #596660

Package-Manager: portage-2.3.2
RepoMan-Options: --include-arches="arm"

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index a212ae2..27aec2c 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -16,7 +16,7 @@ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )



[gentoo-commits] repo/gentoo:master commit in: media-libs/libcaca/

2016-10-16 Thread Tobias Klausmann
commit: 4b509761bf9777abb01c677b1058598f6e08a17e
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sun Oct 16 17:45:27 2016 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sun Oct 16 17:45:27 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b509761

media-libs/libcaca-0.99_beta19-r0: stable on alpha

Gentoo-Bug: 596660

 media-libs/libcaca/libcaca-0.99_beta19.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild 
b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index 5512164..a212ae2 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -16,7 +16,7 @@ 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 
~amd64-fbsd ~x86-fbsd"
 IUSE="cxx doc imlib java mono ncurses opengl python ruby slang static-libs 
test truetype X"
 REQUIRED_USE="
python? ( ${PYTHON_REQUIRED_USE} )