dev-libs/libgcrypt: bump libgcrypt to 1.6.1 and add asm as IUSE
authorkristianf <devnull@localhost>
Wed, 23 Jul 2014 12:17:17 +0000 (14:17 +0200)
committerkristianf <devnull@localhost>
Wed, 23 Jul 2014 12:17:17 +0000 (14:17 +0200)
app-crypt/keyart/metadata.xml [new file with mode: 0644]
dev-libs/libgcrypt/Manifest
dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch [new file with mode: 0644]
dev-libs/libgcrypt/files/libgcrypt-1.6.1-uscore.patch [moved from dev-libs/libgcrypt/files/libgcrypt-1.5.0-uscore.patch with 51% similarity]
dev-libs/libgcrypt/libgcrypt-1.6.1-r1.ebuild [moved from dev-libs/libgcrypt/libgcrypt-1.5.3-r101.ebuild with 51% similarity]
dev-libs/libksba/Manifest [new file with mode: 0644]
dev-libs/libksba/libksba-9999.ebuild [new file with mode: 0644]
media-fonts/eika-otf/Manifest [new file with mode: 0644]
media-fonts/eika-otf/eika-otf-0_p20140601.ebuild [new file with mode: 0644]
media-fonts/eika-otf/metadata.xml [new file with mode: 0644]

diff --git a/app-crypt/keyart/metadata.xml b/app-crypt/keyart/metadata.xml
new file mode 100644 (file)
index 0000000..e4dc40c
--- /dev/null
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <maintainer>
+               <email>kf@sumptuouscapital.com</email>
+       </maintainer>
+</pkgmetadata>
index 4b4965c..fc73c85 100644 (file)
@@ -1,6 +1,7 @@
 AUX 0002-Fix-building-with-GNU-Automake-1.13.patch 2050 SHA256 78b5786783d326a77323cbdb9294544d184a2ddfc3d8d298be170e5b585ea45a SHA512 3b66d6a0e02f0ba16dbcf509b045d771c40865bd6054bd928506cc2c157f764d55f352d557ac33cc0dbc0892351998723306ee61609e5459141b48c9158a86b3 WHIRLPOOL ea63892696187afe9fe9be752247056f4062019a413370186ee28383b4f97c0a4bba43ec5212dc433d94d1f831ec90bd5dac84a37dc5b99faa63f45006fd732e
-AUX libgcrypt-1.5.0-uscore.patch 981 SHA256 4cbb34cebce02531b9b940494b78b7186b2fd05b802866d9ecb42d478e88e845 SHA512 716e182684886c905525ab9218b3453fd968ee8f73da83d3ba97ca84a868e18eb1c1c9bb3891a1e4b25f870eb3d762a5e8a415168c9804e9367d8dd12090a601 WHIRLPOOL 6b6b1944539127c9c41fda46c54d8e331597d249ab91a0024a38d60a907a0fba114fb064c8d956c90a91e27e6ae30aa2e6dd4a3b61b2e8d771e53499b9810016
+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-multilib-syspath.patch 588 SHA256 a3fc53f24b9cd0355a5267bc3ca8e88c397878473046536068c8ae4ae0b526eb SHA512 913c1a474aba50ec3589fb5a991f65204ba2cc28203b92353fdef8fb092350c3be814a57f29a26a2176627509a4f573f6db02ebdbcde3f04a2f1d632879293dc WHIRLPOOL 8d066987dc3cfa1dd686047fd5332b11199e5add63f82e397a34b22b5ce2f97af17d60042681c1eb50617402189a0d7fca5db48db7d41f4ef0f1cbe1acc645ab
-DIST libgcrypt-1.5.3.tar.bz2 1508530 SHA256 bcf5334e7da352c45de6aec5d2084ce9a1d30029ff4a4a5da13f1848874759d1 SHA512 2fc2771d00d5fef9a7158790a8914da10154a5fac9124bf21ee43edd08b43dd4452f38a3aee12deb46d86f574ffdd0688c5829e978f4de2fa3e07be486e99723 WHIRLPOOL da8b354e772ba830d3fbecc2c707c96f8b0f65f98d4af9d5b79ac639a9029bc364688836e0af1d9f7810c5df2679f8d4ba61d9afa775530c4b0f755ac88049fe
-EBUILD libgcrypt-1.5.3-r101.ebuild 1752 SHA256 4e856c899d1fdfb867d60ed087241609a4204f4f957796ad4646856716891671 SHA512 ac0e42d48214d70ad335ead496cb0cf2fcac46d5fe51df5b2ee9a1fe79c00bc9cdd9963d16dd1db989aa1ed35067cdb4e70d2f0679cb22935c3effca54a43bd7 WHIRLPOOL 0964e97684665639cb1e91f191114aa7e67a75b09825f91653f2ffbe29f6782084c1da0a49f4beeda800e46c2cd799893443073fabc69d8f383da57499c441a0
+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-9999.ebuild 722 SHA256 221c5b17e9287b7e7accde422851318091fa2131ceeeaec7a15177dd4714ebe3 SHA512 b37cfe72091a29f6dd462799ff90ad3ba8068cfa179babb8014651eb44f21fd3b9fa27fdb3adf11599e8a94fbae0ee091d98ab008d05f6f7e82e3f6bd659e17f WHIRLPOOL 1c4a773d821c2ab0012472d1703e99fdff255ca22c2f6cb4859dde4bc080a0e87609d9457a21dc6764cb5525165f814d57fcfa2c2cf6e2bd56d1d24ad398a41c
diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch b/dev-libs/libgcrypt/files/libgcrypt-1.6.0-serial-tests.patch
new file mode 100644 (file)
index 0000000..05c40fb
--- /dev/null
@@ -0,0 +1,11 @@
+--- configure.ac       2014-01-23 12:16:46.291335724 +0100
++++ configure.ac       2014-01-23 17:25:50.021776443 +0100
+@@ -73,7 +73,7 @@
+ VERSION=$PACKAGE_VERSION
+ AC_CONFIG_SRCDIR([src/libgcrypt.vers])
+-AM_INIT_AUTOMAKE
++AM_INIT_AUTOMAKE([serial-tests])
+ AC_CONFIG_HEADER(config.h)
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_LIBOBJ_DIR([compat])
@@ -2,24 +2,20 @@ The version taken from GnuPG 1.4 assumes any cross-compiled package have
 prefixed underscores, which is not the case; by using libtool's own macro,
 we can avoid the whole issue.
 
-diff --git a/configure.ac b/configure.ac
-index ab160c3..6df49bf 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -886,7 +886,7 @@ fi
- #
- # Setup assembler stuff.
+--- libgcrypt-1.6.1/configure.ac
++++ libgcrypt-1.6.1/configure.ac
+@@ -1022,7 +1022,7 @@
+ # Check whether underscores in symbols are required.  This needs to be
+ # done before setting up the assembler stuff.
  #
 -GNUPG_SYS_SYMBOL_UNDERSCORE()
 +LT_SYS_SYMBOL_USCORE
- AC_ARG_ENABLE(mpi-path,
-               AC_HELP_STRING([--enable-mpi-path=EXTRA_PATH],
-             [prepend EXTRA_PATH to list of CPU specific optimizations]),
-diff --git a/mpi/config.links b/mpi/config.links
-index 7e910ee..9696828 100644
---- a/mpi/config.links
-+++ b/mpi/config.links
-@@ -291,7 +291,7 @@ fi
+ #################################
+--- libgcrypt-1.6.1/mpi/config.links
++++ libgcrypt-1.6.1/mpi/config.links
+@@ -362,7 +362,7 @@
  
  # Make sysdep.h
  echo '/* created by config.links - do not edit */' >./mpi/sysdep.h
@@ -28,6 +24,3 @@ index 7e910ee..9696828 100644
      cat <<EOF >>./mpi/sysdep.h
  #if __STDC__
  #define C_SYMBOL_NAME(name) _##name
--- 
-1.7.6.1
-
@@ -1,11 +1,11 @@
 # 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.5.3-r100.ebuild,v 1.3 2014/03/01 18:49:18 mgorny Exp $
+# $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
+inherit autotools-multilib flag-o-matic
 
 DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
 HOMEPAGE="http://www.gnupg.org/"
@@ -13,42 +13,47 @@ SRC_URI="mirror://gnupg/libgcrypt/${P}.tar.bz2
        ftp://ftp.gnupg.org/gcrypt/${PN}/${P}.tar.bz2"
 
 LICENSE="LGPL-2.1 MIT"
-SLOT="11/11" # 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 ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=dev-libs/libgpg-error-1.8
-       !dev-libs/libgcrypt:0/11"
+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 asm"
+
+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}"/${PN}-1.5.0-uscore.patch
+       "${FILESDIR}"/${P}-uscore.patch
        "${FILESDIR}"/${PN}-multilib-syspath.patch
+       "${FILESDIR}"/${PN}-1.6.0-serial-tests.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+       /usr/bin/libgcrypt-config
 )
 
-src_configure() {
+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)
+               $(use_enable asm)
 
                # 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-multilib_src_configure
-}
-
-src_install() {
-       autotools-multilib_src_install
-
-       rm -r "${ED%/}"/usr/{bin,include,lib*/*.so,share} || die
+       autotools-utils_src_configure
 }
diff --git a/dev-libs/libksba/Manifest b/dev-libs/libksba/Manifest
new file mode 100644 (file)
index 0000000..e3094d6
--- /dev/null
@@ -0,0 +1 @@
+EBUILD libksba-9999.ebuild 644 SHA256 993edb3b0d1f90ceedea20115251300417a3631d25a3f92808ceb53f66d01b7d SHA512 7e5402270edc184709cbe82ec82026190250143a49b0257d30f3dc25c7a63ccec29836176a59f4cb1bf0edbaa625aa367eb80d53b170291f612165eb8a199077 WHIRLPOOL bcdfc67d7ffaa65bd41742c34d3067b8147ddb02270c7b061b114794a766b6e4594e8553f66566d5256ef49e9aaff9f5870196f00f95ca4c8e20be892652bebd
diff --git a/dev-libs/libksba/libksba-9999.ebuild b/dev-libs/libksba/libksba-9999.ebuild
new file mode 100644 (file)
index 0000000..01bba7e
--- /dev/null
@@ -0,0 +1,32 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/openvpn/openvpn-9999.ebuild,v 1.7 2013/05/03 07:56:29 djc Exp $
+
+EAPI=5
+
+inherit autotools flag-o-matic user git-2
+
+DESCRIPTION="libksba: KSBA is a library to access X.509 certificates and CMS data."
+EGIT_REPO_URI="git://git.gnupg.org/${PN}.git"
+HOMEPAGE="http://gnupg.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS=""
+IUSE=""
+
+REQUIRED_USE=""
+
+DEPEND=""
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+       ./autogen.sh || die
+       eautoreconf
+}
+
+src_configure() {
+       econf \
+               ${myconf} \
+               --enable-maintainer-mode
+}
diff --git a/media-fonts/eika-otf/Manifest b/media-fonts/eika-otf/Manifest
new file mode 100644 (file)
index 0000000..607394b
--- /dev/null
@@ -0,0 +1,3 @@
+DIST eika.tar.bz2 78484 SHA256 ca3ca116def6ec25cd593f122b2c85ad2ebfed3ed8224dafdd7cd3fee6fd01d4 SHA512 580b50780b98704c970b92cb5900f809a8144c2cf691ccbf51e81dfb0ed91cb324079a64f911a0e339c3df65ce8209d002ad47646b4e9ba66fff1fd228fb2a42 WHIRLPOOL 90aacfd79e45e944373e78555382bbdd31b8eb65fd6c2ccfaf8dd5412826f48dca3d2cc81e72cc7d4f5be39afa2aed5d601aa281d392d050708031a46146d148
+EBUILD eika-otf-0_p20140601.ebuild 648 SHA256 9cd98178faab3c9fc981b59b5585c3b6d7545693e67b1ac5383df227ac568979 SHA512 2677f9932207bc4fe4d4ada59c4a9a9f2016ca0b2fc24a00fcd595560f8be41c1091d778deb89ef6d4448832b71ab85ca0988f29186c49b1a0bdba378e221954 WHIRLPOOL 67790098b375944abb938bcdb8ed123aa0127c97159e8375ad9fda88d1c4c5221deb70be836875276dc34f25f6e06dd8c6ba765d27d584127ac33bb54e4f2e94
+MISC metadata.xml 301 SHA256 acd835cdde3601fed626ef7bc1358fbe7b43d175c267ea30de72488b5342f94b SHA512 fdba96b8cd8705111024babeeac6d57ec13ef425b670cc6b4d78a86167ab2b332063d33646daea882a5192826b0b73a0ed926d4ed9e8f840657b430d66d72e33 WHIRLPOOL a6e896c2fe5249d4e46ce9a19c4ab70a3a229387d66b31f71a49c7b40c79fa4209413a23f1db4b079429cddbe1323b8dcd6fe1fb27345f18db70db5e07be9c49
diff --git a/media-fonts/eika-otf/eika-otf-0_p20140601.ebuild b/media-fonts/eika-otf/eika-otf-0_p20140601.ebuild
new file mode 100644 (file)
index 0000000..77b4fb1
--- /dev/null
@@ -0,0 +1,27 @@
+# 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
+
+MY_P="${P/_/}"
+
+DESCRIPTION="Eika's typefont"
+HOMEPAGE="http://eika.no"
+SRC_URI="http://kfwebs.com/gentoo/eika-p20140601.tar.bz2 -> eika.tar.bz2"
+
+LICENSE="OFL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+DEPEND=""
+RDEPEND=""
+
+S="${WORKDIR}/Eika"
+DOCS=""
+FONT_S="${WORKDIR}/Eika"
+FONT_SUFFIX="otf"
+FONTDIR="/usr/share/fonts/${PN}"
diff --git a/media-fonts/eika-otf/metadata.xml b/media-fonts/eika-otf/metadata.xml
new file mode 100644 (file)
index 0000000..3d54646
--- /dev/null
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+       <maintainer>
+               <email>kf@sumptuouscapital.com</email>
+       </maintainer>
+       <use>
+       </use>
+       <upstream>
+               <remote-id type="github">mozilla/Fira</remote-id>
+       </upstream>
+</pkgmetadata>