public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild
@ 2010-07-22 10:29 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-22 10:29 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/22 10:29:39

  Modified:             libcaca-0.99_beta17.ebuild
  Log:
  clean up
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.7                  media-libs/libcaca/libcaca-0.99_beta17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?r1=1.6&r2=1.7

Index: libcaca-0.99_beta17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libcaca-0.99_beta17.ebuild	22 Jul 2010 10:27:32 -0000	1.6
+++ libcaca-0.99_beta17.ebuild	22 Jul 2010 10:29:39 -0000	1.7
@@ -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.6 2010/07/22 10:27:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.7 2010/07/22 10:29:39 ssuominen Exp $
 
 EAPI=2
-inherit autotools flag-o-matic mono multilib java-pkg-opt-2
+inherit autotools mono multilib java-pkg-opt-2
 
 MY_P=${P/_/.}
 






^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild
@ 2010-07-22 10:48 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-22 10:48 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/22 10:48:55

  Modified:             libcaca-0.99_beta17.ebuild
  Log:
  arg, typo
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.8                  media-libs/libcaca/libcaca-0.99_beta17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?r1=1.7&r2=1.8

Index: libcaca-0.99_beta17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- libcaca-0.99_beta17.ebuild	22 Jul 2010 10:29:39 -0000	1.7
+++ libcaca-0.99_beta17.ebuild	22 Jul 2010 10:48:55 -0000	1.8
@@ -1,6 +1,6 @@
 # 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.7 2010/07/22 10:29:39 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.8 2010/07/22 10:48:55 ssuominen Exp $
 
 EAPI=2
 inherit autotools mono multilib java-pkg-opt-2
@@ -55,7 +55,7 @@
 }
 
 src_configure() {
-	use java export JAVACFLAGS="$(java-pkg_javac-args)"
+	use java && export JAVACFLAGS="$(java-pkg_javac-args)"
 
 	export VARTEXFONTS="${T}/fonts" #44128
 






^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild
@ 2010-07-22 10:27 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-22 10:27 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/22 10:27:32

  Modified:             libcaca-0.99_beta17.ebuild
  Log:
  even more java fixes, this time it should be good
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.6                  media-libs/libcaca/libcaca-0.99_beta17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?r1=1.5&r2=1.6

Index: libcaca-0.99_beta17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcaca-0.99_beta17.ebuild	22 Jul 2010 09:19:32 -0000	1.5
+++ libcaca-0.99_beta17.ebuild	22 Jul 2010 10:27:32 -0000	1.6
@@ -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 @@
 		-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_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_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
 }






^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild
@ 2010-07-22  9:19 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-22  9:19 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/22 09:19:32

  Modified:             libcaca-0.99_beta17.ebuild
  Log:
  missing use java conditional
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.5                  media-libs/libcaca/libcaca-0.99_beta17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?r1=1.4&r2=1.5

Index: libcaca-0.99_beta17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libcaca-0.99_beta17.ebuild	22 Jul 2010 09:14:59 -0000	1.4
+++ libcaca-0.99_beta17.ebuild	22 Jul 2010 09:19:32 -0000	1.5
@@ -1,6 +1,6 @@
 # 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.4 2010/07/22 09:14:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.5 2010/07/22 09:19:32 ssuominen Exp $
 
 EAPI=2
 inherit autotools mono multilib java-pkg-opt-2
@@ -52,7 +52,7 @@
 }
 
 src_configure() {
-	export JAVACFLAGS="$(java-pkg_javac-args)"
+	use java && export JAVACFLAGS="$(java-pkg_javac-args)"
 
 	export VARTEXFONTS="${T}/fonts" #44128
 






^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild
@ 2010-07-22  9:14 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-22  9:14 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/22 09:14:59

  Modified:             libcaca-0.99_beta17.ebuild
  Log:
  java fixes
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.4                  media-libs/libcaca/libcaca-0.99_beta17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?r1=1.3&r2=1.4

Index: libcaca-0.99_beta17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- libcaca-0.99_beta17.ebuild	22 Jul 2010 08:20:57 -0000	1.3
+++ libcaca-0.99_beta17.ebuild	22 Jul 2010 09:14:59 -0000	1.4
@@ -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.3 2010/07/22 08:20:57 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.4 2010/07/22 09:14:59 ssuominen Exp $
 
 EAPI=2
-inherit libtool mono multilib java-pkg-opt-2
+inherit autotools mono multilib java-pkg-opt-2
 
 MY_P=${P/_/.}
 
@@ -38,16 +38,22 @@
 src_prepare() {
 	sed -i \
 		-e 's:-g -O2 -fno-strength-reduce -fomit-frame-pointer::' \
-		configure || die
+		configure.ac || die
+
+	sed -i -e 's:$(JAVAC):$(JAVAC) $(JAVACFLAGS):' java/Makefile.am || die
 
 	if ! use truetype; then
-		sed -i -e '/PKG_CONFIG/s:ftgl:dIsAbLe&:' configure || die
+		sed -i -e '/PKG_CHECK_MODULES/s:ftgl:dIsAbLe&:' configure.ac || die
 	fi
 
-	elibtoolize
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
+	export JAVACFLAGS="$(java-pkg_javac-args)"
+
 	export VARTEXFONTS="${T}/fonts" #44128
 
 	econf \






^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild
@ 2010-07-22  8:20 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-22  8:20 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/22 08:20:57

  Modified:             libcaca-0.99_beta17.ebuild
  Log:
  punt .la files too, complainments go to /dev/null
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  media-libs/libcaca/libcaca-0.99_beta17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?r1=1.2&r2=1.3

Index: libcaca-0.99_beta17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- libcaca-0.99_beta17.ebuild	22 Jul 2010 08:12:48 -0000	1.2
+++ libcaca-0.99_beta17.ebuild	22 Jul 2010 08:20:57 -0000	1.3
@@ -1,6 +1,6 @@
 # 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.2 2010/07/22 08:12:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.3 2010/07/22 08:20:57 ssuominen Exp $
 
 EAPI=2
 inherit libtool mono multilib java-pkg-opt-2
@@ -68,4 +68,5 @@
 src_install() {
 	emake DESTDIR="${D}" install || die
 	dodoc AUTHORS ChangeLog NEWS NOTES README THANKS
+	find "${D}" -name '*.la' -delete
 }






^ permalink raw reply	[flat|nested] 7+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild
@ 2010-07-22  8:12 Samuli Suominen (ssuominen)
  0 siblings, 0 replies; 7+ messages in thread
From: Samuli Suominen (ssuominen) @ 2010-07-22  8:12 UTC (permalink / raw
  To: gentoo-commits

ssuominen    10/07/22 08:12:48

  Modified:             libcaca-0.99_beta17.ebuild
  Log:
  tidy up inherit
  (Portage version: 2.2_rc67/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  media-libs/libcaca/libcaca-0.99_beta17.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild?r1=1.1&r2=1.2

Index: libcaca-0.99_beta17.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libcaca-0.99_beta17.ebuild	22 Jul 2010 08:07:24 -0000	1.1
+++ libcaca-0.99_beta17.ebuild	22 Jul 2010 08:12:48 -0000	1.2
@@ -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.1 2010/07/22 08:07:24 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcaca/libcaca-0.99_beta17.ebuild,v 1.2 2010/07/22 08:12:48 ssuominen Exp $
 
 EAPI=2
-inherit eutils libtool mono java-pkg-opt-2
+inherit libtool mono multilib java-pkg-opt-2
 
 MY_P=${P/_/.}
 






^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2010-07-22 10:49 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-22 10:29 [gentoo-commits] gentoo-x86 commit in media-libs/libcaca: libcaca-0.99_beta17.ebuild Samuli Suominen (ssuominen)
  -- strict thread matches above, loose matches on Subject: below --
2010-07-22 10:48 Samuli Suominen (ssuominen)
2010-07-22 10:27 Samuli Suominen (ssuominen)
2010-07-22  9:19 Samuli Suominen (ssuominen)
2010-07-22  9:14 Samuli Suominen (ssuominen)
2010-07-22  8:20 Samuli Suominen (ssuominen)
2010-07-22  8:12 Samuli Suominen (ssuominen)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox