Fix for cross-compiling from Chromium OS.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

6 files changed, 101 insertions, 21 deletions

diff --git a/dev-python/m2crypto/ChangeLog b/dev-python/m2crypto/ChangeLog
index d630d9193954..b7af49ecc4d6 100644
--- a/dev-python/m2crypto/ChangeLog
+++ b/dev-python/m2crypto/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/m2crypto
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.84 2015/04/08 08:05:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/ChangeLog,v 1.85 2015/05/15 09:03:31 vapier Exp $
+
+  15 May 2015; Mike Frysinger <vapier@gentoo.org>
+  +files/m2crypto-0.21.1-cross-compile.patch,
+  +files/m2crypto-0.22.3-cross-compile.patch, m2crypto-0.21.1-r2.ebuild,
+  m2crypto-0.22.3-r3.ebuild:
+  Fix for cross-compiling from Chromium OS.
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> m2crypto-0.21.1-r2.ebuild,
   m2crypto-0.22.3-r3.ebuild:
diff --git a/dev-python/m2crypto/Manifest b/dev-python/m2crypto/Manifest
index 95362e58c632..f37aa964abd2 100644
--- a/dev-python/m2crypto/Manifest
+++ b/dev-python/m2crypto/Manifest
@@ -1,28 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX m2crypto-0.21.1-cross-compile.patch 1437 SHA256 a63ace788d51b9b04847b6d50d83360648322edba773a0d0f375f7fa86d15cd0 SHA512 9c10f1638eb6aa891434b94d9a7d574d498ccfd4e2dc1de03692130b8700bb7c38123d07e6635755a4a9766231c9de4a17f822f44623bcdb8601f9b5f38d6cab WHIRLPOOL 1bc566f065d6809df0181bf610c8f20da59037038ea2470ffb6aa10b720ca6c5ceb0c9890f63024958d5eaf23a8b52d0556aa6a98be86a5cbaad0ec1a44163c0
+AUX m2crypto-0.22.3-cross-compile.patch 1728 SHA256 87c2046e453f1dea08e03459a946eecaa9bf876d1a18ed70c88e142e3730df99 SHA512 efb77cb16f8a63ea13b4883732736bde53dd75bfee6e2913514e3c77f50e3b26f5e615405fbee880fea70a91ff5e31ba3bc640848616e23f829c270e77080dd9 WHIRLPOOL 23051fcc7228f392752506eedf6fdd953e7d4f770a9c1528164fea9dc03cbe106c794f3d6659a35be384be5fee93bcb4fb3ca19c19f1be909ffd26463b5e5bf6
 DIST M2Crypto-0.21.1.tar.gz 413563 SHA256 25b94498505c2d800ee465db0cc1aff097b1615adc3ac042a1c85ceca264fc0a SHA512 b261eed84b3bda8a664c065241c2007f6443235a0fbcdd856c5a0b1f015e75662724b72a56e94aeb174414fff5c8dd71dfcb4b18f677f576ab7e30811a8adf9b WHIRLPOOL 88f184452a660cff934371d18e0065974dec3cea052cf78ef0bbecf35ed2ef6d69f8a40016f1b3fbac24fa06697b7e4c5e9e1f6afd20d30ff63fa1c22b69e8d0
 DIST M2Crypto-0.22.3.tar.gz 74795 SHA256 6071bfc817d94723e9b458a010d565365104f84aa73f7fe11919871f7562ff72 SHA512 c179d3cf03ced77aed24285ca3f1527d5e05bbfe091a1522bff94a940fd390213fbb9b83d7ccd43ceae49626b427ae8790782cf93ead85be1e063bc4121c62e0 WHIRLPOOL 66a9a6e7c9b195814048a1bcecf6ef71a269bebb9dbda73801c88b3ba27330b555a46d05c53bbd0778f9c1e1bb5f9c6e7e860de443bf16baffc2072ee5996e31
-EBUILD m2crypto-0.21.1-r2.ebuild 1788 SHA256 8e8cf378052e24f92db9b95a7052d685b40bdae5e3144c44f1ada9be6869ff0d SHA512 4c1837cbf711a5cb2f65a2aae093ab4b24b7a2c01ffd31e6c680ad7af1e89d71ac0fa299c55aa3842b21a1eed911956b010e9e991c95e714878887217a775ab5 WHIRLPOOL 11ffbb43db8b70f1348548b3815e87c462c2fea74a8389017d18ce1e5fc9c3b29adbf54ea43d8056100e04fa9176639cbba8458697bf6d4c2c715a0a040eda7e
-EBUILD m2crypto-0.22.3-r3.ebuild 1428 SHA256 b816618d062eb16cc8470249699ec32d22157add6d63ef888271d92210304462 SHA512 94431660acb93e59792ac77ec82c02105b417b116e37dc3d71a7ca5d55dc38a6825f39a90eaa7b187f5c6d93b804f7f28dffce799cbb7863cf4fb2058c5d6822 WHIRLPOOL 322f17ed5f8376913cdf715dfb2b816295b8cba2a1b7f919e1b00aa67c0acd611e376d0779b53c5fb7ee019bb165b32a0b4bfdc84157a8bdb11459848440e966
-MISC ChangeLog 11508 SHA256 2ffa88c77ad4f36f758e92ff1efbc647951f07e7e581369b8992466dca52f9d4 SHA512 b8315a6e4e47c6a946e1fc639aef4fd3fe28c5c702accfb2d18b1f4a665a7941da0609f0d4cdf721bc8062fc7c8b8ebc98381802bed53e9427d45fff59ec7b78 WHIRLPOOL 6f0a5197e81595dca0e5105e2bdf11879f9a7eb20515d04af549637c659a4038d4ecef86be9589125e23057978273f195961eab8e5816a239c595f6b18061e64
+EBUILD m2crypto-0.21.1-r2.ebuild 1836 SHA256 5825d819a47f76f87a57670d3d540dd1dc55a6e58c045c649d9c0d43f1101805 SHA512 d7eead603d859425eb56dc687d7125c7008cbbc7cdfcb537ed17ec84b293bfb81be8298394920a97854982bc94747488277aa9e01de25e4f07cf904c724e081c WHIRLPOOL 4b442a936f0447a929f32579c0a6ec8a7021a895143eda48c3785fb1af5175d9c25378394f6f17e586bc8d01b6b66bc9ba2cc78541e8c47b1c9a1ed94225c836
+EBUILD m2crypto-0.22.3-r3.ebuild 1476 SHA256 93114f60c723983f4a2d4cebaf429218c8aef4048426923b735f6b8d537b09a2 SHA512 6fdac59e390a5f622d530e834271a81b4e026b20b3404c652d59c99ff2c890d7f4cfc11b960dcd0e4ac3f7b89c8e290ac12901acb8eba8f090d5da13ead8a78c WHIRLPOOL c1ed113f3c3ad44e53e9423fb45e7887351ce2577e1c992b4cc174b29d02d4153f9b86c2f174b8399a3b4f8f1a5323967247b0e408a66d955a2344b3b4063929
+MISC ChangeLog 11751 SHA256 b13063767bb4bf7bebe469338b4c46e2d4e0d3b0c4cd5ccded29d19bd055337b SHA512 b9cf7e0c3edd7e6921c2b92dc94c25211f483a27253c0f97efc91c22b37f27644aa58685a5c6458f6f77645f0a878c42a04c353fc28c445295a85034a3479950 WHIRLPOOL 0352cdb1bf81307fe70eb7da6ab8049d8b0aedefad807b62d9a8144c136dc6ccbd32b9292988f34088e22b744d76dc5714dedfc4a2cd3f6132616b5d7b241d84
 MISC metadata.xml 231 SHA256 4b3c3ef12b8947ff65c09c0c6bbeda5e9837776cbd593d20951d4fca97b38fc8 SHA512 70d64f2f5642ac485ed4b1ab58e307485d3bbe417edaab9c0cfc6ca1ad56de0b26b350b439bff4ac3d8d4c432df4b086f24f715a1ce631b8231bcd5cb9938561 WHIRLPOOL 59674c4927ea7a1df761e8ff83a04cafa8fc07973491a2c2e033e5afc2dead61366f0f66c8b14290b9e0652af24a8a0919753f8020e8a510ce1bbe4395165ae2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJOJ4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOxCsP/ijiEvdD/2FrPBUexAYVUq8G
-4wAwoufPGMfX2pTY8SSv1wOYKi5bd6jbSrj3QzLKF3x/2i+iGz+nmifDdTGkkR9F
-npLqjiFvZZspDIM3vxKbCmewBPKhhoY5xP6MUmtoMeSNUW9rhj0EiOntufbo+N+I
-tv8oFVPdvhSVdxzvxSOqbEckx6VM8EVxOFttHBRzQaGWW9sHt7PURtHYBSAibyRt
-IqK8vcyow7f+NXZlWWynhzNuD0H7/VQtO+Gfd//SLFyRUYiUupEuiToQLarOWZFY
-uoQBMvC/6pTMywnSoPes1oZtEieMF3VgW57+0dDS3+zNJOcp6RrfQlpN/CdK6XEF
-eDFd3xoqVyEtiI1LEUs3lEPMWDqkJ3CkQvHIxqLmYdI6TFZvrM4Ro3Sd44AB1Na6
-V6jIAWVkfm77VgbG8kGGuKU240WUpszqDdUhsNh1ahmz7WI9qXjQgk4iC7Kvvf5t
-cJ4ViybwhzADp5QJDgjQyCgmucRN5/2i84L5tSfBBvWo88VQGtMqjFoGZb06R16c
-XpaWe+1Dix+nbiOGnIxFo7XI8UiL6Alb/IgPHxRQqRwoNMAi7Ja6ah9BhpMpsdlJ
-OnajzCFG7q9YyYN5SPTq9cVZkMy2DZkXtuK+bk7ylZldXWVhV/mkYg0926xzArkA
-P55RJNWPnXPl5WfOPfA0
-=c60J
+iQIcBAEBCAAGBQJVVbZkAAoJEPGu1DbS6WIALKUP/3eqIQh9YT+AQLAqRX0kfMW6
+Yfn/YjdAqsAHmr831gfIcDg91kr8ZiNoHhjOM1TArA7GORsXf93YPXpqlqyPFCDJ
+ympO22VaDmvKMzdfRjyngBjTED1913fgkNcY7sEnFngRMrjXNwZn9eBq46ZDkxiR
+6SzztuhImv/GI8hy1M7LOtH2gu1s1cRikruJcFq+v4voZ8YSGLZkIirZNKliAyaO
+LlQ0tt0gr/SL9ha/H5nsZ2q7ZAWkkWbgS5Jg1gsUTPiJrr4vyVzUs9GBcU8pGiXQ
+hFkbG8t/7ir+RwKCEDgg8Oq51SIi/x7vpYHSyDfEvS6YHbldhVm46z1dQfG++cI/
+3O3xgA/gPgfWgXWDb8XZsBnDoO5mvfItc5PbeORrr4a+bzJuJsWQSuGqoz2Kwg9t
+4pLxyM00BLjTUOMfqvapV1YpCjgSpuWz398pe5Xraeg9WjT/io+ED20flzm+QqBt
+fgxHRWkrWsmRt8VJJwyUdDoPyUIzAywl5txhMIeUzKRYb11D9hnHXHVMV12aOQ+F
+hRYdB4R7kT2vziK94kklAgAtPkxJcXMVtu4Kdt8c8nVwyJKvPaIDgAaGkDYifGey
+7vlFTjo0XlsHvF2xo4jphdCj4zW1OhxL1Z2j2p1PdWw7jxyNJiKu+JpNfEmknPf4
+mLM7QtnXDAiXNZMOlZtW
+=SMUs
 -----END PGP SIGNATURE-----
diff --git a/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch b/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch
new file mode 100644
index 000000000000..647d93a43205
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.21.1-cross-compile.patch
@@ -0,0 +1,29 @@
+https://bugzilla.osafoundation.org/show_bug.cgi?id=13116
+
+--- a/setup.py
++++ b/setup.py
+@@ -52,14 +52,12 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+         opensslIncludeDir = os.path.join(self.openssl, 'include')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+         
+-        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir]]
++        self.swig_opts = ['-I%s' % i for i in self.include_dirs]
+         self.swig_opts.append('-includeall')
+         #self.swig_opts.append('-D__i386__') # Uncomment for early OpenSSL 0.9.7 versions, or on Fedora Core if build fails
+         #self.swig_opts.append('-DOPENSSL_NO_EC') # Try uncommenting if you can't build with EC disabled
+         
+-        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+-                              os.path.join(os.getcwd(), 'SWIG')]        
++        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
+             
+         if sys.platform == 'cygwin':
+             # Cygwin SHOULD work (there's code in distutils), but
+@@ -69,7 +67,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             # Someday distutils will be fixed and this won't be needed.
+             self.library_dirs += [os.path.join(self.openssl, 'bin')]
+                
+-        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+ 
+ 
+ if sys.version_info < (2,4):
diff --git a/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch b/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch
new file mode 100644
index 000000000000..ba3140473ae7
--- /dev/null
+++ b/dev-python/m2crypto/files/m2crypto-0.22.3-cross-compile.patch
@@ -0,0 +1,41 @@
+https://bugzilla.osafoundation.org/show_bug.cgi?id=13116
+
+--- a/setup.py
++++ b/setup.py
+@@ -68,25 +68,14 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+ 
+         build_ext.build_ext.finalize_options(self)
+ 
+-        self.add_multiarch_paths()
+-
+         opensslIncludeDir = os.path.join(self.openssl, 'include')
+         opensslLibraryDir = os.path.join(self.openssl, 'lib')
+ 
+-        self.swig_opts = ['-I%s' % i for i in self.include_dirs + \
+-                          [opensslIncludeDir, os.path.join(opensslIncludeDir, "openssl")]]
++        self.swig_opts = ['-I%s' % i for i in self.include_dirs]
+         self.swig_opts.append('-includeall')
+         self.swig_opts.append('-modern')
+ 
+-        # Fedora does hat tricks.
+-        if platform.linux_distribution()[0] in ['Fedora', 'CentOS']:
+-            if platform.architecture()[0] == '64bit':
+-                self.swig_opts.append('-D__x86_64__')
+-            elif platform.architecture()[0] == '32bit':
+-                self.swig_opts.append('-D__i386__')
+-
+-        self.include_dirs += [os.path.join(self.openssl, opensslIncludeDir),
+-                              os.path.join(os.getcwd(), 'SWIG')]
++        self.include_dirs += [os.path.join(os.getcwd(), 'SWIG')]
+ 
+         if sys.platform == 'cygwin':
+             # Cygwin SHOULD work (there's code in distutils), but
+@@ -96,8 +85,6 @@ class _M2CryptoBuildExt(build_ext.build_ext):
+             # Someday distutils will be fixed and this won't be needed.
+             self.library_dirs += [os.path.join(self.openssl, 'bin')]
+ 
+-        self.library_dirs += [os.path.join(self.openssl, opensslLibraryDir)]
+-
+ if sys.platform == 'darwin':
+    my_extra_compile_args = ["-Wno-deprecated-declarations"]
+ else:
diff --git a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild b/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
index 36fc5170dbcf..ce2e7d3cf2ae 100644
--- a/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild,v 1.3 2015/04/08 08:05:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.21.1-r2.ebuild,v 1.4 2015/05/15 09:03:31 vapier Exp $
 
 EAPI=5
 
@@ -34,6 +34,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 RESTRICT=test
 
 python_prepare_all() {
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+
 	# use pre-swigged sources
 	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die
 
diff --git a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
index 38ef11d1c98b..2fa396af9531 100644
--- a/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
+++ b/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.2 2015/04/08 08:05:00 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/m2crypto/m2crypto-0.22.3-r3.ebuild,v 1.3 2015/05/15 09:03:31 vapier Exp $
 
 EAPI=5
 
@@ -34,6 +34,8 @@ S="${WORKDIR}/${MY_PN}-${PV}"
 RESTRICT=test
 
 python_prepare_all() {
+	epatch "${FILESDIR}"/${P}-cross-compile.patch
+
 	# use pre-swigged sources
 	sed -i -e '/sources/s:\.i:_wrap.c:' setup.py || die