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 | 253cff56bedd50cd2b12d0d9cf602e53944303a8 (patch) | |
tree | 151ecb469f2ed47e2486e41dad870fc6c278837f /media-libs/libcaca | |
parent | cleanup stale builds (diff) | |
download | historical-253cff56bedd50cd2b12d0d9cf602e53944303a8.tar.gz historical-253cff56bedd50cd2b12d0d9cf602e53944303a8.tar.bz2 historical-253cff56bedd50cd2b12d0d9cf602e53944303a8.zip |
Use java-pkg_get-jni-cflags to get jni.h location wrt #329783, thanks to Petr Gregor and Petteri Räty.
Package-Manager: portage-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/Manifest | 4 | ||||
-rw-r--r-- | media-libs/libcaca/libcaca-0.99_beta17.ebuild | 19 |
3 files changed, 20 insertions, 10 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/Manifest b/media-libs/libcaca/Manifest index 07dbba6c8f67..dd334de884d7 100644 --- a/media-libs/libcaca/Manifest +++ b/media-libs/libcaca/Manifest @@ -4,6 +4,6 @@ DIST libcaca-0.99.beta16.tar.gz 966593 RMD160 fdfc9ab7edb2144f1b78620486d897d72c DIST libcaca-0.99.beta17.tar.gz 1110516 RMD160 86a4d86ced5a9fcf0eddfbd4f86268a68d49bca9 SHA1 24cdb9fb7dc4a01be2787a9009304fad419f79db SHA256 6355ae9e3961e983ef66057a232d25f1fba2e7fa615d7591aba011d78764f1d6 EBUILD libcaca-0.99_beta16-r1.ebuild 1791 RMD160 51437666c35fdc1a33168b8d9597b7fd84c628c1 SHA1 c5ff8597d446d9e4ab62f636dae54a19f8b5cece SHA256 f02c1d14e9d0b18d397c0692086e10cb4971aee7d641583f5fc24766a5a992a0 EBUILD libcaca-0.99_beta16.ebuild 1779 RMD160 60efc546d5704d8033cd1052faed7a28fbd6204e SHA1 f47d84be5dce6a42a83eca003f5402eb1b9a72b2 SHA256 9999eec659da9c06fdecba2e6bf332dc1a55c71965b2619e06542a431ba16606 -EBUILD libcaca-0.99_beta17.ebuild 2364 RMD160 ba98bf0f830c496270ccb7f219d3302dcf18319c SHA1 19bb6f8502110c3ee2338ef66881b9743eab9b60 SHA256 0678b6070a0d12728ff4e7894741f2d8f53741cc6b9cfff2508eb6e36f627050 -MISC ChangeLog 12472 RMD160 46f19131733788cd46d80b150ebef17bf18a89fc SHA1 3ccd403d353044e66fbfa949383badad7d410078 SHA256 2cb545bec726f458c8a5867a74e5bad4aed6b1535303dec1604f2b9f4336efa3 +EBUILD libcaca-0.99_beta17.ebuild 2473 RMD160 9a0189cf803c3c633485c210286aafc6a7d8972f SHA1 4a57c05d65b73e5bd178c090380c5a99f112cbde SHA256 633f679963ef16971aa4de11c51520e42d454f091b425ce1df42f250a8b794bb +MISC ChangeLog 12665 RMD160 e41d6488e8186e0f062e80f7d7f3ea90776750cb SHA1 79070e4d384d5f2e0cbc4be2e9dfe47d4bb6fa49 SHA256 de3fd3154b3f82336e6069171f6ba55a6e9dde3230b0bc1a67a2283ddb2118d9 MISC metadata.xml 223 RMD160 86b42c49b694db39ddb3fdc60b98a3ad1a0c3392 SHA1 ea8c387229caaf4b0d3c9fbef9143b70dcae0b0d SHA256 dd48e823ec9a151bc3611121402ed26ee24eb3304aa62870b1e875a8fa0ac812 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 } |