summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-gfx/gimp/ChangeLog7
-rw-r--r--media-gfx/gimp/gimp-2.2.10.ebuild5
-rw-r--r--media-gfx/gimp/gimp-2.2.11-r1.ebuild5
-rw-r--r--media-gfx/gimp/gimp-2.2.11.ebuild5
-rw-r--r--media-gfx/gimp/gimp-2.2.6-r1.ebuild5
-rw-r--r--media-gfx/gimp/gimp-2.2.8-r1.ebuild5
-rw-r--r--media-gfx/gimp/gimp-2.2.9.ebuild5
-rw-r--r--media-gfx/gimp/gimp-9999.ebuild10
8 files changed, 26 insertions, 21 deletions
diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index dd599cd2bb97..136240a56f48 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/gimp
# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.147 2006/06/16 13:50:37 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.148 2006/06/18 17:53:51 brix Exp $
+
+ 18 Jun 2006; Henrik Brix Andersen <brix@gentoo.org> gimp-2.2.6-r1.ebuild,
+ gimp-2.2.8-r1.ebuild, gimp-2.2.9.ebuild, gimp-2.2.10.ebuild,
+ gimp-2.2.11.ebuild, gimp-2.2.11-r1.ebuild, gimp-9999.ebuild:
+ Updated for addition of the split-out app-doc/gimp-help ebuilds.
*gimp-2.2.11-r1 (16 Jun 2006)
diff --git a/media-gfx/gimp/gimp-2.2.10.ebuild b/media-gfx/gimp/gimp-2.2.10.ebuild
index 6fb0fcea473f..d123ef68809a 100644
--- a/media-gfx/gimp/gimp-2.2.10.ebuild
+++ b/media-gfx/gimp/gimp-2.2.10.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.10.ebuild,v 1.4 2006/04/21 00:15:08 allanonjl Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.10.ebuild,v 1.5 2006/06/18 17:53:51 brix Exp $
inherit flag-o-matic libtool eutils fdo-mime alternatives
@@ -44,7 +44,8 @@ RDEPEND=">=dev-libs/glib-2.4.5
aalib? ( media-libs/aalib )
python? ( >=dev-lang/python-2.2
>=dev-python/pygtk-2 )
- lcms? ( media-libs/lcms )"
+ lcms? ( media-libs/lcms )
+ !app-doc/gimp-help"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0
diff --git a/media-gfx/gimp/gimp-2.2.11-r1.ebuild b/media-gfx/gimp/gimp-2.2.11-r1.ebuild
index 90d4aba6713a..69bbdd572648 100644
--- a/media-gfx/gimp/gimp-2.2.11-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.2.11-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.11-r1.ebuild,v 1.1 2006/06/16 13:50:37 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.11-r1.ebuild,v 1.2 2006/06/18 17:53:51 brix Exp $
inherit flag-o-matic libtool eutils fdo-mime alternatives
@@ -44,7 +44,8 @@ RDEPEND=">=dev-libs/glib-2.4.5
aalib? ( media-libs/aalib )
python? ( >=dev-lang/python-2.2
>=dev-python/pygtk-2 )
- lcms? ( media-libs/lcms )"
+ lcms? ( media-libs/lcms )
+ !app-doc/gimp-help"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0
diff --git a/media-gfx/gimp/gimp-2.2.11.ebuild b/media-gfx/gimp/gimp-2.2.11.ebuild
index cb44dab31f04..895cd0136b07 100644
--- a/media-gfx/gimp/gimp-2.2.11.ebuild
+++ b/media-gfx/gimp/gimp-2.2.11.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.11.ebuild,v 1.1 2006/06/15 15:43:43 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.11.ebuild,v 1.2 2006/06/18 17:53:51 brix Exp $
inherit flag-o-matic libtool eutils fdo-mime alternatives
@@ -44,7 +44,8 @@ RDEPEND=">=dev-libs/glib-2.4.5
aalib? ( media-libs/aalib )
python? ( >=dev-lang/python-2.2
>=dev-python/pygtk-2 )
- lcms? ( media-libs/lcms )"
+ lcms? ( media-libs/lcms )
+ !app-doc/gimp-help"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0
diff --git a/media-gfx/gimp/gimp-2.2.6-r1.ebuild b/media-gfx/gimp/gimp-2.2.6-r1.ebuild
index 091203f1ac75..60e88effb14c 100644
--- a/media-gfx/gimp/gimp-2.2.6-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.2.6-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.6-r1.ebuild,v 1.13 2006/02/01 08:53:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.6-r1.ebuild,v 1.14 2006/06/18 17:53:51 brix Exp $
inherit flag-o-matic libtool eutils fdo-mime
@@ -47,7 +47,8 @@ RDEPEND="
aalib? ( media-libs/aalib )
python? ( >=dev-lang/python-2.2
- >=dev-python/pygtk-2 )"
+ >=dev-python/pygtk-2 )
+ !app-doc/gimp-help"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0
diff --git a/media-gfx/gimp/gimp-2.2.8-r1.ebuild b/media-gfx/gimp/gimp-2.2.8-r1.ebuild
index efb9d924a819..6e5b060e164b 100644
--- a/media-gfx/gimp/gimp-2.2.8-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.2.8-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8-r1.ebuild,v 1.13 2006/02/01 08:53:30 lu_zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.8-r1.ebuild,v 1.14 2006/06/18 17:53:51 brix Exp $
inherit flag-o-matic libtool eutils fdo-mime alternatives
@@ -45,7 +45,8 @@ RDEPEND="
aalib? ( media-libs/aalib )
python? ( >=dev-lang/python-2.2
>=dev-python/pygtk-2 )
- lcms? ( media-libs/lcms )"
+ lcms? ( media-libs/lcms )
+ !app-doc/gimp-help"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0
diff --git a/media-gfx/gimp/gimp-2.2.9.ebuild b/media-gfx/gimp/gimp-2.2.9.ebuild
index c07ba22ef241..08f505cafc8d 100644
--- a/media-gfx/gimp/gimp-2.2.9.ebuild
+++ b/media-gfx/gimp/gimp-2.2.9.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.9.ebuild,v 1.5 2006/01/12 23:40:28 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.9.ebuild,v 1.6 2006/06/18 17:53:51 brix Exp $
inherit flag-o-matic libtool eutils fdo-mime alternatives
@@ -44,7 +44,8 @@ RDEPEND=">=dev-libs/glib-2.4.5
aalib? ( media-libs/aalib )
python? ( >=dev-lang/python-2.2
>=dev-python/pygtk-2 )
- lcms? ( media-libs/lcms )"
+ lcms? ( media-libs/lcms )
+ !app-doc/gimp-help"
DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.12.0
diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index adcf77e1cf24..fc0106925318 100644
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2006 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.2 2006/05/03 21:14:45 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.3 2006/06/18 17:53:51 brix Exp $
inherit alternatives cvs eutils fdo-mime flag-o-matic
@@ -33,6 +33,7 @@ RDEPEND=">=dev-libs/glib-2.8.2
x11-themes/hicolor-icon-theme
aalib? ( media-libs/aalib )
alsa? ( >=media-libs/alsa-lib-1.0.0 )
+ doc? ( app-doc/gimp-help )
gimpprint? ( =media-gfx/gimp-print-4.2* )
gnome? ( >=gnome-base/gnome-vfs-2.10.0
>=gnome-base/libgnomeui-2.10.0
@@ -79,9 +80,6 @@ src_compile() {
"${S}"/autogen.sh $(use_enable doc gtk-doc) || die "autogen.sh failed"
- # X isn't optional (#58003) at the moment
- # $(use_with X x) \
-
econf \
--disable-default-binary \
--with-x \
@@ -129,10 +127,6 @@ pkg_postinst() {
einfo
einfo "If you want Postscript file support, emerge ghostscript."
einfo
- einfo "Due to its CVS nature, this ebuild does not include the"
- einfo "gimp-help package. The manual is available at online at"
- einfo "http://docs.gimp.org/"
- einfo
}
pkg_postrm() {