Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--media-libs/netpbm/ChangeLog6
-rw-r--r--media-libs/netpbm/netpbm-10.11.13-r1.ebuild30
-rw-r--r--media-libs/netpbm/netpbm-10.11.14.ebuild30
-rw-r--r--media-libs/netpbm/netpbm-10.11.5-r3.ebuild28
-rw-r--r--media-libs/netpbm/netpbm-9.12-r4.ebuild38
5 files changed, 58 insertions, 74 deletions
diff --git a/media-libs/netpbm/ChangeLog b/media-libs/netpbm/ChangeLog
index e04d8b938254..b9b425be751e 100644
--- a/media-libs/netpbm/ChangeLog
+++ b/media-libs/netpbm/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/netpbm
# Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.35 2003/12/13 13:05:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/ChangeLog,v 1.36 2004/01/14 04:24:43 vapier Exp $
+
+ 13 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+ Remove x86? ( svga? () ) crap. svga works only on x86 so if someone has
+ svga in their USE on another arch, it's THEIR problem to fix.
13 Dec 2003; Guy Martin <gmsoft@gentoo.org> netpbm-9.12-r4.ebuild:
Marked stable on hppa.
diff --git a/media-libs/netpbm/netpbm-10.11.13-r1.ebuild b/media-libs/netpbm/netpbm-10.11.13-r1.ebuild
index 8c244859414e..74e3f5142ce0 100644
--- a/media-libs/netpbm/netpbm-10.11.13-r1.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.13-r1.ebuild
@@ -1,38 +1,32 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.13-r1.ebuild,v 1.2 2003/11/02 18:50:14 mholzer Exp $
-
-IUSE="svga"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.13-r1.ebuild,v 1.3 2004/01/14 04:24:43 vapier Exp $
inherit flag-o-matic
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64"
+IUSE="svga"
RESTRICT="nomirror"
-HOMEPAGE="http://netpbm.sourceforge.net/"
DEPEND=">=media-libs/jpeg-6b
>=media-libs/tiff-3.5.5
>=media-libs/libpng-1.2.1
- x86? ( svga? ( media-libs/svgalib ) )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64"
+ svga? ( media-libs/svgalib )"
src_unpack() {
unpack ${A}
cd ${S}
- if [ "${ARCH}" != "x86" ] ; then
- cfg="config"
+ if [ `use svga` ] ; then
+ cfg="svga"
else
- if [ -n "`use svga`" ]
- then
- cfg="svga"
- else
- cfg="config"
- fi
+ cfg="config"
fi
# Sparc support ...
@@ -48,7 +42,7 @@ src_compile() {
emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
}
-src_install () {
+src_install() {
make package pkgdir=${D}/usr/ || die "make package failed"
# Fix symlink not being created.
diff --git a/media-libs/netpbm/netpbm-10.11.14.ebuild b/media-libs/netpbm/netpbm-10.11.14.ebuild
index 4e8c091aff33..05f5f73eca89 100644
--- a/media-libs/netpbm/netpbm-10.11.14.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.14.ebuild
@@ -1,38 +1,32 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.3 2003/11/24 19:23:32 agriffis Exp $
-
-IUSE="svga"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.14.ebuild,v 1.4 2004/01/14 04:24:43 vapier Exp $
inherit flag-o-matic
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ia64"
+IUSE="svga"
RESTRICT="nomirror"
-HOMEPAGE="http://netpbm.sourceforge.net/"
DEPEND=">=media-libs/jpeg-6b
>=media-libs/tiff-3.5.5
>=media-libs/libpng-1.2.1
- x86? ( svga? ( media-libs/svgalib ) )"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha ~mips ~hppa ~arm ~amd64 ia64"
+ svga? ( media-libs/svgalib )"
src_unpack() {
unpack ${A}
cd ${S}
- if [ "${ARCH}" != "x86" ] ; then
- cfg="config"
+ if [ `use svga` ] ; then
+ cfg="svga"
else
- if [ -n "`use svga`" ]
- then
- cfg="svga"
- else
- cfg="config"
- fi
+ cfg="config"
fi
# Sparc support ...
@@ -48,7 +42,7 @@ src_compile() {
emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
}
-src_install () {
+src_install() {
make package pkgdir=${D}/usr/ || die "make package failed"
# Fix symlink not being created.
diff --git a/media-libs/netpbm/netpbm-10.11.5-r3.ebuild b/media-libs/netpbm/netpbm-10.11.5-r3.ebuild
index d789e933df82..b658e24fc950 100644
--- a/media-libs/netpbm/netpbm-10.11.5-r3.ebuild
+++ b/media-libs/netpbm/netpbm-10.11.5-r3.ebuild
@@ -1,38 +1,32 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.5-r3.ebuild,v 1.2 2003/11/02 18:50:14 mholzer Exp $
-
-IUSE="svga"
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-10.11.5-r3.ebuild,v 1.3 2004/01/14 04:24:43 vapier Exp $
inherit flag-o-matic
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
+HOMEPAGE="http://netpbm.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa ~arm ~amd64"
+IUSE="svga"
RESTRICT="nomirror"
-HOMEPAGE="http://netpbm.sourceforge.net/"
DEPEND=">=media-libs/jpeg-6b
>=media-libs/tiff-3.5.5
>=media-libs/libpng-1.2.1
svga? ( media-libs/svgalib )"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~sparc alpha ~mips ~hppa ~arm ~amd64"
-
src_unpack() {
unpack ${A}
cd ${S}
- if [ "${ARCH}" != "x86" ] ; then
- cfg="config"
+ if [ `use svga` ] ; then
+ cfg="svga"
else
- if [ -n "`use svga`" ]
- then
- cfg="svga"
- else
- cfg="config"
- fi
+ cfg="config"
fi
# Sparc support ...
@@ -48,7 +42,7 @@ src_compile() {
emake CC="${CC}" CXX="${CXX}"|| die "emake failed"
}
-src_install () {
+src_install() {
make package pkgdir=${D}/usr/ || die "make package failed"
# Fix symlink not being created.
diff --git a/media-libs/netpbm/netpbm-9.12-r4.ebuild b/media-libs/netpbm/netpbm-9.12-r4.ebuild
index d4e61f438e53..9e55e391604a 100644
--- a/media-libs/netpbm/netpbm-9.12-r4.ebuild
+++ b/media-libs/netpbm/netpbm-9.12-r4.ebuild
@@ -1,35 +1,33 @@
# Copyright 1999-2003 Gentoo Technologies, Inc.
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-9.12-r4.ebuild,v 1.14 2003/12/13 13:05:36 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/netpbm/netpbm-9.12-r4.ebuild,v 1.15 2004/01/14 04:24:43 vapier Exp $
+
+inherit flag-o-matic
-S=${WORKDIR}/${P}
DESCRIPTION="A set of utilities for converting to/from the netpbm (and related) formats"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
HOMEPAGE="http://netpbm.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
-DEPEND=">=media-libs/jpeg-6b
- >=media-libs/tiff-3.5.5
- >=media-libs/libpng-1.2.1"
-
-SLOT="0"
LICENSE="GPL-2"
+SLOT="0"
KEYWORDS="x86 ppc sparc amd64 hppa"
-# 13/May/2003: Fix for bug #14392 by Jason Wever <weeve@gentoo.org>
-# start fix
-inherit flag-o-matic
-if [ ${ARCH} = "sparc" ]
-then
- filter-flags "-O3"
- filter-flags "-O2"
- filter-flags "-O"
-fi
-# end fix
-
+DEPEND=">=media-libs/jpeg-6b
+ >=media-libs/tiff-3.5.5
+ >=media-libs/libpng-1.2.1"
src_unpack() {
unpack ${A}
cd ${S}
+ # 13/May/2003: Fix for bug #14392 by Jason Wever <weeve@gentoo.org>
+ # start fix
+ if [ ${ARCH} = "sparc" ]
+ then
+ filter-flags "-O3"
+ filter-flags "-O2"
+ filter-flags "-O"
+ fi
+ # end fix
sed -e "s:-O3:${CFLAGS}:" ${FILESDIR}/${PV}/Makefile.config >Makefile.config
}
@@ -42,7 +40,7 @@ src_compile() {
emake ${myopts}|| die "Make failed"
}
-src_install () {
+src_install() {
make INSTALL_PREFIX="${D}/usr/" install || die "Install failed"
# fix broken symlinks