converted to distutils-r1, thanks cschwan and jer

(Portage version: 2.2.01.22288-prefix/cvs/Linux x86_64, signed Manifest commit with key 0x13CB1360)

4 files changed, 21 insertions, 52 deletions

diff --git a/dev-python/gdmodule/ChangeLog b/dev-python/gdmodule/ChangeLog
index 637fbc70185c..76e95d32c4e9 100644
--- a/dev-python/gdmodule/ChangeLog
+++ b/dev-python/gdmodule/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/gdmodule
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdmodule/ChangeLog,v 1.8 2012/08/02 18:04:39 bicatali Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdmodule/ChangeLog,v 1.9 2013/09/03 21:14:16 bicatali Exp $
+
+  03 Sep 2013; Sébastien Fabbro <bicatali@gentoo.org> -files/0.56-libs.patch,
+  gdmodule-0.56-r2.ebuild, metadata.xml:
+  converted to distutils-r1, thanks cschwan and jer
 
   02 Aug 2012; Sébastien Fabbro <bicatali@gentoo.org> -gdmodule-0.56.ebuild,
   gdmodule-0.56-r2.ebuild:
diff --git a/dev-python/gdmodule/files/0.56-libs.patch b/dev-python/gdmodule/files/0.56-libs.patch
deleted file mode 100644
index aac6405b3332..000000000000
--- a/dev-python/gdmodule/files/0.56-libs.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/Setup.py b/Setup.py
-index c6ef27f..8baedc4 100644
---- a/Setup.py
-+++ b/Setup.py
-@@ -40,7 +40,7 @@ def remove(itm, lst):
- # Unixoid OS's I will just look for the usual suspects.
- 
- libdirs = dirtest([
--    "/usr/local/lib", "/sw/lib", "/usr/lib",
-+    "/usr/lib", "/usr/lib64",
-     "/usr/lib/X11", "/usr/X11R6/lib",
-     "/opt/gnome/lib",
- ])
-@@ -48,7 +48,7 @@ libdirs = dirtest([
- # include_dirs are also non-portable; same trick here.
- 
- incdirs = dirtest([
--    "/usr/local/include", "/sw/include", "/usr/include",
-+    "/usr/include",
-     "/usr/include/X11", "/usr/X11R6/include",
-     "/opt/gnome/include",
- ])
-@@ -57,9 +57,6 @@ incdirs = dirtest([
- 
- want_libs = [
-     "gd",
--    "jpeg", "png", "gif", "z",
--    "X11", "Xpm",
--    "ttf", "freetype",
- ]
- 
- libs = filetest(libdirs, want_libs)
diff --git a/dev-python/gdmodule/gdmodule-0.56-r2.ebuild b/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
index afd598240fdc..554489982291 100644
--- a/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
+++ b/dev-python/gdmodule/gdmodule-0.56-r2.ebuild
@@ -1,18 +1,14 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/gdmodule/gdmodule-0.56-r2.ebuild,v 1.5 2012/08/02 18:04:39 bicatali Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/gdmodule/gdmodule-0.56-r2.ebuild,v 1.6 2013/09/03 21:14:16 bicatali Exp $
 
-EAPI="3"
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
 
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.* 2.7-pypy-* *-jython"
-DISTUTILS_SETUP_FILES=("Setup.py")
-
-inherit distutils eutils flag-o-matic
+inherit distutils-r1 flag-o-matic
 
 DESCRIPTION="Python extensions for gd"
-HOMEPAGE="http://newcenturycomputers.net/projects/gdmodule.html"
+HOMEPAGE="https://github.com/Solomoriah/gdmodule"
 SRC_URI="http://newcenturycomputers.net/projects/download.cgi/${P}.tar.gz"
 
 LICENSE="BSD"
@@ -29,8 +25,11 @@ RDEPEND="
 	xpm? ( x11-libs/libXpm )"
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-fix-libs.patch
+PATCHES=( "${FILESDIR}"/${P}-fix-libs.patch )
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	mv Setup.py setup.py  || die
 
 	# append unconditionally because it is enabled id media-libs/gd by default
 	append-cppflags -DHAVE_LIBGIF
@@ -39,6 +38,4 @@ src_prepare() {
 	use png && append-cppflags -DHAVE_LIBPNG
 	use truetype && append-cppflags -DHAVE_LIBFREETYPE
 	use xpm && append-cppflags -DHAVE_LIBXPM
-
-	distutils_src_prepare
 }
diff --git a/dev-python/gdmodule/metadata.xml b/dev-python/gdmodule/metadata.xml
index 31e74459985d..2201c6fd2292 100644
--- a/dev-python/gdmodule/metadata.xml
+++ b/dev-python/gdmodule/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-  <herd>sci</herd>
-  <longdescription lang="en">
-    This module is a python wrapper for the GD library.
-  </longdescription>
+<herd>sci</herd>
+<longdescription lang="en">
+  This module is a python wrapper for the GD library.
+</longdescription>
 </pkgmetadata>