Handle FreeBSD byteswap function. Fix bug #367119

Package-Manager: portage-2.2.0_alpha43/cvs/FreeBSD i386

4 files changed, 124 insertions, 19 deletions

diff --git a/app-text/ghostscript-gpl/ChangeLog b/app-text/ghostscript-gpl/ChangeLog
index 566ad43d6596..dcbeae861d34 100644
--- a/app-text/ghostscript-gpl/ChangeLog
+++ b/app-text/ghostscript-gpl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-text/ghostscript-gpl
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.113 2011/06/05 21:16:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ChangeLog,v 1.114 2011/08/05 10:55:25 naota Exp $
+
+  05 Aug 2011; Naohiro Aota <naota@gentoo.org> ghostscript-gpl-9.02.ebuild,
+  +files/ghostscript-gpl-9.02-byteswap.patch:
+  Handle FreeBSD byteswap function. Fix bug #367119
 
   05 Jun 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   ghostscript-gpl-9.02.ebuild, +files/ghostscript-gpl-9.02-libpng15.patch:
diff --git a/app-text/ghostscript-gpl/Manifest b/app-text/ghostscript-gpl/Manifest
index 5db4e0fa5972..5d71f512e835 100644
--- a/app-text/ghostscript-gpl/Manifest
+++ b/app-text/ghostscript-gpl/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA1
 
+AUX ghostscript-gpl-9.02-byteswap.patch 3196 RMD160 075efc740fbc678b4862c2319e4a7f32d709e4da SHA1 237d768069601147e769de2e98ae362e0133a2c3 SHA256 237389d9ba4d08eac01a8efe689a03412d173ecd234fd9853198d5b1f0e62cee
 AUX ghostscript-gpl-9.02-libpng15.patch 6699 RMD160 984a970c768a24c4e7eae14bfac8432cb1031129 SHA1 adf2ae55d8d7242f808f852632ed26f7e574858f SHA256 228c65f1ed286122bf8ca96979932989ace83e162f7a894f99474886a41732bc
 DIST ghostscript-8.71.tar.xz 15698644 RMD160 7211f433997e1c4ba5a9dcf2e8b72337b76e60b4 SHA1 aa2df7ba23abdfe95d36acec7333eac51768c47d SHA256 f48f7370a00f24fce174b147074aca3f6bede82154dd2bf93d24430a62e4de73
 DIST ghostscript-9.00.tar.xz 17377160 RMD160 4dd9bf15ccc3e23e11fdebc1d23155e1b9d8993b SHA1 873fbeedecc472ec804943bc5ded131fa8342251 SHA256 2d3afcf30873c8bf8619beeeb6d4c3370fc2944fd1bd47423461b6778daa8248
@@ -14,23 +15,13 @@ DIST gsdjvu-1.4.tar.gz 208611 RMD160 ecbb2fded61a29c4f49f852f99d106a0ba0eb48d SH
 EBUILD ghostscript-gpl-8.71-r6.ebuild 5876 RMD160 dbaa3c0e021a74450fd74b61b41d7db66f9422fc SHA1 de65280243721459350be37a1b386df233b44f9a SHA256 3e87dec029c5c77d5930a7026cae9b917189790d50c06ebce445d27d25905484
 EBUILD ghostscript-gpl-9.00-r1.ebuild 5649 RMD160 305ce2ad24d846cb2865b3f3a2f1ca6eaddfb644 SHA1 781e54cbe977ada507b970fcc0db436185b02473 SHA256 93c3580e9a5b46a57898fef22020021affb98799f69b26709aa7488652dceca6
 EBUILD ghostscript-gpl-9.01.ebuild 5647 RMD160 b2fdaf71d2674cb764c18f8786354dcd7c29c122 SHA1 60a3e3bf58027db657d39ad929ce39c0c09d686e SHA256 f856684d08d6f76226a84718f5b6de57b65e02e3c873cd496d43f78a7c2fbc84
-EBUILD ghostscript-gpl-9.02.ebuild 5839 RMD160 aa25122692b2106cc50449e8682eab515a5d82d9 SHA1 90366236797778f7c351ed9d8ce6e88875502f1f SHA256 36cacc45e0bd36e614b612b2be8ee4ba610fb015dbc4459e4da64b93cae01831
-MISC ChangeLog 20792 RMD160 2bfd78121dfe4e14fbb9dab67c8268e71e2777d5 SHA1 87145066c92c6bb5ac3a28cefc580988240774f4 SHA256 ad69efb8f75023cf0f5a5869744c6c03dd3c6c2d7bcd7bd58ca5dabfa3ab2d2a
+EBUILD ghostscript-gpl-9.02.ebuild 5911 RMD160 e31d909ed62d719ac0e84e6667aa882c0472b43b SHA1 b48ad8737cd7f1e05552534cc76386a8f0996492 SHA256 b05925615b4cf26583da14791eab85881f83b21c1799c749c5539d55e7b7fb88
+MISC ChangeLog 20963 RMD160 2213aff39e23d59cab416b8b553b58846d9e42b2 SHA1 20d33dde51ad742c4ee81e1033302ba1a1b5d85f SHA256 7ff318c52ba7599ade6a19afe511413f1a6d7909bcbcfc8fbead27b15019fd80
 MISC metadata.xml 284 RMD160 df1ccfc8195a57d367d5cb80ae86d4d95084234e SHA1 c6afd0be31143d4bab2720ac199d10cc1bafedef SHA256 48aa4ca7adac201df7ab07ee8d590d13aa5c6d8684487d2bbbf1433f268e90e1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.17 (FreeBSD)
 
-iQIcBAEBCgAGBQJN6/IxAAoJENwGBM22xffe7CgP/i/8jg/jkM0fM6vgil8WoI47
-UOjFqbbgBxSvV2lTJxzOW6GOzpG9oQBruY1MXWbOyLphPV3W6PD5UbY61Vst2CV/
-ydMUVuR4hQ9FkKnNOiLpu51E5Fhbz7lpiodEqsxbxXkVJI1Ev/FqntHRhQX3vu76
-h6wzWEZaRkR/rp0kUh7KLLu1sGDTYyP/kY3LjHqsh335dfjJXdrXrtiXKbAb53vV
-8IwMxvDo2f6RQcfo3RupoJ/EFtEO5EXub0P3u+Zr6/e0k2GqQe4G1w0FYONCFffP
-TWOoh4D8YsiT7vSFsAu41PWOnCT7/DJg9PXWxCnm1a77PaiMt0lsVME5hLBedlEv
-vkFjmEccimN0NhPyrDXYZTHcfdaFZIVAOIaRatP7ELDiWKGdDLuc8e1GdVEWrSgo
-ADT8K178s4Y5VzH+nMhYXOiXbIaJ2GEZncAlBP2onhyCgYIty328KLjV7VFWoyJ+
-UABRx3MWSdlez/sJX03o7MuMKHUoSCJBBfrslVhNR/gU8wSV/HSbIe6wduq3sxBu
-evoA8UijKmc0yKwkTsAz0p5XFqQAy5ipYaqpNcPenLoyvfBIFWek8OifC5muBxVZ
-K7Sqrzjw1PiOfT0MLQIesCX9hIDe16xy3pDF/K7UBBqzV+yNH5AoTH8rQj5Ucz4x
-0DwWU+9dhpnX1X0kRtwF
-=33Xj
+iEYEARECAAYFAk47zDQACgkQGpDnPLSHuMDgpwCg4L/qXqaNHAprRq4qumYYA2no
+L6UAnRt5DnjCAKCN1ahtjQccPMMNYq5W
+=e3gX
 -----END PGP SIGNATURE-----
diff --git a/app-text/ghostscript-gpl/files/ghostscript-gpl-9.02-byteswap.patch b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.02-byteswap.patch
new file mode 100644
index 000000000000..dcd8ae1ae43a
--- /dev/null
+++ b/app-text/ghostscript-gpl/files/ghostscript-gpl-9.02-byteswap.patch
@@ -0,0 +1,107 @@
+diff --git a/gs/base/Makefile.in b/gs/base/Makefile.in
+index 8cc3b63..b014051 100644
+--- a/gs/base/Makefile.in
++++ b/gs/base/Makefile.in
+@@ -121,6 +121,11 @@ GENOPT=
+ 
+ # Choose capability options.
+ 
++# -DHAVE_BSWAP32
++#       use bswap32 intrinsic
++# -DHAVE_BYTESWAP_H
++#       use byteswap.h functions
++#
+ # -DHAVE_MKSTEMP
+ #	uses mkstemp instead of mktemp
+ #		This uses the more secure temporary file creation call
+@@ -142,7 +147,7 @@ GENOPT=
+ # -DHAVE_SSE2
+ #       use sse2 intrinsics
+ 
+-CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@ @HAVE_MKSTEMP64@ @HAVE_FONTCONFIG@ @HAVE_LIBIDN@ @HAVE_SETLOCALE@ @HAVE_SSE2@ @HAVE_DBUS@
++CAPOPT= @HAVE_MKSTEMP@ @HAVE_HYPOT@ @HAVE_FILE64@ @HAVE_MKSTEMP64@ @HAVE_FONTCONFIG@ @HAVE_LIBIDN@ @HAVE_SETLOCALE@ @HAVE_SSE2@ @HAVE_DBUS@ @HAVE_BSWAP32@ @HAVE_BYTESWAP_H@
+ 
+ # Define the name of the executable file.
+ 
+diff --git a/gs/base/configure.ac b/gs/base/configure.ac
+index 2385b18..346a7ae 100644
+--- a/gs/base/configure.ac
++++ b/gs/base/configure.ac
+@@ -1554,6 +1554,49 @@ AC_ARG_ENABLE([sse2], AC_HELP_STRING([--disable-sse2],
+ AC_SUBST(HAVE_SSE2)
+ 
+ dnl --------------------------------------------------
++dnl check for byte swap intrinsics
++dnl --------------------------------------------------
++
++HAVE_BSWAP32=""
++AC_COMPILE_IFELSE([
++int main (int argc, char *argv[])
++{
++  int a = __builtin_bswap32(argc);
++  return(0);
++}
++],HAVE_BSWAP32="-DHAVE_BSWAP32", HAVE_BSWAP32="")
++
++AC_ARG_ENABLE([bswap32], AC_HELP_STRING([--disable-bswap32],
++       [Do not use bswap32 instrinsic]), [
++             if test "x$enable_bswap32" = xno; then
++                HAVE_BSWAP32=""
++             fi])
++ 
++AC_SUBST(HAVE_BSWAP32)
++
++dnl --------------------------------------------------
++dnl check for byte swap header
++dnl --------------------------------------------------
++
++HAVE_BYTESWAP_H=""
++AC_COMPILE_IFELSE([
++#include "byteswap.h"
++int main (int argc, char *argv[])
++{
++  int a = bswap_32(argc);
++  return(0);
++}
++],HAVE_BYTESWAP_H="-DHAVE_BYTESWAP_H", HAVE_BYTESWAP_H="")
++
++AC_ARG_ENABLE([byteswap-h], AC_HELP_STRING([--disable-byteswap-h],
++       [Do not use byteswap.h functions]), [
++             if test "x$enable_byteswap-h" = xno; then
++                HAVE_BYTESWAP_H=""
++             fi])
++ 
++AC_SUBST(HAVE_BYTESWAP_H)
++
++dnl --------------------------------------------------
+ dnl Do substitutions
+ dnl --------------------------------------------------
+ 
+diff --git a/gs/base/gsropt.h b/gs/base/gsropt.h
+index 220ba84..3bbd81a 100644
+--- a/gs/base/gsropt.h
++++ b/gs/base/gsropt.h
+@@ -377,18 +377,15 @@ void rop_release_run_op(rop_run_op *op);
+ #  define ENDIAN_SWAP_INT _byteswap_ulong
+ #endif
+ 
+-#elif defined(__GNUC__) /* Are we using GCC? */
+ 
+-#ifdef __i386__ /* Are we on an x86? */
+-#define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+-#if GCC_VERSION >= 40300 /* Modern enough to have byteswap intrinsics? */
++#elif defined(HAVE_BSWAP32)
+ 
+-#include <byteswap.h>
++#define ENDIAN_SWAP_INT __builtin_bswap32
+ 
+-#define ENDIAN_SWAP_INT bswap_32
++#elif defined(HAVE_BYTESWAP_H)
+ 
+-#endif /* GCC >= 4.3 */
+-#endif /* x86 or later */
++#include <byteswap.h>
++#define ENDIAN_SWAP_INT bswap_32
+ 
+ #endif
+ 
diff --git a/app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild b/app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild
index 8c135a6238fd..4c19c2a3c780 100644
--- a/app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild
+++ b/app-text/ghostscript-gpl/ghostscript-gpl-9.02.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/app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild,v 1.2 2011/06/05 21:16:28 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/ghostscript-gpl/ghostscript-gpl-9.02.ebuild,v 1.3 2011/08/05 10:55:25 naota Exp $
 
 EAPI=3
 inherit autotools eutils versionator flag-o-matic
@@ -80,6 +80,9 @@ src_prepare() {
 	# apply libpng-1.5 patch
 	epatch "${FILESDIR}/${PN}-9.02-libpng15.patch"
 
+	# byteswap detection bug 367119
+	epatch "${FILESDIR}"/${P}-byteswap.patch
+
 	# apply various patches, many borrowed from Fedora
 	# http://pkgs.fedoraproject.org/gitweb/?p=ghostscript.git
 	EPATCH_SUFFIX="patch" EPATCH_FORCE="yes"