diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-25 16:26:09 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-25 16:26:09 +0000 |
| commit | 2859e7dc9f6d017f75826810bf32a978758b5b3d (patch) | |
| tree | b02242dcea4dd4d3d08e414597a440bc1b4c3418 /media-libs/libcaca | |
| parent | cleanup stale builds (diff) | |
| download | gentoo-2-2859e7dc9f6d017f75826810bf32a978758b5b3d.tar.gz gentoo-2-2859e7dc9f6d017f75826810bf32a978758b5b3d.tar.bz2 gentoo-2-2859e7dc9f6d017f75826810bf32a978758b5b3d.zip | |
Use java-pkg_get-jni-cflags to get jni.h location wrt #329783, thanks to Petr Gregor and Petteri Räty.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/libcaca')
| -rw-r--r-- | media-libs/libcaca/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/libcaca/libcaca-0.99_beta17.ebuild | 19 |
2 files changed, 18 insertions, 8 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog index 67d069f83d83..51e833240e50 100644 --- a/media-libs/libcaca/ChangeLog +++ b/media-libs/libcaca/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libcaca # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.85 2010/07/24 08:14:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.86 2010/07/25 16:26:09 ssuominen Exp $ + + 25 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> + libcaca-0.99_beta17.ebuild: + Use java-pkg_get-jni-cflags to get jni.h location wrt #329783, thanks to + Petr Gregor and Petteri Räty. 24 Jul 2010; Samuli Suominen <ssuominen@gentoo.org> libcaca-0.99_beta17.ebuild: diff --git a/media-libs/libcaca/libcaca-0.99_beta17.ebuild b/media-libs/libcaca/libcaca-0.99_beta17.ebuild index e860b537141c..1cf8e1723a37 100644 --- a/media-libs/libcaca/libcaca-0.99_beta17.ebuild +++ b/media-libs/libcaca/libcaca-0.99_beta17.ebuild @@ -1,9 +1,9 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.10 2010/07/24 08:14:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.11 2010/07/25 16:26:09 ssuominen Exp $ EAPI=2 -inherit autotools mono multilib java-pkg-opt-2 +inherit autotools flag-o-matic mono multilib java-pkg-opt-2 MY_P=${P/_/.} @@ -16,8 +16,7 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs truetype X" -RDEPEND="imlib? ( media-libs/imlib2 ) - java? ( >=virtual/jre-1.5 ) +COMMON_DEPEND="imlib? ( media-libs/imlib2 ) mono? ( dev-lang/mono ) ncurses? ( >=sys-libs/ncurses-5.3 ) opengl? ( virtual/opengl @@ -26,7 +25,9 @@ RDEPEND="imlib? ( media-libs/imlib2 ) ruby? ( virtual/ruby ) slang? ( >=sys-libs/slang-2 ) X? ( x11-libs/libX11 x11-libs/libXt )" -DEPEND="${RDEPEND} +RDEPEND="${COMMON_DEPEND} + java? ( >=virtual/jre-1.5 )" +DEPEND="${COMMON_DEPEND} dev-util/pkgconfig doc? ( app-doc/doxygen virtual/latex-base @@ -55,7 +56,11 @@ src_prepare() { } src_configure() { - use java && export JAVACFLAGS="$(java-pkg_javac-args)" + if use java; then + export JAVACFLAGS="$(java-pkg_javac-args)" + append-cflags "$(java-pkg_get-jni-cflags)" + fi + use mono && export CSC=gmcs #329651 export VARTEXFONTS="${T}/fonts" #44128 @@ -79,9 +84,9 @@ src_install() { dodoc AUTHORS ChangeLog NEWS NOTES README THANKS if use java; then - rm -rf "${D}"/usr/share/java java-pkg_newjar java/libjava.jar fi + rm -rf "${D}"/usr/share/java find "${D}" -name '*.la' -delete } |