dev-libs/libgcrypt: attempt to fix x32 issue
authorkristianf <devnull@localhost>
Tue, 29 Jul 2014 15:10:23 +0000 (17:10 +0200)
committerkristianf <devnull@localhost>
Tue, 29 Jul 2014 15:10:23 +0000 (17:10 +0200)
app-crypt/monkeysign/Manifest
app-crypt/monkeysign/monkeysign-1.1.ebuild
dev-libs/libgcrypt/Manifest
dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch [new file with mode: 0644]
dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild [new file with mode: 0644]
media-fonts/mozilla-fira-ttf/mozilla-fira-ttf-0_p20140729.ebuild [new file with mode: 0644]

index 5f3bdbd..859a2e1 100644 (file)
@@ -4,6 +4,6 @@ AUX monkeysign-9999-fr_po.patch 1380 SHA256 6ba414977c3eb1e4fab804fd49f6a706cdb9
 AUX monkeysign-9999-rst2s5.patch 590 SHA256 4227267d3faac04d9fc0f3c0c52a1fd302009b3ca5118b5946e99ac073c8af74 SHA512 61772fdcb0eba85ddfbb5457237ef566fcab0a367b0a1ff49fd6fb716f291697ac8ddf4db996fa891153818c17f3f0bde741d4ad219eda7bd7815547cc50ab1f WHIRLPOOL 4ab90bdfaeaf612a36d9dd3065c8d347029edba4d22c97e6e7c2e015bd32cc76f7bb0f70ab907af65c5c493793017416492479603d9b26d2f63b73b5e836ba36
 AUX monkeysign.desktop 188 SHA256 c1bcfa18ddddedf08c90f790ffd598248f580aca362f56f134fe4238b5de2a15 SHA512 e2418323721dd5eb8859558be5693c0ee5d970edb967a3fefb58876802f431cddeccd87708936141d0d691563a1321930fbe28cf753d069441e33de7666c5d99 WHIRLPOOL dc41569388dd9bfa2861519a795c8f62021c8a44ba4211c660c300542e7bf23f66641677079ba13ece520fbee1d9da621ba31114dcdeab777ba509edfbe777d5
 DIST monkeysign_1.1.tar.gz 54807 SHA256 1229c63c9b649b35a156ab69c7e8ef47ff03817c94ce8138107832117ee5fa6d SHA512 8d1e719633291a3ba9efda8057e8b27b41b8e767db68dc02ca07d18579123b0704f0424ae982f047948620027581589d21ae44470137d1f2ff85f1f360bfd512 WHIRLPOOL 907c65d8ec3a5bbc391dfaa91625a215456989d000e1334687cae3ebcec419b10f34bd65c04d170a6130b21b761ac1b7e9db9f9a1b3fa9ba6ec72d893f7464b9
-EBUILD monkeysign-1.1.ebuild 937 SHA256 276ea5b4cb25916570a4d269f7d2c52407839f68f357447f7f66cefa83b8fa80 SHA512 fd2654a9fb013e568d6fb069665be866328ab980c2ce8576a41a78619b2a9f6e9bec6023ede6d24b8ec3f3614092cf04a6bda437a78436761ad44128cdf8ac5e WHIRLPOOL a07de568835e56c30f85c749a23e9284e9a7f818c1ae3d63e4ed26cd4a105e8acc6d7dd17d3816d74cbcf6c9c1420da5511c988e9a252b8f78007cf9a3ba58c2
+EBUILD monkeysign-1.1.ebuild 942 SHA256 a0da8158392911995cfc934050b047ef80d2f88b100b2575319d70547de3ac16 SHA512 34c30395bfbb65dab2ff0c17d7ce7c1eca9bb04238c9c4bccc50abae3ec34de999bf01c8bd60866a1aea5d838c7f6116237de27b87d8d1149ffa978862b911c5 WHIRLPOOL 8ba33e412e5e8d739ec3d8c2685d72087217b29e9aa0219425ce11bd654cb2f9bdd9f94882dae3e78d505da448ceeed90cb4f00788c392d6e9741266ee9f525b
 EBUILD monkeysign-9999.ebuild 981 SHA256 6e78c35d6450a35cc2cba4bf2a8200a4cafc3246554828c5af26d9fce46b6d67 SHA512 b8741d24aefc1c479a6d78de9954c08021c55b8e6d5ca0d3e93d62367bd7f545df6edc8ee0e1984c216acdf578d7ee11f9540e802134a9111ad0e5338f3f0186 WHIRLPOOL c7e55132cb58a6c173411824c6d85f8d68c170e7adf2b54f3b5acdde56f3efc2114086cc10b2dff80fcf6e9a7dde531212225b41ac0b870749d0c19d06f13ec9
 MISC metadata.xml 237 SHA256 5c58f0c8f9a9d5f50383f6cb306cf688924be830a0be08ede1ae7866c3566c2c SHA512 cd2f27119bff3427ab44b55caf2fc21ed3f56ab1251747a8213ad9914aa284e23e922c73018307a22ccd359906e4b82222a4dab35ef9469129dbc79b4b403b4f WHIRLPOOL 3f039cb8a9e18e11bf4dbd398f81a1b47f4e0a17bf53cb8f642f6cdeeaa13731307111e2f6d34689046a545de8c988a5bf0121473aac548affcb7352ebb1f590
index 7c43a60..d99116e 100644 (file)
@@ -17,25 +17,24 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-
 CDEPEND="dev-python/pygtk:2[${PYTHON_USEDEP}]
        media-gfx/zbar:0=[python,gtk,imagemagick]
        media-gfx/qrencode-python[${PYTHON_USEDEP}]
-       virtual/python-imaging:0="
+       virtual/python-imaging[${PYTHON_USEDEP}]"
 
 DEPEND="dev-python/docutils[${PYTHON_USEDEP}]
        dev-python/setuptools[${PYTHON_USEDEP}]
        ${CDEPEND}"
 
-RDEPEND="app-crypt/gnupg:0=
+RDEPEND="app-crypt/gnupg
        virtual/mta
        ${CDEPEND}"
 
 PATCHES=("${FILESDIR}/${P}-basename.patch"
-         "${FILESDIR}/${P}-rst2s5.patch"
+        "${FILESDIR}/${P}-rst2s5.patch"
        )
 
-python_instal_all()
+python_install_all()
 {
        distutils-r1_python_install_all
        domenu "${FILESDIR}/monkeysign.desktop"
index fc73c85..6cd60ff 100644 (file)
@@ -1,7 +1,8 @@
 AUX 0002-Fix-building-with-GNU-Automake-1.13.patch 2050 SHA256 78b5786783d326a77323cbdb9294544d184a2ddfc3d8d298be170e5b585ea45a SHA512 3b66d6a0e02f0ba16dbcf509b045d771c40865bd6054bd928506cc2c157f764d55f352d557ac33cc0dbc0892351998723306ee61609e5459141b48c9158a86b3 WHIRLPOOL ea63892696187afe9fe9be752247056f4062019a413370186ee28383b4f97c0a4bba43ec5212dc433d94d1f831ec90bd5dac84a37dc5b99faa63f45006fd732e
 AUX libgcrypt-1.6.0-serial-tests.patch 331 SHA256 368f31f2bfab568fac5b782851bcbcd9fdbab97240729d311a015d91c7dd2ddf SHA512 3bb833c7b5f3ad19b1856472676a0000a6837997c0ebb8eeee5ec67b0d415bde733dd98db5dd3060c03e78d5ced219e85acb40dd115aa044d526f530e8459fd2 WHIRLPOOL d219b5b4973c19b81f76d01463c152f04bb44a1f5dd6bf588bd6b24a4a199a438db43440dd71a65080b4ba90da941b0766a0499398c1a58817742f088140e264
 AUX libgcrypt-1.6.1-uscore.patch 843 SHA256 458ebc904185a5d08ef89f0c8ac797b87eec619341b4c0f8130fde2af8749459 SHA512 971814ac34f17464a96fbc110fe995923d873981949a0126e50c206d39499d6146fd00414e837774e6932e4b491cc68c4147278d6216dda630fb876bc8f61791 WHIRLPOOL bbadf4816e081929e8739fbbd3574bd291d9de86c4fe2344dba2c1ceb5f84d3e0bdede194efadefbcbf7409c44c218ab28f48d05b367c225b1687fced7565e15
+AUX libgcrypt-1.6.1-x32-compat.patch 724 SHA256 11ff165714af2a42387fbce4eebcd5ec64c2a8f5277ea661b3c0b90ff4f66436 SHA512 e56b4755ccb826d2200f9c4c7ee7f2ff853072bc5c64296c8e2140530970d11ce39e29330b95a73b8b1af491d06b2456812a88c36eb70cd8e9af94be1421b0b8 WHIRLPOOL 6865db2985f64cc8468fb2b3e4c30d806fa6e0bab93ba9ce1dbdca7cd99513fe51fc6b73fef3e21050edf365c8978e2be9eb876ba43e159e086e91eb52fc0e0e
 AUX libgcrypt-multilib-syspath.patch 588 SHA256 a3fc53f24b9cd0355a5267bc3ca8e88c397878473046536068c8ae4ae0b526eb SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc WHIRLPOOL 8d066987dc3cfa1dd686047fd5332b11199e5add63f82e397a34b22b5ce2f97af17d60042681c1eb50617402189a0d7fca5db48db7d41f4ef0f1cbe1acc645ab
 DIST libgcrypt-1.6.1.tar.bz2 2470885 SHA256 a1c3efea69f8ffe769f488b300ce190eeeb0c30de24a53f1c1b6e4202fdc2070 SHA512 83d502cf998736a5920df7324b7ff658041c34b2cfddccd8b96744ff940c0c84fe91fe7bfe03a69b10b9697a6f04f3007134bbc3c288b0fed78b60fc6ff15bc2 WHIRLPOOL 693de77590ea2da423e43e832f809183a50fa0e5d02d2fe46b860c6e6295d879730a300353d71e63671f498a1041b7b072af6bf4124a1a45eda787fee636a248
-EBUILD libgcrypt-1.6.1-r1.ebuild 2007 SHA256 eb29ff22a33002993d2fc3c5cd722fba802ac471c0a3c37263d36e8169c0e787 SHA512 acecfe49f769d420727ca570a018bc3c4d3ec79f72d33f9167eabcf50a680baf659679e3b8a96a1802046b0f499a13ebdb124decb881799293c2dfd8c68d74b7 WHIRLPOOL e301ead8b01a109af5c9efd0f18f7cccecfaf26dc4436aa543b4fc45db513aa639e32efc41eaa57047ed411216a6f7b16674b6673fff6444f1dc9a77d4db4f8c
+EBUILD libgcrypt-1.6.1-r2.ebuild 2239 SHA256 42f114ed1672b048a024efe1873aadf0c5c2d1614ae43c48d2a805ee1e8cbba8 SHA512 77020357c57ba9fb962cf2342f2bce7a99b915f66ca754615f516ee8e5a8437dc86df7290e558ed9f08af91add884e76b89c529df8bf1c45cd73bb3229c2f2f6 WHIRLPOOL eb73a493e60aa57b4534231ba7782cc714f207e03491fe60d084d9b901cabe4eb7ed57540917b79019a15524f4ab3593e8d20d27bdd17e27fcc26a36d56a386e
 EBUILD libgcrypt-9999.ebuild 722 SHA256 221c5b17e9287b7e7accde422851318091fa2131ceeeaec7a15177dd4714ebe3 SHA512 b37cfe72091a29f6dd462799ff90ad3ba8068cfa179babb8014651eb44f21fd3b9fa27fdb3adf11599e8a94fbae0ee091d98ab008d05f6f7e82e3f6bd659e17f WHIRLPOOL 1c4a773d821c2ab0012472d1703e99fdff255ca22c2f6cb4859dde4bc080a0e87609d9457a21dc6764cb5525165f814d57fcfa2c2cf6e2bd56d1d24ad398a41c
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.1-x32-compat.patch
new file mode 100644 (file)
index 0000000..2f95750
--- /dev/null
@@ -0,0 +1,19 @@
+diff -r 9dc4a391dd6d mpi/generic/mpi-asm-defs.h
+--- a/mpi/generic/mpi-asm-defs.h       Tue Jul 29 16:44:47 2014 +0200
++++ b/mpi/generic/mpi-asm-defs.h       Tue Jul 29 16:47:43 2014 +0200
+@@ -1,7 +1,12 @@
+-/* This file defines some basic constants for the MPI machinery.  We
+- * need to define the types on a per-CPU basis, so it is done with
+- * this file here.  */
++/* AMD64 compiled with x32 fails in assembly due to incorrect 
++ * width of int detected. Using compiler information to detect
++ * this since it is no longer per-architecture
++ */
++#if defined(__GNUC__) && __GNUC__ >= 3 && defined(__x86_64__) && defined(__ILP32__)
++#define BYTES_PER_MPI_LIMB 8
++#else
+ #define BYTES_PER_MPI_LIMB  (SIZEOF_UNSIGNED_LONG)
++#endif
diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.1-r2.ebuild
new file mode 100644 (file)
index 0000000..e6c9423
--- /dev/null
@@ -0,0 +1,64 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgcrypt/libgcrypt-1.6.1-r1.ebuild,v 1.4 2014/06/18 19:14:04 mgorny Exp $
+
+EAPI=5
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-multilib flag-o-matic
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
+       ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
+       abi_x86_32? (
+               !<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+               !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+       )"
+DEPEND="${RDEPEND}"
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
+
+PATCHES=(
+       "${FILESDIR}"/${P}-uscore.patch
+       "${FILESDIR}"/${PN}-multilib-syspath.patch
+       "${FILESDIR}"/${PN}-1.6.0-serial-tests.patch
+       "${FILESDIR}"/${PN}-1.6.1-x32-compat.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/libgcrypt-config
+)
+
+multilib_src_configure() {
+       if [[ ${CHOST} == *86*-solaris* ]] ; then
+               # ASM code uses GNU ELF syntax, divide in particular, we need to
+               # allow this via ASFLAGS, since we don't have a flag-o-matic
+               # function for that, we'll have to abuse cflags for this
+               append-cflags -Wa,--divide
+       fi
+       local myeconfargs=(
+               --disable-padlock-support # bug 201917
+               --disable-dependency-tracking
+               --enable-noexecstack
+               --disable-O-flag-munging
+               $(use_enable static-libs static)
+
+               # disabled due to various applications requiring privileges
+               # after libgcrypt drops them (bug #468616)
+               --without-capabilities
+
+               # http://trac.videolan.org/vlc/ticket/620
+               # causes bus-errors on sparc64-solaris
+               $([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+               $([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+       )
+       autotools-utils_src_configure
+}
diff --git a/media-fonts/mozilla-fira-ttf/mozilla-fira-ttf-0_p20140729.ebuild b/media-fonts/mozilla-fira-ttf/mozilla-fira-ttf-0_p20140729.ebuild
new file mode 100644 (file)
index 0000000..63e8561
--- /dev/null
@@ -0,0 +1,25 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/monafont/monafont-2.90-r2.ebuild,v 1.13 2007/07/22 07:08:31 dirtyepic Exp $
+
+EAPI=5
+
+inherit font
+
+DESCRIPTION="Mozilla's typefont Fira"
+HOMEPAGE="http://www.mozilla.org/en-US/styleguide/products/firefox-os/typeface/"
+SRC_URI="https://github.com/mozilla/Fira/archive/6bcf57fc7f50df118964f71d7c4eb02e1a4e51b3.zip -> mozilla-fira.zip"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND="app-arch/unzip"
+RDEPEND=""
+
+S="${WORKDIR}/Fira-master"
+DOCS="README.md"
+FONT_S="${WORKDIR}/Fira-master/ttf"
+FONT_SUFFIX="ttf"
+FONTDIR="/usr/share/fonts/${PN}"