diff options
61 files changed, 390 insertions, 905 deletions
diff --git a/media-libs/SoGtk/SoGtk-20010601-r1.ebuild b/media-libs/SoGtk/SoGtk-20010601-r1.ebuild index 34bf1f5e205a..6199276fd346 100644 --- a/media-libs/SoGtk/SoGtk-20010601-r1.ebuild +++ b/media-libs/SoGtk/SoGtk-20010601-r1.ebuild @@ -1,42 +1,34 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601-r1.ebuild,v 1.5 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/SoGtk/SoGtk-20010601-r1.ebuild,v 1.6 2002/07/22 14:37:05 seemant Exp $ S=${WORKDIR}/${PN} DESCRIPTION="A Gtk Interface for coin" SRC_URI="ftp://ftp.coin3d.org/pub/snapshots/${P}.tar.gz" HOMEPAGE="http://www.coin3d.org" + SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="x86" DEPEND="virtual/x11 - sys-devel/autoconf - sys-devel/automake - sys-devel/libtool - <x11-libs/gtkglarea-1.99.0 - ~media-libs/coin-${PV}" - -RDEPEND="virtual/x11 <x11-libs/gtkglarea-1.99.0 - ~media-libs/coin-${PV}" + media-libs/coin" src_compile() { - ./bootstrap --add + ./bootstrap --add - ./configure --prefix=/usr \ - --host=${CHOST} \ - --build=${CHOST} || die - - make || die + econf || die + make || die } src_install () { - - make prefix=${D}/usr install || die - cd ${S} - dodoc AUTHORS COPYING ChangeLog* LICENSE* NEWS README* - docinto txt - dodoc docs/qtcomponents.doxygen + make prefix=${D}/usr install || die + + cd ${S} + dodoc AUTHORS COPYING ChangeLog* LICENSE* NEWS README* + docinto txt + dodoc docs/* } - diff --git a/media-libs/SoQt/SoQt-20010601-r1.ebuild b/media-libs/SoQt/SoQt-20010601-r1.ebuild index 9ffd6f437d6d..af8656308341 100644 --- a/media-libs/SoQt/SoQt-20010601-r1.ebuild +++ b/media-libs/SoQt/SoQt-20010601-r1.ebuild @@ -1,27 +1,34 @@ # Copyright 1999-2000 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-20010601-r1.ebuild,v 1.4 2002/07/08 04:47:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/SoQt/SoQt-20010601-r1.ebuild,v 1.5 2002/07/22 14:37:05 seemant Exp $ S=${WORKDIR}/${PN} DESCRIPTION="A Qt Interface for coin" SRC_URI="ftp://ftp.coin3d.org/pub/snapshots/${A}" HOMEPAGE="http://www.coinn3d.org" -DEPEND="virtual/x11 virtual/opengl =x11-libs/qt-2.3* =media-libs/coin-${PV}*" +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="x86" + + +DEPEND="virtual/x11 + virtual/opengl + =x11-libs/qt-2.3* + =media-libs/coin-${PV}*" src_compile() { - ./configure --prefix=/usr --host=${CHOST} --build=${CHOST} --qith-qt-dir=/usr/qt/2 || die - make || die + econf --qith-qt-dir=/usr/qt/2 || die + make || die } src_install () { - make DESTDIR=${D} install || die - dodoc AUTHORS COPYING ChangeLog* LICENSE* NEWS README* - docinto txt - dodoc docs/qtcomponents.doxygen + make DESTDIR=${D} install || die + dodoc AUTHORS COPYING ChangeLog* LICENSE* NEWS README* + docinto txt + dodoc docs/qtcomponents.doxygen } - diff --git a/media-libs/SoQt/files/digest-SoQt-1.0.0 b/media-libs/SoQt/files/digest-SoQt-1.0.0 new file mode 100644 index 000000000000..bff099f50a3b --- /dev/null +++ b/media-libs/SoQt/files/digest-SoQt-1.0.0 @@ -0,0 +1 @@ +MD5 a8ff91b646a84560a4eeb6c7c4bc0dde SoQt-1.0.0.tar.gz 581697 diff --git a/media-libs/a52dec/a52dec-0.7.2.ebuild b/media-libs/a52dec/a52dec-0.7.2.ebuild deleted file mode 100644 index 42907e628c8d..000000000000 --- a/media-libs/a52dec/a52dec-0.7.2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.2.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="a52dec is a bundle of the liba52 (a free library for decoding ATSC A/52 streams used in DVD, etc) with a test program" -SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz" -HOMEPAGE="http://liba52.sourceforge.net" - -DEPEND="virtual/glibc" - -src_compile() { - - ./configure --prefix=/usr || die - make || die - -} - -src_install() { - - make prefix=${D}/usr mandir=${D}/usr/share/man infodir=${D}/usr/share/info docdir=${D}/usr/share/doc/${PF}/html sysconfdir=${D}/etc install || die - - dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO doc/liba52.txt - -} - diff --git a/media-libs/a52dec/a52dec-0.7.3-r1.ebuild b/media-libs/a52dec/a52dec-0.7.3-r1.ebuild index 089b60622235..1feebfd5a2c4 100644 --- a/media-libs/a52dec/a52dec-0.7.3-r1.ebuild +++ b/media-libs/a52dec/a52dec-0.7.3-r1.ebuild @@ -1,13 +1,17 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.3-r1.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.3-r1.ebuild,v 1.3 2002/07/22 14:37:05 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="a52dec is a bundle of the liba52 (a free library for decoding ATSC A/52 streams used in DVD, etc) with a test program" SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz" HOMEPAGE="http://liba52.sourceforge.net" -DEPEND="virtual/glibc >=sys-devel/autoconf-2.52d-r1" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86" + +DEPEND=">=sys-devel/autoconf-2.52d-r1" src_compile() { @@ -20,23 +24,14 @@ src_compile() { && myconf="${myconf} --disable-shared --enable-static" \ || myconf="${myconf} --enable-shared --disable-static" - ./configure \ - --prefix=/usr \ - ${myconf} || die - + econf ${myconf} || die make || die } src_install() { - make \ - prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - docdir=${D}/usr/share/doc/${PF}/html \ - sysconfdir=${D}/etc \ - install || die + einstall docdir=${D}/usr/share/doc/${PF}/html || die dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO dodoc doc/liba52.txt diff --git a/media-libs/a52dec/a52dec-0.7.3.ebuild b/media-libs/a52dec/a52dec-0.7.3.ebuild deleted file mode 100644 index a0f467ee20d5..000000000000 --- a/media-libs/a52dec/a52dec-0.7.3.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/a52dec/a52dec-0.7.3.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="a52dec is a bundle of the liba52 (a free library for decoding ATSC A/52 streams used in DVD, etc) with a test program" -SRC_URI="http://liba52.sourceforge.net/files/${P}.tar.gz" -HOMEPAGE="http://liba52.sourceforge.net" - -DEPEND="virtual/glibc >=sys-devel/autoconf-2.52d-r1" - -src_compile() { - - local myconf - - use oss \ - || myconf="${myconf} --disable-oss" - - use static \ - && myconf="${myconf} --disable-shared --enable-static" \ - || myconf="${myconf} --enable-shared --disable-static" - - ./configure \ - --prefix=/usr \ - --enable-double \ - ${myconf} || die - - make || die - -} - -src_install() { - - make \ - prefix=${D}/usr \ - mandir=${D}/usr/share/man \ - infodir=${D}/usr/share/info \ - docdir=${D}/usr/share/doc/${PF}/html \ - sysconfdir=${D}/etc \ - install || die - - dodoc AUTHORS COPYING ChangeLog HISTORY INSTALL NEWS README TODO - dodoc doc/liba52.txt -} diff --git a/media-libs/a52dec/files/digest-a52dec-0.7.2 b/media-libs/a52dec/files/digest-a52dec-0.7.2 deleted file mode 100644 index 75ee0d2ba844..000000000000 --- a/media-libs/a52dec/files/digest-a52dec-0.7.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 8897222b9fc98b6dd276e1e662d9b5d2 a52dec-0.7.2.tar.gz 235786 diff --git a/media-libs/a52dec/files/digest-a52dec-0.7.3 b/media-libs/a52dec/files/digest-a52dec-0.7.3 deleted file mode 100644 index 6bd046b016e9..000000000000 --- a/media-libs/a52dec/files/digest-a52dec-0.7.3 +++ /dev/null @@ -1 +0,0 @@ -MD5 cd4254b39fc1bde7b1037afea58f7a8b a52dec-0.7.3.tar.gz 235944 diff --git a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild index e4090763b57b..be20ff12c49f 100644 --- a/media-libs/aalib/aalib-1.4_rc4-r2.ebuild +++ b/media-libs/aalib/aalib-1.4_rc4-r2.ebuild @@ -1,6 +1,6 @@ ## Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/aalib/aalib-1.4_rc4-r2.ebuild,v 1.3 2002/07/22 14:37:05 seemant Exp $ inherit libtool @@ -11,9 +11,9 @@ SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz" HOMEPAGE="http://aa-project.sourceforge.net/aalib/" DEPEND=">=sys-libs/ncurses-5.1 - slang? ( >=sys-libs/slang-1.4.2 ) X? ( virtual/x11 ) - gpm? ( sys-libs/gpm )" + gpm? ( sys-libs/gpm ) + slang? ( >=sys-libs/slang-1.4.2 )" SLOT="0" LICENSE="GPL-2" @@ -42,22 +42,12 @@ src_compile() { elibtoolize - ./configure --prefix=/usr \ - --infodir=/usr/share/info \ - --mandir=${D}/usr/share/man \ - --host=${CHOST} \ - ${myconf} || die - + econf ${myconf} || die emake || die } src_install() { - make prefix=${D}/usr \ - infodir=${D}/usr/share/info \ - mandir=${D}/usr/share/man \ - install || die - + einstall || die dodoc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README* } - diff --git a/media-libs/allegro/allegro-4.0.1-r2.ebuild b/media-libs/allegro/allegro-4.0.1-r2.ebuild deleted file mode 100644 index 31a6f32f5923..000000000000 --- a/media-libs/allegro/allegro-4.0.1-r2.ebuild +++ /dev/null @@ -1,126 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/allegro/allegro-4.0.1-r2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $ - -LICENSE="Allegro" - -S=${WORKDIR}/${P} -DESCRIPTION="Allegro is a cross-platform multimedia library" -SRC_URI="mirror://sourceforge/alleg/${P}.tar.gz" -HOMEPAGE="http://alleg.sourceforge.net/" - -RDEPEND="X? ( virtual/x11 ) - alsa? ( media-libs/alsa-lib ) - esd? ( media-sound/esound ) - svga? ( media-libs/svgalib )" - -DEPEND="${RDEPEND} - tetex? ( app-text/tetex )" - -src_compile() { - - use tetex && einfo "TETEX baby!!" - - # Always enable Linux console support and accompanying drivers - confopts="${confopts} --enable-linux --enable-vga" - - # if USE static defined, use static library as default to link with - use static \ - && confopts="${confopts} --enable-staticprog --enable-static" - - # Pentium optimizations - if [ ${CHOST} = "i586-pc-linux-gnu" -o ${CHOST} = "i686-pc-linux-gnu" ] - then - confopts="${confopts} --enable-pentiumopts" - fi - - # Use MMX instructions - use mmx \ - && confopts="${confopts} --enable-mmx" \ - || confopts="${confopts} --enable-mmx=no" - - # Have OSS support - use oss \ - && confopts="${confopts} --enable-ossdigi --enable-ossmidi" \ - || confopts="${confopts} --disable-ossdigi --disable-ossmidi" - - # Have ALSA support - use alsa \ - && confopts="${confopts} --enable-alsadigi --enable-alsamidi" \ - || confopts="${confopts} --disable-alsadigi --disable-alsamidi" - - # Have ESD support - use esd \ - && confopts="${confopts} --enable-esddigi" \ - || confopts="${confopts} --disable-esddigi" - - # Have X11 support - use X \ - && confopts="${confopts} \ - --with-x \ - --enable-xwin-shm \ - --enable-xwin-vidmode \ - --enable-xwin-dga \ - --enable-xwin-dga2" \ - || confopts="${confopts} \ - --without-x \ - --disable-xwin-shm \ - --disable-xwin-vidmode \ - --disable-xwin-dga \ - --disable-xwin-dga2" - - # Have SVGALib support - use svga \ - && confopts="${confopts} --enable-svgalib" \ - || confopts="${confopts} --disable-svgalib" - - # Have fbcon support - use fbcon \ - && confopts="${confopts} --enable-fbcon" \ - || confopts="${confopts} --disable-fbcon" - - # -------------- - - econf ${confopts} || die - - # emake doesn't work - make CFLAGS="${CFLAGS}" || die - - if use tetex; - then - addwrite "/var/lib/texmf" - addwrite "/usr/share/texmf" - addwrite "/var/cache/fonts" - make docs-dvi docs-ps || die - fi - -} - -src_install () { - - make \ - prefix=${D}/usr \ - infodir=${D}/usr/share/info \ - mandir=${D}/usr/share/man \ - install install-gzipped-man install-gzipped-info || die - - # Different format versions of the Allegro documentation - - dodoc AUTHORS CHANGES THANKS readme.txt todo.txt - - if use tetex; - then - dodoc docs/allegro.dvi docs/allegro.ps - fi - - dohtml docs/html/* - - docinto txt - dodoc docs/txt/*.txt - - docinto rtf - dodoc docs/rtf/*.rtf - - docinto build - dodoc docs/build/*.txt -} diff --git a/media-libs/allegro/files/digest-allegro-4.0.1-r2 b/media-libs/allegro/files/digest-allegro-4.0.1-r2 deleted file mode 100644 index d431fa1df4e3..000000000000 --- a/media-libs/allegro/files/digest-allegro-4.0.1-r2 +++ /dev/null @@ -1 +0,0 @@ -MD5 224296524ffafc8369f3b29f5b73cdcb allegro-4.0.1.tar.gz 2391111 diff --git a/media-libs/alsa-oss/alsa-oss-0.9.0_rc1.ebuild b/media-libs/alsa-oss/alsa-oss-0.9.0_rc1.ebuild index 6d8c26b52756..7037bdbfbbce 100644 --- a/media-libs/alsa-oss/alsa-oss-0.9.0_rc1.ebuild +++ b/media-libs/alsa-oss/alsa-oss-0.9.0_rc1.ebuild @@ -1,26 +1,26 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/alsa-oss-0.9.0_rc1.ebuild,v 1.5 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/alsa-oss/alsa-oss-0.9.0_rc1.ebuild,v 1.6 2002/07/22 14:37:05 seemant Exp $ +MY_P=${P/_/} +S=${WORKDIR}/${MY_P} DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer" HOMEPAGE="http://www.alsa-project.org/" +SRC_URI="ftp://ftp.alsa-project.org/pub/oss-lib/${MY_P}.tar.bz2" + +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86" DEPEND="virtual/glibc >=media-libs/alsa-lib-0.9.0_rc1" -SRC_URI="ftp://ftp.alsa-project.org/pub/oss-lib/${P/_rc/rc}.tar.bz2" -S="${WORKDIR}/${P/_rc/rc}" - src_compile() { - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ - || die "./configure failed" + conf || die "./configure failed" emake || die "Parallel Make Failed" } src_install() { - make DESTDIR="${D}" install || die + make DESTDIR=${D} install || die dodoc COPYING } diff --git a/media-libs/atlas-c++/atlas-c++-0.4.4.ebuild b/media-libs/atlas-c++/atlas-c++-0.4.4.ebuild index 2d9f08089bad..8d98b87881c4 100644 --- a/media-libs/atlas-c++/atlas-c++-0.4.4.ebuild +++ b/media-libs/atlas-c++/atlas-c++-0.4.4.ebuild @@ -1,18 +1,23 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.4.4.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/atlas-c++/atlas-c++-0.4.4.ebuild,v 1.4 2002/07/22 14:37:05 seemant Exp $ -S="${WORKDIR}/Atlas-C++-${PV}" -SRC_URI="ftp://victor.worldforge.org/pub/worldforge/libs/Atlas-C++/Atlas-C++-0.4.4.tar.bz2" +MY_PN="Atlas-C++" +MY_P=${MY_PN}-${PV} +S=${WORKDIR}/${MY_P} HOMEPAGE="http://www.worldforge.net" +SRC_URI="ftp://victor.worldforge.org/pub/worldforge/libs/${MY_PN}/${MY_P}.tar.bz2" + SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="x86" + DEPEND="virtual/glibc - ( <dev-libs/libsigc++-1.1.0 - >=dev-libs/libsigc++-1.0.4-r1 )" + =dev-libs/libsigc++-1.0*" src_compile() { - ./configure --host=${CHOST} --prefix=/usr || die + econf || die emake || die } @@ -21,4 +26,5 @@ src_install() { make DESTDIR=${D} install || die + dodoc AUTHORS COPYING ChangeLog NEWS README ROADMAP THANKS TODO } diff --git a/media-libs/audiofile/audiofile-0.2.3-r1.ebuild b/media-libs/audiofile/audiofile-0.2.3-r1.ebuild index e0dc7233cfa7..3ef46ec731fb 100644 --- a/media-libs/audiofile/audiofile-0.2.3-r1.ebuild +++ b/media-libs/audiofile/audiofile-0.2.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.3-r1.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/audiofile/audiofile-0.2.3-r1.ebuild,v 1.5 2002/07/22 14:37:05 seemant Exp $ inherit libtool @@ -19,9 +19,7 @@ src_compile() { elibtoolize - ./configure --host=${CHOST} \ - --prefix=/usr || die - + econf || die emake || die } @@ -31,4 +29,3 @@ src_install() { dodoc ACKNOWLEDGEMENTS AUTHORS COPYING* ChangeLog README TODO dodoc NEWS NOTES } - diff --git a/media-libs/coin/coin-20010601-r1.ebuild b/media-libs/coin/coin-20010601-r1.ebuild index 248a571eed54..7fc10f188f6d 100644 --- a/media-libs/coin/coin-20010601-r1.ebuild +++ b/media-libs/coin/coin-20010601-r1.ebuild @@ -1,34 +1,37 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-20010601-r1.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/coin/coin-20010601-r1.ebuild,v 1.3 2002/07/22 14:37:05 seemant Exp $ -A=Coin-${PV}.tar.gz +MY_P=${P/c/C} S=${WORKDIR}/Coin DESCRIPTION="An OpenSource implementation of SGI's OpenInventor" -SRC_URI="ftp://ftp.coin3d.org/pub/snapshots/${A}" +SRC_URI="ftp://ftp.coin3d.org/pub/snapshots/${MY_P}.tar.gz" HOMEPAGE="http://www.coin3d.org" -DEPEND="virtual/x11 virtual/opengl" +SLOT="0" +LICENSE="LGPL-2.1" +KEYWORDS="x86" + +DEPEND="virtual/x11 + virtual/opengl" src_compile() { - local myconf - if [ -z "`use X`" ] - then - myconf="--without-x" - fi - try ./configure --prefix=/usr --host=${CHOST} --build=${CHOST} $myconf - try make + local myconf + use X || myconf="--without-x" + + econf ${myconf} || die + make || die } src_install () { - try make prefix=${D}/usr install - dodoc AUTHORS COPYING ChangeLog* HACKING LICENSE* NEWS README* - docinto txt - dodoc docs/*.txt docs/coin.doxygen docs/whitepapers/*.txt + einstall || die -} + dodoc AUTHORS COPYING ChangeLog* HACKING LICENSE* NEWS README* + docinto txt + dodoc docs/*.txt docs/coin.doxygen docs/whitepapers/*.txt +} diff --git a/media-libs/compface/compface-1.4.ebuild b/media-libs/compface/compface-1.4.ebuild index 0a8feb71791d..6653e7724334 100644 --- a/media-libs/compface/compface-1.4.ebuild +++ b/media-libs/compface/compface-1.4.ebuild @@ -1,26 +1,29 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# Michael C Tisltra <tadpol@tadpol.org> -# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.4.ebuild,v 1.4 2001/08/31 03:23:39 pm Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/compface/compface-1.4.ebuild,v 1.5 2002/07/22 14:37:05 seemant Exp $ - -A=${P}.tar.gz S=${WORKDIR}/${P} DESCRIPTION="Utilities and library to convert to/from X-Face format" -SRC_URI="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/${A}" -HOMEPAGE="" +SRC_URI="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/${P}.tar.gz" +HOMEPAGE="http://www.ibiblio.org/pub/Linux/apps/graphics/convert/" + +SLOT="0" +LICENSE="MIT" +KEYWORDS="x86" DEPEND="virtual/glibc" src_compile() { - try ./configure --prefix=/usr --mandir=/usr/share/man --host=${CHOST} - try make - + econf || die + make || die } src_install () { - dodir /usr/share/man/man{1,3} /usr/{bin,include,lib} - try make prefix=${D}/usr MANDIR=${D}/usr/share/man install - dodoc README ChangeLog -} + dodir /usr/share/man/man{1,3} /usr/{bin,include,lib} + make \ + prefix=${D}/usr \ + MANDIR=${D}/usr/share/man \ + install || die + dodoc README ChangeLog +} diff --git a/media-libs/devil/devil-1.6.1.ebuild b/media-libs/devil/devil-1.6.1.ebuild index 1b53a853d1ea..3dd2be7c28a7 100644 --- a/media-libs/devil/devil-1.6.1.ebuild +++ b/media-libs/devil/devil-1.6.1.ebuild @@ -1,53 +1,51 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# /space/gentoo/cvsroot/gentoo-x86/skel.ebuild,v 1.8 2002/05/30 01:54:49 sandymac Exp +# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.1.ebuild,v 1.2 2002/07/22 14:37:06 seemant Exp $ +inherit libtool + +S=${WORKDIR}/DevIL DESCRIPTION="DevIL image library 1.6.1" HOMEPAGE="http://www.imagelib.org/" -LICENSE="LGPL-2.1" +SRC_URI="mirror://sourceforge/openil/DevIL-${PV}.tar.gz" + SLOT="0" +LICENSE="LGPL-2.1" KEYWORDS="x86" RDEPEND="X? ( x11-base/xfree ) gif? ( media-libs/giflib ) - jpeg? ( media-libs/jpeg ) - tiff? ( media-libs/tiff ) png? ( media-libs/libpng ) sdl? ( media-libs/libsdl ) + jpeg? ( media-libs/jpeg ) + tiff? ( media-libs/tiff ) opengl? ( virtual/opengl )" DEPEND="${RDEPEND}" -SRC_URI="mirror://sourceforge/openil/DevIL-${PV}.tar.gz" -S=${WORKDIR}/DevIL src_compile() { local myconf + use X && myconf="${myconf} --with-x" use gif || myconf="${myconf} --disable-gif" + use png || myconf="${myconf} --disable-png" + use sdl || myconf="${myconf} --disable-sdl" use jpeg || myconf="${myconf} --disable-jpeg" use tiff || myconf="${myconf} --disable-tiff" - use png || myconf="${myconf} --disable-png" use opengl || myconf="${myconf} --disable-opengl" - use sdl || myconf="${myconf} --disable-sdl" - use X && myconf="${myconf} --with-x" - libtoolize --copy --force - ./configure \ + + elibtoolize + econf \ ${myconf} \ --disable-directx \ - --disable-win32 \ - --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man || die "./configure failed" + --disable-win32 || die "./configure failed" + make || die } src_install () { make DESTDIR=${D} install || die dodoc AUTHORS BUGS COPYING* CREDITS ChangeLog* INSTALL NEWS* README* - - - } - diff --git a/media-libs/divx4linux/divx4linux-20011025.ebuild b/media-libs/divx4linux/divx4linux-20011025.ebuild deleted file mode 100644 index 1fcb6e74c726..000000000000 --- a/media-libs/divx4linux/divx4linux-20011025.ebuild +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/divx4linux/divx4linux-20011025.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $ - -S="${WORKDIR}/${P}" -DESCRIPTION="Binary release of DivX Codec 4.0" -SRC_URI="http://avifile.sourceforge.net/${P}.tgz" -HOMEPAGE="http://www.divx.com/" - -DEPEND="virtual/glibc" - -SLOT="0" -LICENSE="DIVX" -KEYWORDS="x86" - -src_install () { - - dodir /usr/{lib,include} - - dolib.so *.so - - insinto /usr/include - doins *.h - - dodoc RELNOTES.linux license.txt - cp -a 'Codec Core Interface.txt' ${D}/usr/share/doc/${P}/ -} diff --git a/media-libs/divx4linux/divx4linux-20020304.ebuild b/media-libs/divx4linux/divx4linux-20020304.ebuild deleted file mode 100644 index 8c0adc06994b..000000000000 --- a/media-libs/divx4linux/divx4linux-20020304.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/divx4linux/divx4linux-20020304.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $ - -OLD_VER=20011025 -S="${WORKDIR}/${PN}-${PV}" -DESCRIPTION="Binary release of DivX Codec 5.0" -SRC_URI="http://download.divx.com/divx/${PN}50-${PV}.tgz - http://avifile.sourceforge.net/${PN}-${OLD_VER}.tgz - ftp://ftp.ibiblio.org/pub/linux/distributions/gentoo/distfiles/${PN}-${OLD_VER}.tgz" -HOMEPAGE="http://www.divx.com/" - -DEPEND="virtual/glibc" - -SLOT="0" -LICENSE="DIVX" -KEYWORDS="x86" - -src_install() { - - dodir /usr/{lib,include} - - # Do the divx50 decoder stuff - dolib.so *.so - insinto /usr/include - doins *.h - dodoc RELNOTES.linux license.txt - - # Do the divx40 encoder stuff - cd ${WORKDIR}/${PN}-${OLD_VER} - dolib.so libdivxencore.so - doins encore2.h mv_hint.h - docinto DX40 - dodoc RELNOTES.linux license.txt - cp -a 'Codec Core Interface.txt' ${D}/usr/share/doc/${P}/DX40/ -} - diff --git a/media-libs/divx4linux/divx4linux-20020418.ebuild b/media-libs/divx4linux/divx4linux-20020418.ebuild index 2bfa075235b7..6e21dfbe8b2a 100644 --- a/media-libs/divx4linux/divx4linux-20020418.ebuild +++ b/media-libs/divx4linux/divx4linux-20020418.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/divx4linux/divx4linux-20020418.ebuild,v 1.3 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/divx4linux/divx4linux-20020418.ebuild,v 1.4 2002/07/22 14:37:06 seemant Exp $ DXVER=501 S="${WORKDIR}/${PN}-${PV}" @@ -32,4 +32,3 @@ src_install() { mkdir ${D}/usr/share/doc/${P}/html cp -a 'DivX MPEG-4 Codec and Its Interface.htm' ${D}/usr/share/doc/${P}/html } - diff --git a/media-libs/divx4linux/files/digest-divx4linux-20011025 b/media-libs/divx4linux/files/digest-divx4linux-20011025 deleted file mode 100644 index d66a916776eb..000000000000 --- a/media-libs/divx4linux/files/digest-divx4linux-20011025 +++ /dev/null @@ -1 +0,0 @@ -MD5 7f92ddbd26987bccc58f1ab0318931f0 divx4linux-20011025.tgz 161172 diff --git a/media-libs/divx4linux/files/digest-divx4linux-20020304 b/media-libs/divx4linux/files/digest-divx4linux-20020304 deleted file mode 100644 index 296d7ba090a2..000000000000 --- a/media-libs/divx4linux/files/digest-divx4linux-20020304 +++ /dev/null @@ -1,2 +0,0 @@ -MD5 3291d5c31c58856717af0b727b723f7d divx4linux50-20020304.tgz 107914 -MD5 7f92ddbd26987bccc58f1ab0318931f0 divx4linux-20011025.tgz 161172 diff --git a/media-libs/faac/faac-26102001.ebuild b/media-libs/faac/faac-26102001.ebuild index adf43d508ab7..af95997ce590 100644 --- a/media-libs/faac/faac-26102001.ebuild +++ b/media-libs/faac/faac-26102001.ebuild @@ -1,21 +1,24 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-26102001.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/faac/faac-26102001.ebuild,v 1.3 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/faac DESCRIPTION="Free MPEG-4 audio codecs by AudioCoding.com" SRC_URI="http://faac.sourceforge.net/files/faac_src_26102001.zip" HOMEPAGE="http://faac.sourceforge.net/" -LICENSE="GPL" + +SLOT="0" +LICENSE="LGPL-2" +KEYWOEDS="x86" DEPEND=">=media-libs/libsndfile-0.0.28 - >=sys-devel/libtool-1.3.5 - sys-devel/autoconf - sys-devel/automake" + >=sys-devel/libtool-1.3.5 + sys-devel/autoconf + sys-devel/automake" src_unpack() { - unpack ${A} - sh ${FILESDIR}/fix-linefeeds.sh $S + unpack ${A} + sh ${FILESDIR}/fix-linefeeds.sh $S } src_compile() { @@ -34,5 +37,4 @@ src_install() { make DESTDIR=${D} install || die dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO docs/libfaac.pdf - } diff --git a/media-libs/flac/flac-1.0.3.ebuild b/media-libs/flac/flac-1.0.3.ebuild index 023da8a5527c..7fbf57bfaa57 100644 --- a/media-libs/flac/flac-1.0.3.ebuild +++ b/media-libs/flac/flac-1.0.3.ebuild @@ -1,34 +1,45 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.0.3.ebuild,v 1.1 2002/07/08 22:58:10 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/flac/flac-1.0.3.ebuild,v 1.2 2002/07/22 14:37:06 seemant Exp $ DESCRIPTION="A free lossless audio encoder" SRC_URI="mirror://sourceforge/flac/${P}.tar.gz" HOMEPAGE="http://flac.sourceforge.net/" -#flac has an optional xmms plugin. For now, we just depend on xmms. We can optimize this later. -RDEPEND="virtual/glibc X? ( >=media-sound/xmms-1.2.5-r2 ) >=media-libs/libogg-1.0_rc2" -DEPEND="virtual/glibc dev-lang/nasm sys-apps/gawk $RDEPEND" -KEYWORDS="*" -LICENSE="GPL-2 LGPL-2" + SLOT="0" +LICENSE="GPL-2 LGPL-2" +KEYWORDS="x86 ppc" + +RDEPEND="virtual/glibc + >=media-libs/libogg-1.0_rc2 + xmms? ( media-sound/xmms )" + +DEPEND="${RDEPEND} + dev-lang/nasm + sys-apps/gawk" src_compile() { - cd ${S} - local myflags - [ `use sse` ] && myflags="--enable-sse" + local myconf + + use sse && myconf="--enable-sse" + #--use-3dnow is documented but apparently not yet enabled. - #[ `use 3dnow` ] && myflags="$myflags --use-3dnow" - ./configure --prefix=/usr $myflags --host=$CHOST || die + #use 3dnow && myconf="${myconf} --use-3dnow" + + econf ${myconf} || die cp Makefile Makefile.orig + #the man page ebuild requires docbook2man... yick! sed -e 's:include man:include:g' Makefile.orig > Makefile + #emake seems to mess up the building of the xmms input plugin make || die } src_install() { #it looks like we need to run the xmms install first - ( cd src/plugin_xmms; make DESTDIR=${D} install ) + cd src/plugin_xmms make DESTDIR=${D} install -} - + cd ${S} + make DESTDIR=${D} install +} diff --git a/media-libs/fnlib/fnlib-0.5-r1.ebuild b/media-libs/fnlib/fnlib-0.5-r1.ebuild index dfe1d006ba33..ea69ccde9d98 100644 --- a/media-libs/fnlib/fnlib-0.5-r1.ebuild +++ b/media-libs/fnlib/fnlib-0.5-r1.ebuild @@ -1,12 +1,14 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/fnlib/fnlib-0.5-r1.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/fnlib/fnlib-0.5-r1.ebuild,v 1.5 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="Font Library" +HOMEPAGE="http://www.enlightenment.org/" SRC_URI="ftp://ftp.enlightenment.org/pub/enlightenment/enlightenment/libs/${P}.tar.gz" -DEPEND="virtual/glibc >=media-libs/imlib-1.9.8.1" +DEPEND="virtual/glibc + >=media-libs/imlib-1.9.8.1" SLOT="0" LICENSE="GPL" @@ -14,10 +16,7 @@ KEYWORDS="x86 ppc" src_compile() { - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc/fnlib || die + econf --sysconfdir=/etc/fnlib || die make || die } diff --git a/media-libs/freetype/files/digest-freetype-2.1.0 b/media-libs/freetype/files/digest-freetype-2.1.0 deleted file mode 100644 index e72c5e9303d5..000000000000 --- a/media-libs/freetype/files/digest-freetype-2.1.0 +++ /dev/null @@ -1 +0,0 @@ -MD5 27741388b19784be65b963a98c961bc5 freetype-2.1.0.tar.bz2 649519 diff --git a/media-libs/freetype/freetype-1.3.1-r3.ebuild b/media-libs/freetype/freetype-1.3.1-r3.ebuild index cfa81687d36b..5240aa4fe833 100644 --- a/media-libs/freetype/freetype-1.3.1-r3.ebuild +++ b/media-libs/freetype/freetype-1.3.1-r3.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-1.3.1-r3.ebuild,v 1.6 2002/07/22 14:37:06 seemant Exp $ # r3 change by me (danarmak): there's a contrib dir inside the freetype1 # sources with important utils: ttf2bdf, ttf2pfb, ttf2pk, ttfbanner. @@ -13,90 +13,82 @@ # When we update to freetype-pre1.4 or any later version, we should use # the included contrib directory and not download any additional files. -A1=${P}.tar.gz -A2=freetype1-contrib.tar.gz -A="${A1} ${A2}" +P2=${PN}1-contrib S=${WORKDIR}/${P} DESCRIPTION="TTF-Library" -SRC_URI="ftp://ftp.freetype.org/pub/freetype1/${A1} - ftp://ftp.freetype.org/pub/freetype1/${A2}" +SRC_URI="ftp://ftp.freetype.org/pub/freetype1/${P}.tar.gz + ftp://ftp.freetype.org/pub/freetype1/${P2}.tar.gz" HOMEPAGE="http://www.freetype.org/" SLOT="1" LICENSE="FTL" KEYWORDS="x86 ppc" -DEPEND="virtual/glibc - nls? ( sys-devel/gettext )" - -RDEPEND="virtual/glibc" +DEPEND="virtual/glibc" +RDEPEND="nls? ( sys-devel/gettext )" src_unpack() { - - cd ${WORKDIR} - unpack ${A1} - # freetype1-contrib goes under freetype-1.3.1 - cd ${S} - unpack ${A2} - + + cd ${WORKDIR} + unpack ${P}.tar.gz + # freetype1-contrib goes under freetype-1.3.1 + cd ${S} + unpack ${P2}.tar.gz + } src_compile() { - local myconf + local myconf - if [ -z "`use nls`" ] - then - myconf="${myconf} --disable-nls" - fi + use nls || myconf="${myconf} --disable-nls" - try ./configure --host=${CHOST} --prefix=/usr ${myconf} + econf ${myconf} || die - # Make a small fix to disable tests - # Now xfree is no longer required - cp Makefile Makefile.orig - sed -e "s:ttlib tttest ttpo:ttlib ttpo:" Makefile.orig > Makefile + # Make a small fix to disable tests + # Now xfree is no longer required + cp Makefile Makefile.orig + sed -e "s:ttlib tttest ttpo:ttlib ttpo:" Makefile.orig > Makefile - try make - - # make contrib utils - for x in ttf2bdf ttf2pfb ttf2pk ttfbanner - do - cd ${S}/freetype1-contrib/${x} - try ./configure --host=${CHOST} --prefix=/usr - try make - done + make || die + + # make contrib utils + for x in ttf2bdf ttf2pfb ttf2pk ttfbanner + do + cd ${S}/freetype1-contrib/${x} + econf || die + make || die + done } src_install() { - cd lib - - # Seems to require a shared libintl (getetxt comes only with a static one - # But it seems to work without problems - - try make -f arch/unix/Makefile prefix=${D}/usr install - cd ../po - try make prefix=${D}/usr install - cd .. - dodoc announce PATENTS README readme.1st - dodoc docs/*.txt docs/FAQ docs/TODO - docinto html - dodoc docs/*.htm - docinto html/image - dodoc docs/image/*.gif docs/image/*.png - - # install contrib utils - cd ${S}/freetype1-contrib - into /usr - dobin ttf2bdf/ttf2bdf \ + cd lib + + # Seems to require a shared libintl (getetxt comes only with a static one + # But it seems to work without problems + + make -f arch/unix/Makefile prefix=${D}/usr install || die + + cd ${S}/po + make prefix=${D}/usr install || die + + cd ${S} + dodoc announce PATENTS README readme.1st + dodoc docs/*.txt docs/FAQ docs/TODO + dohtml -r docs + + # install contrib utils + cd ${S}/freetype1-contrib + into /usr + dobin ttf2bdf/ttf2bdf \ ttf2pfb/getafm ttf2pfb/t1asm ttf2pfb/.libs/ttf2pfb \ ttf2pk/.libs/ttf2pk ttf2pk/.libs/ttf2tfm \ ttfbanner/.libs/ttfbanner - cp ttf2bdf/ttf2bdf.man ttf2bdf/ttf2bdf.man.1 - doman ttf2bdf/ttf2bdf.man.1 - docinto contrib - dodoc ttf2pk/ttf2pk.doc - + newman ttf2bdf/ttf2bdf.man ttf2bdf/ttf2bdf.man.1 + doman ttf2bdf/ttf2bdf.man.1 + docinto contrib + dodoc ttf2pk/ttf2pk.doc + } diff --git a/media-libs/freetype/freetype-2.0.9.ebuild b/media-libs/freetype/freetype-2.0.9.ebuild index cc6816889313..d36e5ed8f98d 100644 --- a/media-libs/freetype/freetype-2.0.9.ebuild +++ b/media-libs/freetype/freetype-2.0.9.ebuild @@ -1,7 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.9.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $ - +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.0.9.ebuild,v 1.6 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="A high-quality and portable font engine" diff --git a/media-libs/freetype/freetype-2.1.0.ebuild b/media-libs/freetype/freetype-2.1.0.ebuild deleted file mode 100644 index 151bbe3b10ab..000000000000 --- a/media-libs/freetype/freetype-2.1.0.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.0.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $ - - -S=${WORKDIR}/${P} -DESCRIPTION="A high-quality and portable font engine" -SRC_URI="mirror://sourceforge/freetype/${P}.tar.bz2" -HOMEPAGE="http://www.freetype.org/" - -SLOT="2" -LICENSE="FTL | GPL-2" -KEYWORDS="x86" - -DEPEND="virtual/glibc" - -src_unpack() { - unpack ${A} - - # Enable hinting for truetype fonts - cd ${S}/include/freetype/config - cp ftoption.h ftoption.h.orig - sed -e 's:#undef TT_CONFIG_OPTION_BYTECODE_INTERPRETER:#define TT_CONFIG_OPTION_BYTECODE_INTERPRETER:' \ - ftoption.h.orig > ftoption.h - cd ${S} -} - -src_compile() { - make CFG="--host=${CHOST} --prefix=/usr" || die - emake || die -} - -src_install() { - make prefix=${D}/usr install || die - - dodoc ChangeLog README - dodoc docs/{BUGS,BUILD,CHANGES,*.txt,PATENTS,readme.vms,TODO} -} diff --git a/media-libs/freetype/freetype-2.1.2.ebuild b/media-libs/freetype/freetype-2.1.2.ebuild index a8e2e193a9ee..904edc6a03b4 100644 --- a/media-libs/freetype/freetype-2.1.2.ebuild +++ b/media-libs/freetype/freetype-2.1.2.ebuild @@ -1,7 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.2.ebuild,v 1.1 2002/07/17 03:28:03 raker Exp $ - +# $Header: /var/cvsroot/gentoo-x86/media-libs/freetype/freetype-2.1.2.ebuild,v 1.2 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="A high-quality and portable font engine" diff --git a/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild b/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild index 2b05e9b33b23..fb7b9fc3aeb5 100644 --- a/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild +++ b/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild @@ -1,24 +1,25 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gdk-pixbuf/gdk-pixbuf-0.18.0-r1.ebuild,v 1.3 2002/07/22 14:37:06 seemant Exp $ inherit virtualx libtool S=${WORKDIR}/${P} DESCRIPTION="GNOME Image Library" +HOMEPAGE="http://www.gtk.org/" SRC_URI="ftp://ftp.gnome.org/pub/GNOME/unstable/sources/${PN}/${P}.tar.gz" -DEPEND=">=media-libs/imlib-1.9.14-r1 - media-libs/jpeg +DEPEND="media-libs/jpeg media-libs/tiff =x11-libs/gtk+-1.2* + >=media-libs/imlib-1.9.14-r1 >=media-libs/libpng-1.2.1 >=gnome-base/gnome-libs-1.4.1.2-r1" # We need gnome-libs here, else gnome support do not get compiled into # gdk-pixbuf (the GnomeCanvasPixbuf library ) SLOT="0" -LICENSE="GPL" +LICENSE="GPL-2 LGPL-2" KEYWORDS="x86 ppc" src_unpack() { @@ -35,9 +36,7 @@ src_compile() { #update libtool, else we get the "relink bug" elibtoolize - ./configure --host=${CHOST} \ - --prefix=/usr \ - --sysconfdir=/etc/X11/gdk-pixbuf || die + econf --sysconfdir=/etc/X11/gdk-pixbuf || die #build needs to be able to #connect to an X display. diff --git a/media-libs/giblib/giblib-1.2.1.ebuild b/media-libs/giblib/giblib-1.2.1.ebuild index 42820b014ef7..b6b8e02cc0e8 100644 --- a/media-libs/giblib/giblib-1.2.1.ebuild +++ b/media-libs/giblib/giblib-1.2.1.ebuild @@ -1,18 +1,21 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# /home/cvsroot/gentoo-x86/skel.build,v 1.7 2001/08/25 21:15:08 chadh Exp +# $Header: /var/cvsroot/gentoo-x86/media-libs/giblib/giblib-1.2.1.ebuild,v 1.3 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="Giblib, graphics library" -SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz" HOMEPAGE="http://www.libuxbrit.co.uk/" +SRC_URI="http://www.linuxbrit.co.uk/downloads/${P}.tar.gz" -DEPEND="virtual/glibc - >=media-libs/imlib2-1.0.3 +SLOT="0" +LICENSE="as-is|BSD" +KEYWORDS="x86" + +DEPEND=">=media-libs/imlib2-1.0.3 >=media-libs/freetype-2.0" src_compile() { - ./configure --infodir=/usr/share/info --mandir=/usr/share/man --prefix=/usr --host=${CHOST} || die + econf || die emake || die } @@ -21,4 +24,3 @@ src_install () { rm -rf ${D}/usr/doc dodoc TODO README AUTHORS ChangeLog } - diff --git a/media-libs/giflib/giflib-4.1.0-r3.ebuild b/media-libs/giflib/giflib-4.1.0-r3.ebuild index 7fd8e2efe274..248e3750ddba 100644 --- a/media-libs/giflib/giflib-4.1.0-r3.ebuild +++ b/media-libs/giflib/giflib-4.1.0-r3.ebuild @@ -1,19 +1,17 @@ -## Copyright 1999-2002 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# Updated by AJ Lewis <aj@gentoo.org> -# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.6 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/giflib/giflib-4.1.0-r3.ebuild,v 1.7 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} -DESCRIPTION="giflib" +DESCRIPTION="Library to handle, display and manipulate GIF images" +HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml" SRC_URI="ftp://metalab.unc.edu/pub/Linux/libs/giflib/${P}.tar.gz ftp://prtr-13.ucsc.edu/pub/libungif/${P}.tar.gz" -HOMEPAGE="http://prtr-13.ucsc.edu/~badger/software/libungif/index.shtml" - DEPEND="X? ( virtual/x11 )" SLOT="0" -LICENSE="GPL" +LICENSE="as-is|BSD" KEYWORDS="x86 ppc" src_compile() { @@ -24,11 +22,7 @@ src_compile() { && myconf="--with-x" \ || myconf="--without-x" - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - ${myconf} || die - + econf ${myconf} || die emake || die } diff --git a/media-libs/gle/gle-3.0.1-r2.ebuild b/media-libs/gle/gle-3.0.1-r2.ebuild index 1c616f9b01a8..f6d68e181460 100644 --- a/media-libs/gle/gle-3.0.1-r2.ebuild +++ b/media-libs/gle/gle-3.0.1-r2.ebuild @@ -1,28 +1,23 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v 1.5 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gle/gle-3.0.1-r2.ebuild,v 1.6 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="GL extrusion library" SRC_URI="http://www.linas.org/gle/gle-3.0.1.tar.gz" HOMEPAGE="http://www.linas.org/gle" -DEPEND="virtual/glibc - virtual/opengl +DEPEND="virtual/opengl virtual/glu - virtual/glut - virtual/x11" + virtual/glut" SLOT="0" -LICENSE="GPL" +LICENSE="Artistic GPL-2" KEYWORDS="x86 ppc" src_compile() { - ./configure --with-x \ - --prefix=/usr \ - --mandir=/usr/share/man || die - + econf --with-x || die make || die } diff --git a/media-libs/glide-v3/glide-v3-3.10-r3.ebuild b/media-libs/glide-v3/glide-v3-3.10-r3.ebuild index 78216ee01289..b61126957028 100644 --- a/media-libs/glide-v3/glide-v3-3.10-r3.ebuild +++ b/media-libs/glide-v3/glide-v3-3.10-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r3.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glide-v3/glide-v3-3.10-r3.ebuild,v 1.3 2002/07/22 14:37:06 seemant Exp $ # NOTE: Do NOT build this with optimizations, as it will make this package # unstable!!!! @@ -13,6 +13,10 @@ SRC_URI="http://www.ibiblio.org/gentoo/distfiles/glide3x-${PV}.tar.gz # http://telia.dl.sourceforge.net/mirrors/slackware/slackware-8.0/contrib/contrib-sources/3dfx/voodoo4_voodoo5/ HOMEPAGE="http://glide.sourceforge.net/" +SLOT="0" +LICENSE="3DFX" +KEYWORDS="x86" + DEPEND=">=sys-devel/automake-1.4 >=sys-devel/autoconf-2.13 >=sys-devel/libtool-1.3.3 @@ -56,4 +60,3 @@ src_install() { dodir /usr/X11R6/lib dosym /usr/lib/libglide3.so.${PV}.0 /usr/X11R6/lib/libglide3.so } - diff --git a/media-libs/gltt/files/digest-gltt-2.5.2 b/media-libs/gltt/files/digest-gltt-2.5.2 deleted file mode 100644 index d5b4031ef967..000000000000 --- a/media-libs/gltt/files/digest-gltt-2.5.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 1098121fc2b2e66ba0cbc979c1e7d21c gltt-2.5.2.tar.gz 217332 diff --git a/media-libs/gltt/gltt-2.5.2-r1.ebuild b/media-libs/gltt/gltt-2.5.2-r1.ebuild index fb0e21cd2491..590254f181cc 100644 --- a/media-libs/gltt/gltt-2.5.2-r1.ebuild +++ b/media-libs/gltt/gltt-2.5.2-r1.ebuild @@ -1,16 +1,18 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gltt/gltt-2.5.2-r1.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gltt/gltt-2.5.2-r1.ebuild,v 1.3 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="GL truetype library" SRC_URI="http://gltt.sourceforge.net/download/${P}.tar.gz" HOMEPAGE="http://gltt.sourceforge.net/" -DEPEND="virtual/glibc - virtual/opengl - virtual/glut - virtual/x11 +SLOT="0" +LICENSE="LGPL-2" +KEYWORDS="x86" + +DEPEND="virtual/opengl + virtual/glut >=media-libs/freetype-1.3.1" RDEPEND="$DEPEND" diff --git a/media-libs/gltt/gltt-2.5.2.ebuild b/media-libs/gltt/gltt-2.5.2.ebuild deleted file mode 100644 index 77c1eeb4256b..000000000000 --- a/media-libs/gltt/gltt-2.5.2.ebuild +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gltt/gltt-2.5.2.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="GL truetype library" -SRC_URI="http://gltt.sourceforge.net/download/${P}.tar.gz" -HOMEPAGE="http://gltt.sourceforge.net/" - -DEPEND="virtual/glibc - virtual/opengl - virtual/glut - virtual/x11 - >=media-libs/freetype-1.3.1" -RDEPEND="$DEPEND" - -src_compile() { - - ./configure --with-x \ - --prefix=/usr \ - --with-ttf-dir=/usr || die - - make || die - -} - -src_install() { - - make DESTDIR=${D}/usr install || die - - dodoc AUTHORS COPYING ChangeLog NEWS README - -} - - diff --git a/media-libs/glut/glut-3.7-r2.ebuild b/media-libs/glut/glut-3.7-r2.ebuild index 986effb15abe..89153f3b05c1 100644 --- a/media-libs/glut/glut-3.7-r2.ebuild +++ b/media-libs/glut/glut-3.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r2.ebuild,v 1.4 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/glut/glut-3.7-r2.ebuild,v 1.5 2002/07/22 14:37:06 seemant Exp $ MESA_VER="4.0.1" S=${WORKDIR}/Mesa-${MESA_VER} @@ -9,16 +9,15 @@ SRC_URI="mirror://sourceforge/mesa3d/MesaLib-${MESA_VER}.tar.bz2 mirror://sourceforge/mesa3d/MesaDemos-${MESA_VER}.tar.bz2" HOMEPAGE="http://www.opengl.org/developers/documentation/glut/" -DEPEND="virtual/glibc - virtual/opengl - virtual/glu" - -PROVIDE="virtual/glut" - SLOT="0" LICENSE="X11 | GPL-2" KEYWORDS="x86 ppc" +DEPEND="virtual/opengl + virtual/glu" + +PROVIDE="virtual/glut" + src_compile() { ./configure || die @@ -44,4 +43,3 @@ src_install() { dodoc ${S}/docs/COPY* } - diff --git a/media-libs/gst-plugins/gst-plugins-0.3.4.ebuild b/media-libs/gst-plugins/gst-plugins-0.3.4.ebuild index 5d66675089a5..4c1e2ce8a631 100644 --- a/media-libs/gst-plugins/gst-plugins-0.3.4.ebuild +++ b/media-libs/gst-plugins/gst-plugins-0.3.4.ebuild @@ -1,42 +1,45 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.3.4.ebuild,v 1.6 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.3.4.ebuild,v 1.7 2002/07/22 14:37:06 seemant Exp $ + +inherit libtool S=${WORKDIR}/${P} DESCRIPTION="Additional plugins for gstreamer - streaming media framework" SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz" HOMEPAGE="http://gstreamer.sourceforge.net" +SLOT="0" +LICENSE="GPL-2" +KEYWORDS="x86" + # required packages # there are many many optional libraries. features are compiled if the libraries # are present. most optional libraries are from gnome. DEPEND=">=media-libs/gstreamer-0.3.4 media-sound/mad - oggvorbis? ( media-libs/libvorbis - media-libs/libogg ) media-sound/lame - jpeg? ( media-libs/jpeg ) esd? ( media-sound/esound ) + jpeg? ( media-libs/jpeg ) gnome? ( >=gnome-base/gnome-vfs-2.0.1 ) - mikmod? ( media-libs/libmikmod )" -RDEPEND="${DEPEND}" + mikmod? ( media-libs/libmikmod ) + oggvorbis? ( media-libs/libvorbis + media-libs/libogg )" + src_compile() { - libtoolize --copy --force - ./configure \ + + elibtoolize + econf \ --disable-avifile \ - --disable-dv \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --sysconfdir=/etc \ - --mandir=/usr/share/man || die "./configure failed" + --disable-dv || die "./configure failed" + emake || die } src_install () { make DESTDIR=${D} install || die - dodoc AUTHORS COPYING INSTALL README RELEASE TODO + dodoc AUTHORS COPYING INSTALL README RELEASE TODO ChangeLog } pkg_postinst () { diff --git a/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild b/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild index 349fd791d525..d99c4a7209bc 100644 --- a/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild +++ b/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild @@ -1,15 +1,14 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild,v 1.1 2002/07/08 06:49:07 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gst-plugins/gst-plugins-0.4.0.ebuild,v 1.2 2002/07/22 14:37:06 seemant Exp $ inherit libtool -#-Maintainer: Artem Baguinski <artm@v2.nl> -# heavy modification by Spider <spider@gentoo.org> S=${WORKDIR}/${P} DESCRIPTION="Additional plugins for gstreamer - streaming media framework" SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz" HOMEPAGE="http://gstreamer.sourceforge.net" + SLOT="0" LICENSE="LGPL-2.1" KEYWORDS="x86" diff --git a/media-libs/gstreamer/gstreamer-0.3.4.ebuild b/media-libs/gstreamer/gstreamer-0.3.4.ebuild index 6e59443fac75..f46d225c7b7c 100644 --- a/media-libs/gstreamer/gstreamer-0.3.4.ebuild +++ b/media-libs/gstreamer/gstreamer-0.3.4.ebuild @@ -1,14 +1,15 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.3.4.ebuild,v 1.6 2002/07/18 20:09:31 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.3.4.ebuild,v 1.7 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="Streaming media framework" SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz" HOMEPAGE="http://gstreamer.sourceforge.net" + +SLOT="0" LICENSE="LGPL-2" KEYWORDS="x86" -SLOT="0" # required packages # there are many many optional libraries. features are compiled if the libraries @@ -22,6 +23,7 @@ DEPEND=">=dev-libs/glib-2.0 app-text/xmltex app-text/xpdf app-text/ghostscript )" + RDEPEND=">=dev-libs/glib-2.0 >=dev-libs/libxml2-2.4 >=dev-libs/popt-1.5" @@ -29,21 +31,18 @@ RDEPEND=">=dev-libs/glib-2.0 src_compile() { local myconf - use doc && myconf="${myconf} --enable-docs-build" || myconf="${myconf} --disable-docs-build" + use doc \ + && myconf="${myconf} --enable-docs-build" \ + || myconf="${myconf} --disable-docs-build" # gtkdoc-fixxref should do its stuff in DESTDIR pushd docs/libs - cat Makefile.am | sed 's/\(gtkdoc-fixxref.*html-dir=\)/\1$(DESTDIR)/' > Makefile.am.new + sed 's/\(gtkdoc-fixxref.*html-dir=\)/\1$(DESTDIR)/' \ + Makefile.am > Makefile.am.new mv Makefile.am.new Makefile.am popd - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --sysconfdir=/etc \ - ${myconf} \ - --mandir=/usr/share/man || die "./configure failed" + econf ${myconf} || die "./configure failed" emake || die } @@ -59,9 +58,7 @@ src_install () { # docs/random/* # examples/* # get all those html manuals and stuff like that. - dohtml -r docs/fwg/gts-plugin-writers-guide - dohtml -r docs/gst/html - dohtml -r docs/manual/gstreamer-manual + dohtml -r docs } pkg_postinst () { diff --git a/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild b/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild index 31e1610c62e6..4bd88f2250db 100644 --- a/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild +++ b/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild @@ -1,15 +1,16 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild,v 1.1 2002/07/18 20:09:31 spider Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/gstreamer/gstreamer-0.4.0-r1.ebuild,v 1.2 2002/07/22 14:37:06 seemant Exp $ S=${WORKDIR}/${P} DESCRIPTION="Streaming media framework" SRC_URI="mirror://sourceforge/gstreamer/${P}.tar.gz" HOMEPAGE="http://gstreamer.sourceforge.net" + +SLOT="0" LICENSE="LGPL-2" KEYWORDS="x86" -SLOT="0" # required packages # there are many many optional libraries. features are compiled if the libraries @@ -34,24 +35,25 @@ RDEPEND=">=dev-libs/glib-2.0 src_compile() { local myconf - use doc && myconf="${myconf} --enable-docs-build" || myconf="${myconf} --disable-docs-build" + use doc \ + && myconf="${myconf} --enable-docs-build" \ + || myconf="${myconf} --disable-docs-build" # gtkdoc-fixxref should do its stuff in DESTDIR pushd docs/libs - cat Makefile.am | sed 's/\(gtkdoc-fixxref.*html-dir=\)/\1$(DESTDIR)/' > Makefile.am.new + sed 's/\(gtkdoc-fixxref.*html-dir=\)/\1$(DESTDIR)/' \ + Makefile.am > Makefile.am.new + mv Makefile.am.new Makefile.am + popd - ./configure \ - --host=${CHOST} \ - --prefix=/usr \ - --infodir=/usr/share/info \ - --sysconfdir=/etc \ - ${myconf} \ - --mandir=/usr/share/man \ + econf \ --with-configdir=/etc/gstreamer \ - --disable-tests --disable-examples || die "./configure failed" - emake || die "build failed miserably" + --disable-tests --disable-examples \ + ${myconf} || die "./configure failed" + + emake || die "compile failed" } src_install () { @@ -66,9 +68,7 @@ src_install () { # docs/random/* # examples/* # get all those html manuals and stuff like that. - dohtml -r docs/fwg/gts-plugin-writers-guide - dohtml -r docs/gst/html - dohtml -r docs/manual/gstreamer-manual + dohtml -r docs } pkg_postinst () { diff --git a/media-libs/hermes/files/digest-hermes-1.3.2-r1 b/media-libs/hermes/files/digest-hermes-1.3.2-r1 deleted file mode 100644 index 1089b16f7d6f..000000000000 --- a/media-libs/hermes/files/digest-hermes-1.3.2-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 0db5f0902972c550b35f700fd07df658 Hermes-1.3.2.tar.gz 238798 diff --git a/media-libs/hermes/hermes-1.3.2-r1.ebuild b/media-libs/hermes/hermes-1.3.2-r1.ebuild deleted file mode 100644 index 417869393192..000000000000 --- a/media-libs/hermes/hermes-1.3.2-r1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/hermes/hermes-1.3.2-r1.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ - -PN0=Hermes -S=${WORKDIR}/${PN0}-${PV} -DESCRIPTION="Library necessary for building ClanLib?" -SRC_URI="http://dark.x.dtu.dk/~mbn/clanlib/download/download-sphair/${PN0}-${PV}.tar.gz" -HOMEPAGE="http://hermes.terminal.at" -DEPEND="virtual/glibc - sys-devel/automake - sys-devel/autoconf - sys-devel/libtool" -RDEPEND="virtual/glibc" - -src_compile() { - ./autogen.sh || die - ./configure --prefix=/usr --host=${CHOST} || die - sh ltconfig ltmain.sh || die - emake || die - -} - -src_install () { - - make prefix=${D}/usr install || die - dodoc AUTHORS COPYING ChangeLog FAQ NEWS README TODO* - docinto html - dodoc docs/api/*.htm - docinto print - dodoc docs/api/*.ps - docinto txt - dodoc docs/api/*.txt - docinto sgml - dodoc docs/api/sgml/*.sgml -} - diff --git a/media-libs/hermes/hermes-1.3.2-r2.ebuild b/media-libs/hermes/hermes-1.3.2-r2.ebuild index 140d5df2095e..fc2358c45011 100644 --- a/media-libs/hermes/hermes-1.3.2-r2.ebuild +++ b/media-libs/hermes/hermes-1.3.2-r2.ebuild @@ -1,13 +1,17 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/hermes/hermes-1.3.2-r2.ebuild,v 1.2 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/hermes/hermes-1.3.2-r2.ebuild,v 1.3 2002/07/22 14:37:06 seemant Exp $ -PN0=Hermes -S=${WORKDIR}/${PN0}-${PV} +MY_P=${P/h/H} +S=${WORKDIR}/${MY_P} DESCRIPTION="Library for fast colorspace conversion and other graphics routines" -SRC_URI="http://dark.x.dtu.dk/~mbn/clanlib/download/download-sphair/${PN0}-${PV}.tar.gz" +SRC_URI="http://dark.x.dtu.dk/~mbn/clanlib/download/download-sphair/${MY_P}.tar.gz" HOMEPAGE="http://hermes.terminal.at" +SLOT="0" +LICENSE="LGPL-2" +KEYWORDS="x86" + DEPEND="sys-devel/libtool sys-devel/automake sys-devel/autoconf" @@ -18,28 +22,27 @@ src_compile() { automake -a autoconf || die - ./configure \ - --prefix=/usr \ - || die + ./configure \ + --prefix=/usr || die - sh ltconfig ltmain.sh || die - emake || die + sh ltconfig ltmain.sh || die + emake || die } src_install () { - make \ + make \ prefix=${D}/usr \ install || die - dodoc AUTHORS COPYING ChangeLog FAQ NEWS README TODO* + dodoc AUTHORS COPYING ChangeLog FAQ NEWS README TODO* - dohtml docs/api/*.htm - docinto print - dodoc docs/api/*.ps - docinto txt - dodoc docs/api/*.txt - docinto sgml - dodoc docs/api/sgml/*.sgml + dohtml docs/api/*.htm + docinto print + dodoc docs/api/*.ps + docinto txt + dodoc docs/api/*.txt + docinto sgml + dodoc docs/api/sgml/*.sgml } diff --git a/media-libs/id3lib-docs/id3lib-docs-3.8.0_pre2.ebuild b/media-libs/id3lib-docs/id3lib-docs-3.8.0_pre2.ebuild index 90f312edc2b4..bde74f47ce0e 100644 --- a/media-libs/id3lib-docs/id3lib-docs-3.8.0_pre2.ebuild +++ b/media-libs/id3lib-docs/id3lib-docs-3.8.0_pre2.ebuild @@ -1,17 +1,19 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later +# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib-docs/id3lib-docs-3.8.0_pre2.ebuild,v 1.4 2002/07/22 14:37:06 seemant Exp $ -PARENT=id3lib-3.8.0pre2 -A=${PARENT}.tar.gz -S=${WORKDIR}/${PARENT} +MY_P=${PN/-docs/}-${PV/_/} +S=${WORKDIR}/${MY_P} DESCRIPTION="Id3 library for C/C++ -- API Refrence" -SRC_URI="mirror://sourceforge/id3lib/${A}" +SRC_URI="mirror://sourceforge/id3lib/${MY_P}.tar.gz" HOMEPAGE="http://id3lib.sourceforge.net/" +SLOT="0" +LICENSE="LGPL-2" +KEYWORDS="x86" -DEPEND="virtual/glibc - app-doc/doxygen - media-libs/id3lib" +DEPEND="app-doc/doxygen + media-libs/id3lib" src_compile() { @@ -23,7 +25,9 @@ src_compile() { src_install() { # Using ${D} here dosent seem to work. Advice? - dodir /usr/share/doc/${P} - cp -a doc/* ${D}/usr/share/doc/${P} -} + #dodir /usr/share/doc/${P} + c#p -a doc/* ${D}/usr/share/doc/${P} + dohtml -r doc + dodoc AUTHORS COPYING ChangeLog HISTORY NEWS README THANKS TODO +} diff --git a/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild b/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild index 0fab06293aad..02a6e47d781c 100644 --- a/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild +++ b/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild,v 1.2 2002/07/16 11:36:46 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/id3lib/id3lib-3.8.0_pre2-r3.ebuild,v 1.3 2002/07/22 14:37:06 seemant Exp $ MY_P=${P/_/} S=${WORKDIR}/${MY_P} @@ -34,11 +34,9 @@ src_unpack() { src_compile() { - CPPFLAGS="${CPPFLAGS} -Wno-deprecated" \ - ./configure \ - --host=${CHOST} \ - --prefix=/usr || die + export CPPFLAGS="${CPPFLAGS} -Wno-deprecated" + econf || die emake || die } @@ -51,4 +49,3 @@ src_install() { make clean cp -a examples ${D}/usr/share/doc/${PF}/examples } - diff --git a/media-libs/imlib/imlib-1.9.14-r1.ebuild b/media-libs/imlib/imlib-1.9.14-r1.ebuild index 0b6c1da36273..5417123bf26d 100644 --- a/media-libs/imlib/imlib-1.9.14-r1.ebuild +++ b/media-libs/imlib/imlib-1.9.14-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.14-r1.ebuild,v 1.3 2002/07/16 11:36:47 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib/imlib-1.9.14-r1.ebuild,v 1.4 2002/07/22 14:37:06 seemant Exp $ inherit libtool @@ -11,12 +11,11 @@ SRC_URI="ftp://ftp.gnome.org/pub/GNOME/stable/sources/${PN}/${P}.tar.gz ftp://gnome.eazel.com/pub/gnome/stable/sources/${PN}/${P}.tar.gz" HOMEPAGE="http://www.gnome.org/" -DEPEND="virtual/x11 - =x11-libs/gtk+-1.2* +DEPEND="=x11-libs/gtk+-1.2* >=media-libs/tiff-3.5.5 >=media-libs/giflib-4.1.0 >=media-libs/libpng-1.2.1 - >=media-libs/jpeg-6b" + >=media-libs/jpeg-6b" SLOT="0" LICENSE="GPL" @@ -26,11 +25,8 @@ src_compile() { elibtoolize - ./configure --host=${CHOST} \ - --prefix=/usr \ - --mandir=/usr/share/man \ + econf \ --includedir="" \ - --infodir=/usr/share/info \ --sysconfdir=/etc/imlib || die emake || die diff --git a/media-libs/imlib2/files/digest-imlib2-1.0.5 b/media-libs/imlib2/files/digest-imlib2-1.0.5 deleted file mode 100644 index 07c9620d3aa4..000000000000 --- a/media-libs/imlib2/files/digest-imlib2-1.0.5 +++ /dev/null @@ -1 +0,0 @@ -MD5 3b1a80c95ff2a4cfb3bce49e27d94461 imlib2-1.0.5.tar.gz 688261 diff --git a/media-libs/imlib2/files/digest-imlib2-1.0.5-r1 b/media-libs/imlib2/files/digest-imlib2-1.0.5-r1 deleted file mode 100644 index 07c9620d3aa4..000000000000 --- a/media-libs/imlib2/files/digest-imlib2-1.0.5-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 3b1a80c95ff2a4cfb3bce49e27d94461 imlib2-1.0.5.tar.gz 688261 diff --git a/media-libs/imlib2/files/digest-imlib2-1.0.6 b/media-libs/imlib2/files/digest-imlib2-1.0.6 deleted file mode 100644 index f7ba28f3c2aa..000000000000 --- a/media-libs/imlib2/files/digest-imlib2-1.0.6 +++ /dev/null @@ -1 +0,0 @@ -MD5 e3475376bf27347c47c7a9ffb49bdb96 imlib2-1.0.6.tar.gz 688521 diff --git a/media-libs/imlib2/imlib2-1.0.5-r1.ebuild b/media-libs/imlib2/imlib2-1.0.5-r1.ebuild deleted file mode 100644 index a96d6cf0935a..000000000000 --- a/media-libs/imlib2/imlib2-1.0.5-r1.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.5-r1.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="imlib" -SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz" -HOMEPAGE="http://enlightenment.org/" - -DEPEND="virtual/glibc - >=media-libs/giflib-4.1.0 - >=media-libs/libpng-1.2.1 - >=media-libs/tiff-3.5.5 - <=media-libs/freetype-1.4 - =x11-libs/gtk+-1.2* - dev-db/edb - virtual/x11" - -src_compile() { - # always turn off mmx because binutils 2.11.92+ seems to be broken for this package - myconf="--disable-mmx" - ./configure "${myconf} " --host=${CHOST} --prefix=/usr --sysconfdir=/etc/X11/imlib || die - emake || die -} - -src_install() { - make prefix=${D}/usr sysconfdir=${D}/etc/X11/imlib install || die - preplib /usr - dodoc AUTHORS COPYING* ChangeLog README - dohtml -r doc -} diff --git a/media-libs/imlib2/imlib2-1.0.5.ebuild b/media-libs/imlib2/imlib2-1.0.5.ebuild deleted file mode 100644 index 706ba19b6d7e..000000000000 --- a/media-libs/imlib2/imlib2-1.0.5.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.5.ebuild,v 1.5 2002/07/11 06:30:38 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="imlib" -SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz" -HOMEPAGE="http://enlightenment.org/" - -DEPEND="virtual/glibc - >=media-libs/giflib-4.1.0 - >=media-libs/libpng-1.0.7 - >=media-libs/tiff-3.5.5 - <=media-libs/freetype-1.4 - =x11-libs/gtk+-1.2* - dev-db/edb - virtual/x11" - -src_compile() { - # always turn off mmx because binutils 2.11.92+ seems to be broken for this package - myconf="--disable-mmx" - ./configure "${myconf} " --host=${CHOST} --prefix=/usr --sysconfdir=/etc/X11/imlib || die - emake || die -} - -src_install() { - make prefix=${D}/usr sysconfdir=${D}/etc/X11/imlib install || die - preplib /usr - dodoc AUTHORS COPYING* ChangeLog README - dohtml -r doc -} diff --git a/media-libs/imlib2/imlib2-1.0.6-r1.ebuild b/media-libs/imlib2/imlib2-1.0.6-r1.ebuild index 946d0a6d0a59..e5d9c9a196a5 100644 --- a/media-libs/imlib2/imlib2-1.0.6-r1.ebuild +++ b/media-libs/imlib2/imlib2-1.0.6-r1.ebuild @@ -1,26 +1,34 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.6-r1.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.6-r1.ebuild,v 1.5 2002/07/22 14:37:06 seemant Exp $ + +inherit libtool S=${WORKDIR}/${P} -DESCRIPTION="imlib" +DESCRIPTION="Version 2 of an advanced replacement library for libraries like libXpm" SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz" HOMEPAGE="http://enlightenment.org/" -DEPEND="virtual/glibc +DEPEND="=x11-libs/gtk+-1.2* >=media-libs/giflib-4.1.0 >=media-libs/libpng-1.2.1 >=media-libs/tiff-3.5.5 <=media-libs/freetype-1.4 - =x11-libs/gtk+-1.2* - dev-db/edb - virtual/x11" + dev-db/edb" src_compile() { - # always turn off mmx because binutils 2.11.92+ seems to be broken for this package - libtoolize --copy --force + # always turn off mmx because binutils 2.11.92+ + # seems to be broken for this package + elibtoolize + + local myconf + myconf="--disable-mmx" - ./configure "${myconf} " --host=${CHOST} --prefix=/usr --sysconfdir=/etc/X11/imlib || die + + econf \ + --sysconfdir=/etc/X11/imlib \ + ${myconf} || die + emake || die } diff --git a/media-libs/imlib2/imlib2-1.0.6.ebuild b/media-libs/imlib2/imlib2-1.0.6.ebuild deleted file mode 100644 index 73b9ac79fc7d..000000000000 --- a/media-libs/imlib2/imlib2-1.0.6.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2002 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/imlib2/imlib2-1.0.6.ebuild,v 1.4 2002/07/11 06:30:38 drobbins Exp $ - -S=${WORKDIR}/${P} -DESCRIPTION="imlib" -SRC_URI="mirror://sourceforge/enlightenment/${P}.tar.gz" -HOMEPAGE="http://enlightenment.org/" - -DEPEND="virtual/glibc - >=media-libs/giflib-4.1.0 - >=media-libs/libpng-1.2.1 - >=media-libs/tiff-3.5.5 - <=media-libs/freetype-1.4 - =x11-libs/gtk+-1.2* - dev-db/edb - virtual/x11" - -src_compile() { - # always turn off mmx because binutils 2.11.92+ seems to be broken for this package - myconf="--disable-mmx" - ./configure "${myconf} " --host=${CHOST} --prefix=/usr --sysconfdir=/etc/X11/imlib || die - emake || die -} - -src_install() { - make prefix=${D}/usr sysconfdir=${D}/etc/X11/imlib install || die - preplib /usr - dodoc AUTHORS COPYING* ChangeLog README - dohtml -r doc -} diff --git a/media-libs/janus/janus-0.4.2.ebuild b/media-libs/janus/janus-0.4.2.ebuild index 89f5e7ec6305..fb04989b6e64 100644 --- a/media-libs/janus/janus-0.4.2.ebuild +++ b/media-libs/janus/janus-0.4.2.ebuild @@ -1,19 +1,22 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/janus/janus-0.4.2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/janus/janus-0.4.2.ebuild,v 1.4 2002/07/22 14:37:06 seemant Exp $ -S="${WORKDIR}/${P}" +S=${WORKDIR}/${P} +DESCRIPTION="A UI and widget library which employs an extensible XML like data structure and provides an abstract instance of a UI" SRC_URI="ftp://victor.worldforge.org/pub/worldforge/libs/janus/${P}.tar.bz2" HOMEPAGE="http://www.worldforge.net" + SLOT="0" -DEPEND="virtual/glibc - ( >=dev-libs/libsigc++-1.0.4-r1 - <dev-libs/libsigc++-1.1.0 ) +LICENSE="GPL-2" +KEYWORDS="x86" + +DEPEND=">=dev-libs/libsigc++-1.0* >=media-libs/libsdl-1.2.3-r1" src_compile() { - ./configure --host=${CHOST} --prefix=/usr || die + econf || die emake || die } diff --git a/media-libs/jpeg-mmx/files/digest-jpeg-mmx-1.1.2 b/media-libs/jpeg-mmx/files/digest-jpeg-mmx-1.1.2 deleted file mode 100644 index b40a05be6a0c..000000000000 --- a/media-libs/jpeg-mmx/files/digest-jpeg-mmx-1.1.2 +++ /dev/null @@ -1 +0,0 @@ -MD5 63d871b28cb1524b4cf088155688778d jpeg-mmx-1.1.2.tar.gz 568880 diff --git a/media-libs/jpeg-mmx/jpeg-mmx-1.1.2-r1.ebuild b/media-libs/jpeg-mmx/jpeg-mmx-1.1.2-r1.ebuild index eb706a2d8255..261a618fd922 100644 --- a/media-libs/jpeg-mmx/jpeg-mmx-1.1.2-r1.ebuild +++ b/media-libs/jpeg-mmx/jpeg-mmx-1.1.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/jpeg-mmx-1.1.2-r1.ebuild,v 1.3 2002/07/08 14:22:47 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/jpeg-mmx-1.1.2-r1.ebuild,v 1.4 2002/07/22 14:37:06 seemant Exp $ inherit libtool @@ -8,12 +8,12 @@ S=${WORKDIR}/jpeg-mmx DESCRIPTION="JPEG library with mmx enhancements" SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" HOMEPAGE="http://mjpeg.sourceforge.net/" + SLOT="0" LICENSE="as-is" -KEYWORDS="x86" +KEYWORDS="x86 -ppc -sparc -sparc64" DEPEND="virtual/glibc" -RDEPEND="virtual/glibc" src_compile() { elibtoolize diff --git a/media-libs/jpeg-mmx/jpeg-mmx-1.1.2.ebuild b/media-libs/jpeg-mmx/jpeg-mmx-1.1.2.ebuild deleted file mode 100644 index 7c82be661739..000000000000 --- a/media-libs/jpeg-mmx/jpeg-mmx-1.1.2.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2001 Gentoo Technologies, Inc. -# Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg-mmx/jpeg-mmx-1.1.2.ebuild,v 1.3 2002/07/11 06:30:38 drobbins Exp $ - -A=${P}.tar.gz -S=${WORKDIR}/jpeg-mmx -DESCRIPTION="JPEG library with mmx enhancements" -SRC_URI="http://download.sourceforge.net/mjpeg/${A}" -HOMEPAGE="http://mjpeg.sourceforge.net/" - -DEPEND="virtual/glibc" -RDEPEND="virtual/glibc" - -src_compile() { - - try ./configure --enable-shared --prefix=${D}/usr - try make - -} - -src_install() { - - dodir /usr/{include/jpeg-mmx,lib} - make includedir=${D}/usr/include/jpeg-mmx install - mv ${D}/usr/lib/libjpeg.la ${D}/usr/lib/libjpeg-mmx.la - mv ${D}/usr/lib/libjpeg.so.62.0.0 ${D}/usr/lib/libjpeg-mmx.so.62.0.0 - rm ${D}/usr/lib/libjpeg.so - ln -s /usr/lib/libjpeg-mmx.so.62.0.0 ${D}/usr/lib/libjpeg-mmx.so - rm ${D}/usr/lib/libjpeg.so.62 - ln -s /usr/lib/libjpeg-mmx.so.62.0.0 ${D}/usr/lib/libjpeg-mmx.so.62 - dodoc README change.log structure.doc libjpeg.doc - -} diff --git a/media-libs/jpeg/jpeg-6b-r2.ebuild b/media-libs/jpeg/jpeg-6b-r2.ebuild index cb2bbc904538..a8db98818451 100644 --- a/media-libs/jpeg/jpeg-6b-r2.ebuild +++ b/media-libs/jpeg/jpeg-6b-r2.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2000 Gentoo Technologies, Inc. +# Copyright 1999-2002 Gentoo Technologies, Inc. # Distributed under the terms of the GNU General Public License, v2 or later -# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r2.ebuild,v 1.4 2002/07/16 11:36:47 seemant Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/jpeg/jpeg-6b-r2.ebuild,v 1.5 2002/07/22 14:37:06 seemant Exp $ MY_P=${PN}src.v${PV} S=${WORKDIR}/${P} -DESCRIPTION="libjpeg" +DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" SRC_URI="ftp://ftp.uu.net/graphics/jpeg/${MY_P}.tar.gz" HOMEPAGE="http://www.ijg.org/" -DEPEND="virtual/glibc" SLOT="0" LICENSE="as-is" KEYWORDS="x86 ppc" +DEPEND="virtual/glibc" + src_compile() { - ./configure \ - --prefix=/usr \ - --mandir=/usr/share/man \ + econf \ --enable-shared \ --enable-static || die @@ -34,4 +33,3 @@ src_install() { dodoc README change.log structure.doc } - |