From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 63BAE138A1F for ; Thu, 24 Apr 2014 18:52:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6E5AFE09F2; Thu, 24 Apr 2014 18:52:40 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBCD0E09F2 for ; Thu, 24 Apr 2014 18:52:39 +0000 (UTC) Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BFC9C33FF8A for ; Thu, 24 Apr 2014 18:52:38 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 2322) id A20762004B; Thu, 24 Apr 2014 18:52:35 +0000 (UTC) From: "Julian Ospald (hasufell)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, hasufell@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: ChangeLog libcaca-0.99_beta18-r2.ebuild X-VCS-Repository: gentoo-x86 X-VCS-Files: ChangeLog libcaca-0.99_beta18-r2.ebuild X-VCS-Directories: media-libs/libcaca X-VCS-Committer: hasufell X-VCS-Committer-Name: Julian Ospald Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Message-Id: <20140424185235.A20762004B@flycatcher.gentoo.org> Date: Thu, 24 Apr 2014 18:52:35 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 67490a4c-78c7-4f7f-b808-61ea7fbbda63 X-Archives-Hash: ad0078fe11001cf8a7ab6b225fb433de hasufell 14/04/24 18:52:35 Modified: ChangeLog libcaca-0.99_beta18-r2.ebuild Log: convert to multilib-minimal instead and fix bug #508564 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key BDEED020) Revision Changes Path 1.114 media-libs/libcaca/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/ChangeLog?rev=1.114&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/ChangeLog?rev=1.114&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/ChangeLog?r1=1.113&r2=1.114 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v retrieving revision 1.113 retrieving revision 1.114 diff -u -r1.113 -r1.114 --- ChangeLog 19 Apr 2014 07:32:39 -0000 1.113 +++ ChangeLog 24 Apr 2014 18:52:35 -0000 1.114 @@ -1,6 +1,10 @@ # 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.113 2014/04/19 07:32:39 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.114 2014/04/24 18:52:35 hasufell Exp $ + + 24 Apr 2014; Julian Ospald + libcaca-0.99_beta18-r2.ebuild: + convert to multilib-minimal instead and fix bug #508564 19 Apr 2014; Patrick Lauer libcaca-0.99_beta18-r2.ebuild: Whitespace 1.3 media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild?r1=1.2&r2=1.3 Index: libcaca-0.99_beta18-r2.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- libcaca-0.99_beta18-r2.ebuild 19 Apr 2014 07:32:39 -0000 1.2 +++ libcaca-0.99_beta18-r2.ebuild 24 Apr 2014 18:52:35 -0000 1.3 @@ -1,10 +1,10 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.2 2014/04/19 07:32:39 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.3 2014/04/24 18:52:35 hasufell Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) -inherit autotools-multilib eutils flag-o-matic mono multilib java-pkg-opt-2 python-single-r1 +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" @@ -84,17 +84,6 @@ } multilib_src_configure() { - 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) - ) - if multilib_build_binaries; then if use java; then export JAVACFLAGS="$(java-pkg_javac-args)" @@ -103,45 +92,45 @@ use mono && export CSC="$(type -P gmcs)" #329651 export VARTEXFONTS="${T}/fonts" #44128 - - myeconfargs+=( - $(use_enable java) - $(use_enable ruby) - $(use_enable python) - $(use_enable mono csharp) - $(use_enable doc) - ) - else - myeconfargs+=( - --disable-java - --disable-ruby - --disable-python - --disable-csharp - --disable-doc - ) fi - autotools-utils_src_configure + 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) } -src_compile() { +multilib_src_compile() { local _java_makeopts use java && _java_makeopts="-j1" #480864 - autotools-multilib_src_compile ${_java_makeopts} + emake ${_java_makeopts} } multilib_src_test() { emake -j1 check } -src_install() { - autotools-multilib_src_install +multilib_src_install() { + emake DESTDIR="${D}" install - if use java; then + if multilib_build_binaries && 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 }