diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-07-22 10:27:32 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-07-22 10:27:32 +0000 |
| commit | d9a3b88e1c0027fad54a6ef816588a44bb3e2d12 (patch) | |
| tree | 97836b4c38a6a1f4bbf3a8b4f9c58bff27d57fcb /media-libs/libcaca | |
| parent | missing use java conditional (diff) | |
| download | historical-d9a3b88e1c0027fad54a6ef816588a44bb3e2d12.tar.gz historical-d9a3b88e1c0027fad54a6ef816588a44bb3e2d12.tar.bz2 historical-d9a3b88e1c0027fad54a6ef816588a44bb3e2d12.zip | |
even more java fixes, this time it should be good
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64
Diffstat (limited to 'media-libs/libcaca')
| -rw-r--r-- | media-libs/libcaca/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/libcaca/libcaca-0.99_beta17.ebuild | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest index 46c7a59da320..08ea0696f32b 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 2147 RMD160 97141e70bb1b5cae81a601606ba8d50e11cc7e5b SHA1 3a47c59eb5893e74b12cf288f80f562e68260b30 SHA256 0beebda5fc8ad0d91401682efb72a8e49a025ac98f587bbafc28d4b1e2b298d4 +EBUILD libcaca-0.99_beta17.ebuild 2332 RMD160 950002fbe69d3c246127e27d37e351b19005f5a9 SHA1 dcca3518f0e25b3f87b2e206250df68e6d11242d SHA256 d3ae7e3fa8a378c483cdb65112057c33bebf463e3c2af1c449341bdf68eb20cc MISC ChangeLog 12211 RMD160 dfc6fd032d7e66b0a542aa08312000f21d9ebe56 SHA1 a95cd999cfd26fbdaeadd0b2ac12251b68693ea5 SHA256 8393bae8bfb764c32be9759386162b86c5cb2b8e1e58eca557bf6f7b7818b76a 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 2bd8d54d4c94..3a8e8e323e6a 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.5 2010/07/22 09:19:32 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.6 2010/07/22 10:27:32 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/_/.} @@ -40,7 +40,10 @@ src_prepare() { -e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \ configure.ac || die - sed -i -e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' java/Makefile.am || die + sed -i \ + -e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \ + -e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I../caca:' \ + java/Makefile.am || die if ! use truetype; then sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die @@ -52,7 +55,7 @@ src_prepare() { } src_configure() { - use java && export JAVACFLAGS="$(java-pkg_javac-args)" + use java export JAVACFLAGS="$(java-pkg_javac-args)" export VARTEXFONTS="${T}/fonts" #44128 @@ -74,5 +77,11 @@ src_configure() { src_install() { emake DESTDIR="${D}" install || die dodoc AUTHORS ChangeLog NEWS NOTES README THANKS + + if use java; then + rm -rf "${D}"/usr/share/java + java-pkg_newjar java/libjava.jar + fi + find "${D}" -name '*.la' -delete } |