version bump; use ruby20 for ruby bindings, bug #483104; fix java bindings build...

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 7162efa06b18ab46d9cd6cdb10396e231ad52b8d..3462411cc9144ac898b15063f02c5c40bc1130f0 100644 (file)
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libcaca
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.127 2014/09/21 20:06:57 maekke Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.128 2015/03/18 15:41:26 aballier Exp $
+
+*libcaca-0.99_beta19 (18 Mar 2015)
+
+  18 Mar 2015; Alexis Ballier <aballier@gentoo.org>
+  +libcaca-0.99_beta19.ebuild:
+  version bump; use ruby20 for ruby bindings, bug #483104; fix java bindings
+  build, bug #508564; use mono-env.eclass, should fix bug #483372
 
   21 Sep 2014; Markus Meier <maekke@gentoo.org> libcaca-0.99_beta18-r2.ebuild:
   arm stable, bug #522270

diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 7b91eb11f25a41e9059819ce640a9dbce7f53510..3413d5c36ce69e5b861e87cb09329c3d8afc073c 100644 (file)
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -5,15 +5,17 @@ AUX libcaca-0.99_beta18-fix-tests.patch 1874 SHA256 4526b44c79e194d61fbb86957bdb
 AUX libcaca-0.99_beta18-latex_hacks.patch 641 SHA256 859186308ef3ceee830f6d37200c76f443523f02a546e0976063bfa742bd5f6c SHA512 66d878696ae237310cea20e3bd5802afce6fa94f66b07c1660456d17a33218a93e3aea6bcaf99bfada67bef6857089559aa48068a1761e7fe439a81d82a1ab6b WHIRLPOOL e19d7f278f57226d2a6a23a4cabee84db3557acadbc28c9736ededb96e3cbe0d73cf418017974aa8b76236207d854ec84260a3b383dec38d4c99d00be81ff937
 DIST libcaca-0.99.beta17.tar.gz 1110516 SHA256 6355ae9e3961e983ef66057a232d25f1fba2e7fa615d7591aba011d78764f1d6 SHA512 1d08a45a742cbda2c80810e753b49588cb9073ef545a1d47537745c4e62dc79748a25907903ffee58676d9aa5b75c5e0658666429cf028e10c09157d418c8d19 WHIRLPOOL bb241f90a36e2b73e2b50dcf15260153385ac2521bbe43a120c55ce5f2560ab9078ca40cf90a799646e6736461a876e33203abdd39f4ab794e6b509f8622b2d4
 DIST libcaca-0.99.beta18.tar.gz 1168552 SHA256 77ea06633f4a6022dccd4f76c1823e167a40cb05308fc1c7ea0fa1f80f6c33a1 SHA512 b2a8264ec36b74a01ff415a1fd7cb1806c76e28795b73607d4f8fa5ed5cc776b215f2817f45f06c672688f010622ee5c5e2f9dc4d0c43417dedbff545d575ca5 WHIRLPOOL 3e6404f0d16ca5718022a919c1568b0e8afaa40d58ca4a1e3271c437bebd3cde40ac63f45c6bbfea00a4936a673c24bdd21ecc0070f4814464d787dab33c183b
+DIST libcaca-0.99.beta19.tar.gz 1203495 SHA256 128b467c4ed03264c187405172a4e83049342cc8cc2f655f53a2d0ee9d3772f4 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15 WHIRLPOOL 5e0e72543aab79f39c063ab67396ec5e31610c4cffade8c33f5f54e75ccb2ced561da194d287d4857cb712b6cd813bc1430197cc101ca675a441b7ea74d44839
 EBUILD libcaca-0.99_beta17.ebuild 2650 SHA256 b2874ad822ccab2f25af40b987f18bbf88b16685025afa92923848ca242b87dd SHA512 1f1cf2887ab542cbf9590b7e2f869fbf4f5c8b7723e2c357b8c29c77be385a2553d02f4417608885f1b840bb2c1845a0158a46863fe3698105e5f37fe6daefde WHIRLPOOL 64f7b9fda46b5e8f4c1e425aa4e357557b50a359d1f169fe024cf8315c9eea93d2e31636fdbf8330ac35b72fae42202e59af4cc6527f68935d7218889e1ccf3e
 EBUILD libcaca-0.99_beta18-r1.ebuild 3238 SHA256 ab62162f3ee1f5ac083804a5711eb50849c928b09759d554c0b2af4ed5377784 SHA512 9591b98eea13391e3654c7e986f405ecaf39230e33761f0ca3efe4d953adda651f0aedaaa24a1e246d2945495912ad0f91d99a9323ca25a5a91b42d61987dd3a WHIRLPOOL 1ff3d383d9d91fa0e5f1b3d8d3a1ca40ec5f173fa2f7cf82278a2cdb8415e07f1c162556a971b019ec5bb2c258473a6d06e9b5e71f580b0f291699c1dbe34a74
 EBUILD libcaca-0.99_beta18-r2.ebuild 3891 SHA256 bac29f1f0b1764f5cf09178017ce86a859815581bc2ff173ede8224db30da2e0 SHA512 516f388b80ef051435b986f9d6a5cea97ee1f2d195050a9fd0b6808de0919fc855c14a1ae0efe0f79b9ef9407099a788f605da229182c4a4faa87c271e5eea2a WHIRLPOOL aa7240fefbe69f9dc61a812eff6d4db4abe67d8e60d29c8e90f503940b6865f4f1161c81decad1c674435fc572df0ba4c73e7bf103c7ace71cc0a289bcdc3830
-MISC ChangeLog 18610 SHA256 8e5e6817a94c4c0d69c1201af7c6bfd717c1cab66546ba55167ede873e5c0f74 SHA512 817642d89a98656ff315bf21cfc5903c883eedccff565d041e8395b9bf6af8ed4cbc77a07874b15195888475de9b7340704fdf7af9ed1b91a21a7490423fc8a5 WHIRLPOOL 8b74fe98ea8117dfe28bca038e667a534036688569e54ed24c22f7bc3c56df8782aac859fc5138bffd8584d2773ea8cfb79d0098b3579df99c64b8b010703d74
+EBUILD libcaca-0.99_beta19.ebuild 4225 SHA256 a634499287b8b76b1b42bdb60e82b31a6576e6b08dcbaf08b5bc35e044261209 SHA512 ede195f4c5af6d0135054db3998e8c4607364f622b6792de02b33268bebc1f2f19e14db17d9d7b15402ffc58733fbc0afa571d20ba68009a476f607d40f7502f WHIRLPOOL ba62f009836043040f2098a579a7b4301481557a69fb7ed65b66fdf3ecaf6c52c1f2d0027cd4a5ad12806c589abf2ab0786876b7ea917ac77b6cf097051ab436
+MISC ChangeLog 18875 SHA256 f6ee0975ccbf7d8baf5bf0882f64a075dabc9407869a1ee22d64dd865ab091f6 SHA512 6bdf1bc2c923967a562ee4dba70c446400b32a645bf36b9307bd690e46ed4c5cc3062cad85c7917280a8edc439548e3bc7a543bc4d96e39be3d0a89574f3a8ed WHIRLPOOL 17107bb87dcd62a53f96492866463c52ed00ca723b1eef295b8fcb2ff401d5b7ed8cc39bcade30c59596f2278621ec9c04e8c393bcbed0a479e79dde1d5bb3ea
 MISC metadata.xml 223 SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 SHA512 cacba929b8688a7270637f34d348216fdeb89e725cdee4b40e5577ca3f626c5f72e73c1c125605a284506aff47265f41e3fedaa76ed4074c540fc1f200e6d494 WHIRLPOOL dcd04d57abcfe2704036097ed68500917f74b7024b46580e9054e1c933d55678992c350fe07ff0efd590b9345fbcdd81665b8ce546f786dd31f5a0f4eb654da3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQfL+MACgkQkKaRLQcq0GK1HQCfdbbVVKNldsgJpq39PFpVBlab
-iqUAn3WuQ+hY99fjTHPgOVPf3KjcMhQ4
-=qfl1
+iEYEAREIAAYFAlUJnKcACgkQvFcC4BYPU0piXACfdM9Nd7TigyypWNsITveNCeJF
+gAQAoKRoAsM7huMM2nvb0kGIO2aEBOk4
+=R0oS
 -----END PGP SIGNATURE-----

diff --git a/media-libs/libcaca/libcaca-0.99_beta19.ebuild b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
new file mode 100644 (file)
index 0000000..3cee00c
--- /dev/null
+++ b/media-libs/libcaca/libcaca-0.99_beta19.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta19.ebuild,v 1.1 2015/03/18 15:41:26 aballier Exp $
+
+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 ~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} )
+       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[${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? (  $(ruby_implementations_depend) )
+       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
+       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
+
+       # 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) \
+                       $(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 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
+       prune_libtool_files --modules
+}