summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <mgorny@gentoo.org>2014-07-06 09:58:21 +0000
committerMichał Górny <mgorny@gentoo.org>2014-07-06 09:58:21 +0000
commitbbf4f72e415133d6dadd92151a92b51fb6cf3a0a (patch)
tree23c875144869222fe080df4bf905d8b264ce7a98 /media-libs/libcaca
parentRevision bump for added provider (diff)
downloadgentoo-2-bbf4f72e415133d6dadd92151a92b51fb6cf3a0a.tar.gz
gentoo-2-bbf4f72e415133d6dadd92151a92b51fb6cf3a0a.tar.bz2
gentoo-2-bbf4f72e415133d6dadd92151a92b51fb6cf3a0a.zip
Fix the -I sed for java Makefile, bug #515812.
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key EFB4464E!)
Diffstat (limited to 'media-libs/libcaca')
-rw-r--r--media-libs/libcaca/ChangeLog5
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/media-libs/libcaca/ChangeLog b/media-libs/libcaca/ChangeLog
index 468caf649784..f51ca74cb911 100644
--- a/media-libs/libcaca/ChangeLog
+++ b/media-libs/libcaca/ChangeLog
@@ -1,6 +1,9 @@
# 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.116 2014/06/18 19:40:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/ChangeLog,v 1.117 2014/07/06 09:58:21 mgorny Exp $
+
+ 06 Jul 2014; Michał Górny <mgorny@gentoo.org> libcaca-0.99_beta18-r2.ebuild:
+ Fix the -I sed for java Makefile, bug #515812.
18 Jun 2014; Michał Górny <mgorny@gentoo.org> libcaca-0.99_beta18-r2.ebuild:
Update dependencies to require guaranteed EAPI=5 or multilib ebuilds, bug
diff --git a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
index 7c8d1003ecd1..cc021d042866 100644
--- a/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild
@@ -1,6 +1,6 @@
# 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.5 2014/06/18 19:40:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta18-r2.ebuild,v 1.6 2014/07/06 09:58:21 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} )
@@ -62,7 +62,7 @@ src_prepare() {
sed -i \
-e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' \
- -e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I../caca:' \
+ -e 's:libcaca_java_la_CPPFLAGS =:libcaca_java_la_CPPFLAGS = -I$(top_srcdir)/caca:' \
java/Makefile.am || die
if ! use truetype; then