Sync with portage [Thu Feb 11 09:36:40 MSK 2016].

mhiretskiy
root 8 years ago
parent ca883eef21
commit ec46cde591

@ -20,7 +20,6 @@ DEPEND="dev-lang/perl
sys-devel/gettext"
RDEPEND="${DEPEND}
>=sys-apps/findutils-4.3.0
s3? ( dev-perl/Net-Amazon-S3
dev-perl/File-Slurp )"

@ -16,8 +16,7 @@ IUSE="doc"
DEPEND="dev-lang/perl
sys-devel/gettext"
RDEPEND="${DEPEND}
>=sys-apps/findutils-4.3.0"
RDEPEND="${DEPEND}"
src_unpack() {
unpack ${A}

@ -7,9 +7,8 @@ EAPI=5
inherit eutils
DESCRIPTION="Utilities to manipulate and convert cue and toc files"
HOMEPAGE="http://developer.berlios.de/projects/cuetools/"
#SRC_URI="mirror://berlios/${PN}/${P}.tar.gz
SRC_URI="mirror://gentoo/${P}.tar.gz
HOMEPAGE="https://github.com/svend/cuetools"
SRC_URI="https://github.com/svend/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
mirror://gentoo/${P}-debian.patch.bz2"
LICENSE="GPL-2"

@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
SLOT="23"
KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm"
REQUIRED_USE="?? ( aqua X )"

@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/emacs/${P}.tar.xz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
DOCS="ChangeLog keyword-generation.sh"
ELISP_TEXINFO="${PN}.texi"

@ -0,0 +1,29 @@
diff --git a/Ganeti/HTools/Types.hs b/Ganeti/HTools/Types.hs
index 104bf64..8146870 100644
--- a/Ganeti/HTools/Types.hs
+++ b/Ganeti/HTools/Types.hs
@@ -65,2 +65,4 @@ import qualified Data.Map as M
import qualified Text.JSON as JSON
+import Control.Applicative
+import Control.Monad
@@ -221,2 +223,9 @@ data Result a
+instance Functor Result where
+ fmap = liftM
+
+instance Applicative Result where
+ pure = return
+ (<*>) = ap -- defined in Control.Monad
+
instance Monad Result where
@@ -252,2 +261,9 @@ data OpResult a = OpFail FailMode -- ^ Failed operation
+instance Functor OpResult where
+ fmap = liftM
+
+instance Applicative OpResult where
+ pure = return
+ (<*>) = ap -- defined in Control.Monad
+
instance Monad OpResult where

@ -33,6 +33,7 @@ src_prepare() {
sed -i -e "s:) man:):" Makefile
epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629
epatch "${FILESDIR}"/${PN}-0.3.1-base-4.patch #424299
epatch "${FILESDIR}"/${PN}-0.3.1-ghc-7.10.patch
}
src_compile() {

@ -57,7 +57,7 @@ fi
LICENSE="MPL-1.1"
SLOT="0"
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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
${PRECOMPILED} || IUSE+=" +cacert"

@ -12,10 +12,7 @@ SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
DEPEND=">=sys-apps/sed-4.0.5
>=sys-apps/grep-2.4.2
>=sys-apps/findutils-4.1
virtual/cdrtools
DEPEND="virtual/cdrtools
!app-backup/cdbkup"
src_unpack() {

@ -8,4 +8,5 @@ DIST pax-utils-1.1.1.tar.xz 627640 SHA256 9ea1f28b3665da08fd80384e56d2a71bfa9f27
DIST pax-utils-1.1.2.tar.xz 627732 SHA256 49390215f6a4773a9c0a99a6de90ff768d13ce2eb4ba1a869603b81f697fce3e SHA512 7a97ff3f68ef67084d1785c95aed2bef5c3bd6fe0c67b96310bd236dc0a403ab5fa86d2b719bdc493b6d6ce07e43af41cc1ff3aa0bd726f2896494079996bff7 WHIRLPOOL c94e1c55a183ce6a6d44a0993ca6c3c34d41f1fad43dabdc9994357747a159e1578e61f13634c4379d324640c4b1d67073e82992f521964acd64598fa7c342f8
DIST pax-utils-1.1.3.tar.xz 627536 SHA256 b80c923c0231a17aa2db5fce3d81c3b7d061cd8e6b356fecceadb2e9a8ee9bc6 SHA512 0bd5efe455edfbe06e938fab62f7d452bcefe6f426881bfebc8252bf386807a3f50ffa9cadbf8cf4aa514839ba94d3f28b16fea163ae738ef8fdeed28fe9204c WHIRLPOOL 1730c25bfda22d4523c8d8f30fe01a09790131efbfeae21ef1e1917c8fdcd9f8aa0053194c7f32a254fa70b963594e5f399f79f287793afd5b8b7fbafcafc806
DIST pax-utils-1.1.4.tar.xz 627880 SHA256 796860fbd48c5f811e699e8492dc1110459bad0a62efa8d346b74a4f6f556414 SHA512 9557d0a80c2a94f28760665a258e0670ee2dd585b128d644ea3be310128bfd26db1bc19bed8623cf2c886979d0094ba9b92577b3899d363b5d418986a2f52795 WHIRLPOOL 27ab9694528cada62f76592df6414a47af4ceb967871ddfe295be01a3c590ae398612030b28b94025a27f112c8a293a300cc9ddb008082f1c76e8ba3ce2eae1d
DIST pax-utils-1.1.5.tar.xz 646612 SHA256 2945b3e4df2e0dc95800bfbd3d88ab2243b2ee4ff064bbfc75734f6d9d986a89 SHA512 c03c2b867988592ad7ee3fc19cbbe203622a736889aa27a669824f4de670e8d591e1c8477529bd0481e7cdce11e94f8b55d4ef158fe21a6e2baf43b09f33b5b7 WHIRLPOOL 3e54a9d0b30aae9017f2706ea8f79c901de2105e52779e765aa497db40cbcb52d7b90570d9373d246a0338d16eaeab5a75ff9019639082f22b2e7ca1a6b2a544
DIST pax-utils-1.1.tar.xz 627392 SHA256 97ed475ae9f91cf5ca47eeb39abe6033db77e480469dad7c7823ed16be2475ad SHA512 24569a8bbcd635b163f1dc84d4a74dac2e89fc5a18bdb0ead8db78dde5f0661f3d4d51118818f028bc5359447a2d9156ab394ffb26b5c64e377f3bf4536cecb5 WHIRLPOOL e5d1782904bd31ad93e09486ee01bf0af7a33db7bde6eaefdfeaaa462632b1f66633065509b7b79bf493030b0c104472446f7aaf7fbc549564715ffebe5eeb38

@ -0,0 +1,58 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="4"
inherit eutils toolchain-funcs unpacker
DESCRIPTION="ELF related utils for ELF 32/64 binaries that can check files for security relevant properties"
HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
SRC_URI="mirror://gentoo/${P}.tar.xz
http://dev.gentoo.org/~solar/pax/${P}.tar.xz
http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="caps debug python seccomp"
RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
python? ( dev-python/pyelftools )
seccomp? ( sys-libs/libseccomp )"
DEPEND="${RDEPEND}
caps? ( virtual/pkgconfig )
seccomp? ( virtual/pkgconfig )
app-arch/xz-utils"
_emake() {
emake \
USE_CAP=$(usex caps) \
USE_DEBUG=$(usex debug) \
USE_PYTHON=$(usex python) \
USE_SECCOMP=$(usex seccomp) \
"$@"
}
src_configure() {
# Avoid slow configure+gnulib+make if on an up-to-date Linux system
if use prefix || ! use kernel_linux || \
has_version '<sys-libs/glibc-2.10' || true
then
econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
else
tc-export CC
fi
}
src_compile() {
_emake
}
src_test() {
_emake check
}
src_install() {
_emake DESTDIR="${ED}" PKGDOCDIR='$(DOCDIR)'/${PF} install
}

@ -43,7 +43,7 @@ RDEPEND=">=app-text/poppler-0.16:0=[cairo]
virtual/tex-base:0
t1lib? ( >=media-libs/t1lib-5:5 )
)
epub? ( net-libs/webkit-gtk:2 )
epub? ( >=net-libs/webkit-gtk-2.4.3:2 )
gnome-keyring? ( >=app-crypt/libsecret-0.5:0 )
introspection? ( >=dev-libs/gobject-introspection-0.6:0 )
postscript? ( >=app-text/libspectre-0.2:0 )
@ -87,6 +87,7 @@ src_configure() {
$(use_enable dbus) \
$(use_enable djvu) \
$(use_enable dvi) \
$(use_with epub webkit) \
$(use_with gnome-keyring keyring) \
$(use_enable introspection) \
$(use_enable caja) \

@ -3,6 +3,7 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/"
SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz"
LICENSE="GPL-2"
KEYWORDS="alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
KEYWORDS="alpha amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos"
IUSE="setup"
RDEPEND="

@ -0,0 +1,7 @@
DIST assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz 139764 SHA256 5a6c02a44b20425695e54433a9c72a88372fdb35beee764a2cceeb7264cda55f SHA512 8911ee27ba4aad8371e5095cfb7a63aaae08dfc89aca9d7dd72d1c55f7d9e3e2661050965ba123c031165c31733ad6599b9c16716ce01c5f850f2759fc180b90 WHIRLPOOL ecf94dd7e83d783b05a0d69f8c75b7f9243505d01a806e34f57b09cca60047dcf020b81a8bf3383acca28d44485cfdf83c812680d03375c81372ecca274fccb9
DIST bee-1.4.1_p20160125.tar.gz 114965 SHA256 28d368e445e651d50d1262359130621b9ee6e03e51a40c21f48582ebfdb24600 SHA512 fbecfac3fbeb23d00a8b7c6b9933233d29e60ee353def0540a6f75e84d0add7202e7d2f428b6139e21d4c17fb30b67711be46704aae543d8dfff55dce7152568 WHIRLPOOL 58025ad445213a8dba26218814efa64ceb85473e8550a0e0b3cdd91fe217ad37a4771afec64780a238116ef08667370f16d6c3932e7646cd6eead9581656fbb8
DIST fsnotify-f0c08ee9c60704c1879025f2ae0ff3e000082c13.tar.gz 19325 SHA256 fe6567ac79ef0d030e8442df4039f095454602a2a4f5d493e4381492b2a232eb SHA512 a0b1a13d82303fb2eed7f884360b6010722a47233bccacc0b048cbea7bab9be981fff9197fa0aaef587b191b68a50fffa7997ffc2b819dbff4af2b17005b136f WHIRLPOOL 0dce8b0cf1042b1ba2b4ba0833bf16fd0f3c6c5e7e11ed793388ea2f93837f63ec20d25f227f9dd72a8c28db7d2f70022b0011683875b997d9c1c5a54a04f199
DIST gls-8ddce2a84170772b95dd5d576c48d517b22cac63.tar.gz 6472 SHA256 dd9df462edb33ab82fa1007d934f2750600a8d41ec7e0176cb8a8d5db890addb SHA512 4d1f45289929b48f8801d9d51f1acb017dd703b75636cf2930b4222158e14d1850c526903459163d04a2831894bb0fcc9bd80d0e7a23a1f54930f2fc89965dc2 WHIRLPOOL 60b01c33f279fe54b8b02acdbd97fd584bf04bc3867724b7501b83d30996878e9879b1525cfd541859b154747e4bddbe3c2c22e183c855591ced42bbf03cd4b2
DIST go-mysql-267b128680c46286b9ca13475c3cca5de8f79bd7.tar.gz 56401 SHA256 3aa79d9b80b92e7ed08436f82915ece3d211c86d41ba6fdfe56643448dcbe706 SHA512 0c7158e94e0034ce19de5c3cab4dff55bc808b47bd2ec0ddc282a18d971de2362ae72746217d9621a37435cb2fe32dd2f91a0e3ee125303d268a46f765b363e7 WHIRLPOOL 155ec234f9d39be381851530d7280fc6cb03e09f6ec5580e7e61333e1657fbdf4e4b31116363ef3fb87b27658e87c60f239ee26fc57bb0f550c232d85f547a7a
DIST goconvey-bf58a9a1291224109919756b4dcc469c670cc7e4.tar.gz 1161670 SHA256 b54809495f137dab6c798a332a46431df6580e116395233e6cb1daa90a03bd37 SHA512 717663991e54470acb0626a1272a9644486ab3f4552c347eea26d05acf603b713276036433e1997e9c27fe769316d3ba2582e04da9e08b84850b8c5ad494338e WHIRLPOOL e6f059af524fd26b8fd3731b63be9802f30d96aee92392411c67771019ee9cf886152ac1774a96ce35f60cf04ea7ee0f3a34a373b4aec78ebe86b476366cf822
DIST pq-f59175c2986495ff94109dee3835c504a96c3e81.tar.gz 68877 SHA256 681711e05991a904f69c837357723e1524fc326e0e0cdba3c0f956c2d96d8c8a SHA512 c68b62816cec1994848009de420b601307e6b9581f35903b28828d9cab0c8e6763d90bde7b8f297002407086525df3b0da7adaf1c7e0f3b786a0d4fcbda7d2eb WHIRLPOOL e61adb00ca89dcd3631dfce1aeaf72aff63043aa80944234992e2579b03119ddba1f58d51e11ef40004994bc86e406bc092bc1b3334079662791c623b0fe941a

@ -0,0 +1,62 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit golang-build
KEYWORDS="~amd64"
DESCRIPTION="A tool for helping develop with beego app framework"
EGO_PN="github.com/beego/bee/..."
EGIT_COMMIT="1566ca7da16102eab17a81346a1bc223642bc183"
SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
https://github.com/go-sql-driver/mysql/archive/267b128680c46286b9ca13475c3cca5de8f79bd7.tar.gz -> go-mysql-267b128680c46286b9ca13475c3cca5de8f79bd7.tar.gz
https://github.com/howeyc/fsnotify/archive/f0c08ee9c60704c1879025f2ae0ff3e000082c13.tar.gz -> fsnotify-f0c08ee9c60704c1879025f2ae0ff3e000082c13.tar.gz
https://github.com/lib/pq/archive/f59175c2986495ff94109dee3835c504a96c3e81.tar.gz -> pq-f59175c2986495ff94109dee3835c504a96c3e81.tar.gz
https://github.com/smartystreets/goconvey/archive/bf58a9a1291224109919756b4dcc469c670cc7e4.tar.gz -> goconvey-bf58a9a1291224109919756b4dcc469c670cc7e4.tar.gz
https://github.com/smartystreets/assertions/archive/287b4346dc4e71a038c346375a9d572453bc469b.tar.gz -> assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz
https://github.com/jtolds/gls/archive/8ddce2a84170772b95dd5d576c48d517b22cac63.tar.gz -> gls-8ddce2a84170772b95dd5d576c48d517b22cac63.tar.gz"
HOMEPAGE="https://${EGO_PN%/*}"
LICENSE="Apache-2.0"
SLOT="0"
IUSE=""
DEPEND="dev-go/beego:="
get_archive_go_package() {
local archive=${1} uri x
for x in ${SRC_URI}; do
if [[ ${x} == http* ]]; then
uri=${x}
elif [[ ${x} == ${archive} ]]; then
break
fi
done
uri=${uri#https://}
echo ${uri%/archive/*}
}
unpack_go_packages() {
local go_package x
# Unpack packages to appropriate locations for GOPATH
for x in ${A}; do
unpack ${x}
if [[ ${x} == *.tar.gz ]]; then
go_package=$(get_archive_go_package ${x})
mkdir -p "${S}/src/${go_package%/*}"
for x in ${go_package##*/}-*; do
[[ ${x} -ef ${S} ]] && continue
mv "${x}" "${S}/src/${go_package}" || die
done
fi
done
}
src_unpack() {
unpack_go_packages
}
src_install() {
dobin bee
dodoc "${S}/src/${EGO_PN%/*}/README.md"
}

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
</maintainer>
<upstream>
<remote-id type="github">beego/bee</remote-id>
</upstream>
</pkgmetadata>

@ -33,7 +33,7 @@ SRC_URI="https://${EGO_PN%/*}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz
DESCRIPTION="High-performance web framework for Go"
HOMEPAGE="https://${EGO_PN%/*}"
LICENSE="Apache-2.0"
SLOT="0"
SLOT="0/${PVR}"
IUSE=""
RESTRICT="test"

@ -14,5 +14,5 @@ DESCRIPTION="Go sqlite3 driver using database/sql"
HOMEPAGE="https://${EGO_PN%/*}"
SRC_URI="${ARCHIVE_URI}"
LICENSE="MIT"
SLOT="0"
SLOT="0/${PVR}"
IUSE=""

@ -21,9 +21,7 @@ SLOT="0"
KEYWORDS="amd64 ~arm ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="userland_BSD"
# find for bug #214664
DEPEND=">=virtual/jdk-1.4
!userland_BSD? ( >=sys-apps/findutils-4.4 )"
DEPEND=">=virtual/jdk-1.4"
RDEPEND=">=virtual/jre-1.4
>=dev-java/ant-core-1.7.0"

@ -21,7 +21,6 @@ CDEPEND="dev-java/hamcrest-core:0"
RDEPEND=">=virtual/jre-1.5
${CDEPEND}"
DEPEND=">=virtual/jdk-1.5
userland_GNU? ( >=sys-apps/findutils-4.3 )
${CDEPEND}"
S="${WORKDIR}/${PN}${PV}"

@ -25,7 +25,6 @@ RDEPEND=">=virtual/jre-1.5
${CDEPEND}"
DEPEND=">=virtual/jdk-1.5
userland_GNU? ( >=sys-apps/findutils-4.3 )
${CDEPEND}"
S="${WORKDIR}/${PN}${PV}"

@ -3,9 +3,8 @@ DIST apache-tomcat-5.5.27-src.tar.gz 7382057 SHA256 90bc8abcddda604e855c37035653
DIST apache-tomcat-5.5.34-src.tar.gz 3720299 SHA256 a52e7f2abf0fbdd9665ca398d2b39f99b80683b0ee43c72751390e88dcd6114d SHA512 4c8616f839a3c413ffef45b7b6876f123cbda37f4029db96ac1c8f259a75f0d65cdb5709468d89e731e5436b011dac4ee3e9dc397adfc9ad4d0b1bc462c8e519 WHIRLPOOL 25e987b58af5535914b666a5bb8691146d68b2287796ba25b8a5f792df08f55901a7ea3f419602207f7a8168302b080592bde5f4aeb67b58f40e5da00b8049ad
DIST apache-tomcat-6.0.44-src.tar.gz 3447711 SHA256 c6f01526d58f2ba7b9da496e959d9e68cc49183006077704ab91c36ebebf5a4a SHA512 0d6a1539b28fa8ca3442557889d7d21cc523b18136f6998820ba13f41420536aba65ce78bac526002ee1dd86df3cbc80d9f043a3f765d7cf0b79e58e516030be WHIRLPOOL c65e704466191a0f98ec777e95dda889599ff6a545e7c013fd04bc0b72e0d0edf4491415f243d6a4de60cf76abe5c13ffbcc6d98f78b51490f7b7b43b24ecb97
DIST apache-tomcat-7.0.59-src.tar.gz 4687344 SHA256 3a1dedda4019db87464fca3aeb4e800a538f0baee96d8b14c9d64967b0d2ea44 SHA512 acc322eee1446dd1bff72910ae9f40a62f88332ee69d6057b3c684e2abf8f28e6df6ab9505900f0b0cf7a5e2e0e80e64b0a790b3b78594ce595ce897706b4bcb WHIRLPOOL 4948964c1746e6ee912ac72c901ba271793610f402bf082455d104e2e8d6dbfa0bf5371d42d48d8ad7c826271fa60d989119a01e700497099022d0cf3564fdff
DIST apache-tomcat-7.0.65-src.tar.gz 4600718 SHA256 38c266a21ff27560ba4c213dd64628a1ed35b22289d37b5d7f250010e963cc39 SHA512 6eb420a3067783a6ffee781c834dc363d6638d6e79182886594249a0ef810b2ab721f2a44f84b4ea90372a7e2e5171caf49697945d359e9c877a2db640fc3da2 WHIRLPOOL db678b899455ef977d893eec01ba50687c7563646321dbe511be6c55f03859a08778e4f6da14021a9ed051c1f3573edf9d0de527383aaf4ee6114f3a027b281d
DIST apache-tomcat-7.0.67-src.tar.gz 4624303 SHA256 0464ebbeec17fb15103cad9f6639edc826f4eca246dd58a5cb1c5d46aff58e0a SHA512 dd299cab7a172860f51bae19e3490432af874b94825de289095647026a91b27cb3544ba85ab1f786bf4696dc59475ca85d051841ebaa221e3b46079e139a6e52 WHIRLPOOL ae7ec13ffd3bd0964496060413924854c5b956dc88b8d0f1de4ac094e8fb5595ccfc7c2eaa7051f082c575253ed9fdadc8833f494281770f8f72b8c64d9b9593
DIST apache-tomcat-8.0.28-src.tar.gz 4913153 SHA256 441a0a0459b6c2dacab3bcf68a9e512b4bb62f7251a27bd15b909ee31b659367 SHA512 60f9a9f643595cdc87598169b8b66cc1e445445a530cad88d2957e90ca99e7c77be9d3576c7fa3a0e7051166f2a960a1c3bf4103f902d1da122825d41e1154c7 WHIRLPOOL 5867ec0c128fe5247c7b874baf05fba9fc9a5663e1c16ecd60bc6ae1e3c411a43f4d8784db5c915fe6c54bc2ec728a01773708738aede30e5abaf1f77072cdcb
DIST apache-tomcat-8.0.30-src.tar.gz 4939771 SHA256 0f79b74f303cce809ea63a85586efb5d4bb67ea53622f1b44ecffff0f1aa9cf6 SHA512 cc1546292e6b674e251bf5c92b2f63f9fe96f979753a74991dd6e851f7da44743415c3bfc06525071b89faa35c90abb4129cb76dffdc75945a2ea94c3bb92110 WHIRLPOOL a20d1f1e6a290d174e5f7181655d555a5b39296e4c059fcd4833709e0ee635d9c02cf319be29aef9b5442db0283c8590c6d062d5f6eae09136ccb77c4610a5fc
DIST apache-tomcat-8.0.32-src.tar.gz 4957920 SHA256 b8f7770ae947a0c0aed9b5a6f3e2ff18fd27a07f068cc6029f019b5d4c6de560 SHA512 4c18b9ae77963d96ff59891564c4bc8f6aaba582776c319825e9b944dd8cf10747dfc5b3cbc9cfa2ff10f6d889b404902fecd6b49fdde7b3741f9ba90dc6221c WHIRLPOOL 77be9ea10ffd2e606367d477ba13c717294fe49b65ecef6fdc910e53fa2d987f38a8b299c28a340ea7684a16feb6ca3bd0b5e662e3875af73f4735e1ff623a79
DIST apache-tomcat-9.0.0.M3-src.tar.gz 4987071 SHA256 b4d7ed751f556e77fd53fe9d02d69ceba9709e0a44c47f4f59a84e8b5059f5b7 SHA512 3436e64f5c3c77d041091456bce29c1bb5259d25079ffc87560e5e0e90b422c7ff04b94561a1001ab483100074be8b2c2af5622f36823083423f5b44b0e30b81 WHIRLPOOL 79f89ca17fb71293d6e6db741586ac4a481449cac758099569396f6e22ac8255b5554196d9bef7a74c6d49a9f27d0a46012abe687cd04bf874eae397ce48d8a8
DIST jakarta-servletapi-src.tar.gz 65342 SHA256 404e2c55423c609122921a91e03f2b67d371fedc0af8996e005862d83d626697 SHA512 7dad5a52ab6bfca4b052d60a48fc89ce22a5eb790584671f24d8d22b163f2dffe93bea58caebc6b4ecb0bd8434a074c88f640aa57daa1cefbf47d74df758c084 WHIRLPOOL beb0e14920a8623d276c8823e6291aacb4b4d5d0539f5de431ce6f94582df9b260d4e04e0d0b650c59f7ca168f4af9352fffbfc0506b2530464a3bcdcf6ac0d1

@ -1,35 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
JAVA_PKG_IUSE="source"
inherit eutils java-pkg-2 java-ant-2
MY_A="apache-${P}-src"
MY_P="${MY_A/-servlet-api/}"
DESCRIPTION="Tomcat's Servlet API 3.0/JSP API 2.2 implementation"
HOMEPAGE="http://tomcat.apache.org/"
SRC_URI="mirror://apache/tomcat/tomcat-7/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.0"
KEYWORDS="amd64 ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.6"
RDEPEND=">=virtual/jre-1.6"
S="${WORKDIR}/${MY_P}/"
java_prepare() {
cp "${FILESDIR}/${SLOT}-build.xml" build.xml || die "Could not replace build.xml"
rm -fR */*/build.xml ||die
java-pkg_clean
}
src_install() {
java-pkg_dojar "${S}"/output/build/lib/*.jar
use source && java-pkg_dosrc java/javax/servlet/
}

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -15,7 +15,7 @@ SRC_URI="mirror://apache/tomcat/tomcat-8/v${PV}/src/${MY_P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="3.1"
KEYWORDS="amd64 x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
KEYWORDS="~amd64 ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
IUSE=""
DEPEND=">=virtual/jdk-1.7"

@ -107,9 +107,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
REQUIRED_USE="?? ( ghcbootstrap binary )"
# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
use binary && QA_PREBUILT="*"
# haskell libraries built with cabal in configure mode, #515354
QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
@ -317,6 +314,9 @@ relocate_ghc() {
}
pkg_setup() {
# quiet portage about prebuilt binaries
use binary && QA_PREBUILT="*"
[[ ${MERGE_TYPE} == binary ]] && return
if use ghcbootstrap; then

@ -107,9 +107,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
REQUIRED_USE="?? ( ghcbootstrap binary )"
# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
use binary && QA_PREBUILT="*"
# haskell libraries built with cabal in configure mode, #515354
QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
@ -317,6 +314,9 @@ relocate_ghc() {
}
pkg_setup() {
# quiet portage about prebuilt binaries
use binary && QA_PREBUILT="*"
[[ ${MERGE_TYPE} == binary ]] && return
if use ghcbootstrap; then

@ -111,8 +111,6 @@ PDEPEND="
# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
REQUIRED_USE="ia64? ( !gmp )"
use binary && QA_PREBUILT="*"
append-ghc-cflags() {
local flag compile assemble link
for flag in $*; do
@ -248,6 +246,9 @@ relocate_ghc() {
}
pkg_setup() {
# quiet portage about prebuilt binaries
use binary && QA_PREBUILT="*"
if use ghcbootstrap; then
ewarn "You requested ghc bootstrapping, this is usually only used"
ewarn "by Gentoo developers to make binary .tbz2 packages for"

@ -122,8 +122,6 @@ PDEPEND="
# ia64 fails to return from STG GMP primitives (stage2 always SIGSEGVs)
REQUIRED_USE="ia64? ( !gmp )"
use binary && QA_PREBUILT="*"
# haskell libraries built with cabal in configure mode, #515354
QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
@ -301,6 +299,9 @@ relocate_ghc() {
}
pkg_setup() {
# quiet portage about prebuilt binaries
use binary && QA_PREBUILT="*"
if use ghcbootstrap; then
ewarn "You requested ghc bootstrapping, this is usually only used"
ewarn "by Gentoo developers to make binary .tbz2 packages for"

@ -97,9 +97,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
REQUIRED_USE="?? ( ghcbootstrap binary )"
# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
use binary && QA_PREBUILT="*"
# haskell libraries built with cabal in configure mode, #515354
QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
@ -268,6 +265,9 @@ relocate_ghc() {
}
pkg_setup() {
# quiet portage about prebuilt binaries
use binary && QA_PREBUILT="*"
if use ghcbootstrap; then
ewarn "You requested ghc bootstrapping, this is usually only used"
ewarn "by Gentoo developers to make binary .tbz2 packages."

@ -98,9 +98,6 @@ PDEPEND="!ghcbootstrap? ( =app-admin/haskell-updater-1.2* )"
REQUIRED_USE="?? ( ghcbootstrap binary )"
# yeah, top-level 'use' sucks. I'd like to have it in 'src_install()'
use binary && QA_PREBUILT="*"
# haskell libraries built with cabal in configure mode, #515354
QA_CONFIGURE_OPTIONS+=" --with-compiler --with-gcc"
@ -269,6 +266,9 @@ relocate_ghc() {
}
pkg_setup() {
# quiet portage about prebuilt binaries
use binary && QA_PREBUILT="*"
[[ ${MERGE_TYPE} == binary ]] && return
if use ghcbootstrap; then

@ -1,8 +1,6 @@
DIST pl-6.6.6.tar.gz 14838653 SHA256 9f80bb274e2f31fd68b0acbe35982c012d5f8311dbe44ec1d8d04351a776996d SHA512 a850b0f6b283d34aa77d5e9d8a0053161fa534fa6d8935c7472362ff7b59ea6035de0658d9e38c317e2d92ed810370f2adc3e92b6346fc0ff392d18f1c8012a6 WHIRLPOOL 448d844fe45aee97ad2e37bea3f81dd5eb388e1dcb9f1c4dc54c18991aa91d481bff5b70174fb06edb06c1361759621a570a083fe36d62bffdf6028c49244b2a
DIST swi-prolog-6.6.6-gentoo-patchset-0.tar.gz 1590 SHA256 2b240d15562603120e0314bb69bde50089326c11876b7a62106c05f9d48ace71 SHA512 807c7e897dd5b9eef14e063ea53c03047f3acb23174a70a613258adf7f85dc1f7637158fde70aab2e0f40de4bc6ac5e3548dd09dbe3745d916a388f43eb832eb WHIRLPOOL 0a0dbc361cfbe343c8b3562a2c0535905eb1443eea0783b14f96bda43c04e8db6264f476c07da766c6936dc6088e34059f799a3244717390644bf0f5ae83018e
DIST swi-prolog-7.2.3-gentoo-patchset-1.tar.gz 1875 SHA256 c11e48122dc468f21e08da4a65f5a2daa9e0ddbc2e186bbd952626c95b29db04 SHA512 3506f4168d52f7d3539cd753c5153750df8c3239b78ffac1784c634b585d5fb0c825700e77abc9c1f467af71473ae1861eef629ebdf76b7c783d276c393f40fc WHIRLPOOL 8b70ab91592280d0634c6c897771696c0c63d30680044994cedf69f18cd4f386adf833998e64d4ad892cff97300b5bbfaa8dec8448ea04ebaba7e31f7e9c30d0
DIST swi-prolog-7.3.12-gentoo-patchset-0.tar.gz 334 SHA256 648fa255ffa3a88f94bab11cf746a4a39f69554c2a4b97a2fc7cc65a0c7a954f SHA512 36ad39132eef380f620f29b3d05acbd499667cf2c82a8952d2047ebaea4dea4a7d1c54fdfa290b76fe5eda2e9e1698b25f7f707825485cf56be56db57b433a6c WHIRLPOOL e8a8988d51f40670abfa25a6788785932dbb01c8cdb885f4b4dc8c46fba793e30aa2d014af57c544f0e863ceb6c5b15dbfd89cdd69ff1ca069fc1e56ebbec2ce
DIST swipl-7.2.3.tar.gz 16192142 SHA256 43657d51b7c5887bc2d2bced50a9822b86a08a6841399b8e76ee877f51d646b5 SHA512 da27a6b171d3b471401f1a91e86a4dbe98973d8a1db8c72aa27e452311d08b893b01a1de8f9f4dafcdac460774b4ea980050256d37284546941e1bdf84f8cd7b WHIRLPOOL de695c8e0317921dcc13898f7a3c88d1012e3f87f633cd25766ca5cb6637b29ca81b9245d015614089291a7d9abd0d8c7109ccae1df9297d78301d241cb258b3
DIST swipl-7.3.12.tar.gz 16176445 SHA256 33b5c8fbdcabc1a297f577e5a95dbc0d52150890e577f94809aa85dc9cc4b798 SHA512 d45785467eeef5f7f102597e2b61ee29e5fe973996f8d11fc1ae94276ce3de2b2b7335d1cbf9e6a0257b74ab409e7b12231ae29fff4e27fafc834d5c0894c370 WHIRLPOOL 400d2e41f7fa24f6e0cfce81cd32b97d36aa28af3f440b4b697cf2c6f631943d0cb7bad82b20253e71a2077fb3daa3d159208da358f51cd92fd11a77ae0a808c
DIST swipl-7.3.13.tar.gz 16182766 SHA256 eb1cad792dea0b1c53cb1822049084720b7391e6c4c4ff4d428b48a46962cea0 SHA512 4b3f077ffc140de98b76d67e692b41ab6084020d9594c1522201880655cbb203af1616e7eca8c889a044303d65a682a702ef8ba1a467133a443ecad71bd4c9ed WHIRLPOOL 25f78f2fb437a54d5e07a4aff3c16022b8e9e1544a80a3e49c1b781e2b0ab11bed1f24d2f7be92a57b8ba6352e37103d85d511243b923a8d982a72d43dbfc281
DIST swipl-7.3.14.tar.gz 16190376 SHA256 2f201f79a01c65a9c2296b622d207749442c3ae1c62d3d9866a4a03f71d5e64f SHA512 3a88329d2c244b8614dfd55cbd0978bb1b59c975b6767ff18255d7c5dcfe713f04e252dc180b70d2daac4790c940d31ab060cec0371d0b36b13fd4e4b482e1c8 WHIRLPOOL 74e023c56f074c279249759f40e009c70698e282094201ae0f9ab0a88d42b29080b7db5c3337303b5b1f42615d7ff8afe1d96a2b2887e933440252778daa03b6
DIST swipl-7.3.15.tar.gz 16216228 SHA256 4ff611d8db31ff097edba66f8ee45cdffb229be75f66974d3d1beb114ab85d47 SHA512 2a2d61413e7c98366cb4dd472044b381b296b60b68867e61a2a38f52f3be538603c60710770f766e6f4fa53383bd40043f053352fd96d5054766225e91b4f8d9 WHIRLPOOL 76224d6db53090ffd4d44573acb463c8c79b2d08699625d98ee9e23da7a8211a84ba3aaea054d81d18228f1ce84be32811f5d4d61fadb12431e0ab29f47ffd05

@ -1,142 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils flag-o-matic java-pkg-opt-2 multilib
PATCHSET_VER="0"
DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz
mirror://gentoo/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"
RDEPEND="sys-libs/ncurses:=
archive? ( app-arch/libarchive )
berkdb? ( >=sys-libs/db-4:= )
zlib? ( sys-libs/zlib )
odbc? ( dev-db/unixODBC )
readline? ( sys-libs/readline:= )
gmp? ( dev-libs/gmp:0 )
ssl? (
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
)
java? ( >=virtual/jdk-1.5:= )
uuid? ( dev-libs/ossp-uuid )
X? (
virtual/jpeg:0
x11-libs/libX11
x11-libs/libXft
x11-libs/libXpm
x11-libs/libXt
x11-libs/libICE
x11-libs/libSM )"
DEPEND="${RDEPEND}
X? ( x11-proto/xproto )
java? ( test? ( =dev-java/junit-3.8* ) )"
S="${WORKDIR}/swipl-${PV}"
src_prepare() {
EPATCH_FORCE=yes
EPATCH_SUFFIX=patch
epatch "${WORKDIR}"/${PV}
if ! use uuid; then
mv packages/clib/uuid.pl packages/clib/uuid.pl.unused || die
fi
# OSX/Intel ld doesn't like an archive without table of contents
sed -i -e 's/-cru/-scru/' packages/nlp/libstemmer_c/Makefile.pl || die
}
src_configure() {
append-flags -fno-strict-aliasing
use ppc && append-flags -mno-altivec
use hardened && append-flags -fno-unit-at-a-time
use debug && append-flags -DO_DEBUG
# ARCH is used in the configure script to figure out host and target
# specific stuff
export ARCH=${CHOST}
export CC_FOR_BUILD=$(tc-getBUILD_CC)
cd "${S}"/src || die
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_enable gmp) \
$(use_enable readline) \
$(use_enable static-libs static) \
--enable-shared \
--enable-custom-flags COFLAGS="${CFLAGS}"
if ! use minimal ; then
local jpltestconf
if use java && use test ; then
jpltestconf="--with-junit=$(java-config --classpath junit)"
fi
cd "${S}/packages" || die
econf \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
$(use_with archive) \
$(use_with berkdb bdb ) \
$(use_with java jpl) \
${jpltestconf} \
$(use_with odbc) \
$(use_with ssl) \
$(use_with X xpce) \
$(use_with zlib) \
COFLAGS='"${CFLAGS}"'
fi
}
src_compile() {
cd "${S}"/src || die
emake
if ! use minimal ; then
cd "${S}/packages" || die
emake
./report-failed || die "Cannot report failed packages"
fi
}
src_test() {
cd "${S}/src" || die
emake check
if ! use minimal ; then
unset DISPLAY
cd "${S}/packages" || die
emake \
USE_PUBLIC_NETWORK_TESTS=false \
USE_ODBC_TESTS=false \
check
./report-failed || die
fi
}
src_install() {
emake -C src DESTDIR="${D}" install
if ! use minimal ; then
emake -C packages DESTDIR="${D}" install
if use doc ; then
emake -C packages DESTDIR="${D}" html-install
fi
./packages/report-failed || die "Cannot report failed packages"
fi
dodoc ReleaseNotes/relnotes-5.10 INSTALL README VERSION
}

@ -12,7 +12,7 @@ DESCRIPTION="free, small, and standard compliant Prolog compiler"
HOMEPAGE="http://www.swi-prolog.org/"
SRC_URI="http://www.swi-prolog.org/download/devel/src/swipl-${PV}.tar.gz"
LICENSE="LGPL-2.1"
LICENSE="BSD-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="archive berkdb debug doc +gmp hardened java libressl minimal odbc +readline ssl static-libs test uuid zlib X"

@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz"
LICENSE="BSD BSD-2 BSD-4 ISC"
SLOT="0"
KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="static-libs"
pkg_setup() {

@ -0,0 +1,326 @@
From fcbb9fcc2e6983ea61bf565b6ee2e29816b8cd57 Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Wed, 10 Feb 2016 17:43:03 +0900
Subject: [PATCH] ecc: Fix for chosen cipher text attacks.
* src/mpi.h (_gcry_mpi_ec_curve_point): New internal function.
* cipher/ecc.c (ecc_decrypt_raw): Validate input. Remove duplicated
point_free.
* mpi/ec.c (_gcry_mpi_ec_mul_point):Use simple left-to-right binary
method for when SCALAR is secure.
(_gcry_mpi_ec_curve_point): New.
--
CVE-id: CVE-2015-7511
Thanks to Daniel Genkin, Lev Pachmanov, Itamar Pipman, and Eran
Tromer. http://www.cs.tau.ac.IL/~tromer/ecdh/
This could be an effective contermeasure to some chosen cipher text
attacks.
(backport from master
commit 88e1358962e902ff1cbec8d53ba3eee46407851a)
(backport from LIBGCRYPT-1-6-BRANCH
commit 28eb424e4427b320ec1c9c4ce56af25d495230bd)
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
cipher/ecc.c | 11 ++-
mpi/ec.c | 226 +++++++++++++++++++++++++++++++++++------------------------
src/mpi.h | 2 +-
3 files changed, 145 insertions(+), 94 deletions(-)
diff --git a/cipher/ecc.c b/cipher/ecc.c
index b8487dc..80b67ae 100644
--- a/cipher/ecc.c
+++ b/cipher/ecc.c
@@ -1535,12 +1535,19 @@ ecc_decrypt_raw (int algo, gcry_mpi_t *result, gcry_mpi_t *data,
ctx = _gcry_mpi_ec_init (sk.E.p, sk.E.a);
+ if (!_gcry_mpi_ec_curve_point (&kG, sk.E.b, ctx))
+ {
+ point_free (&kG);
+ point_free (&sk.E.G);
+ point_free (&sk.Q);
+ _gcry_mpi_ec_free (ctx);
+ return GPG_ERR_INV_DATA;
+ }
+
/* R = dkG */
point_init (&R);
_gcry_mpi_ec_mul_point (&R, sk.d, &kG, ctx);
- point_free (&kG);
-
/* The following is false: assert( mpi_cmp_ui( R.x, 1 )==0 );, so: */
{
gcry_mpi_t x, y;
diff --git a/mpi/ec.c b/mpi/ec.c
index fa00818..bdb155a 100644
--- a/mpi/ec.c
+++ b/mpi/ec.c
@@ -612,110 +612,154 @@ _gcry_mpi_ec_mul_point (mpi_point_t *result,
gcry_mpi_t scalar, mpi_point_t *point,
mpi_ec_t ctx)
{
-#if 0
- /* Simple left to right binary method. GECC Algorithm 3.27 */
- unsigned int nbits;
- int i;
-
- nbits = mpi_get_nbits (scalar);
- mpi_set_ui (result->x, 1);
- mpi_set_ui (result->y, 1);
- mpi_set_ui (result->z, 0);
-
- for (i=nbits-1; i >= 0; i--)
+ if (mpi_is_secure(scalar))
{
- _gcry_mpi_ec_dup_point (result, result, ctx);
- if (mpi_test_bit (scalar, i) == 1)
- _gcry_mpi_ec_add_points (result, result, point, ctx);
- }
-
-#else
- gcry_mpi_t x1, y1, z1, k, h, yy;
- unsigned int i, loops;
- mpi_point_t p1, p2, p1inv;
-
- x1 = mpi_alloc_like (ctx->p);
- y1 = mpi_alloc_like (ctx->p);
- h = mpi_alloc_like (ctx->p);
- k = mpi_copy (scalar);
- yy = mpi_copy (point->y);
+ /* Simple left to right binary method. GECC Algorithm 3.27 */
+ unsigned int nbits;
+ int i;
+ mpi_point_t tmppnt;
- if ( mpi_is_neg (k) )
- {
- k->sign = 0;
- ec_invm (yy, yy, ctx);
- }
+ nbits = mpi_get_nbits (scalar);
+ mpi_set_ui (result->x, 1);
+ mpi_set_ui (result->y, 1);
+ mpi_set_ui (result->z, 0);
- if (!mpi_cmp_ui (point->z, 1))
- {
- mpi_set (x1, point->x);
- mpi_set (y1, yy);
+ point_init (&tmppnt);
+ for (i=nbits-1; i >= 0; i--)
+ {
+ _gcry_mpi_ec_dup_point (result, result, ctx);
+ _gcry_mpi_ec_add_points (&tmppnt, result, point, ctx);
+ if (mpi_test_bit (scalar, i) == 1)
+ point_set (result, &tmppnt);
+ }
+ point_free (&tmppnt);
}
else
{
- gcry_mpi_t z2, z3;
-
- z2 = mpi_alloc_like (ctx->p);
- z3 = mpi_alloc_like (ctx->p);
- ec_mulm (z2, point->z, point->z, ctx);
- ec_mulm (z3, point->z, z2, ctx);
- ec_invm (z2, z2, ctx);
- ec_mulm (x1, point->x, z2, ctx);
- ec_invm (z3, z3, ctx);
- ec_mulm (y1, yy, z3, ctx);
- mpi_free (z2);
- mpi_free (z3);
- }
- z1 = mpi_copy (ctx->one);
+ gcry_mpi_t x1, y1, z1, k, h, yy;
+ unsigned int i, loops;
+ mpi_point_t p1, p2, p1inv;
- mpi_mul (h, k, ctx->three); /* h = 3k */
- loops = mpi_get_nbits (h);
- if (loops < 2)
- {
- /* If SCALAR is zero, the above mpi_mul sets H to zero and thus
- LOOPs will be zero. To avoid an underflow of I in the main
- loop we set LOOP to 2 and the result to (0,0,0). */
- loops = 2;
- mpi_clear (result->x);
- mpi_clear (result->y);
- mpi_clear (result->z);
- }
- else
- {
- mpi_set (result->x, point->x);
- mpi_set (result->y, yy);
- mpi_set (result->z, point->z);
- }
- mpi_free (yy); yy = NULL;
+ x1 = mpi_alloc_like (ctx->p);
+ y1 = mpi_alloc_like (ctx->p);
+ h = mpi_alloc_like (ctx->p);
+ k = mpi_copy (scalar);
+ yy = mpi_copy (point->y);
- p1.x = x1; x1 = NULL;
- p1.y = y1; y1 = NULL;
- p1.z = z1; z1 = NULL;
- point_init (&p2);
- point_init (&p1inv);
+ if ( mpi_is_neg (k) )
+ {
+ k->sign = 0;
+ ec_invm (yy, yy, ctx);
+ }
- for (i=loops-2; i > 0; i--)
- {
- _gcry_mpi_ec_dup_point (result, result, ctx);
- if (mpi_test_bit (h, i) == 1 && mpi_test_bit (k, i) == 0)
+ if (!mpi_cmp_ui (point->z, 1))
+ {
+ mpi_set (x1, point->x);
+ mpi_set (y1, yy);
+ }
+ else
{
- point_set (&p2, result);
- _gcry_mpi_ec_add_points (result, &p2, &p1, ctx);
+ gcry_mpi_t z2, z3;
+
+ z2 = mpi_alloc_like (ctx->p);
+ z3 = mpi_alloc_like (ctx->p);
+ ec_mulm (z2, point->z, point->z, ctx);
+ ec_mulm (z3, point->z, z2, ctx);
+ ec_invm (z2, z2, ctx);
+ ec_mulm (x1, point->x, z2, ctx);
+ ec_invm (z3, z3, ctx);
+ ec_mulm (y1, yy, z3, ctx);
+ mpi_free (z2);
+ mpi_free (z3);
}
- if (mpi_test_bit (h, i) == 0 && mpi_test_bit (k, i) == 1)
+ z1 = mpi_copy (ctx->one);
+
+ mpi_mul (h, k, ctx->three); /* h = 3k */
+ loops = mpi_get_nbits (h);
+ if (loops < 2)
{
- point_set (&p2, result);
- /* Invert point: y = p - y mod p */
- point_set (&p1inv, &p1);
- ec_subm (p1inv.y, ctx->p, p1inv.y, ctx);
- _gcry_mpi_ec_add_points (result, &p2, &p1inv, ctx);
+ /* If SCALAR is zero, the above mpi_mul sets H to zero and thus
+ LOOPs will be zero. To avoid an underflow of I in the main
+ loop we set LOOP to 2 and the result to (0,0,0). */
+ loops = 2;
+ mpi_clear (result->x);
+ mpi_clear (result->y);
+ mpi_clear (result->z);
+ }
+ else
+ {
+ mpi_set (result->x, point->x);
+ mpi_set (result->y, yy);
+ mpi_set (result->z, point->z);
+ }
+ mpi_free (yy); yy = NULL;
+
+ p1.x = x1; x1 = NULL;
+ p1.y = y1; y1 = NULL;
+ p1.z = z1; z1 = NULL;
+ point_init (&p2);
+ point_init (&p1inv);
+
+ for (i=loops-2; i > 0; i--)
+ {
+ _gcry_mpi_ec_dup_point (result, result, ctx);
+ if (mpi_test_bit (h, i) == 1 && mpi_test_bit (k, i) == 0)
+ {
+ point_set (&p2, result);
+ _gcry_mpi_ec_add_points (result, &p2, &p1, ctx);
+ }
+ if (mpi_test_bit (h, i) == 0 && mpi_test_bit (k, i) == 1)
+ {
+ point_set (&p2, result);
+ /* Invert point: y = p - y mod p */
+ point_set (&p1inv, &p1);
+ ec_subm (p1inv.y, ctx->p, p1inv.y, ctx);
+ _gcry_mpi_ec_add_points (result, &p2, &p1inv, ctx);
+ }
}
+
+ point_free (&p1);
+ point_free (&p2);
+ point_free (&p1inv);
+ mpi_free (h);
+ mpi_free (k);
}
+}
+
+
+/* Return true if POINT is on the curve described by CTX. */
+int
+_gcry_mpi_ec_curve_point (mpi_point_t *point, gcry_mpi_t b, mpi_ec_t ctx)
+{
+ int res = 0;
+ gcry_mpi_t x, y, w;
+ gcry_mpi_t xxx;
+
+ x = mpi_new (0);
+ y = mpi_new (0);
+ w = mpi_new (0);
+ xxx = mpi_new (0);
+
+ if (_gcry_mpi_ec_get_affine (x, y, point, ctx))
+ goto leave;
+
+ /* y^2 == x^3 + a·x + b */
+ ec_mulm (y, y, y, ctx);
+
+ ec_mulm (xxx, x, x, ctx);
+ ec_mulm (xxx, xxx, x, ctx);
+ ec_mulm (w, ctx->a, x, ctx);
+ ec_addm (w, w, b, ctx);
+ ec_addm (w, w, xxx, ctx);
+
+ if (!mpi_cmp (y, w))
+ res = 1;
+
+ leave:
+ _gcry_mpi_release (xxx);
+ _gcry_mpi_release (w);
+ _gcry_mpi_release (x);
+ _gcry_mpi_release (y);
- point_free (&p1);
- point_free (&p2);
- point_free (&p1inv);
- mpi_free (h);
- mpi_free (k);
-#endif
+ return res;
}
diff --git a/src/mpi.h b/src/mpi.h
index 65a4f97..adc65e2 100644
--- a/src/mpi.h
+++ b/src/mpi.h
@@ -257,7 +257,7 @@ void _gcry_mpi_ec_add_points (mpi_point_t *result,
void _gcry_mpi_ec_mul_point (mpi_point_t *result,
gcry_mpi_t scalar, mpi_point_t *point,
mpi_ec_t ctx);
-
+int _gcry_mpi_ec_curve_point (mpi_point_t *point, gcry_mpi_t b, mpi_ec_t ctx);
#endif /*G10_MPI_H*/
--
2.1.4

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -30,6 +30,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-1.5.0-uscore.patch
"${FILESDIR}"/${PN}-multilib-syspath.patch
"${FILESDIR}"/${P}-clang-arm.patch
"${FILESDIR}"/${P}-CVE-2015-7511.patch
)
src_configure() {

@ -0,0 +1,58 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_AUTORECONF=1
inherit autotools-multilib
DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
HOMEPAGE="http://www.gnupg.org/"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1 MIT"
SLOT="0/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="static-libs"
RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}]
!dev-libs/libgcrypt:11
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}"/${PN}-multilib-syspath.patch
"${FILESDIR}"/${P}-clang-arm.patch
"${FILESDIR}"/${P}-CVE-2015-7511.patch
)
MULTILIB_CHOST_TOOLS=(
/usr/bin/libgcrypt-config
)
src_configure() {
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-multilib_src_configure
}

@ -25,7 +25,7 @@ RDEPEND="
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
sys-libs/zlib
net-libs/http-parser
net-libs/http-parser:=
gssapi? ( virtual/krb5 )
ssh? ( net-libs/libssh2 )
"

@ -24,8 +24,7 @@ IUSE="bzip2 +cxx doc unicode zlib static-libs"
RDEPEND="bzip2? ( app-arch/bzip2 )
zlib? ( sys-libs/zlib )"
DEPEND="${RDEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
virtual/pkgconfig"
S=${WORKDIR}/${MY_P}

@ -29,8 +29,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline )"
DEPEND="${RDEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
virtual/pkgconfig"
RDEPEND="${RDEPEND}
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2

@ -29,8 +29,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline )"
DEPEND="${RDEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
virtual/pkgconfig"
RDEPEND="${RDEPEND}
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2

@ -29,8 +29,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
virtual/pkgconfig"
RDEPEND="${RDEPEND}
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2

@ -29,8 +29,7 @@ RDEPEND="bzip2? ( app-arch/bzip2 )
libedit? ( dev-libs/libedit )
readline? ( sys-libs/readline:0= )"
DEPEND="${RDEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
virtual/pkgconfig"
RDEPEND="${RDEPEND}
abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r2

@ -1,2 +1,3 @@
DIST libzip-1.0.1.tar.xz 450308 SHA256 f948d597afbb471de8d528d0e35ed977de85b2f4d76fdd74abbb985550e5d840 SHA512 df51ca44e97e2644a5d6930e3c76830453579c1486d11b9529d3cef173bb5ae873ef34b0af0ea6403dd4076805371fa93975a18ce56e37aa2a52500eb279887b WHIRLPOOL 6705e5739417738d474a85e10c72718c2feaae68698d6fc71af17d2761c76acab705fcf6c8c69be165afca9230dc55c47843d9b0281abde445aad23addef1c41
DIST libzip-1.1.1.tar.xz 458864 SHA256 69e690f567e172d8f69b58ca237b61a690eaa1c5aa2293e1a2a446496bdf14c1 SHA512 24f6d3026986bbc3b9633ed78bb38e13d468cf9be307871db4fa11cc37218eaf2b2019d49882ec57ce773922e5ab2383472715bd438662db83fcb4ba9c01ce69 WHIRLPOOL 65e8c41b3369edc705a1ac3f1411849d44888611754e8737a9efecb7b5bb34b5d556bd226c274875b0cba4e8a4a3b370ec30b49d6fe5175510c377d57379aaaa
DIST libzip-1.1.tar.xz 458528 SHA256 13b0b49637f9857ab8ba7335f529e26d02aadacf2074bf0c9b28889a0fc83b24 SHA512 0a250835155eb2ed19a00718e086b3e05741c9bcf01c7c73ed6e83fd989d9fb0bddf192f69c989f75860e4e9a44490b263fd08d9b06994e534fc0374667df2f0 WHIRLPOOL 7d59cbfb32d96230ef57e4dd7e57fbef5e3d2e1a3c92044bcee876c8de855e84eb189608c0c123265cb9e47ccf4b3cf216186f27a0f6afb14c1dca3dfd4d42fc

@ -0,0 +1,29 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils
DESCRIPTION="Library for manipulating zip archives"
HOMEPAGE="http://www.nih.at/libzip/"
SRC_URI="http://www.nih.at/libzip/${P}.tar.xz"
LICENSE="BSD"
SLOT="0/4"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="static-libs"
RDEPEND="sys-libs/zlib"
DEPEND="${RDEPEND}
app-arch/xz-utils
"
DOCS=( AUTHORS NEWS README THANKS )
PATCHES=(
"${FILESDIR}/${PN}-0.11.2-headers.patch"
)

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>

@ -1 +1,2 @@
DIST ocaml-cstruct-1.7.1.tar.gz 245894 SHA256 7869d096fe7c6231bbceefe3b2205417b28b6c10f4174b7e2cfdfa46956eaaa5 SHA512 67dd276ab2f895ef80cc7ba5b48d51bcfcf52ac49aa29cd4b17aa00be109198347a50229b81fbe506d831ace753d72f3b4bb80f19e8e57fa29d9ba65da472f19 WHIRLPOOL 8145930a1dcadbcf48c1da0dcba10a45f3d52c8ae2565aee7e609bd3eeb5eead9cee9ef423332a580ab77ceabb2f301917226d1a73e1b7f6efc7a3096c4112d6
DIST ocaml-cstruct-1.8.0.tar.gz 250696 SHA256 e1635072283ae5db7889966ce92e916749bcd192012a0c46285827beba1263d7 SHA512 38ea6301b48603f8b63c73a7aa42312d25bbd16fb8524e1de2b69a54e45e9e1c1326201e19fcf2953d2719607139c903d76296a32fb7058998c079ac112adc9c WHIRLPOOL 6fdabfc1143331662757826de11c62c3947fb59155ba68e866a2f9939963deacd52d5832417997833deff9a9ff902675d266a98b41e0d2cf9f29c4d4c628601e

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>
@ -16,6 +18,7 @@
<flag name="async">Support for asynchronous execution</flag>
<flag name="camlp4">Enable support for camlp4</flag>
<flag name="lwt">Enable threads via lwt</flag>
<flag name="ppx">Enable the ppx syntax extension</flag>
</use>
<upstream>
<remote-id type="github">mirage/ocaml-cstruct</remote-id>

@ -0,0 +1,45 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
OASIS_BUILD_DOCS=1
OASIS_BUILD_TESTS=1
inherit oasis
DESCRIPTION="Map OCaml arrays onto C-like structs"
HOMEPAGE="https://github.com/mirage/ocaml-cstruct https://mirage.io"
SRC_URI="https://github.com/mirage/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ISC"
SLOT="0/${PV}"
KEYWORDS="~amd64"
IUSE="async +camlp4 +lwt +ppx"
RDEPEND="
async? ( dev-ml/async:= )
camlp4? ( dev-ml/camlp4:= )
lwt? ( dev-ml/lwt:= )
ppx? ( dev-ml/ppx_tools:= )
>=dev-lang/ocaml-4.01:=
dev-ml/ocplib-endian:=
dev-ml/sexplib:=
dev-ml/type-conv:=
"
DEPEND="
test? ( dev-ml/ounit )
${RDEPEND}
"
src_configure() {
oasis_configure_opts="
$(use_enable lwt)
$(use_enable camlp4)
$(use_enable async)
$(use_enable ppx)
--enable-unix
" oasis_src_configure
}
DOCS=( CHANGES README.md TODO.md )

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>
@ -16,6 +18,6 @@
<flag name="ounit">Enable integration with ounit</flag>
</use>
<upstream>
<remote-id type="github">c-cube/qcheck</remote-id>
<remote-id type="github">OCamlPro/ocplib-endian</remote-id>
</upstream>
</pkgmetadata>

@ -3,6 +3,8 @@
<pkgmetadata>
<maintainer type="person">
<email>tomboy64@sina.cn</email>
<name>M.B.</name>
<description>Maintainer, assign bugs to him</description>
</maintainer>
<maintainer type="project">
<email>ml@gentoo.org</email>

@ -10,7 +10,7 @@ inherit perl-module
DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="alpha amd64 arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
RDEPEND="

@ -11,7 +11,7 @@ inherit perl-module
DESCRIPTION="Getopt::Long with usage text"
SLOT="0"
KEYWORDS="amd64 ~arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
KEYWORDS="amd64 arm ~ppc ~x86 ~ppc-aix ~ppc-macos ~x86-solaris"
IUSE="test"
RDEPEND="

@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE=""
RDEPEND="

@ -0,0 +1 @@
DIST croniter-0.3.11.tar.gz 13647 SHA256 38fa316e95990a2d7f45bc7c29edb0c4777e87ac5dd49b102e67d0dae304492b SHA512 3413df2df1ad19e15a6914b387f841112bb65c87e9c315cb70a7b4b83ba737e17b1663950d4d5a758d231e1ac3a2dfda92814fb4506b0c5291641d64a0a79be1 WHIRLPOOL 68233a5844f645ee096d1967eb0b00f9bc593b0e4c2e92e29636140b705c683c32c9cb2d361c95cb0f879c2a0f88f24c3fc159fcc2068044ff06fec0e56c5e3f

@ -0,0 +1,19 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_{4,5}} )
inherit distutils-r1
DESCRIPTION="Python module to provide iteration for datetime object"
HOMEPAGE="https://github.com/kiorky/croniter https://pypi.python.org/pypi/croniter"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<upstream>
<remote-id type="pypi">croniter</remote-id>
<remote-id type="github">kiorky/croniter</remote-id>
</upstream>
<maintainer type="person">
<email>zmedico@gentoo.org</email>
</maintainer>
</pkgmetadata>

@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MPL-2.0"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE=""
RDEPEND=""

@ -1,3 +1,4 @@
DIST packaging-15.3.tar.gz 34359 SHA256 1e9a6b9ad621bc1dbd3aa8dfff52abc4b44f5c14fbb406731c25cba250a5f61e SHA512 bd59408dc6ea2a4f8cb3a84b4d1e4284148a0f6fb2d3203f90885f608871f1f2315201427d08d2ca7b2d706bc5457c8a521b5edda9187e794522dbb8e46a663c WHIRLPOOL 197e9f26022383bf5962efbd562f1502bd5f0972a782c94f3188961d8d14167c25febee459ad5b3a731bafaf3f7e53e5b051d383382c169b58aff1cb521442f3
DIST packaging-16.0.tar.gz 40167 SHA256 a32895134cd7b86ee8add60a3be5bfd7ef3f30e73e5b54221dbe67d0e0690689 SHA512 7672f0a51f73543e39ad80b021d288c0e235c2ace9add5022a1d494b2711ce55ba7d05d92245cbb96fa354d67fdfbdbdd2e1858ace3d6d2761869bc5ddaaeddd WHIRLPOOL be813ffbcc614e5be3bc9bb1e704e9c65c194b47172bb0c9bf0113ea8456256fa8263faec33b3e001b6d71ed7fd8763796afd6eeb608f3a65ea987db48304d5a
DIST packaging-16.1.tar.gz 42929 SHA256 7792caf5bfda630c96310a84ecba5d61b17a843ab72194bb5606d81e4f44094f SHA512 f4e081be85247c989343e7532d5e4afcad68af960264b59271862799e8d63ed0b7fb733670f7446da69aa60f013fc886c8c31c6010c1157110c1a417209d9325 WHIRLPOOL 8c13ef4196633cc4c7c59aef2fa8980abc46908fd30ffbe79d565dcd6089bc1496a8b5dc6aa5968273281e8ef494ef54036c72192f36dfe30dbb0f3fcf8544c9
DIST packaging-16.2.tar.gz 43398 SHA256 0eb4a6329c6d40a0deef725b4f510b6219ec8c365f888583babbb4454d761dd6 SHA512 2310efbd4d73498d5645d0c3a2f0cb162cd18cff28079ba2ac44b784e728363d84a8eae4d9e313c4491394841638ef01ef37ef7da3bac01e27af37a72e387dd1 WHIRLPOOL 5aff538bf5ee18474074048bb581140200c078ceb6366f5c709be931851b0835a8a725ecc17a1b2c34bae34cf79d8743a4422c6701e5c6e9ba99bfdc51aa439f

@ -0,0 +1,47 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 )
inherit distutils-r1
DESCRIPTION="Core utilities for Python packages"
HOMEPAGE="https://github.com/pypa/packaging https://pypi.python.org/pypi/packaging"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="|| ( Apache-2.0 BSD-2 )"
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 ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
RDEPEND=""
DEPEND="${RDEPEND}
test? (
dev-python/pretend[${PYTHON_USEDEP}]
dev-python/pytest[${PYTHON_USEDEP}]
)
"
PDEPEND="
dev-python/pyparsing[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]
"
python_test() {
py.test --capture=no --strict -v || die
}
pkg_preinst() {
# Remove this in the next version bump
_cleanup() {
local pyver=$("${PYTHON}" -c "from distutils.sysconfig import get_python_version; print(get_python_version())")
local egginfo="${ROOT%/}$(python_get_sitedir)/${P}-py${pyver}.egg-info"
if [[ -d ${egginfo} ]]; then
echo rm -r "${egginfo}"
rm -r "${egginfo}" || die "Failed to remove egg-info directory"
fi
}
python_foreach_impl _cleanup
}

@ -1,8 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_3,3_4} )
inherit distutils-r1
@ -16,16 +17,19 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="examples opengl"
RDEPEND=">=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
dev-python/decorator[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
RDEPEND="
>=dev-libs/boost-1.48[python,${PYTHON_USEDEP}]
>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
>=dev-python/cffi-1.1.0:=[${PYTHON_USEDEP}]
>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
dev-python/mako[${PYTHON_USEDEP}]
dev-python/pytools[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
>=dev-python/pytools-2015.1.2[${PYTHON_USEDEP}]
>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
>=virtual/opencl-0-r1"
DEPEND="${RDEPEND}"
src_configure()
{
src_configure() {
local myconf=()
if use opengl; then
myconf+=(--cl-enable-gl)

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -20,7 +20,7 @@ IUSE="debug doc examples svg"
RDEPEND="
x11-libs/qwt:5[svg?]
dev-python/PyQt4[${PYTHON_USEDEP}]
~dev-python/PyQt4-4.11.1[${PYTHON_USEDEP}]
dev-python/numpy[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )"
DEPEND="${DEPEND}

@ -1 +1,2 @@
DIST python-gflags-2.0.tar.gz 64929 SHA256 311066217acb8cd8519a4c872cb3fe64f02bcf105802bb761ab0de55c2386cd6 SHA512 28566acffd092f09105f3b9ad3be4ada11f024f940914e6efb103907f3779283c63bdfe13edad83aa470c5e887b49ad8b05031fc1895f3bad9b5d9c368bbfe18 WHIRLPOOL 61054cce9033ef26ee6d6296fc761c840f394de07f068a899b52a5d4212de4e4601f9a203fd8033db576e79369e4d53a0bb04bfca0e50cf828ff94105a2b453a
DIST python-gflags-3.0.2.tar.gz 91481 SHA256 f2ca688f385bba47382a067d2d77322ab974fd4d596baad95bcd7d319241061d SHA512 f24b404a1821d55f2d7423548c241f54962e79b31ade6b718e0c50591756ec269545445326e459a1b02806ca5eab7ccf9c545211e4148b3da050069b9a97088f WHIRLPOOL 4a72cde4f2715d2fd32760b0b69f4ff1b0b14d94ad3d00d002cd16a9d3715f7f61bf14878fca4073c8c573ae853229c15d781eb766ad324ce053645a76cedba5

@ -0,0 +1,29 @@
The scripts are installed as 'data' rather than scripts.
http://code.google.com/p/python-gflags/issues/detail?id=12
From d544cdad63faa5a53ba524e39f091f4a18e1eeb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
Date: Sun, 16 Dec 2012 16:27:13 +0100
Subject: [PATCH] Install Python scripts using 'scripts' key.
This is necessary to ensure that the shebangs are properly replaced when
installing for multiple Python implementations.
---
setup.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/setup.py b/setup.py
index 573db2d..ddad318 100755
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,6 @@ setup(name='python-gflags',
author_email='google-gflags@googlegroups.com',
url='https://github.com/google/python-gflags',
py_modules=['gflags'],
- data_files=[('bin', ['gflags2man.py'])],
+ scripts=['gflags2man.py'],
include_package_data=True,
)
--
1.8.0.2

@ -0,0 +1,25 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1
DESCRIPTION="Google's Python argument parsing library"
HOMEPAGE="https://github.com/gflags/python-gflags"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc64 ~s390 ~sh ~x86"
IUSE=""
RDEPEND=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
PATCHES=(
"${FILESDIR}"/${P}-scripts-install.patch
)

@ -1 +1,2 @@
DIST pytools-2014.3.5.tar.gz 47522 SHA256 62a77a3c1865d5254ce212473da2af04f43d82eb0020ae9a009f97408e74968e SHA512 94d2b51cdd87dd11263fdc7d04040979240dea0e0090da0ff325112df9770aacb0849e20812b90f807024ad3815313bc344307a30add8f6795a70e7ebd6adfaa WHIRLPOOL bc3b4c118627d790a1d5bf07f1a4f9e5a4a76a1b38d43b9e6cd3130b8f8415a87807fef4b82ebda778a255e7ed71616f7c8e515fd20f1dad56bdac28023247bf
DIST pytools-2016.1.tar.gz 47498 SHA256 084feeb68171fc36ddb40f27c4ad5b60d3596716a5f3ad3523257a0d27a351cc SHA512 5492b8b78b6fd00f190d97f3be82c3e807a8e73661888f3b70fc26c5825544f3a76f94c76149b825d77557a74aee2d956231193a9f8056cd433e108556af61df WHIRLPOOL 7c89f0ff132af7782e4738475e493513251c8f18b859b93c57e178a3991e8cd342fa07596e5b049f8707c489e9c3fb9ca2bf0dd0fb274cf0ded68632bf6aee54

@ -0,0 +1,32 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python{2_7,3_{3,4,5}} )
inherit distutils-r1
DESCRIPTION="A collection of tools missing from the Python standard library"
HOMEPAGE="http://mathema.tician.de/software/pytools"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="test"
RDEPEND="
>=dev-python/appdirs-1.4.0[${PYTHON_USEDEP}]
>=dev-python/decorator-3.2.0[${PYTHON_USEDEP}]
>=dev-python/numpy-1.6.0[${PYTHON_USEDEP}]
>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}
>=dev-python/setuptools-0.7.2[${PYTHON_USEDEP}]
test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
python_test() {
py.test -v || die "Tests fail with ${EPYTHON}"
}

@ -1,2 +1,2 @@
DIST commander-4.3.5.gem 35328 SHA256 23234d4a975c9b5356c9795a46ca2b7786999720321ba3c4a3ec417fea15965f SHA512 a6bdf476c60636883bde58f5915cc08cd858093ad19143617d7cd72a523adb6bf2c72539ce2de469520624bc1d387c5ba44de4577d174f00b03eaf684ffa3966 WHIRLPOOL d4e28dea3108a20195a097a94af3894b6f8c50b16d32bc5ca7f92c8446a13fb9de253c7270c463e93523e43e9a0fa9578a9a54b6ffdb7564a3a16c95d7688892
DIST commander-4.3.7.gem 35328 SHA256 c5caa7882a27a793b720e8c071218cc26d112d85a73d4dda1f93be08bfa09f3a SHA512 adfb4483fe3b74bb40d2e6e3101b990eee82aea1c6593ea2ce76213740ab4e3e39eb25cd1d22ec23d406d20c5d6f8bb930c1058a808abd01b7fdb20463209cb8 WHIRLPOOL 27e65562d7cd90d268683321a829ffcf364dd326a008872640b6f8107c2107940fec50ce1cec3a13732fa922b60443114da74e5e85f3ff8841cc85a1cc9c76da
DIST commander-4.3.8.gem 35328 SHA256 e88fbd8f8b1b630f2e8b7812975bbaa84364a79669176cada333b396413117af SHA512 0630adc6c775c880312b55b78a3d835e4312a6166f407215693386b8436f91f1e7588c834e0aa8bec32872329a09598602ce16f400db3417c95e814a159ae279 WHIRLPOOL e40a3f8048d270da1ca8f814716fe0159a8399a453db5405c700991acec7978e87fab7210d969b8b257391fe6a5e284df994a39531a54259b248850ee35087ad

@ -1,9 +1,9 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21 ruby22"
USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_EXTRADOC="History.rdoc README.md"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"

@ -1,7 +1,5 @@
DIST listen-0.7.3-git.tgz 34831 SHA256 e6e1b8b45251e5bdcb397a9774dea57918ab091b6358ae42654a99bda280686b SHA512 9d4297f24b63449f3293f750d903170793b31c2a7d0a87c16bc4c3b741b993e0cc06ec5408d7a2c706505641fa3cd3f070cc09e7a7a5d358d8f18f26b41fb408 WHIRLPOOL da8c416f3e2757f146c6bdc83f7c527b8c566ac7716b52408788abd3407c2ac823d5f1cb94dd3df92ce75e5510705aa7bb65f9833974c3be20c18a470d9e5659
DIST listen-1.3.1-git.tgz 35521 SHA256 36676ee96fac67e46f52227ce8590a7532b0861ad1d0fa865d8783b635c56749 SHA512 4676d030a3e676249a221cf4a136ce69651009ce5855821924be184460e404e4f33026627c9d524156a89344c826b48a690a249f1059493d7d214b922381bdd0 WHIRLPOOL ecaf0e8dca01fba1d75c5c8bfc5bf6a3c5d371d5ca8c38bb92aba9a95cda6c1fb39b5e9927524581ef54f4ff2faf2e739f0dbf61b3a016c8943858f785e06ad2
DIST listen-2.8.5.tar.gz 44835 SHA256 6d251965b6c9309d4609c47880a025d53538a77bee355e74fd667fb3738980d2 SHA512 e784f8e90299aac0b0ed5ce20c08c5cfd821f325fbee4328d9af521782637a46aff8fb25ab37d44710204fbd74fc0c09aca92e61ee6a158c3238f9816220288a WHIRLPOOL 321d98e5b34b936767351dd73ca467b7f84b1621a0f8ff06ca25021acb674c6cf52644b6e1db90f418e4b9aca77f5830cc3d2d672e04f290247d2f70cf0025b6
DIST listen-2.8.6.tar.gz 44932 SHA256 69e3577b50e8b14378a38680f87e7ad2d69e2b1a54c51959b7757b39f8ca8875 SHA512 5ce81b3ae58f26865b2823bdc6dcd701a96be2fb6140ddb89ff7f3bed73b9f5e0fb384dfe1bdc6ee2282ad958cd89039cea3689a29432730bb58b179cf8f3541 WHIRLPOOL 1d6c7a616f3c68768b1a687b24d4785ba402d0f037b276c64d3b16bc0d3d39a6fcc3a36cc0b26e46e7e85f2453d1f0d97af82d76b42326c6c26835d60cf4ec37
DIST listen-3.0.3.tar.gz 48490 SHA256 c9fd26e29c60b15b1475f509ccf1b4d9a3b20b421d7aa240f7212c5774105955 SHA512 45b8c06a8251a884462d61b6e5fadeddb3c7aa0b6d15dc1a26ad1696c6220fc02dafe5ffbd1e0a3577b25bac7a7e4c80f6489ff64b797637433be2cfb6a28813 WHIRLPOOL d13fa46d4a4beaca269416d56aeaa96ee61bade9e31ec51e50ddce322f5725d69b07a7323a73f4567fab854ec27aeb64b32532cded659a2c3f3c518a502d6cd1
DIST listen-3.0.4.tar.gz 48784 SHA256 454630d4e3a3f8d610f8f2771e866fca3befec5a23f7646a7bce00f7877c815e SHA512 1fa3218ab1a7df8b38e9e55847e09b7ce11600ed56efdc8318a3f279f396409ceb41f4973353456b8146c09653d72644890604b001ad990c2ae1b60322f29a74 WHIRLPOOL d3d7f56a593c7cddfb5897d04d2157ce2e4afc3e4685aaaa78f7de72680a06e50997c15410ededc701849685996565be5b155749f3ca3fc9de9c2a4fa5967505
DIST listen-3.0.5.tar.gz 48899 SHA256 bca371cb74ed989ddca7ede97656d23aab2819a8767803bbbeacf70c3d3fd9ea SHA512 d8658f0dce4b9db42960843ebf96f8cbff86f33bd830f5869842bb93f16d0aa59494ee7558d6924fb4f9000e4c3e6e0a5013a1005670f78b0f0ac499a16ab2da WHIRLPOOL 26cf9c8ec538f45869cf25e9463c15ca15f8cf0230b30a11d569426d37824098ea5734ae951b23791b5c7cd480b82ad66f8b83a5695764f367b4cf52186ccdc3
DIST listen-3.0.6.tar.gz 48896 SHA256 1c6e110be9b9d825d07cce8d6773d2ae908d1c172ea8c747b9562918b30faf3c SHA512 baa9fcba86cd288ec86040cd855b37882b13307f9a7fea49f2cdb716053a1c5cb615bf15bfe18ce137e59d113ee9b284ff3f2b0c2c63ac1331fbff243723eb80 WHIRLPOOL d5e6e1afcc6c58787648e59b54de08c3f4d5515c3725b22a0673669284afc439187c1380a2f03b18d7ee7cf06cae3f286971c927485f009199055466629925d7

@ -1,38 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="Listens to file modifications and notifies you about the changes"
HOMEPAGE="https://github.com/guard/listen"
LICENSE="MIT"
SLOT="2"
KEYWORDS="~amd64 ~ppc ~ppc64"
IUSE=""
# Block on other packages trying to install a /usr/bin/listen
RDEPEND+="!!media-sound/listen !!media-radio/ax25"
ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0
>=dev-ruby/celluloid-0.15.2"
ruby_add_bdepend "test? ( dev-ruby/celluloid-io )"
all_ruby_prepare() {
sed -i -e "/git/,+3d" -e "/rb-fsevent/d" -e "/bundler/d" -e "/rspec-retry/d" ${PN}.gemspec || die
sed -i -e "/retry/d" spec/spec_helper.rb || die
rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
}

@ -1,38 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="Listens to file modifications and notifies you about the changes"
HOMEPAGE="https://github.com/guard/listen"
LICENSE="MIT"
SLOT="2"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# Block on other packages trying to install a /usr/bin/listen
RDEPEND+="!!media-sound/listen !!media-radio/ax25"
ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0
>=dev-ruby/celluloid-0.15.2"
ruby_add_bdepend "test? ( dev-ruby/celluloid-io )"
all_ruby_prepare() {
sed -i -e "/git/,+3d" -e "/rb-fsevent/d" -e "/bundler/d" -e "/rspec-retry/d" ${PN}.gemspec || die
sed -i -e "/retry/d" spec/spec_helper.rb || die
rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
}

@ -1,47 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
inherit ruby-fakegem
SRC_URI="https://github.com/guard/listen/archive/v${PV}.tar.gz -> ${P}.tar.gz"
DESCRIPTION="Listens to file modifications and notifies you about the changes"
HOMEPAGE="https://github.com/guard/listen"
LICENSE="MIT"
SLOT="3"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
# Block on other packages trying to install a /usr/bin/listen
RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0"
ruby_add_bdepend "test? ( dev-ruby/thor )"
all_ruby_prepare() {
rm -f Gemfile || die
sed -i -e "/git/,+3d" -e "/rb-fsevent/d" ${PN}.gemspec || die
rm -rf spec/lib/listen/adapter/darwin_spec.rb || die
}
each_ruby_prepare() {
mkdir spec/.fixtures || die
}
each_ruby_test() {
RSPEC_VERSION=3 ruby-ng_rspec
rm -rf spec/.fixtures || die
}

@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21"
USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
@ -21,13 +21,13 @@ HOMEPAGE="https://github.com/guard/listen"
LICENSE="MIT"
SLOT="3"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="test"
# Block on other packages trying to install a /usr/bin/listen
RDEPEND+="!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2"
ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.0"
ruby_add_rdepend ">=dev-ruby/rb-inotify-0.9.7"
ruby_add_bdepend "test? ( dev-ruby/thor )"

@ -1,4 +1,3 @@
DIST parser-2.2.2.6.gem 370176 SHA256 1016f97e594d9abc92936e8b9ac0444438cf91df46afcf1fe607415cb227b066 SHA512 cdc9ac96e894b2cbcd26affceda8d0a327efde45b5562b9446739e9791b0f484c03bdcefa9405cc738d088b5e43d56ef58a9ffac8052908b5c82fcd8f2205668 WHIRLPOOL 8cb73c12540fbebe69f865c3ba51fbb14054773023852ee87242ee7034f3da3be23a646a325dd9bec3f18ae66d7dbc280844911f05a9ae51bb96c1495d262eb2
DIST parser-2.2.3.0.gem 456704 SHA256 4cb1cf8b34f8d331c9f4a02e4b2f8068cde73b1c957c9c6f24401251d503ab91 SHA512 8f3c20417fd2c788573f0a0068f03c8bca80f3f3e49b0a2516b5f976e896453707fee50e248968a1f65294cb86f771749decd71d9a56588c1ef5cff9dd048cea WHIRLPOOL 8427e10f57128457a7490b807272fc6d09c6b36d91e8d28a493a429ada2d4a5526b3fa7dcfc3c06013b07e4fcddefdbdacdb8a0a578fefbc701ec8294d727582
DIST parser-2.3.0.1.gem 505344 SHA256 536e8e5549927a118900608a05550ad77e5baff828c185f2a7211a9e5a0590c2 SHA512 277b2133e2e9c009018aedacf9e64fa163114ce4e5359c9cb9b2887afffbb3d90ebddd158d2c57abf7f3f95cb51386efee5a6147273aeef63844235d2a1a7236 WHIRLPOOL 7db2fa2e180ef11d7a0e6e0f5df0c4fe1bff973a0a9704b82c870996e21d7bcb54ab3a140f08338bf9df715594b7945f29ac2ed2537b3826df8abfdf0528da29
DIST parser-2.3.0.2.gem 503808 SHA256 4941df938d747bea9922468ce76c7364851439084b09bb066e12314aec2ef03d SHA512 0b4413d4402e70e7f49ccbeedde8ae59b7815eae488e09d9f36319a2eae82a72a93f2643051b97561edb1f712f2455745649050e5a942a7f33808dd823661de9 WHIRLPOOL 27c5861222867ff150bbe69b123506d75567750f46343602baf1620fa998835fc9aceb17c4fcfbf92c62eb590d61b097ee580255fb5b70c58bf6ddeb0ff7e0ba
DIST parser-2.3.0.4.gem 508928 SHA256 1c480682d9fc2b19f67520fb250f6f9713ac419e1dd0d71b235122a4991828c6 SHA512 e9f273a78c40e1ea5861308653d3e284ddb564527eb0d2cc6ca1a495e2ab6453eefabfc0c24784ddd383cd156e47b9824e902b2834955d9d4e3dd9361281a7d0 WHIRLPOOL e48aa6ee3d5467012ada0bed8ab260d77248a0aacf09ea449ec450ec97e7942460e3499131653b1488161e115d5219cde12b39905edee4755ecd63c898e6940d

@ -1,34 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21 ruby22"
RUBY_FAKEGEM_RECIPE_DOC="yard"
RUBY_FAKEGEM_TASK_TEST="test"
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
RUBY_FAKEGEM_VERSION="${PV/_pre/.pre.}"
inherit ruby-fakegem
DESCRIPTION="A production-ready Ruby parser written in pure Ruby"
HOMEPAGE="https://github.com/whitequark/parser"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
ruby_add_bdepend "test? (
dev-ruby/minitest:5
dev-ruby/racc
dev-ruby/cliver )"
ruby_add_rdepend "dev-ruby/ast
dev-ruby/slop:3"
all_ruby_prepare() {
sed -i -e "/[Bb]undler/d" Rakefile || die
sed -i -e "/simplecov/,+35d" test/helper.rb || die
}

@ -1,3 +1,4 @@
DIST rdoc-4.0.1.gem 467456 SHA256 b712d56c266a8568362bbebcdc385b102b1494ceea099161c71e02f420d716ba SHA512 11cf6e1700598bd7c414f3ed9d7b75f73bf0f053eb2754d2652bb628e6e47c171646fb420d7b7ee4b589da43fb4b638bc9a2b151ec348c0a20ebaf10f58438c9 WHIRLPOOL 471cd451fd4bc947ad4a29802d66182a21079d444963bb3006fb065175285c71351bfb75c1aaf3d5778e5554c9b5562281037ec38df1c0b159e60dfa368016fd
DIST rdoc-4.2.0.gem 735232 SHA256 391bfe3484a69db2cfa0fa32eed9010a7878b33ae645d67558d1806c847290cc SHA512 d58aebd7969fa8ea795fd4a2b35ba92d0f7368526ae0fc7fa64956db4e3d80c1b61f472384fe7e5eaa628e9c1ee637c967caf1a52362422cb7c2757e486594de WHIRLPOOL b2b8ee2500c901b8638d1dcd1b8194ee12f447a8ecf56205f77999e75a0f038583382efc6147719d4782befd6a3e4106697ea3158deb00c6183c4388223a720c
DIST rdoc-4.2.1.gem 737280 SHA256 81207a9d3ef9e60fc42bf3c6569373cb32397a16af370ca6be6dc71b358df839 SHA512 e5f65436169b38bef5841aad3ece111f010f2a359d242e4e48fa01db03acffd541ba1694fe29ae1a9c5ba605e40d8aec32930358d5b716ac339ff30f17d7155d WHIRLPOOL 7c0b114f0ae9c31ce6e953572bc94c794d1ddea5225af5f8c8b6fedfd5b1cba106bed5ec0f0913c7feeec50d684286bfae67384a8770909f390cf96809febf93
DIST rdoc-4.2.2.gem 738816 SHA256 f3341c252b1547be6ba042f5ca1ce1fc5c52e3c27d8e0d485d0486173edfed08 SHA512 446ac09e35806174dafc23939049c327693654a26fd2cec57c719359518ac53bee383564f9596ef5f569487e500970d24820127195ca2631603bccd14d037dc5 WHIRLPOOL 3ae6cb842173f961eac14f530c93cbaf198f61fe471471ad6f45530f599476781f6b6612984c136af76033382660062ad5ab12dc493a2f3850c6b1955576d1cc

@ -0,0 +1,98 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21 ruby22 ruby23"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_DOCDIR="doc"
RUBY_FAKEGEM_EXTRADOC="History.rdoc README.rdoc RI.rdoc TODO.rdoc"
RUBY_FAKEGEM_BINWRAP=""
inherit ruby-fakegem eutils
DESCRIPTION="An extended version of the RDoc library from Ruby 1.8"
HOMEPAGE="https://github.com/rdoc/rdoc/"
LICENSE="Ruby MIT"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
ruby_add_bdepend "
dev-ruby/racc
test? (
>=dev-ruby/minitest-5.8:5
)"
ruby_add_rdepend "=dev-ruby/json-1* >=dev-ruby/json-1.4"
all_ruby_prepare() {
# Other packages also have use for a nonexistent directory, bug 321059
sed -i -e 's#/nonexistent#/nonexistent_rdoc_tests#g' test/test_rdoc*.rb || die
# Remove unavailable and unneeded isolate plugin for Hoe
sed -i -e '/isolate/d' Rakefile || die
# Remove licenses line from Hoe definitions so we also use older versions.
sed -i -e '/licenses/ s:^:#:' Rakefile || die
epatch "${FILESDIR}/${PN}-3.0.1-bin-require.patch"
# Remove test that is depending on the locale, which we can't garantuee.
sed -i -e '/def test_encode_with/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die
# Remove test depending on FEATURES=userpriv, bug 361959
sed -i -e '/def test_check_files/,/^ end/ s:^:#:' test/test_rdoc_options.rb || die
# Make sure we get the expected version of minitest.
#echo 'gem "minitest", "~> 5.8"' > test/test_0000.rb || die
# Remove tests for code that is not included and not listed in Manifest.txt
rm -f test/test_rdoc_i18n_{locale,text}.rb \
test/test_rdoc_generator_pot* || die
}
all_ruby_compile() {
all_fakegem_compile
if use doc ; then
ruby -Ilib -S bin/rdoc || die
fi
}
each_ruby_compile() {
# Generate the file inline here since the Rakefile confuses jruby
# into a circular dependency.
for file in lib/rdoc/rd/block_parser lib/rdoc/rd/inline_parser ; do
${RUBY} -S racc -l -o ${file}.rb ${file}.ry || die
done
}
each_ruby_test() {
${RUBY} -Ilib:. -e 'Dir["test/test_*.rb"].each{|f| require f}' || die
}
all_ruby_install() {
all_fakegem_install
for bin in rdoc ri; do
ruby_fakegem_binwrapper $bin /usr/bin/$bin-2
for version in 20 21 22 23; do
if use ruby_targets_ruby${version}; then
ruby_fakegem_binwrapper $bin /usr/bin/${bin}${version}
sed -i -e "1s/env ruby/ruby${version}/" \
"${ED}/usr/bin/${bin}${version}" || die
fi
done
done
}
pkg_postinst() {
if [[ ! -n $(readlink "${ROOT}"usr/bin/rdoc) ]] ; then
eselect ruby set $(eselect --brief --colour=no ruby show | head -n1)
fi
}

@ -1,3 +1,3 @@
DIST shoulda-matchers-2.8.0.gem 153600 SHA256 a089735b66e82d6b65fb4ac774d858a812fe16b69d97becaf0c986a919f67934 SHA512 7b40220811a11cf57cfa38457eaab612ec9f6db5b660df21bd142b3df30d3691d3b7b3b4f931eed1e186c5afe4b576eee2c86f6f8f491d46955598f1441a9027 WHIRLPOOL b4e04218aded6452884ed339cc81865e65a7927243209d678ca7e857c3f2577f10d1f8dfd7321b1b0e93b669956bbaec0215b474cefebd25cf44bf0e0bd4c028
DIST shoulda-matchers-3.0.1.gem 177664 SHA256 4b06fb7d92165507246dbc4154440cb30742e1b6e8ac396e96358d88d65eeaa9 SHA512 f49ff413cb0e983d26ac463522dfea8a63fdf09be4feb401cd0319f7fcc0bdcb79608eddc3672d3082e47f61c87dc7e4b61d8af622f315978efc7bace160df92 WHIRLPOOL ab8e9d5028f821e807301b268218535810c083c1e3aad3b9c2d500fb1ce38844cbe27e044a318087ded8e330083a81dd0794a6ebdd7bcfeb0d81ba3e891ea178
DIST shoulda-matchers-3.1.0.gem 197632 SHA256 b503c3c7112d9de1288d03b96d1c03ec4bfd7357d43379d82e9758cf222256ee SHA512 50e725d6f9d296f6b054b78dba3dd9b9b4b9ff1f4e612741eb0add410e3ac8c981becf3d943bdf9ecf11b61574847eaf7714039371fd3cec0bc8e3f9d9f6ace3 WHIRLPOOL dcb3b91b250bc71f78c54b2e18de626586351eee8fda4ebd6bcf01f012cab36629b3a743cef4dfefd4ee28d9ac8706df11467a509a23ec511af35efdf7116154
DIST shoulda-matchers-3.1.1.gem 200192 SHA256 f8f73357eb6c51b03cb0e76cf425092d3b96a61766dc94a9df02e5959a68c6b1 SHA512 e9baeca04ec6e0ee278761964c3816481d3efd9e3cddadc359c7efda5277796babfed164a1c7e8da3a212c2f84a0fe5d68d5d361552054084f19636554b2d338 WHIRLPOOL 4083f271b1526c6640c870e893ced36437369fdb70b0139d2cd3ebd430af6dd9ab81923ff26126c7ad9b7781890b72561a906823d2b2d4e65cbf4bbcfc94e4cf

@ -1,10 +1,10 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
USE_RUBY="ruby20 ruby21"
USE_RUBY="ruby20 ruby21 ruby22"
RUBY_FAKEGEM_TASK_DOC=""

@ -1 +1 @@
DIST cyclo-2.1_pre1.tar.gz 30866 SHA256 56c2c2ab2e684eb8d4c196835a2343b13ca3c26e1f1ca63ffd8c5bb2f485ad89 SHA512 1b28c54b84d28ed9f72f57e8db1da74cd29be92947418bb3e9452afae1fc863ffb1110face3291f1abb34d1dcaed84d018bf9122ae25b4b67017e4990bb080b6 WHIRLPOOL dcbbd1117a9f5ecdafbda40814ce47053b9653de251fd8384a4900765537fe61cd406b1eddfc890e79adce32da30f799c5a736b2ca246cab5505eac060f5e518
DIST cyclo-2.1.0.tar.gz 27120 SHA256 b8753c149e298d3683add4aec834fb4a4b748636b7bfd9a79a2548e6b81e2045 SHA512 19cf4116e55ba3dff6e49536fed7e5a8da4cc2b691874b5356e67763652785b3f349cb309629e9aca66be15f1c4632ece8bcd5cc3b69373a5a7923eab8058382 WHIRLPOOL c805174fffb6d1cc9a5d9d6c6f7a460699a48347ce5ac5eae0f55cbc3b55b5305624f8e29ecd9f9889242557bd362bfcb99feda8661fd26e13250be590d11132

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@ -13,7 +13,7 @@ if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/sarnold/cyclo.git"
inherit git-r3
else
SRC_URI="https://github.com/sarnold/cyclo/archive/2.1_pre1.tar.gz -> ${P}.tar.gz"
SRC_URI="https://github.com/sarnold/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@ -24,23 +24,26 @@ IUSE="debug"
DEPEND="sys-devel/flex"
src_compile() {
local my_flags="CC=$(tc-getCC) CCPLUS=$(tc-getCXX)"
local my_opts
my_opts="CC=$(tc-getCC) CXX=$(tc-getCXX)"
if ! use debug ; then
DBG="" make ${my_flags} all || die "make failed"
DBG="" emake ${my_opts} || die "make failed"
else
export STRIP_MASK="*/bin/*"
if [ -n "${DEBUG}" ] ; then
DBG="${DEBUG}" make ${my_flags} all || die "make debug failed"
DBG="${DEBUG}" emake ${my_opts} \
|| die "make debug failed"
else
make ${my_flags} all || die "make debug failed"
emake ${my_opts} || die "make debug failed"
fi
fi
}
src_install() {
dobin cyclo mcstrip
src_test() {
make -f Makefile.test test
}
doman cyclo.0 mcstrip.1 cyclo.1
dodoc README.rst mccabe.example || die "dodoc failed"
src_install() {
emake PREFIX=/usr DESTDIR="${ED}" install
}

@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
else
inherit eutils multilib-minimal
SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2"
KEYWORDS="alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris"
fi
DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89"

@ -149,8 +149,6 @@ if [[ ${PN} != cmake ]]; then
CMAKEDEPEND+=" >=dev-util/cmake-${CMAKE_MIN_VERSION}"
fi
CMAKEDEPEND+=" userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
[[ ${WANT_CMAKE} = always ]] || CMAKEDEPEND+=" )"
DEPEND="${CMAKEDEPEND}"

@ -65,8 +65,7 @@ then
fi
DEPEND="${DEPEND}
virtual/pkgconfig
userland_GNU? ( >=sys-apps/findutils-4.4.0 )"
virtual/pkgconfig"
# @FUNCTION: go-mono_src_unpack
# @DESCRIPTION:

@ -2352,9 +2352,7 @@ java-pkg_do_write_() {
java-pkg_init_paths_
# Create directory for package.env
dodir "${JAVA_PKG_SHAREPATH}"
if [[ -n "${JAVA_PKG_CLASSPATH}" || -n "${JAVA_PKG_LIBRARY}" || -f \
"${JAVA_PKG_DEPEND_FILE}" || -f \
"${JAVA_PKG_OPTIONAL_DEPEND_FILE}" ]]; then
# Create package.env
(
echo "DESCRIPTION=\"${DESCRIPTION}\""
@ -2388,7 +2386,6 @@ java-pkg_do_write_() {
[[ -n ${JAVA_SOURCES} ]] && echo "JAVA_SOURCES=\"${JAVA_SOURCES}\"" \
>> ${JAVA_PKG_ENV}
echo "MERGE_VM=\"${GENTOO_VM}\"" >> "${JAVA_PKG_ENV}"
[[ -n ${GENTOO_COMPILER} ]] && echo "MERGE_COMPILER=\"${GENTOO_COMPILER}\"" >> "${JAVA_PKG_ENV}"
@ -2403,11 +2400,6 @@ java-pkg_do_write_() {
# Strip unnecessary leading and trailing colons
# TODO try to cleanup if possible
sed -e "s/=\":/=\"/" -e "s/:\"$/\"/" -i "${JAVA_PKG_ENV}" || die "Did you forget to call java_init ?"
else
debug-print "JAVA_PKG_CLASSPATH, JAVA_PKG_LIBRARY, JAVA_PKG_DEPEND_FILE"
debug-print "or JAVA_PKG_OPTIONAL_DEPEND_FILE not defined so can't"
debug-print "write package.env."
fi
}
# @FUNCTION: java-pkg_record-jar_

@ -4,7 +4,6 @@
# @ECLASS: nvidia-driver.eclass
# @MAINTAINER:
# Tony Vroon <chainsaw@gentoo.org>
# Jeroen Roovers <jer@gentoo.org>
# @AUTHOR:
# Original author: Doug Goldstein <cardoe@gentoo.org>
@ -13,7 +12,7 @@
# Provide useful messages for nvidia-drivers based on currently installed Nvidia
# card. It inherits versionator.
inherit readme.gentoo versionator
inherit readme.gentoo-r1 versionator
DEPEND="sys-apps/pciutils"

@ -199,7 +199,7 @@ qt5-build_src_prepare() {
# Don't inject -msse/-mavx/... into CXXFLAGS when detecting
# compiler support for extended instruction sets (bug 552942)
if use x86 && [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
if [[ ${QT5_MINOR_VERSION} -ge 5 ]]; then
find config.tests/common -name '*.pro' -type f -execdir \
sed -i -e '/else:QMAKE_CXXFLAGS\s*+=/ d' '{}' + || die
fi
@ -537,13 +537,13 @@ qt5_base_configure() {
#-qml-debug
# extended instruction sets support
$(is-flagq -mno-sse2 && echo -no-sse2)
$(is-flagq -mno-sse3 && echo -no-sse3)
$(is-flagq -mno-ssse3 && echo -no-ssse3)
$(is-flagq -mno-sse4.1 && echo -no-sse4.1)
$(is-flagq -mno-sse4.2 && echo -no-sse4.2)
$(is-flagq -mno-avx && echo -no-avx)
$(is-flagq -mno-avx2 && echo -no-avx2)
$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse2 && echo -no-sse2)
$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse3 && echo -no-sse3)
$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-ssse3 && echo -no-ssse3)
$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.1 && echo -no-sse4.1)
$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-sse4.2 && echo -no-sse4.2)
$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx && echo -no-avx)
$([[ ${QT5_MINOR_VERSION} -le 4 ]] && is-flagq -mno-avx2 && echo -no-avx2)
$(is-flagq -mno-dsp && echo -no-mips_dsp)
$(is-flagq -mno-dspr2 && echo -no-mips_dspr2)

@ -1,2 +1,3 @@
DIST gcompris-14.12.tar.bz2 272767636 SHA256 bf0beafb03c0f4ffe05bbfcda54b91a5e8a034b5d813cb4492d6f59a21f9cdcf SHA512 b0948fcf303b335a231318dd57ef84d83cda7839e82542e5c4b9e794745561c24d64e7e76a96c63d1b0eb5a44377f2bf05b1d89f3bcab75dd2c32075e2ba5258 WHIRLPOOL 0d49a59e5fddd5e24e6e593ad53d99c7a8714b6b48dd2e3f776600366f61886c4ea15428f056cb8ae69e26024a88f3264814f80ce9e11e9d82d4f9d0adb8b056
DIST gcompris-15.02.tar.bz2 272847496 SHA256 c3e2f84f459d747b853b0424e366d0ce7b1f4ef00d660cdde5084712cf5c3ad4 SHA512 468ca9a3a4cfff78e34206c40e6aebfc79ba087dd1e87f96a8b9b2ae1149550791be16ca0776f11e6768dd4acb3caaae9e763ac9d941f1f09c7a3464e829e7af WHIRLPOOL 5b38bf16e061d9770e66573c81e4b3b0617d3cf2e0679919a06b628ff622d4b0e8585115b4084e51e674c57cf1f2a36472e3e66283a9ee3f78423eac998b5a24
DIST gcompris-15.10.tar.bz2 279959562 SHA256 6aba73e2a1db0f50d43a40ee1a4a2b9d62a96e68542971b555c9debd8f50fc38 SHA512 1915a6934f3111e871be2777ed88c8d15a3ddb85f0c16d92333b6ebcba0cbbe526e51e84ecc576021cd807a5d69bb9570dba481ddc925da9d4dd35a0075380fc WHIRLPOOL 3baeac6e632f621111d8db096ed1713df0297f7460902f23f52667d551b85da3b124c39af5977935f9c7d98e037faf168f51eae33d0063e4f8852bac190f9ebf

@ -0,0 +1,81 @@
--- gcompris-13.11.orig/Makefile.am
+++ gcompris-13.11/Makefile.am
@@ -7,7 +7,7 @@
# endif
-icondir=$(datadir)/pixmaps
+icondir=/usr/share/pixmaps
icon_DATA = gcompris.png gcompris-edit.png
if BUILD_MINGW32
@@ -15,7 +15,7 @@
Applications_in_files =
Applications_DATA =
else
-Applicationsdir = $(datadir)/applications/
+Applicationsdir = /usr/share/applications/
Applications_in_files = gcompris.desktop.in gcompris-edit.desktop.in
Applications_DATA = gcompris.desktop gcompris-edit.desktop
endif
--- gcompris-13.11.orig/configure.ac
+++ gcompris-13.11/configure.ac
@@ -57,7 +57,8 @@
gtk+-2.0 >= $GTK_REQUIRED \
librsvg-2.0 >= $LIBRSVG_REQUIRED \
libxml-2.0 >= $LIBXML_REQUIRED \
- gthread-2.0 )
+ gthread-2.0 \
+ gmodule-2.0 )
AC_SUBST(GCOMPRIS_CFLAGS)
AC_SUBST(GCOMPRIS_LIBS)
@@ -204,10 +205,8 @@
USE_DEBUG="$enableval", USE_DEBUG="no")
if test "x$USE_DEBUG" == "xyes" ; then
AC_DEFINE_UNQUOTED(DEBUG, 1, "Enable debug messages.")
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -g"
-else
- CFLAGS="$CFLAGS $OSX_CFLAGS -Wall -O2"
fi
+CFLAGS="$CFLAGS $OSX_CFLAGS -Wall"
dnl disable activation code
AC_ARG_ENABLE(disable-activation-code,
@@ -336,21 +335,21 @@
fi
else
dnl Set PACKAGE_LOCALE_DIR in config.h.
- AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "${myprefix}/${DATADIRNAME}/locale", [GCompris locale directory])
+ AC_DEFINE_UNQUOTED(PACKAGE_LOCALE_DIR, "/usr/share/locale", [GCompris locale directory])
dnl Set PACKAGE_DATA_DIR
PACKAGE_DATA_DIR="boards"
AC_SUBST(PACKAGE_DATA_DIR)
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${myprefix}/${DATADIRNAME}", [GCompris data directory])
+ AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}", [GCompris data directory])
dnl Plugin Directory
my_libdir=`eval echo "${libdir}"`
- AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${my_libdir}", [Gcompris plugins directory])
+ AC_DEFINE_UNQUOTED(PACKAGE_CLIB_DIR, "${libdir}", [Gcompris plugins directory])
plugindir=$libdir/gcompris
AC_SUBST(plugindir)
dnl Python plugin Directory
- PYTHON_PLUGIN_DIR="${myprefix}/${DATADIRNAME}/${PACKAGE}/python"
+ PYTHON_PLUGIN_DIR="${datadir}/${PACKAGE}/python"
AC_SUBST(PYTHON_PLUGIN_DIR)
dnl System GCompris config directory
--- gcompris-13.11.orig/src/gcompris/gcompris.c
+++ gcompris-13.11/src/gcompris/gcompris.c
@@ -1322,7 +1322,7 @@
properties->package_plugin_dir = g_strconcat(pkg_clib_dir, "/gcompris", NULL);
properties->package_python_plugin_dir = g_strconcat(pkg_data_dir, "/gcompris/python",
NULL);
- properties->system_icon_dir = g_strconcat(pkg_data_dir, "/pixmaps", NULL);
+ properties->system_icon_dir = g_strconcat("/usr/share", "/pixmaps", NULL);
properties->menu_dir = g_strdup(properties->package_data_dir);
g_free(pkg_data_dir);
g_free(pkg_clib_dir);

@ -0,0 +1,89 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite,threads"
inherit autotools eutils python-single-r1 games
DESCRIPTION="full featured educational application for children from 2 to 10"
HOMEPAGE="http://gcompris.net/"
SRC_URI="http://gcompris.net/download/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="gstreamer"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="x11-libs/gtk+:2
gnome-base/librsvg[gtk(+)]
gstreamer? (
media-libs/gstreamer:0.10
media-libs/gst-plugins-good:0.10
media-plugins/gst-plugins-ogg:0.10
media-plugins/gst-plugins-alsa:0.10
media-plugins/gst-plugins-vorbis:0.10 )
!gstreamer? (
media-libs/sdl-mixer
media-libs/libsdl:0 )
dev-libs/libxml2
dev-libs/popt
virtual/libintl
dev-db/sqlite:3
dev-python/pygtk[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
gnome-base/gnome-common
dev-perl/XML-Parser
sys-devel/gettext
sys-apps/texinfo
app-text/texi2html
virtual/pkgconfig"
RDEPEND="${RDEPEND}
media-gfx/tuxpaint
sci-electronics/gnucap"
pkg_setup() {
python-single-r1_pkg_setup
games_pkg_setup
}
src_prepare() {
# Drop DEPRECATED flags, bug #387817
sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
src/gcompris/Makefile.am || die
epatch "${FILESDIR}"/${P}-build.patch
cp /usr/share/gettext/config.rpath .
eautoreconf
sed -i \
-e 's#^itlocaledir =.*$#itlocaledir = @localedir@#' \
po/Makefile.in.in || die
# Fix desktop files
sed -i \
-e '/Encoding/d' \
gcompris.desktop.in \
gcompris-edit.desktop.in || die
}
src_configure() {
GNUCHESS="${GAMES_BINDIR}/gcompris-gnuchess" \
egamesconf \
--datarootdir="${GAMES_DATADIR}" \
--datadir="${GAMES_DATADIR}" \
--localedir=/usr/share/locale \
--infodir=/usr/share/info \
--with-python="${PYTHON}" \
$(use_enable !gstreamer sdlmixer) \
--enable-sqlite \
--enable-py-build-only
}
src_install() {
default
prune_libtool_files --modules
prepgamesdirs
}

@ -1 +1,2 @@
DIST tomenet-4.6.0.tar.bz2 3039894 SHA256 bd1cbf05fe8cb4c8af5e658ede622cf12b54aae42c640af12677e4067902673f SHA512 73dd682158b09ede8b78ca604891eebe6534ca3e8979187ac8b938deb3b37e5fde3424122fac6fce392e0e38cc70e40ae6bb07ce7e7192a8cd43d7d8057ab9b3 WHIRLPOOL 8f03ed1b1bc962403d8ff7611857ce40daa5436fa540da96aa142bdf70d6c4dd134238b582e7c6be2e52b63ce1c92f33bef1d21799d1ff4f29684256404831f6
DIST tomenet-4.6.1a.tar.bz2 2990275 SHA256 0e27c0332f1a1e58e51c4d254dd14707e21608e32c5acf2be28a5baaa65065ab SHA512 eb89cd2276a18947d55efcc745e0b0abc0d9ae8a8d922a4726632657f32657e762bd0530d721afcf9d4ab3eeed2da6e43a3822d1d8c2c3b630fdb4cde924ac9f WHIRLPOOL eb5ecbea231bf756c71b983b4a7fc082e7d63061d8f215731b7065eeef57e912dfbb1b217d3d031c6db11f8882c4d4c10c8d821c8ccd873f0e9e41f9148f2d30

@ -0,0 +1,77 @@
diff -ru tomenet-4.6.1a.orig/src/makefile tomenet-4.6.1a/src/makefile
--- tomenet-4.6.1a.orig/src/makefile 2015-12-31 07:05:21.000000000 -0500
+++ tomenet-4.6.1a/src/makefile 2016-02-10 01:42:12.958344532 -0500
@@ -203,7 +203,7 @@
#
# This is my compiler of choice, it seems to work most everywhere
#
-CC = gcc
+CC ?= gcc
# For allowing #if..#else..#endif constructs in LUA files - C. Blue
# Note: The flags must contain
@@ -215,16 +215,26 @@
# need to use the gcc invocation below instead.
#
# cpp variant:
-CPP = cpp
-CPPFLAGS = -C -P
+#CPP = cpp
+#CPPFLAGS = -C -P
# gcc variant:
-#CPP = gcc
-#CPPFLAGS = -x c -E -Wp,-C,-P
+CPP ?= gcc
+CPPFLAGS = -x c -E -Wp,-C,-P
# For variations with X11
X11BASE = /usr/X11R6
+# defines
+ifdef USE_SDL
+CFLAGS += -DSOUND_SDL $(shell sdl-config --cflags)
+SDL_LIBS = $(shell sdl-config --libs) -lSDL_mixer
+endif
+
+ifdef USE_X
+CFLAGS += -I${X11BASE}/include -DUSE_X11
+LIBS += -L${X11BASE}/lib -lX11
+endif
##
## Standard version -- supports X11 (main-x11.c)
@@ -237,6 +247,11 @@
#CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags`
#LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm `sdl-config --libs` -lSDL_mixer
##
+
+CFLAGS += -Wall
+CFLAGS += -DUSE_GCU -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
+LIBS += -L/usr/pkg/lib $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm ${SDL_LIBS}
+
## Without SDL
#CFLAGS = -g -pipe -Wall -DUSE_X11 -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
#LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lcrypt -lm
@@ -256,8 +271,8 @@
# attempt to "guess" at many of these flags based on your system.
#
## With SDL
-CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
-LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 -lncurses -lcrypt -lm `sdl-config --libs` -lSDL_mixer
+#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99 -DSOUND_SDL `sdl-config --cflags` -D_DEFAULT_SOURCE -DACC32
+LIBS = -L${X11BASE}/lib -L/usr/pkg/lib -lX11 $(shell ${PKG_CONFIG} --libs ncurses) -lcrypt -lm $(shell sdl-config --libs) -lSDL_mixer
##
## Without SDL
#CFLAGS = -g -pipe -Wall -DUSE_X11 -DUSE_GCU -I${X11BASE}/include -D_XOPEN_SOURCE -D_BSD_SOURCE -DMEXP=19937 -std=c99
@@ -357,10 +372,6 @@
# Compile a client with 'test client' version/tag
tomenet.test: CFLAGS += -DTEST_CLIENT -O0
-# Normal release build
-tomenet: CFLAGS += -O2
-
-
# Lua
SRCS += $(LUASRCS)
SRCS += $(CLI_LUASRCS)

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save