gentoo resync : 07.07.2018

3 files changed, 4 insertions, 140 deletions

diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index fd437736d7fe..166b06a5cf11 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -1,7 +1,5 @@
 AUX libcaca-0.99_beta18-fix-tests.patch 1874 BLAKE2B ff5537354ec12b336e6f0e9f35c41d973adc880656b8554b273ce92c3dce99491145e1398a8585bdb89b8f0054cd31c142f745f04dedeafa2cc6a2c445e05642 SHA512 1a10f0c4b006684471505b35bbe0369e6928c2dfc01e9d8c8ed706d9dc6890035c1fbf509e4a02c6030f0af382a982616c83128b92a2b5574a99e0963ae6b20f
 AUX libcaca-0.99_beta18-latex_hacks.patch 641 BLAKE2B ecaaed51bf3d8c7f75641da665bf8a4d25d2aab47de4bb0fe9e8ff40cacb628650a346074e2a57d220f7fa8a5c2063a8f16f65d52aad222dd81eba6269809e7e SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b
-DIST libcaca-0.99.beta18.tar.gz 1168552 BLAKE2B 6becacc8b6ae7f8b90eaadf9fe9682f3b35e986c8319907f6336e0b118adc7abc813f95c2ee6a6eac954dc3d8eb304389652489ba881e9004d1f7bfb79aba4cb SHA512 b2a8264ec36b74a01ff415a1fd7cb1806c76e28795b73607d4f8fa5ed5cc776b215f2817f45f06c672688f010622ee5c5e2f9dc4d0c43417dedbff545d575ca5
 DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
-EBUILD libcaca-0.99_beta18-r2.ebuild 3770 BLAKE2B 35e84791a49b95a5f1a07ad32c41ae83f934fe5063a7ef06cefd9b435b6c8713263b82aa9ce3312a6a389defdaa4a997db35df18d362cf580625db1baecbb842 SHA512 0146860a8f47f143c45f9f73d6dfd626be0be71e2a9264eac115e22a29605a4ad10fbbee38a610a75920f0228e8102ecdf0fd209b87c80c398a0f5f5a6925a89
-EBUILD libcaca-0.99_beta19.ebuild 4112 BLAKE2B 47ab2bca1e149e452c8dc775b91fe3c041827ff66fd41b3cf9ba9806b5dad490c247d568be9719f84c7a9dec0cbf51bafef25d098d8b354b560b9d5177c8814a SHA512 d498c32321fb268b4548b9da0cfdd2fba107d9005789a307d23644c51b60d97c9c04d820ffa3f04ea9dacd85145a7178a4c61f6fa55f3a32841cfbd48eeaad5f
+EBUILD libcaca-0.99_beta19.ebuild 4155 BLAKE2B 8d8a326339b40470582be15efc70c3bb268b8ceede79db11e60f74309ba9deb97b7150cc76a04eff8ef8a311e88a54d4d1a32dedda78ca0c41dc7cbf95446c24 SHA512 860872760bd33d95d3c82d82c9a4abc2bca010163b8e8c535a1c7644002fe0c3a7b35e7efcb64da24117b5da4a2388702fcd8298d31181d8d3b9c4c5efcb3e9f
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
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 131cf1d73ae2..000000000000
--- 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)" #329651
-		export VARTEXFONTS="${T}/fonts" #44128
-	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) \
-			$(multilib_native_use_enable 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 ${_java_makeopts}
-}
-
-multilib_src_test() {
-	emake -j1 check
-}
-
-multilib_src_install() {
-	emake 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
-	prune_libtool_files --modules
-}
diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
index c57546e7c401..95e1897cc71c 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