change gimp live ebuild from cvs to svn

Package-Manager: portage-2.1.2.4

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index 00f48d7d9d3ab50521480f5ee002348950a50562..783d293e4012b3101fc9ddb7be075dcd5f5eede8 100644 (file)
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.185 2007/04/02 20:49:26 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.186 2007/04/21 04:34:25 hanno Exp $
+
+  21 Apr 2007; Hanno Boeck <hanno@gentoo.org> gimp-9999.ebuild:
+  Change live ebuild from cvs to svn.
 
 *gimp-2.3.15 (02 Apr 2007)
 

diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index f693b25bce91eec121bdc946e0d243fab745a34b..12f061e97fd9c441b06bd0263ced6876646e1601 100644 (file)
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -17,10 +17,10 @@ DIST gimp-2.2.12.tar.bz2 12875447 RMD160 31a4ee1344f799619dd9b38ea78e8748556fe7c
 DIST gimp-2.3.13.tar.bz2 15855459 RMD160 a12f99ceca3c55af03b04b6b16ef1266f31b1b02 SHA1 6f222f1a851a21e603f34ec925ddd15b7ad848c2 SHA256 6cc35431735c9303721c0a99f63dc685be60e82c197800880cbbf861c5c498ae
 DIST gimp-2.3.14.tar.bz2 16035467 RMD160 53aab8b6e0a3f1d1249b6f4c363d76fa7a5e20b0 SHA1 c1564d1c56bfc0d4472cd9f7ff8d35888a6d3c4e SHA256 43524502fa4d94c85bd432bb1d008daf746b65e32357b0a3b0b8a62b6ee03438
 DIST gimp-2.3.15.tar.bz2 16080133 RMD160 8c2017dccf188fe2b76e8a15acdc91c338c3457a SHA1 7447afd00d2940e2dd02edfc92575715d3a52936 SHA256 419f42a6e9b305a6b7870771ef072e64265f9332f8dcfa341ba14f5216aa0ac7
-EBUILD gimp-2.2.12.ebuild 4255 RMD160 016f2c5bdc1ac030fc6fd6d6b606c1fff198e97b SHA1 dee76cf652401951379cc20d005dee9e95d251de SHA256 85cbd5ef41baf373c27c13ebafa4aef009e725bad7786e1f09fa7c28279dd55f
-MD5 b9f9094e7bb40dbd2801c6b1645ec93a gimp-2.2.12.ebuild 4255
-RMD160 016f2c5bdc1ac030fc6fd6d6b606c1fff198e97b gimp-2.2.12.ebuild 4255
-SHA256 85cbd5ef41baf373c27c13ebafa4aef009e725bad7786e1f09fa7c28279dd55f gimp-2.2.12.ebuild 4255
+EBUILD gimp-2.2.12.ebuild 4255 RMD160 2fff86c9b59c783b625c41a6a82f38fc2cc28c13 SHA1 0714d66a944d83a2938b0e251e3249c6dc9d7eff SHA256 a446fe6838de1649c5cffd740015fd8edd283e3db3e5fbef63587faf2c1729af
+MD5 8f3c782856ae97ed5a0be4e29ec4648d gimp-2.2.12.ebuild 4255
+RMD160 2fff86c9b59c783b625c41a6a82f38fc2cc28c13 gimp-2.2.12.ebuild 4255
+SHA256 a446fe6838de1649c5cffd740015fd8edd283e3db3e5fbef63587faf2c1729af gimp-2.2.12.ebuild 4255
 EBUILD gimp-2.3.13.ebuild 3092 RMD160 56d84cc55bf66d1e561d89774d935856a415c6e5 SHA1 43d06baa3133ea365507109546e8d7d526b1c1a3 SHA256 daa234f8b50e1ab91406d060e8ffe6e54afc2e2d8299f1bddc380f9e24b410c9
 MD5 de1847813b5cfe5de6efc6ddb72a9094 gimp-2.3.13.ebuild 3092
 RMD160 56d84cc55bf66d1e561d89774d935856a415c6e5 gimp-2.3.13.ebuild 3092
@@ -33,14 +33,14 @@ EBUILD gimp-2.3.15.ebuild 3093 RMD160 0ca8c5a0dab68f6cb7bdaeea130c268f37474c1a S
 MD5 45659ac2ea504124ae8202d00929feca gimp-2.3.15.ebuild 3093
 RMD160 0ca8c5a0dab68f6cb7bdaeea130c268f37474c1a gimp-2.3.15.ebuild 3093
 SHA256 318e20ad472405695f05dae5bbd62068d10d803633c8e30111d0ee607d15acf6 gimp-2.3.15.ebuild 3093
-EBUILD gimp-9999.ebuild 3633 RMD160 52d963ccd8cbe4209426a52c5a12c78c92552fe6 SHA1 253e4aa56dced277db0a1885d6ad3346ce0800ad SHA256 312623e77d6204c2bdd639e7cf914a79e51e03859b7acc8057447631709f2e89
-MD5 616c02b24a94024e01571afbce850ff9 gimp-9999.ebuild 3633
-RMD160 52d963ccd8cbe4209426a52c5a12c78c92552fe6 gimp-9999.ebuild 3633
-SHA256 312623e77d6204c2bdd639e7cf914a79e51e03859b7acc8057447631709f2e89 gimp-9999.ebuild 3633
-MISC ChangeLog 26427 RMD160 d388b6eb6c5f9c08bc6b042aa75f15bb418a251a SHA1 ef2f3082d7401b546d88ebf6b2119792f707cf30 SHA256 081ad4060b57a6751d24bd94ef177e730141bccb122af3752d36ed47cc044d3e
-MD5 77e3b0ff509eed2ed817d22128de5a42 ChangeLog 26427
-RMD160 d388b6eb6c5f9c08bc6b042aa75f15bb418a251a ChangeLog 26427
-SHA256 081ad4060b57a6751d24bd94ef177e730141bccb122af3752d36ed47cc044d3e ChangeLog 26427
+EBUILD gimp-9999.ebuild 3172 RMD160 c909ac39ccf2a63ab2eebc0f38a0b99d06e254ec SHA1 5f03e78f4c063de8821971aa7d90a3fe04e62b3a SHA256 f88812b96a57b4d742a8d26c0f0f9ac325b4c5405920a22e3f12b6798febc77f
+MD5 02f9080706383bb94b41afc69db05e2d gimp-9999.ebuild 3172
+RMD160 c909ac39ccf2a63ab2eebc0f38a0b99d06e254ec gimp-9999.ebuild 3172
+SHA256 f88812b96a57b4d742a8d26c0f0f9ac325b4c5405920a22e3f12b6798febc77f gimp-9999.ebuild 3172
+MISC ChangeLog 26530 RMD160 46a89a98d4c48e203f613bdf64c8ce132de76e61 SHA1 02fa8219a1678a263e98b25381eae0308c57390b SHA256 8981277107fc5bf43b10811ea00ff1975939abdbb495adf604ee2092f3c44cbb
+MD5 0972654db3fd1bfd5e6117762ac23a64 ChangeLog 26530
+RMD160 46a89a98d4c48e203f613bdf64c8ce132de76e61 ChangeLog 26530
+SHA256 8981277107fc5bf43b10811ea00ff1975939abdbb495adf604ee2092f3c44cbb ChangeLog 26530
 MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
 MD5 8fee4c6e0af48517b726cceb49fa580a metadata.xml 220
 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 metadata.xml 220
@@ -63,7 +63,7 @@ SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGEWxOr2QksT29OyARAigqAKCRiUumBOtEZQEUAIkRKVgpqG1opACeK6ap
-sNw9Nquz8odLUcBu71V22Ow=
-=nyLo
+iD8DBQFGKZRXr2QksT29OyARAkqmAJ9wRUQymWCYY2MMIAJC+L3oMM5TQgCfVB1B
+tUwST7vreiC19tQe/5z3XH8=
+=7TuK
 -----END PGP SIGNATURE-----

diff --git a/media-gfx/gimp/gimp-2.2.12.ebuild b/media-gfx/gimp/gimp-2.2.12.ebuild
index bd6934c8a106c92e589af8178a28a721bde2f598..006c56fd1a50a2f71a41d1f1cd895bdb48f27fbb 100644 (file)
--- a/media-gfx/gimp/gimp-2.2.12.ebuild
+++ b/media-gfx/gimp/gimp-2.2.12.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.12.ebuild,v 1.11 2006/09/08 18:04:31 tcort Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.2.12.ebuild,v 1.12 2007/04/21 04:34:25 hanno Exp $
 
 inherit flag-o-matic libtool eutils fdo-mime alternatives
 

diff --git a/media-gfx/gimp/gimp-9999.ebuild b/media-gfx/gimp/gimp-9999.ebuild
index e72f550d8a26ae2fd4f5960f6372c698737069b9..8779ca42084d7dbd234db370cde1e65b72e8afaa 100644 (file)
--- a/media-gfx/gimp/gimp-9999.ebuild
+++ b/media-gfx/gimp/gimp-9999.ebuild
@@ -1,27 +1,23 @@
 # Copyright 1999-2007 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.7 2007/01/28 11:50:58 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.8 2007/04/21 04:34:25 hanno Exp $
 
-inherit alternatives cvs eutils fdo-mime flag-o-matic
+inherit subversion fdo-mime flag-o-matic
 
-ECVS_SERVER="anoncvs.gimp.org:/cvs/gnome"
-ECVS_MODULE="gimp"
-ECVS_AUTH="pserver"
-ECVS_USER="anonymous"
+ESVN_REPO_URI="http://svn.gnome.org/svn/gimp/trunk/"
 
-S=${WORKDIR}/${ECVS_MODULE}
-
-DESCRIPTION="GNU Image Manipulation Program from CVS HEAD"
+DESCRIPTION="GNU Image Manipulation Program"
 HOMEPAGE="http://www.gimp.org/"
 SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="2"
-KEYWORDS="-*"
+KEYWORDS=""
 
-IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png print python smp sse svg tiff wmf"
+IUSE="alsa aalib altivec debug doc gtkhtml gnome jpeg lcms mmx mng pdf png python smp sse svg tiff wmf"
 
-RDEPEND=">=dev-libs/glib-2.10.2
+RDEPEND=">=dev-libs/glib-2.12.3
+               >=x11-libs/gtk+-2.8.20-r1
                >=x11-libs/pango-1.12.2
                >=media-libs/freetype-2.1.7
                >=media-libs/fontconfig-2.2.0
@@ -34,19 +30,17 @@ RDEPEND=">=dev-libs/glib-2.10.2
                alsa? ( >=media-libs/alsa-lib-1.0.0 )
                doc? ( app-doc/gimp-help )
                gnome? ( >=gnome-base/gnome-vfs-2.10.0
-                               >=gnome-base/libgnomeui-2.10.0
-                               >=gnome-base/gnome-keyring-0.4.5 )
+                       >=gnome-base/libgnomeui-2.10.0
+                       >=gnome-base/gnome-keyring-0.4.5 )
                gtkhtml? ( =gnome-extra/gtkhtml-2* )
                jpeg? ( >=media-libs/jpeg-6b-r2
-                               >=media-libs/libexif-0.6.0 )
+                       >=media-libs/libexif-0.6.0 )
                lcms? ( media-libs/lcms )
                mng? ( media-libs/libmng )
                pdf? ( >=app-text/poppler-bindings-0.3.1 )
                png? ( >=media-libs/libpng-1.2.2 )
-               print? ( >=x11-libs/gtk+-2.9.3 )
-               !print? ( >=x11-libs/gtk+-2.8.17 )
                python? ( >=dev-lang/python-2.2.1
-                               >=dev-python/pygtk-2 )
+                       >=dev-python/pygtk-2.8 )
                tiff? ( >=media-libs/tiff-3.5.7 )
                svg? ( >=gnome-base/librsvg-2.8.0 )
                wmf? ( >=media-libs/libwmf-0.2.8 )"
@@ -65,13 +59,6 @@ pkg_setup() {
        fi
 }
 
-src_unpack() {
-       cvs_src_unpack
-
-       cd "${S}"
-       epatch ${FILESDIR}/${P}-autogen-gentoo.patch
-}
-
 src_compile() {
        # workaround portage variable leakage
        local AA=
@@ -80,10 +67,10 @@ src_compile() {
        # gimp uses floating point math, needs accuracy (#98685)
        filter-flags "-fno-inline" "-ffast-math"
 
-       "${S}"/autogen.sh $(use_enable doc gtk-doc) || die "autogen.sh failed"
+       sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
+       "${S}"/autogen.sh $(use_enable doc gtk-doc) || die
 
-       econf \
-               --disable-default-binary \
+       econf --enable-default-binary \
                --with-x \
                $(use_with aalib aa) \
                $(use_with alsa) \
@@ -96,9 +83,8 @@ src_compile() {
                $(use_with lcms) \
                $(use_enable mmx) \
                $(use_with mng libmng) \
-               $(use_with png libpng) \
                $(use_with pdf poppler) \
-               $(use_with print) \
+               $(use_with png libpng) \
                $(use_enable python) \
                $(use_enable smp mp) \
                $(use_enable sse) \
@@ -116,13 +102,6 @@ src_install() {
 }
 
 pkg_postinst() {
-       local binary
-
-       # install symlinks for everything but gimptool (#136012)
-       for binary in gimp gimp-console gimp-remote; do
-               alternatives_auto_makesym "/usr/bin/${binary}" "/usr/bin/${binary}-[0-9].[0-9]"
-       done
-
        fdo-mime_desktop_database_update
        fdo-mime_mime_database_update