Add re-base of darwin patch

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 43 insertions, 8 deletions

diff --git a/dev-python/sip/ChangeLog b/dev-python/sip/ChangeLog
index 8e531a7ad783..e652aa3f1bab 100644
--- a/dev-python/sip/ChangeLog
+++ b/dev-python/sip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-python/sip
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.280 2014/04/01 08:07:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/ChangeLog,v 1.281 2014/04/01 15:43:49 idella4 Exp $
+
+  01 Apr 2014; Ian Delaney <idella4@gentoo.org> +files/sip-4.15.5-darwin.patch,
+  sip-4.15.5.ebuild:
+  Add re-base of darwin patch
 
 *sip-4.15.5 (01 Apr 2014)
 
diff --git a/dev-python/sip/Manifest b/dev-python/sip/Manifest
index fffbec2f48ac..6474071284be 100644
--- a/dev-python/sip/Manifest
+++ b/dev-python/sip/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sip-4.15.5-darwin.patch 1168 SHA256 6c96b4528ecb2cf596d0eb477167d5314dff65f5f88b355f66c604414e1f1921 SHA512 bd48d54c2d2ac8f3487b20f1e2ac3b09f480d0c6afc17d350093ec97d624d7fcdfb006d3f7c24131f0cfccb9fbd7d49ef755b698e6f0a1355039a2ffb51dc8e7 WHIRLPOOL 5752fe37b855c821689c5ab56c5606e9853cd050d6036b1bb5eadad42e1edcd24f0c33291ce6b266453b9f02e755e5c478d1808683cc0a2fa6774edfe346a39d
 AUX sip-4.9.3-darwin.patch 1447 SHA256 91751308ce118af4f7f7cb3ac3e25de29c527ddc0bb52102e6e835c8c0e64ea2 SHA512 a0b2c4deb30b547473d8e2b095b57d32c8a82c12e5670b330fbfce1faddab87960a0c71b150fd7c51a5ce6486eb54b40fd6fa15d76b031599b988fc88179486b WHIRLPOOL 88cc2a34b1616dcb5377879cc9e50d9dc16b7ed505ac88c14aadbb3ce9d824fdf196231fcbdcc5c63cfe7c8c531bf70799e7cf56d0b20db2c3a433668596f9fb
 DIST sip-4.14.7.tar.gz 754916 SHA256 05669120a53a2c98f98560424cda413ae95f5528494c80764004dbea78d361b7 SHA512 8a2ff12553c4c0b31f5884ef292b9c233d0a1148c66c9bdea2b7f74ce151465a16f8e511069e6e47a0527f960c1f13a9ec6c5766d7324670c236a92536bbb6b3 WHIRLPOOL 6729efbd0e6a42138d5590822a0a22f7c38938dc2af4af2245ae13b1461bf15510c0f4161ef3dd864f02c98a168817f755ccd60b41c94358ffcacfc3d14ad673
 DIST sip-4.15.3.tar.gz 773818 SHA256 46f245252866dbdb7fb5aca194bda991cc84ba8090d5e864765ee7e511a053d4 SHA512 495522aa2a553099c02ab4f7ce7485d24267e5093398f5f20e7102542153084486b6e654564ee716634a257301dd094a08754cdc40282cd2e4496e52619bc138 WHIRLPOOL 3192e9f15420409905faaa155939829b24da8bd5e1467ca908857ba293416e114d31f4374bb54659f285ed693cd51074c249221e0063b4d916326e7724e8e9f0
@@ -9,13 +10,13 @@ DIST sip-4.15.5.tar.gz 843133 SHA256 9b11d87e7f382ce22bf013137f29462e75b56f5ea46
 EBUILD sip-4.14.7.ebuild 2949 SHA256 f7509074e6f7980e5ef0d2ca11883794e057c895ac6b19ca439b3e4b7f3a464d SHA512 3cbdbce5d4909f9b11f369be68345006cfb0a288b5696726d65b43d3181a85b8b9ac60eb9461b9bb6005b97627580778aa692411c2322a25d51f8b80228653e8 WHIRLPOOL 51566bdf1464516821062a259b77de7b410351a2241614426a7dfb17c5af99f3abc620f2452737ec859ccc97e878b0590e7afc05b86bb4afbaa0d14217693153
 EBUILD sip-4.15.3.ebuild 2960 SHA256 54de6c5df7e375cb37717d21367dc2ff268672444de13937002d3ec7141a1644 SHA512 c687a49279a74a8d93d3f830f507dbc263e228d31fda03802f77a33fb701591f8db8b8e07211c7c95439817d52fa66dfd751d736a490b29ab33fb3f2cf15321c WHIRLPOOL 6a8dea3c1bbdaaa0258e4e03a0949e87a94ec791a3508a78acc1689352950297bbc854721dfa9485a7faa839a0b47f3a3506e579d8ffbc21019ad75654f5ef00
 EBUILD sip-4.15.4.ebuild 2972 SHA256 65c1c1dca9bd7d2a7f5a3f5a4a855cdc4fafd11df3061637e29d4d3fff15635f SHA512 65a990453a8d9f52112fdcd92ac0291b71155e419a23dc68282e4125efa549ac3955419891361c24367b112cd8594f6b5d2746091a20918ea4f53a05027a3c29 WHIRLPOOL 18480f0a814b5b9b7fbffc11419a4c61ee8c500d7c23cf168cd5be3bd7b4a88d8ab6f18439bbb8b4a3d765f0b97b24055d1483461c543d915efe678274c6645a
-EBUILD sip-4.15.5.ebuild 2973 SHA256 6bca0ba09932edd6254c7ddd73a35515dfa06ceb994607766933c91470025d93 SHA512 d69ed32c65e837295e205d48d9f694775a57d9593f8663313ea089d4c3d849ee2f5c38b25f34e1d43bdcac8d82a55723138ff642036034934bfe37038bce52f7 WHIRLPOOL 8f0157888549d26566520365c11b6084941a1fcb9e043ff2ab924bebdba0c177e23be20f90779bf5c3a0604e1cbc38b8c6d8f3d0b527b2601e809401dca76b93
-MISC ChangeLog 33465 SHA256 53e4b09060770b04ac5c3891f4d1cf1242769c391881f3088ecbe7e89ac5ac56 SHA512 ecc2281d2ff7ceb3be3df633d31d49f7b4aceb536ec9820d0985d3789530d55db22a1baca21e827acd5bd2dfa6f25b728cfed64c440ddfa5aaa5c287d3b5c7f5 WHIRLPOOL 6611020338fad3c177c2092b4fcaccd42daf028aee88494ee6fc8e160e3465911e233c7e112383599759ef5b2e81104a89ee09e0cd794d7421763d638a775249
+EBUILD sip-4.15.5.ebuild 2973 SHA256 422965056e16b940e12dd8f6a982bbc7b7cf65f4d79ee06aaef5a6690cfb6df7 SHA512 af742d836cdb41caf4da3fc9c322166dae80fe9ddcaa973a119aac85d16317e487cff09a3470d4d2c1153f5d3a19cdcf7cf0c9398ce2a24042fff6a741846e4d WHIRLPOOL d608084908c4270995d670f88918617c9218fc02fce6697bbf4224bc574f9c9401aff3bb9b6d11ba699db4190d54d298c730bb3e823209b4643fab34a4f0c019
+MISC ChangeLog 33597 SHA256 a27aabfc6978ae3515a6d9606cd4a5a96f0ae6dc98202907fbd59bfefacd5df4 SHA512 d7260987822b2881ba2909316042876bb098aaf1599116e7be8414a9b29e02d8de8865b7af6c283dffdafb5c304654c4bbd1ab24144d75646be3528f869c68f7 WHIRLPOOL 86d0ccff046a28ae8d98abda03eda65b4d5faea7e25cb14b17061ca8011b36316f62d93f3b06cf8f75735b40c75cf771d2d62fa84d1d4258daf420a66371d1ee
 MISC metadata.xml 422 SHA256 a39c95b926df4f580178e84c2705f41a0991f75ab6e6bc465f5fb99f02a08412 SHA512 ac3dcaa48537ac9a4e641749817cc9d3799b96577d8a82258f0d5b5476cbe452de2aaae5a7ee183b31f8054aa9baf44c138206c3a240589e2c6aca5a65a3e4cf WHIRLPOOL efce5684d26c31c9d89930a97cbd8b2f83228eba71e4d830e5b2fb57ef3a11fcf9d27f34b21cdc098314e4084f50f12afcb51b1efc69fd6eef1823b710d9b8f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlM6cfwACgkQso7CE7gHKw12UgCg2GsKKd+n0uPqtQdUbXPgfWmT
-HvQAoNuHdMlv8IvG/+T23cTscmF6bpxS
-=6g/X
+iEYEAREIAAYFAlM63QoACgkQso7CE7gHKw01qgCfZqf0k788V80OwevTg1LmpiG/
+MkcAnj/OWv84NknAjPC0IGYoshbpmrQk
+=FoxM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sip/files/sip-4.15.5-darwin.patch b/dev-python/sip/files/sip-4.15.5-darwin.patch
new file mode 100644
index 000000000000..b625d15c27c5
--- /dev/null
+++ b/dev-python/sip/files/sip-4.15.5-darwin.patch
@@ -0,0 +1,30 @@
+diff -ur sip-4.15.5.orig/siputils.py sip-4.15.5/siputils.py
+--- siputils.py	2014-02-21 18:31:35.000000000 +0800
++++ siputils.py	2014-04-01 23:21:41.895036589 +0800
+@@ -945,8 +945,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             plib = clib + ".lib"
+-        elif sys.platform == "darwin" and framework:
+-            plib = "-framework " + clib
+         else:
+             plib = "-l" + clib
+ 
+@@ -961,8 +959,6 @@
+         """
+         if self.generator in ("MSVC", "MSVC.NET", "MSBUILD", "BMAKE"):
+             prl_name = os.path.join(self.config.qt_lib_dir, clib + ".prl")
+-        elif sys.platform == "darwin" and framework:
+-            prl_name = os.path.join(self.config.qt_lib_dir, clib + ".framework", clib + ".prl")
+         else:
+             prl_name = os.path.join(self.config.qt_lib_dir, "lib" + clib + ".prl")
+ 
+@@ -1633,7 +1629,7 @@
+             if sys.platform == "win32":
+                 ext = "pyd"
+             elif sys.platform == "darwin":
+-                ext = "so"
++                ext = "bundle"
+             elif sys.platform == "cygwin":
+                 ext = "dll"
+             else:
diff --git a/dev-python/sip/sip-4.15.5.ebuild b/dev-python/sip/sip-4.15.5.ebuild
index 425ef0283a87..ccb10bcf4106 100644
--- a/dev-python/sip/sip-4.15.5.ebuild
+++ b/dev-python/sip/sip-4.15.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.15.5.ebuild,v 1.1 2014/04/01 08:07:06 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sip/sip-4.15.5.ebuild,v 1.2 2014/04/01 15:43:49 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -44,7 +44,7 @@ RDEPEND="${DEPEND}"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 src_prepare() {
-#	epatch "${FILESDIR}"/${PN}-4.9.3-darwin.patch
+	epatch "${FILESDIR}"/${PN}-4.15.5-darwin.patch
 
 	if [[ ${PV} == *9999* ]]; then
 		python2 build.py prepare || die