Version bump. Fix detection of Linux version 3.x in both 1.1.5 and 1.3.0. Bugs 359347 and 375253.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

5 files changed, 86 insertions, 20 deletions

diff --git a/dev-python/pyfltk/ChangeLog b/dev-python/pyfltk/ChangeLog
index 5e8b194e117f..b4ba179ae04d 100644
--- a/dev-python/pyfltk/ChangeLog
+++ b/dev-python/pyfltk/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-python/pyfltk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.27 2011/05/05 15:17:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/ChangeLog,v 1.28 2011/12/09 17:13:29 ssuominen Exp $
+
+*pyfltk-1.3.0 (09 Dec 2011)
+
+  09 Dec 2011; Samuli Suominen <ssuominen@gentoo.org> pyfltk-1.1.5.ebuild,
+  +pyfltk-1.3.0.ebuild, +files/pyfltk-1.3.0-linux-3.x-detection.patch:
+  Version bump. Fix detection of Linux version 3.x in both 1.1.5 and 1.3.0.
+  Bugs 359347 and 375253.
 
   05 May 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   pyfltk-1.1.5.ebuild, +files/pyfltk-1.1.5-swig-2.patch:
diff --git a/dev-python/pyfltk/Manifest b/dev-python/pyfltk/Manifest
index 28392f49c177..8ff256553a44 100644
--- a/dev-python/pyfltk/Manifest
+++ b/dev-python/pyfltk/Manifest
@@ -2,25 +2,22 @@
 Hash: SHA1
 
 AUX pyfltk-1.1.5-swig-2.patch 283 RMD160 c28662fd7067b1b51d5622e57472b2c1ae6e889f SHA1 b87b765c81e4eb641dc7a8a8e18196cd5c5ec8ea SHA256 2d0d03d92fe881f46e66bb214b8cf5e28b35bef30cbf78ebeadf08c3182643cf
+AUX pyfltk-1.3.0-linux-3.x-detection.patch 679 RMD160 9591e3c8b2712bba0adbe5812f66a12819105481 SHA1 6a04aaf5b12983beb48165cba290b8b4bbfb0997 SHA256 ccc7ce0949cdacace00b71c1e438f343c87255fd8fbfa6fc9aad1911670edc55
 DIST pyFltk-1.1.5.tar.gz 864463 RMD160 df6a0ab3f88e1f8fddba9542a0217cb32a215333 SHA1 2c55e438bb8d37b86b5c9c27339dd2222338d835 SHA256 278234198cf59b6e687cb4949e609ef766e29076f81fed4492cf31ab353c5a5c
+DIST pyFltk-1.3.0.tar.gz 915600 RMD160 4605c5ef277323a60da6edd91743f3a7e0f970ae SHA1 82c40bc11e0cef5b191949587b7e58c3a740cd88 SHA256 c52852d21ee17d495185259b46ac9603d683edde7d7e6d4b6f9268da4ee3de57
 DIST pyfltkmanual.pdf 206137 RMD160 ea55c11127e41e3617ff86fe44ef3097f6fe4ad9 SHA1 672003a9d44b285a79a7172b2e498047da7c74fd SHA256 17a4806e6a0f75f0b458ceca1cfa6d8738cee2f1fb2d092aa5bd83882f9dd122
-EBUILD pyfltk-1.1.5.ebuild 1369 RMD160 78015c7ad30ef4b71af2edab743021bccaabc316 SHA1 0a8b70264274aea823e1a5c699cbef6bd66dadd2 SHA256 fadfc219b698739a2a0ddda07f653285c31f47d9824dc3470fbd2a06bfd329ad
-MISC ChangeLog 3562 RMD160 2ea9a65b4f67d920bd9d47b0f7697c804ae0ba54 SHA1 2a2ec7d49da1fa297789aa3f2cf451267d84ed74 SHA256 051233fdb9ad4f18cb50f63daee579ed8c3d84194f1941cb2dd2b63b42323c92
+EBUILD pyfltk-1.1.5.ebuild 1437 RMD160 75f424f6722f723aa881acdf723e51aab6a6ef7d SHA1 44e14a8f28e0e5eef2ba2e2f43d6c50efcaa59e6 SHA256 ba8d0ff595ddec6b7dc0394f3748dab1b97e0c3b3937e339bc00456c3d1514f1
+EBUILD pyfltk-1.3.0.ebuild 1070 RMD160 a0e3303013e0d3461156bdfedef02dbda6ccf5e7 SHA1 f7e7d6fb1b3d8f4ea5919c6addddef5d096ff73e SHA256 d004188055cf0b776f21b9bb1a2d33f5f04058fa5a03a9cbfde564d8271dbbc3
+MISC ChangeLog 3841 RMD160 b17c0d8d7c582406ae67e515b49e20c72249f0a4 SHA1 10303d32271523f1d45d7ac85c738f175bc2f568 SHA256 655ae43e20965d494169f34232762915bea4eb354fa451f6b362e5d2c0c02fd9
 MISC metadata.xml 314 RMD160 bfa1d9d8065cbf737b7d9f8c76f927df04b5d6f9 SHA1 5d19fc1121d414307f541e22e056f197be58409b SHA256 cde0c68fc1ead45abf7718c8cbcec1d679f2419f571d649ed658e34034b1428d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQIcBAEBAgAGBQJNwr+jAAoJENgZr6v6gHY0fREQAMuKJNJKF8oRB27EZlVEPRvQ
-/kTylQoMioaJOK+4xAp8/+HxobNs/prN7qV32y8fSjIRu3ofj604xu6X5OcM5gjz
-dyo3h/vREd3mwuv2bKnfoQwSah31gK3W0o+374lQeUoSsv9F9Kd3tQ41JK94KbVF
-Uvj9BoH5SrR6bv8iam5X4kXelNYU+MMOCUHa8lKEdbq4XITHGhVMQPe2J+sqmWyN
-ZsQKr807ah9cCYT2QwH+8opJBknRsdasqT4w4VAva9JQvqQWl0GcbagDD6mjPL6E
-fC903CQFaQ9HZhsBOmRpaHUzQEJcD6S2nOvB2rjQauxucF3+igeeevxkcY8o8VXi
-gGGpHGlbIF4QtTS/KIQhIa+hRd+aeJfL7c/BoRekmxq+1avs4kcEHMLmdAce4p55
-76+r/+hn9Iz7vyT4OyTObdG2qIVCZTlVo0D3FqYj0xjdlZvmo97vwAY+ppXcCewd
-IbaCoibC7B14nCuhFpckgpxMnO8xD/b+BTX76dntxMI/kx16/Nn50iQyEhkRS/eb
-crVGKXh18uwGs6K3Av95elrnh/v78xMcUc1n9bkXRc31/2Fkaoz2s7q6+F6vqBhi
-MBML4ngaWQ1oYqF4YoF5jye1R2Z+PYkOqpdzV/e1GafHHc3RxgnmTVHtfpvRRKzq
-h2Rl4YBVzxLXJiPyISPT
-=xqZ8
+iQEcBAEBAgAGBQJO4kGbAAoJEEdUh39IaPFNJ7YH/3cdtArKcqwTl4SUAQlZNWpu
+ibF8Jrb5T3r0K5JGfeAp5NGeSF4BKzXN7RHT6hx1IJHFy+RKwZj85Et1osb7yA6M
+UGOeai/9Va+eg0+efSZeaorsDYVU9BZyqx08mDq6u7sBJ7Go0DQFKVjsPwjh2ku7
+sBaf7X6J4/4FqfUMfWa6JZObRx2aoklWrl1ASUUX9WrTXT+rgG0LQf6v55RjYoVT
+dVbNbTWtkQA6HiyNJdq3hzH7etBp0W9Qy2VVsz6Aj8oSAr90rdOQuR19FEw1Tx7X
+kKSV3nPiTsZpvbItYVZmXogMFuDXc4HTaF/r5dQnLhMUZGCZ8Vmw2r3ja3tjzbI=
+=Lj29
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch b/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
new file mode 100644
index 000000000000..9b084616c871
--- /dev/null
+++ b/dev-python/pyfltk/files/pyfltk-1.3.0-linux-3.x-detection.patch
@@ -0,0 +1,15 @@
+http://bugs.gentoo.org/show_bug.cgi?id=375253
+
+http://lipyrary.blogspot.com/2011/09/python-and-linux-kernel-30-sysplatform.html
+
+--- setup.py
++++ setup.py
+@@ -76,7 +76,7 @@
+     lib_dir_list = [fltk_lib_dir]
+     lib_list = ["fltk", "kernel32", "user32", "gdi32", "winspool", "comdlg32", "Comctl32", "advapi32", "shell32", "oleaut32", "odbc32", "odbccp32", "stdc++", "msvcr71"]
+     #link_arg_list=["-Wl,--enable-runtime-pseudo-reloc", "-Wl,--enable-auto-import"]
+-elif sys.platform == 'linux2':
++elif sys.platform.startswith('linux'):
+     print "Building for Linux"
+     # ugly hack to force distutils to use g++ instead of gcc for linking
+     from distutils import sysconfig
diff --git a/dev-python/pyfltk/pyfltk-1.1.5.ebuild b/dev-python/pyfltk/pyfltk-1.1.5.ebuild
index f7c353303e47..81a1a14f688e 100644
--- a/dev-python/pyfltk/pyfltk-1.1.5.ebuild
+++ b/dev-python/pyfltk/pyfltk-1.1.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild,v 1.10 2011/05/05 15:17:41 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.1.5.ebuild,v 1.11 2011/12/09 17:13:29 ssuominen Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -21,7 +21,7 @@ SLOT="0"
 KEYWORDS="amd64 ppc ~ppc64 x86"
 IUSE="doc"
 
-RDEPEND="x11-libs/fltk:1[opengl]"
+RDEPEND="<x11-libs/fltk-1.3.0:1[opengl]"
 DEPEND="${RDEPEND}
 	>=dev-lang/swig-1.3.38"
 
@@ -37,7 +37,9 @@ src_prepare() {
 	# move docs because the swig stuff will remove them
 	use doc && cp -r fltk fltk.docs
 
-	epatch "${FILESDIR}/${P}-swig-2.patch"
+	epatch \
+		"${FILESDIR}"/${P}-swig-2.patch \
+		"${FILESDIR}"/${PN}-1.3.0-linux-3.x-detection.patch
 }
 
 src_compile() {
diff --git a/dev-python/pyfltk/pyfltk-1.3.0.ebuild b/dev-python/pyfltk/pyfltk-1.3.0.ebuild
new file mode 100644
index 000000000000..895d6d005716
--- /dev/null
+++ b/dev-python/pyfltk/pyfltk-1.3.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pyfltk/pyfltk-1.3.0.ebuild,v 1.1 2011/12/09 17:13:29 ssuominen Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2:2.7"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.* *-jython"
+
+inherit distutils eutils
+
+MY_P=pyFltk-${PV}
+
+DESCRIPTION="Python interface to Fltk library"
+HOMEPAGE="http://pyfltk.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/fltk-1.3.0:1[opengl]"
+DEPEND="${RDEPEND}
+	>=dev-lang/swig-2.0.4"
+
+PYTHON_CXXFLAGS=("2.* + -fno-strict-aliasing")
+PYTHON_MODNAME="fltk"
+DOCS="CHANGES README TODO"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-linux-3.x-detection.patch
+}
+
+src_install() {
+	distutils_src_install
+
+	# FIXME: Install documentation ourself. Would some argument to distutils_src_install
+	# instead help?
+	rm -rf "${ED}"/usr/lib*/python*/site-packages/fltk/docs
+	dohtml fltk/docs/*
+}