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-gfx/gimp/ChangeLog8
-rw-r--r--media-gfx/gimp/gimp-2.3.19.ebuild13
-rw-r--r--media-gfx/gimp/gimp-2.4.6.ebuild25
-rw-r--r--media-gfx/gimp/gimp-2.4.7.ebuild26
-rw-r--r--media-gfx/gimp/gimp-2.6.4.ebuild13
-rw-r--r--media-gfx/gimp/gimp-2.6.5.ebuild13
-rw-r--r--media-gfx/gimp/gimp-2.6.6.ebuild13
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild22
8 files changed, 73 insertions, 60 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 068beaf82fd0..0be57e0f8a1b 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-gfx/gimp
# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.290 2009/04/06 14:23:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.291 2009/04/10 23:19:10 loki_val Exp $
+
+ 10 Apr 2009; Peter Alfredsen <loki_val@gentoo.org> gimp-2.3.19.ebuild,
+ gimp-2.4.6.ebuild, gimp-2.4.7.ebuild, gimp-2.6.4.ebuild,
+ gimp-2.6.5.ebuild, gimp-2.6.6.ebuild, gimp-9999.ebuild:
+ Updating media-gfx/gimp for virtual/poppler-glib update; cairo is the
+ superior backend, always enable it anywhere it can be used.
06 Apr 2009; Brent Baude <ranger@gentoo.org> gimp-2.6.4.ebuild:
Marking gimp-2.6.4 ppc for bug 258344
diff --git a/media-gfx/gimp/gimp-2.3.19.ebuild b/media-gfx/gimp/gimp-2.3.19.ebuild
index 1b6cd27bed0e..3032375f1660 100644
--- a/media-gfx/gimp/gimp-2.3.19.ebuild
+++ b/media-gfx/gimp/gimp-2.3.19.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.19.ebuild,v 1.8 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.3.19.ebuild,v 1.9 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
inherit fdo-mime flag-o-matic multilib python
@@ -37,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
>=media-libs/libexif-0.6.15 )
lcms? ( media-libs/lcms )
mng? ( media-libs/libmng )
- pdf? ( >=virtual/poppler-glib-0.3.1 )
+ pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
png? ( >=media-libs/libpng-1.2.2 )
python? ( >=dev-lang/python-2.2.1
>=dev-python/pygtk-2.10.4 )
@@ -49,7 +51,7 @@ DEPEND="${RDEPEND}
>=dev-util/intltool-0.31
doc? ( >=dev-util/gtk-doc-1 )"
-src_compile() {
+src_configure() {
# workaround portage variable leakage
local AA=
@@ -82,6 +84,11 @@ src_compile() {
$(use_with tiff libtiff) \
$(use_with wmf) \
|| die "econf failed"
+}
+
+src_compile() {
+ # workaround portage variable leakage
+ local AA=
emake || die "emake failed"
}
diff --git a/media-gfx/gimp/gimp-2.4.6.ebuild b/media-gfx/gimp/gimp-2.4.6.ebuild
index 9f83296fb6a8..6cab67aed1c4 100644
--- a/media-gfx/gimp/gimp-2.4.6.ebuild
+++ b/media-gfx/gimp/gimp-2.4.6.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.9 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.6.ebuild,v 1.10 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
x11-misc/xdg-utils
x11-themes/hicolor-icon-theme
aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
curl? ( net-misc/curl )
dbus? ( dev-libs/dbus-glib )
hal? ( sys-apps/hal )
@@ -39,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
exif? ( >=media-libs/libexif-0.6.15 )
lcms? ( media-libs/lcms )
mng? ( media-libs/libmng )
- pdf? ( >=virtual/poppler-glib-0.3.1 )
+ pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
png? ( >=media-libs/libpng-1.2.2 )
python? ( >=dev-lang/python-2.2.1
>=dev-python/pygtk-2.10.4 )
@@ -55,11 +57,6 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
pkg_setup() {
- if use alsa && ! built_with_use media-libs/alsa-lib midi; then
- eerror "This package requires media-libs/alsa-lib compiled with midi support."
- die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
- fi
-
G2CONF="--enable-default-binary \
--with-x \
$(use_with aalib aa) \
@@ -85,8 +82,8 @@ pkg_setup() {
$(use_with wmf)"
}
-src_unpack() {
- gnome2_src_unpack
+src_prepare() {
+ gnome2_src_prepare
epatch "${FILESDIR}/gimp-web-browser.patch"
# Workaround for MIME-type, this is fixed in gimp trunk, so we can
@@ -96,7 +93,7 @@ src_unpack() {
eautoreconf
}
-src_compile() {
+src_configure() {
# workaround portage variable leakage
local AA=
@@ -107,6 +104,12 @@ src_compile() {
if use ppc || use ppc64; then
append-flags "-fsigned-char"
fi
+ gnome2_src_configure
+}
+
+src_compile() {
+ # workaround portage variable leakage
+ local AA=
gnome2_src_compile
}
diff --git a/media-gfx/gimp/gimp-2.4.7.ebuild b/media-gfx/gimp/gimp-2.4.7.ebuild
index dfef6a8797a5..c6297a06391e 100644
--- a/media-gfx/gimp/gimp-2.4.7.ebuild
+++ b/media-gfx/gimp/gimp-2.4.7.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.7.ebuild,v 1.2 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.4.7.ebuild,v 1.3 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
inherit gnome2 fdo-mime flag-o-matic multilib python eutils autotools
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
x11-misc/xdg-utils
x11-themes/hicolor-icon-theme
aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
curl? ( net-misc/curl )
dbus? ( dev-libs/dbus-glib )
hal? ( sys-apps/hal )
@@ -39,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
exif? ( >=media-libs/libexif-0.6.15 )
lcms? ( media-libs/lcms )
mng? ( media-libs/libmng )
- pdf? ( >=virtual/poppler-glib-0.3.1 )
+ pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
png? ( >=media-libs/libpng-1.2.2 )
python? ( >=dev-lang/python-2.2.1
>=dev-python/pygtk-2.10.4 )
@@ -55,10 +57,6 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
pkg_setup() {
- if use alsa && ! built_with_use media-libs/alsa-lib midi; then
- eerror "This package requires media-libs/alsa-lib compiled with midi support."
- die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
- fi
G2CONF="--enable-default-binary \
--with-x \
@@ -85,8 +83,8 @@ pkg_setup() {
$(use_with wmf)"
}
-src_unpack() {
- gnome2_src_unpack
+src_prepare() {
+ gnome2_src_prepare
epatch "${FILESDIR}/gimp-web-browser.patch"
# Workaround for MIME-type, this is fixed in gimp trunk, so we can
@@ -96,7 +94,7 @@ src_unpack() {
eautoreconf
}
-src_compile() {
+src_configure() {
# workaround portage variable leakage
local AA=
@@ -108,9 +106,17 @@ src_compile() {
append-flags "-fsigned-char"
fi
+ gnome2_src_configure
+}
+
+src_compile() {
+ # workaround portage variable leakage
+ local AA=
+
gnome2_src_compile
}
+
pkg_postinst() {
gnome2_pkg_postinst
diff --git a/media-gfx/gimp/gimp-2.6.4.ebuild b/media-gfx/gimp/gimp-2.6.4.ebuild
index f566a6fdd1cb..19f0985f6d8e 100644
--- a/media-gfx/gimp/gimp-2.6.4.ebuild
+++ b/media-gfx/gimp/gimp-2.6.4.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.4.ebuild,v 1.8 2009/04/06 14:23:25 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.4.ebuild,v 1.9 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
inherit eutils gnome2 fdo-mime multilib python
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
x11-themes/hicolor-icon-theme
>=media-libs/gegl-0.0.22
aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
curl? ( net-misc/curl )
dbus? ( dev-libs/dbus-glib )
hal? ( sys-apps/hal )
@@ -37,7 +39,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
exif? ( >=media-libs/libexif-0.6.15 )
lcms? ( media-libs/lcms )
mng? ( media-libs/libmng )
- pdf? ( >=virtual/poppler-glib-0.3.1 )
+ pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
png? ( >=media-libs/libpng-1.2.2 )
python? ( >=dev-lang/python-2.5.0
>=dev-python/pygtk-2.10.4 )
@@ -53,11 +55,6 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
pkg_setup() {
- if use alsa && ! built_with_use media-libs/alsa-lib midi; then
- eerror "This package requires media-libs/alsa-lib compiled with midi support."
- die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
- fi
-
G2CONF="--enable-default-binary \
--with-x \
$(use_with aalib aa) \
diff --git a/media-gfx/gimp/gimp-2.6.5.ebuild b/media-gfx/gimp/gimp-2.6.5.ebuild
index c2fc476553d6..3a3466ed7d85 100644
--- a/media-gfx/gimp/gimp-2.6.5.ebuild
+++ b/media-gfx/gimp/gimp-2.6.5.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.5.ebuild,v 1.3 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.5.ebuild,v 1.4 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
inherit eutils gnome2 fdo-mime multilib python
@@ -26,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
x11-themes/hicolor-icon-theme
>=media-libs/gegl-0.0.22
aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
curl? ( net-misc/curl )
dbus? ( dev-libs/dbus-glib )
hal? ( sys-apps/hal )
@@ -36,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
exif? ( >=media-libs/libexif-0.6.15 )
lcms? ( media-libs/lcms )
mng? ( media-libs/libmng )
- pdf? ( >=virtual/poppler-glib-0.3.1 )
+ pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
png? ( >=media-libs/libpng-1.2.2 )
python? ( >=dev-lang/python-2.5.0
>=dev-python/pygtk-2.10.4 )
@@ -52,11 +54,6 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
pkg_setup() {
- if use alsa && ! built_with_use media-libs/alsa-lib midi; then
- eerror "This package requires media-libs/alsa-lib compiled with midi support."
- die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
- fi
-
G2CONF="--enable-default-binary \
--with-x \
$(use_with aalib aa) \
diff --git a/media-gfx/gimp/gimp-2.6.6.ebuild b/media-gfx/gimp/gimp-2.6.6.ebuild
index f7438ef7c386..bc49724212a4 100644
--- a/media-gfx/gimp/gimp-2.6.6.ebuild
+++ b/media-gfx/gimp/gimp-2.6.6.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.6.ebuild,v 1.3 2009/04/02 03:47:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.6.ebuild,v 1.4 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
inherit eutils gnome2 fdo-mime multilib python
@@ -26,7 +28,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
x11-themes/hicolor-icon-theme
>=media-libs/gegl-0.0.22
aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
curl? ( net-misc/curl )
dbus? ( dev-libs/dbus-glib )
hal? ( sys-apps/hal )
@@ -36,7 +38,7 @@ RDEPEND=">=dev-libs/glib-2.18.1
exif? ( >=media-libs/libexif-0.6.15 )
lcms? ( media-libs/lcms )
mng? ( media-libs/libmng )
- pdf? ( >=virtual/poppler-glib-0.3.1 )
+ pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
png? ( >=media-libs/libpng-1.2.2 )
python? ( >=dev-lang/python-2.5.0
>=dev-python/pygtk-2.10.4 )
@@ -52,11 +54,6 @@ DEPEND="${RDEPEND}
DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
pkg_setup() {
- if use alsa && ! built_with_use media-libs/alsa-lib midi; then
- eerror "This package requires media-libs/alsa-lib compiled with midi support."
- die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
- fi
-
G2CONF="--enable-default-binary \
--with-x \
$(use_with aalib aa) \
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index 05390a7a6b1a..600a94498266 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,8 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.18 2009/03/30 13:28:41 loki_val Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.19 2009/04/10 23:19:10 loki_val Exp $
+
+EAPI=2
inherit subversion fdo-mime flag-o-matic multilib python
@@ -27,7 +29,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
dev-libs/libxslt
x11-themes/hicolor-icon-theme
aalib? ( media-libs/aalib )
- alsa? ( >=media-libs/alsa-lib-1.0.14a-r1 )
+ alsa? ( >=media-libs/alsa-lib-1.0.14a-r1[midi] )
curl? ( net-misc/curl )
dbus? ( dev-libs/dbus-glib
sys-apps/hal )
@@ -39,7 +41,7 @@ RDEPEND=">=dev-libs/glib-2.12.3
>=media-libs/libexif-0.6.15 )
lcms? ( media-libs/lcms )
mng? ( media-libs/libmng )
- pdf? ( >=virtual/poppler-glib-0.3.1 )
+ pdf? ( >=virtual/poppler-glib-0.3.1[cairo] )
png? ( >=media-libs/libpng-1.2.2 )
python? ( >=dev-lang/python-2.2.1
>=dev-python/pygtk-2.10.4 )
@@ -52,14 +54,7 @@ DEPEND="${RDEPEND}
>=sys-devel/gettext-0.17
doc? ( >=dev-util/gtk-doc-1 )"
-pkg_setup() {
- if use alsa && ! built_with_use media-libs/alsa-lib midi; then
- eerror "This package requires media-libs/alsa-lib compiled with midi support."
- die "Please reemerge media-libs/alsa-lib with USE=\"midi\"."
- fi
-}
-
-src_compile() {
+src_configure() {
# workaround portage variable leakage
local AA=
@@ -99,10 +94,15 @@ src_compile() {
$(use_with tiff libtiff) \
$(use_with wmf) \
|| die "econf failed"
+}
+src_compile() {
+ # workaround portage variable leakage
+ local AA=
emake || die "emake failed"
}
+
src_install() {
make DESTDIR="${D}" install || die "make install failed"