[gentoo-commits] gentoo-x86 commit in media-gfx/gimp: gimp-2.6.10.ebuild ChangeLog gimp-2.6.11.ebuild gimp-9999.ebuild gimp-2.6.8.ebuild

[Arfrever Frehtes Taifersar Arahesis (arfrever)]

arfrever    11/01/28 18:02:17

  Modified:             gimp-2.6.10.ebuild ChangeLog gimp-2.6.11.ebuild
                        gimp-9999.ebuild gimp-2.6.8.ebuild
  Log:
  Fix deprecation warnings. Call python_pkg_setup(). Don't install .pyc / .pyo files.
  
  (Portage version: 2.2.0_alpha19_p6/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  media-gfx/gimp/gimp-2.6.10.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.10.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.10.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.10.ebuild?r1=1.2&r2=1.3

Index: gimp-2.6.10.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.10.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gimp-2.6.10.ebuild	7 Nov 2010 19:09:13 -0000	1.2
+++ gimp-2.6.10.ebuild	28 Jan 2011 18:02:17 -0000	1.3
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.10.ebuild,v 1.2 2010/11/07 19:09:13 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.10.ebuild,v 1.3 2011/01/28 18:02:17 arfrever Exp $
 
-EAPI=2
+EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit eutils gnome2 fdo-mime multilib python
@@ -82,14 +82,20 @@
 
 	if use python; then
 		python_set_active_version 2
+		python_pkg_setup
 	fi
 }
 
+src_prepare() {
+	echo '#!/bin/sh' > py-compile
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 
 	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${D}"
+		python_convert_shebangs -r $(python_get_version) "${ED}"
 		python_need_rebuild
 	fi
 }



1.318                media-gfx/gimp/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.318&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?rev=1.318&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/ChangeLog?r1=1.317&r2=1.318

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v
retrieving revision 1.317
retrieving revision 1.318
diff -u -r1.317 -r1.318
--- ChangeLog	7 Nov 2010 19:09:13 -0000	1.317
+++ ChangeLog	28 Jan 2011 18:02:17 -0000	1.318
@@ -1,6 +1,11 @@
 # ChangeLog for media-gfx/gimp
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.317 2010/11/07 19:09:13 anarchy Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.318 2011/01/28 18:02:17 arfrever Exp $
+
+  28 Jan 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@g.o>
+  gimp-2.6.8.ebuild, gimp-2.6.10.ebuild, gimp-2.6.11.ebuild, gimp-9999.ebuild:
+  Fix deprecation warnings. Call python_pkg_setup(). Don't install .pyc / .pyo
+  files.
 
   07 Nov 2010; Jory A. Pratt <anarchy@g.o> gimp-2.6.8.ebuild,
   gimp-2.6.10.ebuild, gimp-2.6.11.ebuild, gimp-9999.ebuild:



1.3                  media-gfx/gimp/gimp-2.6.11.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.11.ebuild?r1=1.2&r2=1.3

Index: gimp-2.6.11.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gimp-2.6.11.ebuild	7 Nov 2010 19:09:13 -0000	1.2
+++ gimp-2.6.11.ebuild	28 Jan 2011 18:02:17 -0000	1.3
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11.ebuild,v 1.2 2010/11/07 19:09:13 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11.ebuild,v 1.3 2011/01/28 18:02:17 arfrever Exp $
 
-EAPI=2
+EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit eutils gnome2 fdo-mime multilib python
@@ -82,14 +82,20 @@
 
 	if use python; then
 		python_set_active_version 2
+		python_pkg_setup
 	fi
 }
 
+src_prepare() {
+	echo '#!/bin/sh' > py-compile
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 
 	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${D}"
+		python_convert_shebangs -r $(python_get_version) "${ED}"
 		python_need_rebuild
 	fi
 }



1.32                 media-gfx/gimp/gimp-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild?rev=1.32&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild?rev=1.32&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild?r1=1.31&r2=1.32

Index: gimp-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- gimp-9999.ebuild	7 Nov 2010 19:09:13 -0000	1.31
+++ gimp-9999.ebuild	28 Jan 2011 18:02:17 -0000	1.32
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 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.31 2010/11/07 19:09:13 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-9999.ebuild,v 1.32 2011/01/28 18:02:17 arfrever Exp $
 
-EAPI=2
+EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit git eutils gnome2 fdo-mime multilib python
@@ -56,16 +56,6 @@
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
-src_prepare() {
-	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
-	./autogen.sh
-	gnome2_src_prepare
-}
-
-src_unpack() {
-	git_src_unpack
-}
-
 pkg_setup() {
 	G2CONF="--enable-default-binary \
 		--with-x \
@@ -94,14 +84,26 @@
 
 	if use python; then
 		python_set_active_version 2
+		python_pkg_setup
 	fi
 }
 
+src_unpack() {
+	git_src_unpack
+}
+
+src_prepare() {
+	echo '#!/bin/sh' > py-compile
+	sed -i -e 's:\$srcdir/configure:#:g' autogen.sh
+	./autogen.sh
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 
 	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${D}"
+		python_convert_shebangs -r $(python_get_version) "${ED}"
 		python_need_rebuild
 	fi
 }



1.16                 media-gfx/gimp/gimp-2.6.8.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild?r1=1.15&r2=1.16

Index: gimp-2.6.8.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- gimp-2.6.8.ebuild	7 Nov 2010 19:09:13 -0000	1.15
+++ gimp-2.6.8.ebuild	28 Jan 2011 18:02:17 -0000	1.16
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild,v 1.15 2010/11/07 19:09:13 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.8.ebuild,v 1.16 2011/01/28 18:02:17 arfrever Exp $
 
-EAPI=2
+EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
 
 inherit eutils gnome2 fdo-mime multilib python
@@ -53,10 +53,6 @@
 
 DOCS="AUTHORS ChangeLog* HACKING NEWS README*"
 
-src_prepare() {
-	epatch "${FILESDIR}/${P}-libpng-1.4.patch"
-}
-
 pkg_setup() {
 	G2CONF="--enable-default-binary \
 		--with-x \
@@ -85,14 +81,21 @@
 
 	if use python; then
 		python_set_active_version 2
+		python_pkg_setup
 	fi
 }
 
+src_prepare() {
+	echo '#!/bin/sh' > py-compile
+	epatch "${FILESDIR}/${P}-libpng-1.4.patch"
+	gnome2_src_prepare
+}
+
 src_install() {
 	gnome2_src_install
 
 	if use python; then
-		python_convert_shebangs -r $(python_get_version) "${D}"
+		python_convert_shebangs -r $(python_get_version) "${ED}"
 		python_need_rebuild
 	fi
 }