gentoo resync : 20.06.2021

4 files changed, 3 insertions, 327 deletions

diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 6020fee2612a..ca521aa14de0 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -8,7 +8,5 @@ AUX fix-css-path.patch 502 BLAKE2B c494c458524f98017dceb41266ed051cb3bc9f00c5718
 AUX libcaca-0.99_beta18-fix-tests.patch 1886 BLAKE2B 8961c617ae568ab19b0404a8ddb1e4da743f7792b36fd32ace460071c04754f8e5845200333f96e4b9602f547d3249da301c3df62cee7bb20235da6a3242789f SHA512 583b440f93d2d468b14a707946eda928811b8c6573b1a48a1f6010d2f3713399689434531b0068ebbc1999dc82867c7ae6da0bdea9fb754277eda484fe39b1f6
 AUX libcaca-0.99_beta18-latex_hacks.patch 645 BLAKE2B 8b72799bdb19accf044c590a144ec7330532aebb7faa3076b12cc49ca82e8e127126b7d1ec8930d0a0871476e4f7632c6ebb6d10ae36146a3006040be72157d6 SHA512 9c1fc4aba3eecf94f47f296ebf11441de60ddf7a335c11bae4da4aa04e5cbbddd07d8cacf40b2b0aaf96312923c24cc0f1a3f031284cac13e8dd9c29ce36aa18
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta19-r1.ebuild 4017 BLAKE2B 09e3b339beb9a45a816779ce2b0394601b4bd687e6606bbe70ce09dcf0d91e8b82388909f657cb3de11ec4210bd06cd7bee5fe6379cae83ea023a49d38b5f84d SHA512 5c5356db2d1e3d4e0cd083d29be5261698677989c59941b1b632ce2164a23a829bcd249e4178e33589dd81ba40447b0b9fce1125cceb6bca4109cd0257c73038
-EBUILD libcaca-0.99_beta19-r3.ebuild 4162 BLAKE2B 721115dcd52859816b62ad09c2ca11e0083154fabd5cf5298b9f1ca28f908e64fb8521c5f507ef9995a8a84b3cbdaa28573b3bce777ef2ef20d5eb40c07d14fc SHA512 b2a5edc036c7b92b75a9bef4a7007ad71afb24d068adc405b11e70076a35b3bba3a0993bee9b1ed2627284c7df59aeb6e373faeca17969738aa73f57b594574f
-EBUILD libcaca-0.99_beta19-r4.ebuild 4489 BLAKE2B 59bc7b32f8ace89d2a36c302bb77ec25977262a3f590d8935bf822830e554840a5808785949054796234fec56bc29875c870031ecb477ea6190fc81ba95a8c71 SHA512 e33a1880f941d63668e4cb7546cd362e3193e3045f41ea6de5c47213ebc6d3946631cec2306ff993d30883e50113724a0763f48ff746d004f7927b8f2c0b7a17
+EBUILD libcaca-0.99_beta19-r7.ebuild 4480 BLAKE2B 111efd3fba0668074f78a2346d84e16e1df15990dfa10e2ee99fc253aca4c4d6ed11ff1eb8c506b80c535e7150672a41668f7c6211d17bb2f1a7118bef7c6f03 SHA512 8f4988bce594b728b31d0e283844213dcb1c7a154de4ee180d3d2d1acd7a77c965a5f0ecebc0d15f1dd5b39d91d2c43c558a5ed538e7c4f924445c19e515684f
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
deleted file mode 100644
index a7e21adb2add..000000000000
--- a/media-libs/libcaca/libcaca-0.99_beta19-r1.ebuild
+++ /dev/null
@@ -1,149 +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="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
-RESTRICT="!test? ( test )"
-REQUIRED_USE=""
-#	ruby? ( ruby_targets_${USE_RUBY} )
-
-COMMON_DEPEND="imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
-	X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )"
-#	ruby? (  $(ruby_implementations_depend) )
-RDEPEND="${COMMON_DEPEND}
-	java? ( >=virtual/jre-1.5 )"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		>=dev-texlive/texlive-fontsrecommended-2012
-		>=dev-texlive/texlive-latexextra-2012
-		dev-texlive/texlive-latexrecommended
-	)
-	java? ( >=virtual/jdk-1.5 )
-	test? ( dev-util/cppunit )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use mono && mono-env_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die #339962
-
-	sed -i \
-		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.ac || die
-
-	sed -i \
-		-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
-		-e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
-		java/Makefile.am || die
-
-	if ! use truetype; then
-		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
-	fi
-
-	if use imlib && ! use X; then
-		append-cflags -DX_DISPLAY_MISSING
-	fi
-
-	# bug 653400
-	append-cxxflags -std=c++11
-
-	# Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this
-	# patch before wrt #517474
-	epatch "${FILESDIR}"/${PN}-0.99_beta18-latex_hacks.patch
-
-	# fix out of source tests
-	epatch "${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
-
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-
-		use mono && export CSC="$(type -P gmcs)" #329651
-		export VARTEXFONTS="${T}/fonts" #44128
-		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
-	fi
-
-	ECONF_SOURCE="${S}" \
-		econf \
-			$(use_enable static-libs static) \
-			$(use_enable slang) \
-			$(use_enable ncurses) \
-			$(use_enable X x11) $(use_with X x) --x-libraries=/usr/$(get_libdir) \
-			$(use_enable opengl gl) \
-			$(use_enable cxx) \
-			$(use_enable imlib imlib2) \
-			$(use_enable test cppunit) \
-			$(multilib_native_use_enable java) \
-			$(multilib_native_use_enable ruby) \
-			--disable-python \
-			$(multilib_native_use_enable mono csharp) \
-			$(multilib_native_use_enable doc)
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-	use java && _java_makeopts="-j1" #480864
-	emake V=1 ${_java_makeopts}
-}
-
-multilib_src_test() {
-	emake V=1 -j1 check
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/libjava.jar
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	rm -rf "${D}"/usr/share/java
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
deleted file mode 100644
index 9e2445342374..000000000000
--- a/media-libs/libcaca/libcaca-0.99_beta19-r3.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-RUBY_OPTIONAL=yes
-#USE_RUBY=ruby20
-
-inherit autotools ruby-ng flag-o-matic java-pkg-opt-2 mono-env toolchain-funcs multilib-minimal
-
-MY_P=${P/_/.}
-DESCRIPTION="A library that creates colored ASCII-art graphics"
-HOMEPAGE="http://libcaca.zoy.org/"
-SRC_URI="http://libcaca.zoy.org/files/${PN}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
-RESTRICT="!test? ( test )"
-
-# ruby? ( ruby_targets_${USE_RUBY} )
-REQUIRED_USE=""
-
-# ruby? (  $(ruby_implementations_depend) )
-DEPEND="
-	imlib? ( >=media-libs/imlib2-1.4.6-r2[${MULTILIB_USEDEP}] )
-	mono? ( dev-lang/mono )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	opengl? (
-		>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
-		>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
-		>=media-libs/freeglut-2.8.1[${MULTILIB_USEDEP}]
-		truetype? ( >=media-libs/ftgl-2.1.3_rc5 )
-	)
-	slang? ( >=sys-libs/slang-2.2.4-r1[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
-	)
-"
-RDEPEND="java? ( >=virtual/jre-1.5 )"
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		virtual/latex-base
-		>=dev-texlive/texlive-fontsrecommended-2012
-		>=dev-texlive/texlive-latexextra-2012
-		dev-texlive/texlive-latexrecommended
-	)
-	java? ( >=virtual/jdk-1.5 )
-	test? ( dev-util/cppunit )
-"
-
-DOCS=( AUTHORS ChangeLog NEWS NOTES README THANKS )
-
-PATCHES=(
-	# Removed 'has_version '>=dev-texlive/texlive-latex-2013' &&' that prefixed this
-	# patch before wrt #517474
-	"${FILESDIR}"/${PN}-0.99_beta18-latex_hacks.patch
-	# Fix out of source tests
-	"${FILESDIR}"/${PN}-0.99_beta18-fix-tests.patch
-)
-
-pkg_setup() {
-	java-pkg-opt-2_pkg_setup
-	use mono && mono-env_pkg_setup
-}
-
-src_unpack() {
-	default
-}
-
-src_prepare() {
-	# bug #339962
-	sed -i -e '/doxygen_tests = check-doxygen/d' test/Makefile.am || die
-
-	sed -i \
-		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
-		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \
-		configure.ac || die
-
-	sed -i \
-		-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
-		-e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
-		java/Makefile.am || die
-
-	if ! use truetype; then
-		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
-	fi
-
-	if use imlib && ! use X; then
-		append-cflags -DX_DISPLAY_MISSING
-	fi
-
-	# bug #653400
-	append-cxxflags -std=c++11
-
-	# bug #601902
-	append-libs "$($(tc-getPKG_CONFIG) --libs ncurses)"
-
-	default
-	eautoreconf
-
-	java-pkg-opt-2_src_prepare
-}
-
-multilib_src_configure() {
-	if multilib_is_native_abi; then
-		if use java; then
-			export JAVACFLAGS="$(java-pkg_javac-args)"
-			export JAVA_CFLAGS="$(java-pkg_get-jni-cflags)"
-		fi
-
-		# bug #44128
-		export VARTEXFONTS="${T}/fonts"
-
-		# bug #329651
-		use mono && export CSC="$(type -P gmcs)"
-		use ruby && use ruby_targets_${USE_RUBY} && export RUBY=$(ruby_implementation_command ${USE_RUBY})
-	fi
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable slang)
-		$(use_enable ncurses)
-		$(use_enable X x11)
-		$(use_with X x)
-		--x-libraries=/usr/$(get_libdir)
-		$(use_enable opengl gl)
-		$(use_enable cxx)
-		$(use_enable imlib imlib2)
-		$(use_enable test cppunit)
-		$(multilib_native_use_enable java)
-		$(multilib_native_use_enable ruby)
-		--disable-python
-		$(multilib_native_use_enable mono csharp)
-		$(multilib_native_use_enable doc)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_compile() {
-	local _java_makeopts
-
-	# bug #480864
-	use java && _java_makeopts="-j1"
-	emake V=1 ${_java_makeopts}
-}
-
-multilib_src_test() {
-	emake V=1 -j1 check
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install
-
-	# Note: broken, see bug #508564 and bug #773913
-	if multilib_is_native_abi && use java; then
-		java-pkg_newjar java/libjava.jar
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	rm -rf "${ED}"/usr/share/java || die
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r7.ebuild
index f0eece5142c7..bc7b204dd360 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)