diff options
| -rw-r--r-- | media-libs/SoGtk/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/SoGtk/SoGtk-20010601-r1.ebuild | 4 | ||||
| -rw-r--r-- | media-libs/libgd/ChangeLog | 5 | ||||
| -rw-r--r-- | media-libs/libgd/libgd-1.8.4-r2.ebuild | 6 | ||||
| -rw-r--r-- | media-libs/mesa/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-3.5.ebuild | 100 | ||||
| -rw-r--r-- | media-libs/t1lib/ChangeLog | 3 | ||||
| -rw-r--r-- | media-libs/t1lib/t1lib-5.0.0-r2.ebuild | 4 |
8 files changed, 66 insertions, 70 deletions
diff --git a/media-libs/SoGtk/ChangeLog b/media-libs/SoGtk/ChangeLog index 2bf5dabd2dad..df64cfa79e05 100644 --- a/media-libs/SoGtk/ChangeLog +++ b/media-libs/SoGtk/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/SoGtk -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/ChangeLog,v 1.7 2003/04/23 00:15:05 lostlogic Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/ChangeLog,v 1.8 2004/06/07 22:43:11 agriffis Exp $ + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> SoGtk-20010601-r1.ebuild: + Fix use invocation 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords diff --git a/media-libs/SoGtk/SoGtk-20010601-r1.ebuild b/media-libs/SoGtk/SoGtk-20010601-r1.ebuild index bec10fb16819..09c740369749 100644 --- a/media-libs/SoGtk/SoGtk-20010601-r1.ebuild +++ b/media-libs/SoGtk/SoGtk-20010601-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601-r1.ebuild,v 1.16 2004/03/19 07:56:03 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601-r1.ebuild,v 1.17 2004/06/07 22:43:11 agriffis Exp $ IUSE="nls doc" @@ -26,7 +26,7 @@ src_compile() { local myconf - if [ -z "`use nls`" ] + if ! use nls then myconf="${myconf} --disable-nls" touch intl/libgettext.h diff --git a/media-libs/libgd/ChangeLog b/media-libs/libgd/ChangeLog index 981937f1e980..ad9ef8841eab 100644 --- a/media-libs/libgd/ChangeLog +++ b/media-libs/libgd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/libgd # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.45 2004/05/12 03:07:33 randy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/ChangeLog,v 1.46 2004/06/07 22:43:59 agriffis Exp $ + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> libgd-1.8.4-r2.ebuild: + Fix use invocation 11 May 2004; Michael McCabe <randy@gentoo.org> libgd-2.0.23.ebuild: Added s390 keywords diff --git a/media-libs/libgd/libgd-1.8.4-r2.ebuild b/media-libs/libgd/libgd-1.8.4-r2.ebuild index 1075955bbb36..70dd73c13a5e 100644 --- a/media-libs/libgd/libgd-1.8.4-r2.ebuild +++ b/media-libs/libgd/libgd-1.8.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4-r2.ebuild,v 1.11 2004/05/16 08:52:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libgd/libgd-1.8.4-r2.ebuild,v 1.12 2004/06/07 22:43:59 agriffis Exp $ inherit eutils gcc @@ -46,11 +46,11 @@ src_unpack() { compopts="${compopts} -DHAVE_LIBPNG" libsopts="${libsopts} -lpng" - if [ `use freetype-version-1` ] ; then + if use freetype-version-1 ; then compopts="${compopts} -DHAVE_LIBTTF" libsopts="${libsopts} -lttf" incopts="-I/usr/include/freetype" - elif [ `use truetype` ] ; then + elif use truetype ; then compopts="${compopts} -DHAVE_LIBFREETYPE" libsopts="${libsopts} -lfreetype" incopts="-I/usr/include/freetype2" diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 4cf240dc409e..e0adb6964e23 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-libs/mesa -# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.6 2003/11/25 03:44:27 agriffis Exp $ +# Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.7 2004/06/07 22:42:53 agriffis Exp $ + + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> mesa-3.5.ebuild: + Fix use invocation 24 Nov 2003; Aron Griffis <agriffis@gentoo.org> mesa-3.5.ebuild: Add ~alpha diff --git a/media-libs/mesa/mesa-3.5.ebuild b/media-libs/mesa/mesa-3.5.ebuild index 1d9b551dbb13..02fe6da9c2a7 100644 --- a/media-libs/mesa/mesa-3.5.ebuild +++ b/media-libs/mesa/mesa-3.5.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.5.ebuild,v 1.11 2004/03/19 07:56:04 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-3.5.ebuild,v 1.12 2004/06/07 22:42:53 agriffis Exp $ IUSE="mmx fbcon sse X svga ggi 3dnow" @@ -13,10 +13,10 @@ HOMEPAGE="http://mesa3d.sourceforge.net/" DEPEND="X? ( virtual/x11 ) ggi? ( >=media-libs/libggi-2.0_beta3 ) - svga? ( >=media-libs/svgalib-1.4.2-r1 )" + svga? ( >=media-libs/svgalib-1.4.2-r1 ) + >=sys-apps/sed-4" -if [ "`use X`" ] -then +if use X; then PROVIDE="virtual/opengl virtual/glu virtual/glut" else PROVIDE="virtual/opengl" @@ -27,82 +27,65 @@ LICENSE="LGPL-2" KEYWORDS="x86 sparc ~alpha" src_compile() { - local myconf + local myconf=" + $(use_enable mmx) \ + $(use_enable 3dnow) \ + $(use_enable sse) \ + $(use_with svga)" - use mmx \ - && myconf="--enable-mmx" \ - || myconf="--disable-mmx" - - use 3dnow \ - && myconf="${myconf} --enable-3dnow" \ - || myconf="${myconf} --disable-3dnow" - - use sse \ - && myconf="${myconf} --enable-sse" \ - || myconf="${myconf} --disable-sse" - - use X && ( \ - myconf="${myconf} --with-x --without-glut" + if use X ; then # --without-glut means that mesa is forced to use and install - # his own version of glut. - ) || ( \ + # its own version of glut + myconf="${myconf} --with-x --without-glut" + else myconf="${myconf} --without-x" rm -rf src-glut - ) - - ( use ggi && use fbcon ) \ - || myconf="${myconf} --disable-ggi-fbdev --without-ggi" + fi - use svga || myconf="${myconf} --without-svga" + if ! use ggi || ! use fbcon; then + myconf="${myconf} --disable-ggi-fbdev --without-ggi" + fi - cp configure configure.orig - sed -e "s:^ggi_confdir.*:ggi_confdir=/etc/ggi:" \ - -e "s:^ggi_libdir.*:ggi_libdir=\$prefix/lib:" \ - configure.orig > configure + sed -i -e 's:^ggi_confdir.*:ggi_confdir=/etc/ggi:' \ + -e 's:^ggi_libdir.*:ggi_libdir=$prefix/lib:' configure \ + || die "sed failed" econf \ --sysconfdir=/etc/mesa \ ${myconf} || die - ( use ggi && use fbcon ) && ( \ - cd ${S}/src/GGI - cp Makefile Makefile.orig - sed -e "s:^ggimesaconfdatadir.*:ggimesaconfdatadir = \${ggi_confdir}:" \ - Makefile.orig > Makefile - - cd ${S}/src/GGI/default - cp stubs.c stubs.c.orig - sed -e "s:Texture.Enabled:Texture.ReallyEnabled:" stubs.c.orig > stubs.c - - cd ${S}/src/GGI/include/ggi/mesa - cp display_fbdev.h display_fbdev.h.orig - sed -e "s:fbdev_hook:ggi_fbdev_priv:" display_fbdev.h.orig > display_fbdev.h + if use ggi && use fbcon; then + sed -i -e 's:^ggimesaconfdatadir.*:ggimesaconfdatadir = ${ggi_confdir}:' \ + ${S}/src/GGI/Makefile \ + || die "sed Makefile failed" + sed -i -e 's:Texture.Enabled:Texture.ReallyEnabled:' \ + ${S}/src/GGI/default/stubs.c \ + || die "sed stubs.c failed" + sed -i -e 's:fbdev_hook:ggi_fbdev_priv:' \ + ${S}/src/GGI/include/ggi/mesa/display_fbdev.h \ + || die "sed display_fbdev.h failed" cd ${S} mkdir gg ln -s /usr/lib/libgg*.so . - ) + fi - emake || die + emake || die "emake failed" - use ggi && ( \ - cd ${S}/ggi/ggiglut - make \ + if use ggi; then + make -C ${S}/ggi/ggiglut \ libglut_la_LIBADD="-lggi -lgg -L${S}/src/.libs -lGL" || die - ) + fi } -src_install () { - use ggi && ( \ +src_install() { + if use ggi; then cd ggi/ggiglut make DESTDIR=${D} install || die - cd ${D}/usr/lib - cp libglut.la libglut.orig - sed -e "s:-L${S}/src/.libs::g" libglut.orig > libglut.la - rm libglut.orig - ) + sed -i -e "s:-L${S}/src/.libs::g" ${D}/usr/lib/libglut.la \ + || die "sed libglut.la failed" + fi - cd ${S} make DESTDIR=${D} install || die cd ${D}/usr/lib if [ "$PN" = "mesa-glu" ] @@ -118,6 +101,7 @@ src_install () { cd ${S} dodoc docs/* - #we no longer install demos since they seem to be linked + + # we no longer install demos since they seem to be linked # for built-time testing only. } diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog index 7c85e3f9f298..6bbb7ad9ee99 100644 --- a/media-libs/t1lib/ChangeLog +++ b/media-libs/t1lib/ChangeLog @@ -2,6 +2,9 @@ # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2 # /space/gentoo/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.2 2002/04/16 01:14:04 seemant Exp + 07 Jun 2004; Aron Griffis <agriffis@gentoo.org> t1lib-5.0.0-r2.ebuild: + Fix use invocation + 11 May 2004; Michael McCabe <randy@gentoo.org> t1lib-5.0.2.ebuild: Added s390 keywords diff --git a/media-libs/t1lib/t1lib-5.0.0-r2.ebuild b/media-libs/t1lib/t1lib-5.0.0-r2.ebuild index 2bc3f1e04760..47253892399c 100644 --- a/media-libs/t1lib/t1lib-5.0.0-r2.ebuild +++ b/media-libs/t1lib/t1lib-5.0.0-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2004 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r2.ebuild,v 1.11 2004/02/10 19:24:12 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.0-r2.ebuild,v 1.12 2004/06/07 22:47:43 agriffis Exp $ inherit gnuconfig flag-o-matic @@ -67,7 +67,7 @@ src_install() { cd .. dodoc Changes LGPL LICENSE README* - if [ `use doc` ] ; then + if use doc ; then cd doc insinto /usr/share/doc/${PF} doins *.pdf *.dvi |