Sync with portage [Sat Nov 4 23:44:01 MSK 2017].

mhiretskiy 1004
root 7 years ago
parent 64fa2527e4
commit 0e639ccda7

@ -11,7 +11,7 @@ DESCRIPTION="Speech synthesizer for English and other languages"
HOMEPAGE="http://espeak.sourceforge.net/"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="portaudio pulseaudio"
COMMON_DEPEND="portaudio? ( >=media-libs/portaudio-19_pre20071207 )

@ -13,7 +13,7 @@ SRC_URI="http://www.infodrom.org/projects/sysklogd/download/${P}.tar.gz
LICENSE="BSD"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86"
IUSE="logrotate"
RESTRICT="test"

@ -11,7 +11,7 @@ SRC_URI="https://github.com/Tripwire/tripwire-open-source/archive/${PV}.tar.gz -
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
KEYWORDS="amd64 ~ppc x86 ~x86-fbsd"
IUSE="libressl selinux ssl static +tools"
DEPEND="sys-devel/automake

@ -1,205 +0,0 @@
https://bz-attachments.freebsd.org/attachment.cgi?id=149027&action=diff&collapsed=&context=patch&format=raw&headers=1
--- perl/Amanda/Application.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Application.c 2014-10-27 08:48:58.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Archive.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Archive.c 2014-10-27 08:49:05.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Cmdline.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Cmdline.c 2014-10-27 08:49:13.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Config.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Config.c 2014-10-27 08:49:19.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Debug.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Debug.c 2014-10-27 08:49:25.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Device.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Device.c 2014-10-27 08:49:30.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Disklist.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Disklist.c 2014-10-27 08:49:36.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Feature.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Feature.c 2014-10-27 08:49:41.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Header.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Header.c 2014-10-27 08:49:48.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Logfile.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Logfile.c 2014-10-27 08:49:53.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/MainLoop.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/MainLoop.c 2014-10-27 08:49:59.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/NDMP.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/NDMP.c 2014-10-27 08:50:19.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Tapelist.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Tapelist.c 2014-10-27 08:50:24.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Tests.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Tests.c 2014-10-27 09:01:12.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Util.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Util.c 2014-10-27 09:01:17.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/Xfer.c.orig 2012-07-25 17:59:54.000000000 +0200
+++ perl/Amanda/Xfer.c 2014-10-27 09:01:22.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif
--- perl/Amanda/XferServer.c.orig 2012-07-25 17:59:55.000000000 +0200
+++ perl/Amanda/XferServer.c 2014-10-27 09:01:29.000000000 +0100
@@ -1450,9 +1450,6 @@
#ifdef eof
#undef eof
#endif
-#ifdef bool
- #undef bool
-#endif
#ifdef close
#undef close
#endif

@ -1,3 +1,4 @@
DIST codecrypt-1.7.2.tar.gz 446975 SHA256 dfe932b6aa18e85d3f1f5324dd11f1b02a75e2225748d91e07020b31eb721906 SHA512 4ad2ad9e665e486e353b48efff344436b276eac2dcbddcf4330796b8f1f06284eaeec9c4f4ef63f61e4477c3bce0973f60f76291dce11bee31a75658bee6a3a0 WHIRLPOOL 804980127104da801556a2bc09cd018a215a68c10147e0a2f2380e5f0c92f4063b390533d65a1a4d810e6c27ae912897a345a025d48362d2937c8e8ebfa5d527
DIST codecrypt-1.7.5.tar.gz 464250 SHA256 873b6849bfb2ac0a530935da43422a763bc5763a01026c467ebe164eb41c3cc3 SHA512 237459ec4387f068d39946c1360e27b02f1cfd34a78eef0d3c3eccf31604f3d27b9e5c9c091b88257231bff02f7bf9fb82f7a9e8a8e8a6bbc27091c83ab1f880 WHIRLPOOL ecfcfaf62e59d1f62000e7c1c4a290483c7731f90e1271b1b0acfbc58cf1ce0799b23cb616f5b4d8ee5fc5a2e670d5c148ea1d893abae63aed18dec87ec843a6
DIST codecrypt-1.7.6.tar.gz 463999 SHA256 6cb8728d7fee9eafdee1277fae810955f1c418755ccfa69ec8c1e86cac6c9873 SHA512 1bd1432c75985d2ff968095bcb9e23ea2c6e91bd7009c9c50a5ab90123e14db0937e0a945a20a6c7f540a5b52e3f1d9ea2dbf779406d43a203f1d1bcafb94406 WHIRLPOOL af45ef6d548ad5e39268ea408c54e2235a90566a22fe9dc9e38882c1ede093835460a81bae128e49272344e0332c2fe0379fcd6c2858d97f3c9521c9d0259d45
DIST codecrypt-1.8.tar.gz 471273 SHA256 3be7c2a548aa336dbac706c3cab2071664d02b11652c16c02a8b4fb5cac6bc88 SHA512 0e452f4e93498faa671a5927a3dd93b6dc66cbda7eb71cb33a509f8608573eff5ac8fed0d5e09911e03c153b88c9cb1bb54f7b2aeeb7b6c31eec918ad9685102 WHIRLPOOL 7fec87cb92be770d2bf4e6a5b6d4c17ee26740b19155bb59ae1e0bef8ddd01922b388bf907207ab575155bcc18eab9e632b65e4f02ae0adc970528d058361ee7

@ -0,0 +1,32 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit autotools
DESCRIPTION="Post-quantum cryptography tool"
HOMEPAGE="http://e-x-a.org/codecrypt/"
SRC_URI="http://e-x-a.org/codecrypt/files/${P}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="+cryptopp"
DEPEND="dev-libs/gmp:=
cryptopp? ( dev-libs/crypto++ )
sci-libs/fftw:3.0"
RDEPEND="${DEPEND}"
src_prepare() {
default
# workaround -- gentoo is missing crypto++ pkg-config file
sed -i -e 's/PKG_CHECK_MODULES(\[CRYPTOPP\],.*/LDFLAGS="$LDFLAGS -lcrypto++"/' configure.ac || die
eautoreconf
}
src_configure() {
econf \
$(use_with cryptopp )
}

@ -1,2 +1 @@
DIST opendict-0.6.3.tar.gz 132515 SHA256 dad7723512768aeae65fead0f06a3c973b161a86658b94a66c4945beb12f45dc SHA512 687afba45f9fd271acee9f72fd3971fbc624588fe0f4194ad4499e2e64259a59c516854a7b0b1c02b3e214bf6e77e52b5b0713430e3cd5e0127c5b3c8fc02f5c WHIRLPOOL 06a48141bb1da7557d616deda3c4c18500171d4c158cb5f5cc83ca9f1f8037584ade85a742c88a4b6ab667bd6586492fed075e6a4e69fa51c8e37ece75880a62
DIST opendict-0.6.7.tar.gz 169580 SHA256 d376c8a81e5747e40775214177df9d0f04d6441acaea7435e0cb7e770b6c460f SHA512 ef97ec84591bda4d8d4746fa4532de109cf03d89dfd5aa20e1775224c687b503759c020b2286e5cedd395ebce5db3b2a10495adc31fcc31dbd4fddfca6fee1f8 WHIRLPOOL 215a3f9ec80bf07c662f5cc35f1e698cfabbb74edd8c641681b562bc6a4a47b4b2fe1e889288abb8e5f213441cd501cf9c6d2ad4581501a5c90bb0048623c3d7

@ -1,144 +0,0 @@
Use native python instead of external pyxml dependency. Patch from Debian.
https://bugs.gentoo.org/367733
--- a/README.txt
+++ b/README.txt
@@ -15,9 +15,8 @@ universal and easy to use for desktop users and developers.
Requirements
~~~~~~~~~~~~
- - Python >= 2.3
- - wxPython 2.6
- - python-xml (PyXML)
+ - Python >= 2.4
+ - wxPython >= 2.6
- gettext >= 0.14
--- a/lib/xmltools.py
+++ b/lib/xmltools.py
@@ -20,7 +20,6 @@
#
import xml.dom.minidom
-import xml.dom.ext
from lib import meta
@@ -30,7 +29,7 @@ def _textData(element):
text = ''
for node in element.childNodes:
- text = node.data
+ text = node.data.strip()
return text
@@ -99,7 +98,7 @@ class RegisterConfigGenerator:
or ''))
return doc
-
+
def generatePlainDictConfig(**args):
"""Generate configuration and return DOM object"""
@@ -113,10 +112,11 @@ def generatePlainDictConfig(**args):
def writePlainDictConfig(doc, path):
"""Write XML file"""
- fd = open(path, 'w')
- xml.dom.ext.PrettyPrint(doc, fd)
+ import codecs
+ fd = codecs.open(path, 'w', 'utf-8')
+ doc.writexml(fd, addindent = " ", newl = "\n", encoding = "UTF-8")
fd.close()
-
+
class RegisterConfigParser:
@@ -144,32 +144,32 @@ class RegisterConfigParser:
for nameElement in registerElement.getElementsByTagName('name'):
for node in nameElement.childNodes:
- name = node.data
+ name = node.data.strip()
for formatElement in registerElement.getElementsByTagName('format'):
for node in formatElement.childNodes:
- format = node.data
+ format = node.data.strip()
for pathElement in registerElement.getElementsByTagName('path'):
for node in pathElement.childNodes:
- path = node.data
+ path = node.data.strip()
for versionElement in registerElement.getElementsByTagName('version'):
for node in versionElement.childNodes:
version = node.data.strip()
for authorElement in registerElement.getElementsByTagName('author'):
- authors.append({'name': authorElement.getAttribute('name'),
- 'email': authorElement.getAttribute('email')})
+ authors.append({'name': authorElement.getAttribute('name').strip(),
+ 'email': authorElement.getAttribute('email').strip()})
for md5Element in registerElement.getElementsByTagName('md5'):
for node in md5Element.childNodes:
- md5 = node.data
+ md5 = node.data.strip()
for encodingElement in \
registerElement.getElementsByTagName('encoding'):
for node in encodingElement.childNodes:
- encoding = node.data
+ encoding = node.data.strip()
for licenceElement in \
registerElement.getElementsByTagName('licence'):
@@ -241,8 +241,9 @@ def generateIndexFile(index):
def writeIndexFile(doc, path):
"""Write XML file"""
- fd = open(path, 'wb')
- xml.dom.ext.PrettyPrint(doc, fd)
+ import codecs
+ fd = codecs.open(path, 'wb', 'utf-8')
+ doc.writexml(fd, addindent = " ", newl = "\n", encoding = "UTF-8")
fd.close()
@@ -511,7 +512,8 @@ def generateMainConfig(props):
def writeConfig(doc, path):
"""Write XML file"""
- fd = open(path, 'w')
- xml.dom.ext.PrettyPrint(doc, fd)
+ import codecs
+ fd = codecs.open(path, 'w', 'utf-8')
+ doc.writexml(fd, addindent = " ", newl = "\n", encoding = "UTF-8")
fd.close()
--- a/opendict.py
+++ b/opendict.py
@@ -53,16 +53,6 @@ except ImportError:
print >> sys.stderr, "**"
sys.exit(1)
-
-try:
- import xml.dom.ext
-except ImportError:
- print >> sys.stderr, "**"
- print >> sys.stderr, "** Error: Python/XML library not found"
- print >> sys.stderr, "** Please install python-xml (PyXML) to run OpenDict"
- print >> sys.stderr, "**"
- sys.exit(1)
-
# get_main_dir() returns the directory name of the script or the
# directory name of the exe
def get_main_dir():

@ -1,91 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
GCONF_DEBUG="no" # We skip gnome2_src_configure entirely
PYTHON_COMPAT=( python2_7 )
inherit eutils gnome2 python-single-r1 readme.gentoo
DESCRIPTION="OpenDict is a free cross-platform dictionary program"
HOMEPAGE="http://opendict.sourceforge.net/"
SRC_URI="http://opendict.idiles.com/files/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND="${PYTHON_DEPS}
dev-python/wxpython:2.8[${PYTHON_USEDEP}]
"
DEPEND="${RDEPEND}"
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="If you want system-wide plugins, unzip them into
${ROOT}usr/share/${PN}/dictionaries/plugins
Some are available from http://opendict.sourceforge.net/?cid=3"
src_prepare() {
epatch "${FILESDIR}"/${P}-pyxml.patch
sed -e "s:), '..')):), '../../../../..', 'share', 'opendict')):g" \
-i "${S}/lib/info.py"
gnome2_src_prepare
}
src_configure() {
# override gnome2_src_configure
default
}
src_compile() {
# evil makefile
:
}
src_install() {
# makefile is broken, do it manually
dodir /usr/share/${PN}/dictionaries/plugins # global dictionary plugins folder
# Needed by GUI
insinto /usr/share/${PN}
doins "${S}"/copying.html
insinto /usr/share/${PN}/pixmaps
doins "${S}"/pixmaps/*
DHOME="$(python_get_sitedir)/opendict"
insinto "${DHOME}/lib"
doins -r "${S}"/lib/*
exeinto "${DHOME}"
python_fix_shebang opendict.py
doexe opendict.py
dosym "${DHOME}/opendict.py" /usr/bin/opendict
domenu misc/${PN}.desktop
insinto /usr/share/icons/hicolor/24x24/apps/
newins "${S}/pixmaps/icon-24x24.png" opendict.png
insinto /usr/share/icons/hicolor/32x32/apps/
newins "${S}/pixmaps/icon-32x32.png" opendict.png
insinto /usr/share/icons/hicolor/48x48/apps/
newins "${S}/pixmaps/icon-48x48.png" opendict.png
insinto /usr/share/icons/hicolor/scalable/apps/
newins "${S}/pixmaps/SVG/icon-rune.svg" opendict.svg
doman opendict.1
dodoc README.txt TODO.txt doc/Plugin-HOWTO.html
readme.gentoo_create_doc
}
pkg_postinst() {
gnome2_pkg_postinst
readme.gentoo_print_elog
}

@ -1,53 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit distutils-r1 eutils fdo-mime
MY_PN=${PN/e/E}
DESCRIPTION="Multi-platform text editor supporting over 50 programming languages"
HOMEPAGE="http://editra.org https://pypi.python.org/pypi/Editra"
SRC_URI="http://editra.org/uploads/src/${MY_PN}-${PV}.tar.gz"
LICENSE="wxWinLL-3.1"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="spell"
DEPEND="
>=dev-python/wxpython-2.8.9.2:2.8[${PYTHON_USEDEP}]
>=dev-python/setuptools-0.6[${PYTHON_USEDEP}]"
# setuptools is RDEPEND because it's used by the runtime for installing plugins
RDEPEND="${DEPEND}
spell? ( dev-python/pyenchant[${PYTHON_USEDEP}] )"
S="${WORKDIR}"/${MY_PN}-${PV}
python_compile() {
# https://code.google.com/p/editra/issues/detail?id=481
distutils-r1_python_compile --no-clean
}
python_install() {
distutils-r1_python_install --no-clean
}
python_install_all() {
distutils-r1_python_install_all
doicon "${S}"/pixmaps/editra.png
make_desktop_entry editra Editra editra "Utility;TextEditor"
dodoc FAQ THANKS
}
pkg_postinst() {
fdo-mime_desktop_database_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
}

@ -1,12 +0,0 @@
# Generate skk-autoloads.el with coding cookie.
--- a/SKK-MK
+++ b/SKK-MK
@@ -884,7 +884,7 @@ SKK tutorials:
(set-buffer buf)
(erase-buffer)
(insert "\
-;;; skk-autoloads.el --- autoload settings for SKK.
+;;; skk-autoloads.el --- autoload settings for SKK. -*- coding: iso-2022-jp -*-
;; This file was generated automatically by SKK-MK at "
(current-time-string)

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -16,6 +16,7 @@ KEYWORDS="amd64 x86"
DEPEND=">=dev-libs/libxml2-2.6.13"
RDEPEND="${DEPEND}"
ELISP_PATCHES="${P}-gcc7.patch"
SITEFILE="50${PN}-gentoo.el"
src_configure() {

@ -0,0 +1,104 @@
Fix compilation with GCC 7.
https://bugs.gentoo.org/635746
--- doxymacs-1.8.0.orig/c/doxymacs_parser.c
+++ doxymacs-1.8.0/c/doxymacs_parser.c
@@ -70,6 +70,7 @@
hash_entry *symbol_hash[HASH_SIZE];
+static inline unsigned int hash(const char *s);
inline unsigned int hash(const char *s)
{
unsigned int h = 0;
@@ -82,6 +83,7 @@
return abs(h % HASH_SIZE);
}
+static inline void AddToHash(completion_list *cl);
inline void AddToHash(completion_list *cl)
{
unsigned int h = hash(cl->symbol);
@@ -96,6 +98,7 @@
}
/* mmmmm... free hash */
+static inline void FreeHash(void);
inline void FreeHash(void)
{
unsigned int i;
@@ -117,6 +120,7 @@
/* XML Helper Functions */
+static inline char *XMLTagChild(xmlNodePtr node, const char *name);
inline char *XMLTagChild(xmlNodePtr node, const char *name)
{
xmlNodePtr cur = node->xmlChildrenNode;
@@ -141,6 +145,7 @@
return NULL;
}
+static inline char *XMLTagAttr(xmlNodePtr node, const char *attr);
inline char *XMLTagAttr(xmlNodePtr node, const char *attr)
{
xmlAttrPtr props = node->properties;
@@ -167,6 +172,7 @@
/* Look up functions for symbols and descriptions */
+static inline completion_list *LookUpSymbol(const char *symbol);
inline completion_list *LookUpSymbol(const char *symbol)
{
unsigned int h = hash(symbol);
@@ -187,6 +193,7 @@
return NULL;
}
+static inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc);
inline desc_url_list *LookUpDesc(completion_list *entry, const char *desc)
{
desc_url_list *cur = entry->descs;
@@ -206,6 +213,8 @@
/* Add the given name, description and url to our completion list */
+static inline int AddToCompletionList(const char *name,
+ const char *desc, const char *url);
inline int AddToCompletionList(const char *name,
const char *desc, const char *url)
{
@@ -274,6 +283,7 @@
}
/* Encode the given string so that {X}Emacs will understand it */
+static inline char *Encode(const char *s);
inline char *Encode(const char *s)
{
unsigned int extra_len = 0;
@@ -341,6 +351,7 @@
/* Output the completion list in a way {X}Emacs can easily read in */
+static inline int OutputCompletionList(void);
inline int OutputCompletionList(void)
{
completion_list *cur = comp_list;
@@ -400,6 +411,7 @@
/* Clean up */
+static inline void FreeCompletionList(void);
inline void FreeCompletionList(void)
{
completion_list *cur = comp_list;
@@ -428,7 +440,8 @@
}
/* Add the members of a compound to the completion list */
-
+static inline int AddCompoundMembers(xmlNodePtr compound,
+ const char *name, const char *url);
inline int AddCompoundMembers(xmlNodePtr compound,
const char *name, const char *url)
{

@ -1,3 +1,4 @@
DIST emms-3.0.tar.gz 200838 SHA256 5b750312dc82f856b1c725c0d795216f430ef7c25a301cda75b4847e52773594 SHA512 a6637d6d9bcf7fdc81815e698b51579d2dcb51b70b39d65117a81d180541f4774c82a1da23f5e67a5ffd37d5f1a4ce4fe5f653f8e443f899910320eaf5420119 WHIRLPOOL b8f9eecf1c1883e59051a31076888abb038627960012c22d9822764d558e84d97afb0b3eee9c6bf3fe89b707c6657d62099b384cac684709f1250f8fe63e9c59
DIST emms-4.1.tar.gz 283625 SHA256 032e5680c39f70234245e2c6d56bc8278cfb80e5539f3aa1ed26b771c330c62b SHA512 b92773bb102e8d082a70644743665d5a1bfa470f579b8aaa1df60a29d0156aa6c4d516ea92a842db50d3418d63be7eb0cd36f18e9e3574b840056ed4ea210107 WHIRLPOOL 4ce84196531fae53e37d50b4e802b731db5f99a530b83965dfc95c63f105cdf1703df65af95fe2b4849ce1f412e3ba2fb4141cc6f9ec9bae0541e73226932de8
DIST emms-4.3.tar.gz 287153 SHA256 00112d631eee0cfee80a85c048bfbf7c2d25886067ee02152376208ae87c2c36 SHA512 fd674e8637700d0a08cbdf0253ffd285623ba8181fac389eb94a701091ce25b071f995baa4fd68d60528dbbb90bbf034705bf52b41d9d5edd7af12c2c99418ed WHIRLPOOL fe7347c9a7013d0be81c9dff0c52e94ba5d62cbf9a04b4fcd18e7074658f12c0d3188a9242554d28143c5ebae62101e1d5f39ce302c94ed1852b0cf5094a23b0
DIST emms-4.4.tar.gz 288922 SHA256 10ecc2e9c957ca1f80bbf8d9a0473b9eae552218aaea278dc8b10564215513ac SHA512 d0aaac80728b542366885916e43c2c50302a5a5d6c9e35ff53a5b46a7185fda19459ea28f0d77929920873d7d9732fa531a4ef50f5052ed4df42cc474d14d0ba WHIRLPOOL 0c25526a7c55410a25fc7c873c3ba63b7caea87a00f24ca5c763e402e5f12aff93e2f37cbd28cdfd34ea4411eff053990591209e85a01385c983a58c394968c9

@ -0,0 +1,38 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit elisp toolchain-funcs
DESCRIPTION="The Emacs Multimedia System"
HOMEPAGE="https://www.gnu.org/software/emms/
https://www.emacswiki.org/emacs/EMMS"
SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3+ FDL-1.1+"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
DEPEND="media-libs/taglib"
RDEPEND="${DEPEND}"
# EMMS can use almost anything for playing media files therefore the dependency
# possibilities are so broad that we refrain from setting anything explicitly
# in DEPEND/RDEPEND.
SITEFILE="50${PN}-gentoo.el"
src_compile() {
emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" \
all emms-print-metadata
}
src_install() {
elisp-install ${PN} lisp/*.{el,elc}
elisp-site-file-install "${FILESDIR}/${SITEFILE}"
doinfo doc/emms.info*
dobin src/emms-print-metadata
doman emms-print-metadata.1
dodoc AUTHORS ChangeLog NEWS README THANKGNU
}

@ -1,4 +1,4 @@
DIST containerd-0.2.5_p20170308.tar.gz 1021631 SHA256 d08d3d0758b76f7de0e8f503b74e1562d8c0a1014cb4baf4cd34e246751cec4c SHA512 8b00862a7b54490a8342bcc0eddaa7e8c86d1e05c02f5173b9f4a08321425f8d75d1fb0665e86bc79249294354977693c21d6a4d8405866ff8058da9772e2ecc WHIRLPOOL ed658d10f927fff4d9591930bdf855fc0ed259ca538d4361ce3cffcc5943dcfe39121242f1c9ef950897761016a8450b3a2117c0be0b8b0ebffeab330fe30b5d
DIST containerd-0.2.9.tar.gz 1228977 SHA256 2360fec91d40e4e93757f964f07c74e35b6bfe838252b1cc814a176e1cd1c604 SHA512 6f0de476668e6b86a0cd5e1ea0f6dac24e0e68fe2dd52b8915dbafa5ffab137a5eea866c216f8184ffa6e4750c7b69bce3d46552e8be283a15ce676ea4356fc8 WHIRLPOOL b9fdd57af3cf39e6a5efdd67f0302ad38d6634d20aa3eb45431d2900f5fbb7dc62d624b07a5028bbb09ae763e07103e37703cf52f3e14e7af72fc2198d9c7876
DIST containerd-0.2.9_p20170605.tar.gz 1229549 SHA256 c506121c49e3bfea27018aa77e09e4734067f84ae85b6ef75ec31b488a91ae54 SHA512 900cf9c251c4de0f9848fb5bf26537226c1361d1a64a0fba853bda3805cb141fc2a849442fe885f0ee228b3e3a7018440af18898b484a54a7b75b4a86538aaa9 WHIRLPOOL 880f19a994f623b7cd8c3f771b5c56468681de349ae4196e60ffcb5a34d42ef423d8eefc82c07134c9e50c33bc0ecbfc1a9e47c3df987050d8dcb82da0178d80
DIST containerd-0.2.9_p20170917.tar.gz 1140788 SHA256 4d2b6e30bcc6c4bb901d6b9f19b5ac1d4a2d9b17075a9b1f110102920d01f64a SHA512 c749bda691197ec8a7603db9ad92f2800a3f065143430a660333b7862518deb4c158a1c1fd01671dff438b40988d4a64d8f06bab05496b8728c6e2f57cd7da0a WHIRLPOOL 75cb3467a94af50bef52377f309d7c85386475789fab3d2758679f022b516735728a1ac2c54307954a14100c4f84059d8fd5e8376270fdd69e572cff43453fa0
DIST containerd-1.0.0_beta2.tar.gz 3681494 SHA256 3130384a814bc0a43fe3b76e2bbb2db2372fdc96490b76f8b278362ebc0d3fb1 SHA512 cecb4d2e0dccbc27c1e59f3e49f8fd5b08445988e49aa4b8a2a5910851509d51e001b5295905288c29fee2d91eadf2180a6b86947e130abe1b33a9a01416a286 WHIRLPOOL 4d526904a146971d57adbde6102e4fe42e0d303b102e721e34aaea3f54ef3176586dedf31a347f52d95a6e5c1850454b31ab3e5c6195b868929d32fde6218eb3

@ -12,7 +12,7 @@ else
MY_PV="${PV/_/-}"
EGIT_COMMIT="6e23458c129b551d5c9871e5174f6b1b7f6d1170"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~ppc64"
KEYWORDS="amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
fi

@ -2,15 +2,16 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EGO_PN="github.com/${PN}/${PN}"
EGO_PN="github.com/containerd/${PN}"
inherit toolchain-funcs
if [[ ${PV} == *9999 ]]; then
inherit golang-vcs
else
MY_PV="${PV/_/-}"
EGIT_COMMIT="cfb82a876ecc11b5ca0977d1733adbe58599088a"
MY_PV="${PV/_beta/-beta.}"
EGIT_COMMIT="v${MY_PV}"
CONTAINERD_COMMIT="a543c93"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
@ -23,20 +24,28 @@ LICENSE="Apache-2.0"
SLOT="0"
IUSE="hardened +seccomp"
DEPEND=""
RDEPEND=">=app-emulation/docker-runc-1.0.0_rc3_p20170607
DEPEND="sys-fs/btrfs-progs"
RDEPEND="|| ( >=app-emulation/docker-runc-1.0.0_rc4
>=app-emulation/runc-1.0.0_rc4 )
seccomp? ( sys-libs/libseccomp )"
S=${WORKDIR}/${P}/src/${EGO_PN}
RESTRICT="test"
src_prepare() {
default
if [[ ${PV} != *9999* ]]; then
sed -i -e "s/git describe --match.*$/echo ${PV})/"\
-e "s/git rev-parse HEAD.*$/echo $CONTAINERD_COMMIT)/"\
Makefile || die
fi
}
src_compile() {
local options=( $(usex seccomp "seccomp" '') )
local options=( $(usex seccomp "seccomp" "") )
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake BUILDTAGS="${options[@]}"
}
src_install() {
dobin bin/containerd* bin/ctr
dobin bin/containerd{-shim,-stress,} bin/ctr
}

@ -1,18 +1,18 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EGO_PN="github.com/docker/${PN}"
EGO_PN="github.com/containerd/${PN}"
inherit toolchain-funcs
if [[ ${PV} == *9999 ]]; then
inherit golang-vcs
else
MY_PV="${PV/_/-}"
MY_PV="${PV/_beta/-beta.}"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~ppc64"
KEYWORDS="~amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
fi
@ -24,17 +24,17 @@ SLOT="0"
IUSE="hardened +seccomp"
DEPEND=""
RDEPEND=">=app-emulation/runc-1.0.0_rc2
RDEPEND=">=app-emulation/runc-1.0.0_rc4
seccomp? ( sys-libs/libseccomp )"
S=${WORKDIR}/${P}/src/${EGO_PN}
src_compile() {
local options=( $(usex seccomp "seccomp") )
local options=( $(usex seccomp "seccomp" "") )
export GOPATH="${WORKDIR}/${P}" # ${PWD}/vendor
LDFLAGS=$(usex hardened '-extldflags -fno-PIC' '') emake GIT_COMMIT="$EGIT_COMMIT" BUILDTAGS="${options[@]}"
}
src_install() {
dobin bin/containerd* bin/ctr
dobin bin/containerd{-shim,-stress,} bin/ctr
}

@ -11,7 +11,7 @@ else
EGIT_COMMIT="810190ceaa507aa2727d7ae6f4790c76ec150bd2"
RUNC_COMMIT="810190" # Change this when you update the ebuild
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm ~ppc64"
KEYWORDS="amd64 ~arm ~ppc64"
inherit golang-vcs-snapshot
fi

@ -1,3 +1,4 @@
DIST docker-17.03.2.tar.gz 7783969 SHA256 171a65c44340c7b5710da6948b0afb9306b126b36c531ddab1a3653fd2980aaa SHA512 9fad6c1fa38f9a14208547ca2d3d6a11a565fe4cebd7b432ccad9e2a57ab4a005df20415d1c797f747a99d309b07d8ec97bb45c67644554622aafe0bf1893e04 WHIRLPOOL e34f04698e4a510ed26c9e8f87510878a940d77dc7558df40173a8ea452a2843327196dea3099844dc389a051e23294671b3bc835120af3ca1f4c9c758de44a3
DIST docker-17.06.2.tar.gz 9684548 SHA256 cfcb5646db32f52c4c394bc688fff405e585beab4ded64251958804a102a5269 SHA512 0a9b7b122aadef911141ec1f606759e892c0673821ddf5f3247a5b2d4476a20018add84a22c5aca32f0f91c1046e5be6d8d3f9ce65c3e4244896bf061b1eac6b WHIRLPOOL d0cc166319dbf735d67796df3836f79b24b9108327276ca0ba272398cdc70d6fae4649d9097b6dd29e62633ee636a216343e0d3ffd781cf63ef4c7a7c8cea259
DIST docker-17.09.0.tar.gz 10132253 SHA256 ef1d7f2c48824495e4109426ba85b75c09cc9463b9ba92703e25ffcbe14536ae SHA512 d96570825fb3dc24516b3b9666e935d5277674221452d8a23e6bcd1116f0bb3a2b8b315f47b98f52e681ab79309c099bb3b5c437af942539708ff3126c993638 WHIRLPOOL ca96166ff3573138713d3d45fcfc42cfed99a70e9db17a1763a9e157e6ce3f301fd01ab3c579aacfcbcab7639986e97bbbbc680fbc65edd76047aee079239b6b
DIST docker-17.10.0.tar.gz 10252333 SHA256 90f54b988d5241ee0472800e139e0628ae8a58dac168bb32fdb031383f3b46be SHA512 4ec5dae379ecda36b9af7066432507947142631efea471cd7f447677f9db1fe1522fe81ef68b28d3e63b5e759535a1c518ce1ef71f4de0e9dd32c957c682098c WHIRLPOOL 5e8278c663f0a0e793c2f439ce84e541371a45e605f78194a86ab3da4922400d8ef7101b5534ac35927381a658a88929c9a83a8ffee0f984488edb5a3c993eae

@ -20,7 +20,7 @@ else
DOCKER_GITCOMMIT="cec0b72"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm"
KEYWORDS="amd64 ~arm"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
inherit golang-vcs-snapshot
fi

@ -0,0 +1,315 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
EGO_PN="github.com/docker/docker-ce"
if [[ ${PV} = *9999* ]]; then
# Docker cannot be fetched via "go get", thanks to autogenerated code
EGIT_REPO_URI="https://${EGO_PN}.git"
EGIT_CHECKOUT_DIR="${WORKDIR}/${P}/src/${EGO_PN}"
inherit git-r3
else
inherit versionator
if [ "$(get_version_component_count)" = 4 ]; then
MY_PV="$(replace_version_separator 3 '-ce-')"
else
MY_PV="$PV-ce"
fi
DOCKER_GITCOMMIT="f4ffd25"
EGIT_COMMIT="v${MY_PV}"
SRC_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~arm"
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
inherit golang-vcs-snapshot
fi
inherit bash-completion-r1 golang-base linux-info systemd udev user
DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
HOMEPAGE="https://dockerproject.org"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="apparmor aufs btrfs +container-init +device-mapper hardened overlay pkcs11 seccomp"
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
CDEPEND="
>=dev-db/sqlite-3.7.9:3
device-mapper? (
>=sys-fs/lvm2-2.02.89[thin]
)
seccomp? ( >=sys-libs/libseccomp-2.2.1 )
apparmor? ( sys-libs/libapparmor )
"
DEPEND="
${CDEPEND}
dev-go/go-md2man
btrfs? (
>=sys-fs/btrfs-progs-3.16.1
)
"
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#optional-dependencies
RDEPEND="
${CDEPEND}
>=net-firewall/iptables-1.4
sys-process/procps
>=dev-vcs/git-1.7
>=app-arch/xz-utils-4.9
~app-emulation/containerd-0.2.9_p20170917
~app-emulation/docker-runc-1.0.0_rc4_p20170917[apparmor?,seccomp?]
>=app-emulation/docker-proxy-0.8.0_p20170917
container-init? ( >=sys-process/tini-0.16.1[static] )
"
RESTRICT="installsources strip"
S="${WORKDIR}/${P}/src/${EGO_PN}"
# see "contrib/check-config.sh" from upstream's sources
CONFIG_CHECK="
~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
~KEYS
~VETH ~BRIDGE ~BRIDGE_NETFILTER
~NF_NAT_IPV4 ~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
~NETFILTER_XT_MATCH_ADDRTYPE ~NETFILTER_XT_MATCH_CONNTRACK
~NF_NAT ~NF_NAT_NEEDED
~POSIX_MQUEUE
~USER_NS
~SECCOMP
~CGROUP_PIDS
~MEMCG_SWAP ~MEMCG_SWAP_ENABLED
~BLK_CGROUP ~BLK_DEV_THROTTLING ~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
~CGROUP_PERF
~CGROUP_HUGETLB
~NET_CLS_CGROUP
~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
~IP_VS ~IP_VS_PROTO_TCP ~IP_VS_PROTO_UDP ~IP_VS_NFCT ~IP_VS_RR
~VXLAN
~XFRM_ALGO ~XFRM_USER
~IPVLAN
~MACVLAN ~DUMMY
"
ERROR_KEYS="CONFIG_KEYS: is mandatory"
ERROR_MEMCG_SWAP="CONFIG_MEMCG_SWAP: is required if you wish to limit swap usage of containers"
ERROR_RESOURCE_COUNTERS="CONFIG_RESOURCE_COUNTERS: is optional for container statistics gathering"
ERROR_BLK_CGROUP="CONFIG_BLK_CGROUP: is optional for container statistics gathering"
ERROR_IOSCHED_CFQ="CONFIG_IOSCHED_CFQ: is optional for container statistics gathering"
ERROR_CGROUP_PERF="CONFIG_CGROUP_PERF: is optional for container statistics gathering"
ERROR_CFS_BANDWIDTH="CONFIG_CFS_BANDWIDTH: is optional for container statistics gathering"
ERROR_XFRM_ALGO="CONFIG_XFRM_ALGO: is optional for secure networks"
ERROR_XFRM_USER="CONFIG_XFRM_USER: is optional for secure networks"
pkg_setup() {
if kernel_is lt 3 10; then
ewarn ""
ewarn "Using Docker with kernels older than 3.10 is unstable and unsupported."
ewarn " - http://docs.docker.com/engine/installation/binaries/#check-kernel-dependencies"
fi
# for where these kernel versions come from, see:
# https://www.google.com/search?q=945b2b2d259d1a4364a2799e80e8ff32f8c6ee6f+site%3Akernel.org%2Fpub%2Flinux%2Fkernel+file%3AChangeLog*
if ! {
kernel_is ge 3 16 \
|| { kernel_is 3 15 && kernel_is ge 3 15 5; } \
|| { kernel_is 3 14 && kernel_is ge 3 14 12; } \
|| { kernel_is 3 12 && kernel_is ge 3 12 25; }
}; then
ewarn ""
ewarn "There is a serious Docker-related kernel panic that has been fixed in 3.16+"
ewarn " (and was backported to 3.15.5+, 3.14.12+, and 3.12.25+)"
ewarn ""
ewarn "See also https://github.com/docker/docker/issues/2960"
fi
if kernel_is le 3 18; then
CONFIG_CHECK+="
~RESOURCE_COUNTERS
"
fi
if kernel_is le 3 13; then
CONFIG_CHECK+="
~NETPRIO_CGROUP
"
else
CONFIG_CHECK+="
~CGROUP_NET_PRIO
"
fi
if kernel_is lt 4 5; then
CONFIG_CHECK+="
~MEMCG_KMEM
"
ERROR_MEMCG_KMEM="CONFIG_MEMCG_KMEM: is optional"
fi
if kernel_is lt 4 7; then
CONFIG_CHECK+="
~DEVPTS_MULTIPLE_INSTANCES
"
fi
if use aufs; then
CONFIG_CHECK+="
~AUFS_FS
~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
"
ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs-sources are used instead of aufs4/aufs3"
fi
if use btrfs; then
CONFIG_CHECK+="
~BTRFS_FS
~BTRFS_FS_POSIX_ACL
"
fi
if use device-mapper; then
CONFIG_CHECK+="
~BLK_DEV_DM ~DM_THIN_PROVISIONING ~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
"
fi
if use overlay; then
CONFIG_CHECK+="
~OVERLAY_FS ~EXT4_FS_SECURITY ~EXT4_FS_POSIX_ACL
"
fi
linux-info_pkg_setup
# create docker group for the code checking for it in /etc/group
enewgroup docker
}
src_compile() {
export GOPATH="${WORKDIR}/${P}"
# setup CFLAGS and LDFLAGS for separate build target
# see https://github.com/tianon/docker-overlay/pull/10
export CGO_CFLAGS="-I${ROOT}/usr/include"
export CGO_LDFLAGS="-L${ROOT}/usr/$(get_libdir)"
# if we're building from a tarball, we need the GITCOMMIT value
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
# fake golang layout
ln -s docker-ce/components/engine ../docker || die
ln -s docker-ce/components/cli ../cli || die
# let's set up some optional features :)
export DOCKER_BUILDTAGS=''
for gd in aufs btrfs device-mapper overlay; do
if ! use $gd; then
DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
fi
done
for tag in apparmor pkcs11 seccomp; do
if use $tag; then
DOCKER_BUILDTAGS+=" $tag"
fi
done
pushd components/engine || die
if use hardened; then
sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
sed "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
-i hack/make/dynbinary-daemon || die
grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
fi
# build daemon
./hack/make.sh dynbinary || die 'dynbinary failed'
popd || die # components/engine
pushd components/cli || die
# build cli
emake \
LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
VERSION="$(cat ../../VERSION)" \
GITCOMMIT="${DOCKER_GITCOMMIT}" \
DISABLE_WARN_OUTSIDE_CONTAINER=1 \
dynbinary || die
# build man pages
go build -o gen-manpages github.com/docker/cli/man || die
./gen-manpages --root . --target ./man/man1 || die
./man/md2man-all.sh -q || die
rm gen-manpages || die
# see "components/cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
popd || die # components/cli
}
src_install() {
dosym containerd /usr/bin/docker-containerd
dosym containerd-shim /usr/bin/docker-containerd-shim
dosym runc /usr/bin/docker-runc
use container-init && dosym tini /usr/bin/docker-init
pushd components/engine || die
newbin "$(readlink -f bundles/latest/dynbinary-daemon/dockerd)" dockerd
newinitd contrib/init/openrc/docker.initd docker
newconfd contrib/init/openrc/docker.confd docker
systemd_dounit contrib/init/systemd/docker.{service,socket}
udev_dorules contrib/udev/*.rules
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
dodoc -r docs/*
insinto /usr/share/vim/vimfiles
doins -r contrib/syntax/vim/ftdetect
doins -r contrib/syntax/vim/syntax
# note: intentionally not using "doins" so that we preserve +x bits
dodir /usr/share/${PN}/contrib
cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
popd || die # components/engine
pushd components/cli || die
newbin build/docker-* docker
doman man/man*/*
dobashcomp contrib/completion/bash/*
insinto /usr/share/zsh/site-functions
doins contrib/completion/zsh/_*
popd || die # components/cli
}
pkg_postinst() {
udev_reload
elog
elog "To use Docker, the Docker daemon must be running as root. To automatically"
elog "start the Docker daemon at boot, add Docker to the default runlevel:"
elog " rc-update add docker default"
elog "Similarly for systemd:"
elog " systemctl enable docker.service"
elog
elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
elog " usermod -aG docker youruser"
elog
}

@ -7,10 +7,9 @@ diff --git a/Makefile.conf.in b/Makefile.conf.in
index cd4b34d..cc29931 100644
--- a/Makefile.conf.in
+++ b/Makefile.conf.in
@@ -55,2 +55,4 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
@@ -55,2 +55,3 @@ ALL_LDFLAGS:=@DOSEMU_LDFLAGS@ ${LDFLAGS}
DOSBIN_LDFLAGS:=@DOSBIN_LDFLAGS@
+# flags to "link" 16-bit .com files
+IA16_LDFLAGS:=-Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s @IA16_LDFLAGS_EXTRA@
+IA16_LDFLAGS_EXTRA:=@IA16_LDFLAGS_EXTRA@
LIBS:=@LIBS@
diff --git a/configure.ac b/configure.ac
index 0f06f57..a86208e 100644
@ -27,12 +26,12 @@ index 3139b85..c5c4607 100644
@@ -56,3 +56,3 @@ dosbin: $(COM1) $(COM2) $(SYS)
$(D)/%.sys: %.o
- $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
+ $(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
chmod -x $@
@@ -60,3 +60,3 @@ $(D)/%.sys: %.o
$(D)/%.com: %.o
- $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
+ $(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
chmod -x $@
diff --git a/src/plugin/commands/Makefile b/src/plugin/commands/Makefile
index 48f49d5..d3a5667 100644
@ -41,5 +40,5 @@ index 48f49d5..d3a5667 100644
@@ -57,3 +57,3 @@ $(STUBFULL): $(D)/generic.com ./mkcomstub
$(D)/%.com: %.o
- $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s -o $@ $<
+ $(LD) $(ALL_LDFLAGS) $(IA16_LDFLAGS) -o $@ $<
+ $(LD) $(ALL_LDFLAGS) -Wl,-Ttext,0x100,-e,_start16,--oformat,binary -nostdlib -s $(IA16_LDFLAGS_EXTRA) -o $@ $<
chmod -x $@

@ -13,7 +13,7 @@ SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="~amd64 x86"
IUSE="alsa"
DEPEND="dev-libs/atk

@ -15,6 +15,7 @@ KEYWORDS="alpha amd64 ppc sparc x86 ~x64-macos ~x86-macos"
IUSE="bzip2 custom-cflags +suid"
RDEPEND="bzip2? ( app-arch/bzip2 )
net-libs/libnsl:0
sys-libs/zlib"
DEPEND="${RDEPEND}"

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@ -15,6 +15,7 @@ KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x64-macos ~x86-macos"
IUSE="bzip2 custom-cflags +suid"
RDEPEND="bzip2? ( app-arch/bzip2 )
net-libs/libnsl:0=
sys-libs/zlib"
DEPEND="${RDEPEND}"

@ -1 +1,2 @@
DIST kompose-1.3.0.tar.gz 5166961 SHA256 c047708123b769d23cd8e68063b01b6229c5e76338ec294ba0e62a4b73ef46d8 SHA512 394cc35022d6c9f3e70cc8ff567f403fad84b54c71a0c7da856313162bf41223d7dff59abff372f7726404dec04283deb5e0c0960f966471f86607140eddb4d4 WHIRLPOOL e0300c3380e058351f6029ca158c1b8ba5a5c91fd5583dbad84dea7faff2f8f472fcb50eda9673d58c1711c7607d4abb2353fd957c18f4ffa4a5f90413a2c704
DIST kompose-1.4.0.tar.gz 5183071 SHA256 29ea870886bac78850a6b7a864ece63b3f67ed769358193d5ea12c8b0d197f82 SHA512 49d18e0c82d6195752e786d71ec67a388e6c64244dbc0376a7a41b1d31791a833d7a392c19487129d4047d102f1ec423d1531b0626003958c3375f2a0bf22686 WHIRLPOOL 81bbe1ac7f9834dd62d15c6e21acbcf6aa0d057b25906224d954c4db1cb0e3cd2313f5d1c3c08673c70bdbd9a97d9a5c6c8bedb9fbfd717a91b68bd56639f762

@ -0,0 +1,30 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit golang-build golang-vcs-snapshot
EGO_PN="github.com/kubernetes/kompose"
EGIT_COMMIT="v${PV}"
COMPOSE_COMMIT="c7964e7"
ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64"
DESCRIPTION="Tool to move from docker-compose to Kubernetes"
HOMEPAGE="https://github.com/kubernetes/kompose https://kompose.io"
SRC_URI="${ARCHIVE_URI}"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="hardened"
RESTRICT="test"
src_compile() {
export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
GOPATH="${S}" go build -v -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=${COMPOSE_COMMIT}" -o bin/kompose src/${EGO_PN}/main.go || die
}
src_install() {
dobin bin/*
dodoc -r src/${EGO_PN}/{docs,{README,RELEASE,ROADMAP,CHANGELOG,CONTRIBUTING}.md}
}

@ -32,7 +32,7 @@ DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest
HOMEPAGE="https://www.xenproject.org"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"

@ -6,6 +6,7 @@ DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da
DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62
DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808
DIST xen-4.8.2-upstream-patches-1.tar.xz 29608 SHA256 7b1833eede01b7c8ae607614afd35c66ff009518cca972e2653d5828fb632aa6 SHA512 3ea002c37a0e2189f1846548a4aa607c42041cf093ec9a57509692dabe5c0b718151d183f5714443403d5cf8d4ab010a8f3893207bebf81cb85793282c30b457 WHIRLPOOL 0659a56e419918cb091ff0d87bf69a03464d2a0a0b4c6bad87521e83c40b48e210582d5fab2d9686b22b4ba839041be6e8aa39ab306a86ce18461d99c36be439
DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
DIST xen-gentoo-patches-10.tar.xz 27876 SHA256 aa91759d25611afa2e851e190c8445b18e4262037fc06da886f2fa4a4c500b94 SHA512 2033f4cb671971c73841cfaa7eb46623c37778c5746b47302eee252c4af287ccbeb8d1884ffdf32cd97a38cd7785257d56f13ef20d4c03dc0fb1cb196dc04ece WHIRLPOOL e02cc3c6ffd701b2f04df111ab33b18f7fa09e292b94a34af4d806509a564b896a7b677ab64654523ee992f363d59bf6bd4c2cbeaea7330f368cf657bfa2d538
DIST xen-gentoo-patches-9.tar.xz 27456 SHA256 67c410d12ef4628a8c0a931e5868b425f2eb4b2f0e307304a75384cbe509734b SHA512 9a797be9dd2392c34b3f6561c2274e116b4f5b114f4520dbbd0b51818c774479ceabb45aa916f93c1a2bc49787f4ca6e6c83bc743baa6bdeef91d77276b20f36 WHIRLPOOL c41cde532726bb55acd05d558b35d575b229d2ee64eba7438f7b196df313f0e44154148c1e47bf6e8c810667b3b237bcfa410371b4bb6f097b981f6b2637ead3

@ -13,12 +13,12 @@ MAJOR_V="$(get_version_component_range 1-2)"
if [[ $PV == *9999 ]]; then
inherit git-r3
KEYWORDS=""
KEYWORDS="x86"
REPO="xen.git"
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
KEYWORDS="~amd64 ~arm ~arm64 ~x86"
KEYWORDS="~amd64 ~arm ~arm64 x86"
UPSTREAM_VER=1
SECURITY_VER=
# xen-tools's gentoo patches tarball

@ -101,6 +101,7 @@ DEPEND="${COMMON_DEPEND}
dev-lang/perl
app-misc/pax-utils
doc? (
app-text/ghostscript-gpl
app-text/pandoc
dev-python/markdown[${PYTHON_USEDEP}]
dev-texlive/texlive-latexextra

@ -0,0 +1,467 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='ncurses,xml,threads'
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs versionator
MY_PV=${PV/_/-}
MAJOR_V="$(get_version_component_range 1-2)"
if [[ $PV == *9999 ]]; then
inherit git-r3
KEYWORDS=""
REPO="xen.git"
EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}"
else
KEYWORDS="amd64 ~arm ~arm64 x86"
UPSTREAM_VER=2
SECURITY_VER=
# xen-tools's gentoo patches tarball
GENTOO_VER=10
# xen-tools's gentoo patches version which apply to this specific ebuild
GENTOO_GPV=0
# xen-tools ovmf's patches
OVMF_VER=2
SEABIOS_VER=1.10.0
# OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
OVMF_PV=20151110
[[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz"
[[ -n ${SECURITY_VER} ]] && \
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
[[ -n ${OVMF_VER} ]] && \
OVMF_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-ovmf-patches-${OVMF_VER}.tar.xz"
SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/xen-${MY_PV}.tar.gz
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
https://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
${OVMF_PATCHSET_URI} )
${UPSTREAM_PATCHSET_URI}
${SECURITY_PATCHSET_URI}
${GENTOO_PATCHSET_URI}"
S="${WORKDIR}/xen-${MY_PV}"
fi
DESCRIPTION="Xen tools including QEMU and xl"
HOMEPAGE="https://www.xenproject.org"
DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2"
SLOT="0/${MAJOR_V}"
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
# >=dev-lang/ocaml-4 stable
# Masked in profiles/eapi-5-files instead
IUSE="api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
pygrub? ( python )
ovmf? ( hvm )
^^ ( qemu system-qemu )"
COMMON_DEPEND="
sys-apps/pciutils
dev-libs/lzo:2
dev-libs/glib:2
dev-libs/yajl
dev-libs/libaio
dev-libs/libgcrypt:0
sys-libs/zlib
${PYTHON_DEPS}
"
DEPEND="${COMMON_DEPEND}
dev-python/lxml[${PYTHON_USEDEP}]
x86? ( sys-devel/dev86
sys-power/iasl )
pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
api? ( dev-libs/libxml2
net-misc/curl )
ovmf? (
!arm? ( !arm64? ( dev-lang/nasm ) )
$(python_gen_impl_dep sqlite)
)
!amd64? ( >=sys-apps/dtc-1.4.0 )
amd64? ( sys-devel/bin86
system-seabios? ( sys-firmware/seabios )
sys-firmware/ipxe
sys-devel/dev86
sys-power/iasl )
dev-lang/perl
app-misc/pax-utils
doc? (
app-text/ghostscript-gpl
app-text/pandoc
dev-python/markdown[${PYTHON_USEDEP}]
dev-texlive/texlive-latexextra
media-gfx/transfig
)
hvm? ( x11-proto/xproto
!net-libs/libiscsi )
qemu? (
app-arch/snappy:=
x11-libs/pixman
sdl? ( media-libs/libsdl[X] )
)
system-qemu? ( app-emulation/qemu[xen] )
ocaml? ( dev-ml/findlib
>=dev-lang/ocaml-4 )"
RDEPEND="${COMMON_DEPEND}
sys-apps/iproute2[-minimal]
net-misc/bridge-utils
screen? (
app-misc/screen
app-admin/logrotate
)"
# hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032
QA_WX_LOAD="
usr/libexec/xen/boot/hvmloader
usr/share/qemu-xen/qemu/s390-ccw.img
usr/share/qemu-xen/qemu/u-boot.e500
"
QA_PREBUILT="
usr/libexec/xen/bin/ivshmem-client
usr/libexec/xen/bin/ivshmem-server
usr/libexec/xen/bin/qemu-img
usr/libexec/xen/bin/qemu-io
usr/libexec/xen/bin/qemu-nbd
usr/libexec/xen/bin/qemu-system-i386
usr/libexec/xen/bin/virtfs-proxy-helper
usr/libexec/xen/libexec/xen-bridge-helper
usr/share/qemu-xen/qemu/s390-ccw.img
usr/share/qemu-xen/qemu/u-boot.e500
"
RESTRICT="test"
pkg_setup() {
python_setup
export "CONFIG_LOMOUNT=y"
#bug 522642, disable compile tools/tests
export "CONFIG_TESTS=n"
if [[ -z ${XEN_TARGET_ARCH} ]] ; then
if use x86 && use amd64; then
die "Confusion! Both x86 and amd64 are set in your use flags!"
elif use x86; then
export XEN_TARGET_ARCH="x86_32"
elif use amd64 ; then
export XEN_TARGET_ARCH="x86_64"
elif use arm; then
export XEN_TARGET_ARCH="arm32"
elif use arm64; then
export XEN_TARGET_ARCH="arm64"
else
die "Unsupported architecture!"
fi
fi
}
src_prepare() {
local i
# Upstream's patchset
if [[ -n ${UPSTREAM_VER} ]]; then
einfo "Try to apply Xen Upstream patch set"
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
EPATCH_OPTS="-p1" \
epatch "${WORKDIR}"/patches-upstream
fi
# Security patchset
if [[ -n ${SECURITY_VER} ]]; then
einfo "Try to apply Xen Security patch set"
# apply main xen patches
# Two parallel systems, both work side by side
# Over time they may concdense into one. This will suffice for now
EPATCH_SUFFIX="patch"
EPATCH_FORCE="yes"
source "${WORKDIR}"/patches-security/${PV}.conf || die
for i in ${XEN_SECURITY_MAIN}; do
epatch "${WORKDIR}"/patches-security/xen/$i
done
# apply qemu-xen/upstream patches
pushd "${S}"/tools/qemu-xen/ > /dev/null
for i in ${XEN_SECURITY_QEMUU}; do
epatch "${WORKDIR}"/patches-security/qemuu/$i
done
popd > /dev/null
# apply qemu-traditional patches
pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
for i in ${XEN_SECURITY_QEMUT}; do
epatch "${WORKDIR}"/patches-security/qemut/$i
done
popd > /dev/null
fi
# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
pushd tools/firmware/ > /dev/null
ln -s seabios-dir-remote seabios-dir || die
popd > /dev/null
# Gentoo's patchset
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
einfo "Try to apply Gentoo specific patch set"
source "${FILESDIR}"/gentoo-patches.conf || die
_gpv=_gpv_${PN/-/_}_${PV//./}_${GENTOO_GPV}
for i in ${!_gpv}; do
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-gentoo/$i
done
fi
# Ovmf's patchset
if use ovmf; then
if [[ -n ${OVMF_VER} ]];then
einfo "Try to apply Ovmf patch set"
pushd "${WORKDIR}"/ovmf-*/ > /dev/null
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
EPATCH_OPTS="-p1" \
epatch "${WORKDIR}"/patches-ovmf
popd > /dev/null
fi
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
fi
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
# Fix building with gcc 7, Bug #634338
# https://xenbits.xen.org/gitweb/?p=xen.git;a=commit;h=f49fa658b53580cf2ad354d2bf1796766cc11222
sed -e 's/name\[60\]/name\[100\]/g' \
-i tools/misc/xenlockprof.c || die
# Fix texi2html build error with new texi2html, qemu.doc.html
sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
use api || sed -e "/SUBDIRS-\$(LIBXENAPI_BINDINGS) += libxen/d" -i tools/Makefile || die
sed -e 's:$(MAKE) PYTHON=$(PYTHON) subdirs-$@:LC_ALL=C "$(MAKE)" PYTHON=$(PYTHON) subdirs-$@:' \
-i tools/firmware/Makefile || die
# Drop .config, fixes to gcc-4.6
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
# try and remove all the default cflags
find "${S}" \( -name Makefile -o -name Rules.mk -o -name Config.mk \) \
-exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} + || die "failed to re-set custom-cflags"
else
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
unset CPPFLAGS
fi
if ! use pygrub; then
sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
fi
if ! use python; then
sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
fi
if ! use hvm; then
sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
# Bug 351648
elif ! use x86 && ! has x86 $(get_all_abis); then
mkdir -p "${WORKDIR}"/extra-headers/gnu || die
touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
export CPATH="${WORKDIR}"/extra-headers
fi
if use qemu; then
if use sdl; then
sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
tools/Makefile || die
else
sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
tools/qemu-xen-traditional/xen-setup || die
sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
tools/Makefile || die
fi
else
# Don't bother with qemu, only needed for fully virtualised guests
sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
fi
# Reset bash completion dir; Bug 472438
sed -e "s:^BASH_COMPLETION_DIR ?= \$(CONFIG_DIR)/bash_completion.d:BASH_COMPLETION_DIR ?= $(get_bashcompdir):" \
-i Config.mk || die
sed -i -e "/bash-completion/s/xl\.sh/xl/g" tools/libxl/Makefile || die
# xencommons, Bug #492332, sed lighter weight than patching
sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-i tools/hotplug/Linux/init.d/xencommons.in || die
# fix bashishm
sed -e '/Usage/s/\$//g' \
-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
# respect multilib, usr/lib/libcacard.so.0.0.0
sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-i tools/qemu-xen/configure || die
#bug 518136, don't build 32bit exactuable for nomultilib profile
if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
fi
# uncomment lines in xl.conf
sed -e 's:^#autoballoon=:autoballoon=:' \
-e 's:^#lockfile=:lockfile=:' \
-e 's:^#vif.default.script=:vif.default.script=:' \
-i tools/examples/xl.conf || die
default
}
src_configure() {
local myconf="--prefix=${PREFIX}/usr \
--libdir=${PREFIX}/usr/$(get_libdir) \
--libexecdir=${PREFIX}/usr/libexec \
--localstatedir=${EPREFIX}/var \
--disable-werror \
--disable-xen \
--enable-tools \
--enable-docs \
$(use_enable pam) \
$(use_enable api xenapi) \
$(use_enable ovmf) \
$(use_enable ocaml ocamltools) \
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
"
use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
use system-qemu && myconf+=" --with-system-qemu=/usr/bin/qemu-system-x86_64"
use amd64 && myconf+=" $(use_enable qemu-traditional)"
econf ${myconf}
}
src_compile() {
export VARTEXFONTS="${T}/fonts"
local myopt
use debug && myopt="${myopt} debug=y"
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
if use doc; then
emake -C docs build
else
emake -C docs man-pages
fi
}
src_install() {
# Override auto-detection in the build system, bug #382573
export INITD_DIR=/tmp/init.d
export CONFIG_LEAF_DIR=../tmp/default
# Let the build system compile installed Python modules.
local PYTHONDONTWRITEBYTECODE
export PYTHONDONTWRITEBYTECODE
emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
XEN_PYTHON_NATIVE_INSTALL=y install-tools
# Created at runtime
rm -rv "${ED%/}/var/run" || die
# Fix the remaining Python shebangs.
python_fix_shebang "${D}"
# Remove RedHat-specific stuff
rm -rf "${D}"tmp || die
emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
use doc && dodoc -r docs/{pdf,txt}
dodoc ${DOCS[@]}
newconfd "${FILESDIR}"/xendomains.confd xendomains
newconfd "${FILESDIR}"/xenstored.confd xenstored
newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
newinitd "${FILESDIR}"/xencommons.initd xencommons
newconfd "${FILESDIR}"/xencommons.confd xencommons
newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
if use screen; then
cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
keepdir /var/log/xen-consoles
fi
# For -static-libs wrt Bug 384355
if ! use static-libs; then
rm -f "${D}"usr/$(get_libdir)/*.a "${D}"usr/$(get_libdir)/ocaml/*/*.a
fi
# for xendomains
keepdir /etc/xen/auto
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
}
pkg_postinst() {
elog "Official Xen Guide and the offical wiki page:"
elog "https://wiki.gentoo.org/wiki/Xen"
elog "https://wiki.xen.org/wiki/Main_Page"
elog ""
elog "Recommended to utilise the xencommons script to config sytem At boot"
elog "Add by use of rc-update on completion of the install"
if ! use hvm; then
echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
elog "support enable the hvm use flag."
elog "An x86 or amd64 system is required to build HVM support."
fi
if use qemu; then
elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
elog "build of qemu. This allows for app-emulation/qemu to be emerged concurrently"
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise"
elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
fi
}

@ -3,5 +3,6 @@ DIST xen-4.7.2.tar.gz 20714281 SHA256 61494a56d9251e2108080f95b0dc8e3d175f1ba4da
DIST xen-4.7.3.tar.gz 20722625 SHA256 5b5385b476e59e4cf31ecc6dd605df38814b83432b8e8d917f18c8edfdfb708f SHA512 df596bef7f0f0e7f35246fb025913721dae5aa91da27f1b47a49256e9faa8f7dcb80e8c4679345c19614093c02059b6ced54fc51e6900a372b0e76b4ad827126 WHIRLPOOL 9e88db149e216651711cd56830fba33d587de60d57d53fd3ab3db231319f74e4e88222bf1b2bb9b20fea68739bccd4b26304c73a0ae25aad6dbbac64681e3a62
DIST xen-4.8.2-upstream-patches-0.tar.xz 7540 SHA256 d4bd4ce76097c49ebbad67a64814b9b41af0528b390ade15814cf0fb144e5e77 SHA512 34118ac114773cfc01a464de2a93b14905d3fb5edd62ae093f6cb40758f89c7fdc8449d0b7e9bfbaaee812b6f32b0c21860adeebb609376a22ce231e405b0837 WHIRLPOOL 0ff8c2fe3c349e6dc85e98644a813dd590c42bc78c6bbf98cdf77ed516e73fe5ca72a44935eae77f6ff9dcba8fef5d24c181d24b63b15bc470e7ed59098d5808
DIST xen-4.8.2-upstream-patches-1.tar.xz 29608 SHA256 7b1833eede01b7c8ae607614afd35c66ff009518cca972e2653d5828fb632aa6 SHA512 3ea002c37a0e2189f1846548a4aa607c42041cf093ec9a57509692dabe5c0b718151d183f5714443403d5cf8d4ab010a8f3893207bebf81cb85793282c30b457 WHIRLPOOL 0659a56e419918cb091ff0d87bf69a03464d2a0a0b4c6bad87521e83c40b48e210582d5fab2d9686b22b4ba839041be6e8aa39ab306a86ce18461d99c36be439
DIST xen-4.8.2-upstream-patches-2.tar.xz 38852 SHA256 12c1f1fd2adba22b923d2ee944e6e66794701393966f9e9e2079961e202f6d64 SHA512 536823eabf03e92585a8c5cde90ce502672dd1ec080b28b39411d6a778b899436a57bfb633f11c94d48d2f963848b7771e469f5ea53e84b580976f631f69cc5d WHIRLPOOL 5baf92709da895eccbe8b154c1d1cdf4c2f0faf5166ef2e4bbf32ca6899d8b88aa67ccd765a15a2f9a6d5200d4a1eb832775891d41c00a950855e5d1d4358e35
DIST xen-4.8.2.tar.gz 22522336 SHA256 cb1cc2f0985e3d8651215e5d24c1fcc3036994fa7cc495a5091a2c85ece2aff9 SHA512 7805531f73d23ecfff3439770e62d387f4254a444875670d53a0a739323e5d4d8f8fcc478f8936ee1ae8aff3e0229549e47c01c606365a8ce060dd5c503e87da WHIRLPOOL 8e54e79219f89640162673da471a02ee8a39bb884e2376a79a09226462903185b49a771fef51ceca54c4dd42a110ee1214db6dbf94235a156a17d6c597634c3d
DIST xen-security-patches-26.tar.xz 8276 SHA256 2a21ec429f8952875f7d95f24697600e606326f1a16d5622cee73628cd0401c1 SHA512 f54fc7e720a70258263d29cc482b8269386818ad75792de87b0d0357fdb6af81f2102e5983100db47563435fa28f875a84e8c6d73d44797aadaf0c469d9fb0ec WHIRLPOOL b31667d8415dc1fbcd60160fdbc2fe0ad4de9bd2171fda875f5585b8d7821c4c035b029dbf382abacf4b6be745aeeb708f419fdcabdd86f78ff1c13703802e3f

@ -0,0 +1,184 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
inherit eutils flag-o-matic mount-boot multilib python-any-r1 toolchain-funcs
MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}
if [[ $PV == *9999 ]]; then
inherit git-r3
KEYWORDS=""
EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
SRC_URI=""
else
KEYWORDS="amd64 ~arm -x86"
UPSTREAM_VER=2
SECURITY_VER=
GENTOO_VER=
[[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
[[ -n ${SECURITY_VER} ]] && \
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.xz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
SRC_URI="https://downloads.xenproject.org/release/xen/${MY_PV}/${MY_P}.tar.gz
${UPSTREAM_PATCHSET_URI}
${SECURITY_PATCHSET_URI}
${GENTOO_PATCHSET_URI}"
fi
DESCRIPTION="The Xen virtual machine monitor"
HOMEPAGE="http://xen.org/"
HOMEPAGE="https://www.xenproject.org"
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask"
DEPEND="${PYTHON_DEPS}
efi? ( >=sys-devel/binutils-2.22[multitarget] )
!efi? ( >=sys-devel/binutils-2.22 )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"
# no tests are available for the hypervisor
# prevent the silliness of /usr/lib/debug/usr/lib/debug files
# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
RESTRICT="test splitdebug strip"
# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"
REQUIRED_USE="arm? ( debug )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
python-any-r1_pkg_setup
if [[ -z ${XEN_TARGET_ARCH} ]]; then
if use amd64; then
export XEN_TARGET_ARCH="x86_64"
elif use arm; then
export XEN_TARGET_ARCH="arm32"
elif use arm64; then
export XEN_TARGET_ARCH="arm64"
else
die "Unsupported architecture!"
fi
fi
if use flask ; then
export "XSM_ENABLE=y"
export "FLASK_ENABLE=y"
fi
}
src_prepare() {
# Upstream's patchset
if [[ -n ${UPSTREAM_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
EPATCH_OPTS="-p1" \
epatch "${WORKDIR}"/patches-upstream
fi
# Security patchset
if [[ -n ${SECURITY_VER} ]]; then
einfo "Try to apply Xen Security patch set"
# apply main xen patches
# Two parallel systems, both work side by side
# Over time they may concdense into one. This will suffice for now
EPATCH_SUFFIX="patch"
EPATCH_FORCE="yes"
source "${WORKDIR}"/patches-security/${PV}.conf
local i
for i in ${XEN_SECURITY_MAIN}; do
epatch "${WORKDIR}"/patches-security/xen/$i
done
fi
# Gentoo's patchset
if [[ -n ${GENTOO_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-gentoo
fi
epatch "${FILESDIR}"/${PN}-4.6-efi.patch
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
if use efi; then
export EFI_VENDOR="gentoo"
export EFI_MOUNTPOINT="boot"
fi
# if the user *really* wants to use their own custom-cflags, let them
if use custom-cflags; then
einfo "User wants their own CFLAGS - removing defaults"
# try and remove all the default custom-cflags
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} \; || die "failed to re-set custom-cflags"
fi
default
}
src_configure() {
use arm && myopt="${myopt} CONFIG_EARLY_PRINTK=sun7i"
use debug && myopt="${myopt} debug=y"
if use custom-cflags; then
filter-flags -fPIE -fstack-protector
replace-flags -O3 -O2
else
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
fi
}
src_compile() {
# Send raw LDFLAGS so that --as-needed works
emake V=1 CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
}
src_install() {
local myopt
use debug && myopt="${myopt} debug=y"
# The 'make install' doesn't 'mkdir -p' the subdirs
if use efi; then
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
fi
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
# make install likes to throw in some extra EFI bits if it built
use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
}
pkg_postinst() {
elog "Official Xen Guide:"
elog " https://wiki.gentoo.org/wiki/Xen"
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
elog "You can optionally block the installation of /boot/xen-syms by an entry"
elog "in folder /etc/portage/env using the portage's feature INSTALL_MASK"
elog "e.g. echo ${msg} > /etc/portage/env/xen.conf"
}

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge.jp/${PN}/37536/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="canna-2ch emacs static-libs"
RDEPEND="canna-2ch? ( app-dicts/canna-2ch )

@ -0,0 +1,48 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit multilib toolchain-funcs
DESCRIPTION="Entropy Gathering And Distribution System"
HOMEPAGE="http://www.securesoftware.com/download_egads.htm"
SRC_URI="http://www.securesoftware.com/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
EGADS_DATADIR=/var/run/egads
src_prepare() {
default
sed -i \
-e '/^BINDIR/d' \
-e '/^LIBDIR/d' \
-e '/^INCLUDEDIR/d' \
"${S}"/Makefile.in || die "Failed to fix Makefile.in"
tc-export CC AR RANLIB
}
src_configure() {
econf \
--with-egads-datadir="${EGADS_DATADIR}" \
--with-bindir=/usr/sbin
}
src_compile() {
emake LIBDIR="/usr/$(get_libdir)"
}
src_install() {
keepdir ${EGADS_DATADIR}
fperms +t ${EGADS_DATADIR}
# NOT parallel safe, and no DESTDIR support
emake -j1 install \
BINDIR="${D}"/usr/sbin \
LIBDIR="${D}"/usr/$(get_libdir) \
INCLUDEDIR="${D}"/usr/include
dodoc README* doc/*.txt doc/*.html
}

@ -1,10 +0,0 @@
--- gourmet.desktop.in
+++ gourmet.desktop.in
@@ -4,6 +4,6 @@ _Comment=Organize recipes, create shopping lists, calculate nutritional informat
Exec=gourmet
Terminal=false
Type=Application
-Categories=GNOME;Application;Utility;
+Categories=GNOME;Utility;
StartupNotify=true
Icon=gourmet

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@ -11,7 +11,7 @@ DESCRIPTION="Graphical LCD Driver"
HOMEPAGE="https://projects.vdr-developer.org/projects/graphlcd-base"
SRC_URI="mirror://vdr-developerorg/${VERSION}/${P}.tgz"
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="~amd64 ~ppc x86"
SLOT="0"
LICENSE="GPL-2"
IUSE="g15"

@ -1,54 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils prefix toolchain-funcs
DESCRIPTION="pal command-line calendar program"
HOMEPAGE="http://palcal.sourceforge.net/"
SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="nls"
RDEPEND="
>=dev-libs/glib-2.0
nls? ( virtual/libintl )
sys-libs/ncurses
sys-libs/readline
"
DEPEND="
${RDEPEND}
nls? ( sys-devel/gettext )
virtual/pkgconfig
"
S=${WORKDIR}/${P}/src
src_prepare() {
epatch "${FILESDIR}"/${PV}-strip.patch
epatch "${FILESDIR}"/${PV}-ldflags.patch
epatch "${FILESDIR}"/${P}-pkg_config.patch
epatch "${FILESDIR}"/${P}-prefix.patch
eprefixify Makefile.defs input.c Makefile
sed -i -e 's/ -o root//g' {.,convert}/Makefile || die
tc-export PKG_CONFIG
}
src_compile() {
emake CC="$(tc-getCC)" OPT="${CFLAGS}" LDOPT="${LDFLAGS}"
}
src_install() {
emake DESTDIR="${D}" install-man install-bin install-share
if use nls; then
emake DESTDIR="${D}" install-mo
fi
dodoc "${WORKDIR}"/${P}/{ChangeLog,doc/example.css}
}

@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/palcal/${P}.tgz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
KEYWORDS="amd64 ~hppa ppc x86 ~amd64-linux ~x86-linux ~x86-macos"
IUSE="nls"
RDEPEND="

@ -1,34 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
inherit flag-o-matic eutils toolchain-funcs
DESCRIPTION="Scans for and fixes broken or messy symlinks"
HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
LICENSE="symlinks"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="static"
src_prepare() {
# could be useful if being used to repair
# symlinks that are preventing shared libraries from
# functioning.
use static && append-flags -static
append-lfs-flags
sed 's:-O2::g' -i Makefile || die
}
src_compile() {
emake CC=$(tc-getCC) CFLAGS="${CPPFLAGS} ${CFLAGS} ${LDFLAGS}"
}
src_install() {
dobin symlinks
doman symlinks.8
dodoc symlinks.lsm
}

@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
LICENSE="symlinks"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
IUSE="static"
DOCS=( symlinks.lsm )

@ -1,27 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
inherit flag-o-matic eutils toolchain-funcs
DESCRIPTION="Scans for and fixes broken or messy symlinks"
HOMEPAGE="http://www.ibiblio.org/pub/linux/utils/file/"
SRC_URI="http://www.ibiblio.org/pub/linux/utils/file/${P}.tar.gz"
LICENSE="symlinks"
SLOT="0"
KEYWORDS="alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
IUSE="static"
src_compile() {
# could be useful if being used to repair
# symlinks that are preventing shared libraries from
# functioning.
use static && append-flags -static
emake CC=$(tc-getCC) CFLAGS="${CFLAGS} ${LDFLAGS}" || die
}
src_install() {
dobin symlinks || die
doman symlinks.8 || die
dodoc symlinks.lsm || die
}

@ -1,4 +1,4 @@
# Copyright 1999-2016 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="5"
@ -19,6 +19,7 @@ RDEPEND="|| (
~app-mobilephone/kannel-${PV}[sqlite]
~app-mobilephone/kannel-${PV}[postgres]
)
net-libs/libnsl:0=
ssl? ( dev-libs/openssl:0 )"
DEPEND="${RDEPEND}
doc? ( media-gfx/transfig

@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha ~amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-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 ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="sys-apps/gentoo-functions"

@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="nls static"
RDEPEND="dev-libs/iniparser:0"

@ -1 +1,2 @@
DIST asciidoc-8.6.10.tar.gz 577208 SHA256 9e52f8578d891beaef25730a92a6e723596ddbd07bfe0d2a56486fcf63a0b983 SHA512 6ecc86977baaf1c756691e3f661e43ef2bb24e606898f6075bfa6f174d1fdc5e77d00853ffe014847e295364349d6ad34f3b8209cb97870e0233012fc38a281a WHIRLPOOL 36c097befed3befb901ceb0c42079488462c31acb92719f22da88a76804a692463c4ee37872c4b5e8c15711ed26734659cb52e61cd483b2062f0109a16c6af47
DIST asciidoc-8.6.9.tar.gz 907253 SHA256 78db9d0567c8ab6570a6eff7ffdf84eadd91f2dfc0a92a2d0105d323cab4e1f0 SHA512 1984482010dbd35c3a1def67f4915ce83ecfc29a7463f84aa312107d7a9ff647978f57615462c65e885bea424eed89a212df728cc3acd3c63df1c763dfa5e955 WHIRLPOOL dbd576ed3b7bcaf46afd33d9aae7a94f82fb171fa73f0b99f737b6934f62927ea11e1290aeac141ce5de27f66a56d7ed2d110f2b0d84e0598e858eac0e52b35d

@ -1,40 +1,45 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
EAPI=6
PYTHON_COMPAT=( python2_7 pypy )
inherit readme.gentoo-r1 python-single-r1
inherit autotools python-single-r1 readme.gentoo-r1
DESCRIPTION="AsciiDoc is a plain text human readable/writable document format"
HOMEPAGE="http://asciidoc.org/"
SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.gz"
SRC_URI="https://github.com/asciidoc/asciidoc/archive/${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
LICENSE="GPL-2"
SLOT="0"
IUSE="examples graphviz highlight test"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.75
dev-libs/libxslt
graphviz? ( media-gfx/graphviz )
app-text/docbook-xml-dtd:4.5
highlight? ( || ( dev-util/source-highlight \
dev-python/pygments[${PYTHON_USEDEP}] \
app-text/highlight )
RDEPEND="
app-text/docbook-xml-dtd:4.5
>=app-text/docbook-xsl-stylesheets-1.75
dev-libs/libxslt
${PYTHON_DEPS}
graphviz? ( media-gfx/graphviz )
highlight? (
|| (
dev-util/source-highlight
dev-python/pygments[${PYTHON_USEDEP}]
app-text/highlight
)
)"
DEPEND="
test? (
app-text/dvipng
dev-texlive/texlive-latex
dev-util/source-highlight
media-gfx/graphviz
media-gfx/imagemagick
media-sound/lilypond
${PYTHON_DEPS}
"
DEPEND="test? ( dev-util/source-highlight
media-sound/lilypond
media-gfx/imagemagick
dev-texlive/texlive-latex
app-text/dvipng
media-gfx/graphviz
${PYTHON_DEPS} )
"
)"
DOC_CONTENTS="
If you are going to use a2x, please also look at a2x(1) under
@ -42,38 +47,42 @@ REQUISITES for a list of runtime dependencies.
"
src_prepare() {
default
# Only needed for prefix - harmless (does nothing) otherwise
sed -i -e "s:^CONF_DIR=.*:CONF_DIR='${EPREFIX}/etc/asciidoc':" \
"${S}/asciidoc.py" || die
eautoreconf
}
src_configure() {
econf --sysconfdir="${EPREFIX}"/usr/share
}
src_install() {
emake DESTDIR="${D}" install
src_test() {
local -x ASCIIDOC_PY=asciidoc.py
"${EPYTHON}" tests/test${PN}.py update || die
"${EPYTHON}" tests/test${PN}.py run || die
}
python_fix_shebang "${ED}"/usr/bin/*.py
src_install() {
default
python_fix_shebang "${ED%/}"/usr/bin/*.py
readme.gentoo_create_doc
dodoc BUGS CHANGELOG README docbook-xsl/asciidoc-docbook-xsl.txt \
dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
dodoc BUGS.txt CHANGELOG.txt README.asciidoc docbook-xsl/asciidoc-docbook-xsl.txt \
dblatex/dblatex-readme.txt filters/code/code-filter-readme.txt
# Below results in some files being installed twice in different locations, but they are in the right place,
# uncompressed, and there won't be any broken links. See bug #483336.
# Below results in some files being installed twice in different locations, but they are
# in the right place, uncompressed, and there won't be any broken links. See bug #483336
if use examples; then
cp -rL examples/website "${D}"/usr/share/doc/${PF}/examples || die
# examples/website is full of relative symlinks,
# deref them for copying, which dodoc doesn't do
cp -rL examples/website "${ED%/}"/usr/share/doc/${PF}/examples || die
docompress -x /usr/share/doc/${PF}/examples
fi
}
src_test() {
local -x ASCIIDOC_PY=asciidoc.py
"${PYTHON}" tests/test${PN}.py update || die
"${PYTHON}" tests/test${PN}.py run || die
}
pkg_postinst() {
readme.gentoo_print_elog
}

@ -1,86 +0,0 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
inherit eutils fdo-mime multilib python-r1 versionator
DESCRIPTION="Bibliographic and reference management software, integrates with LO and MS Word"
HOMEPAGE="http://bibus-biblio.sourceforge.net/"
SRC_URI="
mirror://sourceforge/${PN}-biblio/${PN}_${PV}.orig.tar.gz
https://dev.gentoo.org/~jlec/distfiles/${P}-lo-4.patch.xz
"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="mysql"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
# Most of this mess is designed to give the choice of sqlite or mysql
# but prefer sqlite. We also need to default to sqlite if neither is requested.
# Cannot depend on virtual/ooo
# bibus fails to start with app-office/openoffice-bin (bug #288232).
RDEPEND="
${PYTHON_DEPS}
app-office/libreoffice
dev-python/wxpython:2.8[${PYTHON_USEDEP}]
dev-db/sqliteodbc
dev-db/unixODBC
mysql? (
dev-python/mysql-python[${PYTHON_USEDEP}]
dev-db/myodbc
)"
DEPEND="${RDEPEND}"
pkg_setup() {
if [[ -d "/usr/$(get_libdir)/openoffice" ]] ; then
OFFICESUITE="/usr/$(get_libdir)/openoffice"
else
OFFICESUITE="/usr/$(get_libdir)/libreoffice"
fi
}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-install.patch \
"${FILESDIR}"/${P}-bibus.cfg.patch \
"${WORKDIR}"/${P}-lo-4.patch
}
src_compile() { :; }
src_install() {
einfo "Installing for ${OFFICESUITE}"
installation() {
emake \
DESTDIR="${D}" \
prefix="${EPREFIX}/usr" \
oopath="${OFFICESUITE}/program" \
ooure="${OFFICESUITE}/ure-link/lib" \
oobasis="${OFFICESUITE}/program" \
sysconfdir="${EPREFIX}/etc" \
pythondir="$(python_get_sitedir)" \
python=${PYTHON} \
install install-doc-en
}
python_foreach_impl installation
python_foreach_impl python_optimize
python_foreach_impl python_newscript bibusStart.py ${PN}
}
pkg_postinst() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}
pkg_postrm() {
fdo-mime_desktop_database_update
fdo-mime_mime_database_update
}

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=4
@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/djvu/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 x86"
IUSE="debug nsplugin"
RDEPEND="

@ -11,7 +11,7 @@ SRC_URI="https://github.com/AbiWord/enchant/releases/download/${PN}-${MY_PV}/${P
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="aspell +hunspell static-libs test zemberek"
REQUIRED_USE="|| ( hunspell aspell zemberek )"

@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
IUSE=""
RDEPEND=""

@ -42,4 +42,7 @@ src_install() {
java-pkg_dolauncher "${PN}" --jar "${PN}.jar"
newicon images/external/JabRef-icon-128.png JabRef-bin-icon.png
make_desktop_entry "${PN}" JabRef-bin JabRef-bin-icon Office
ewarn "Jabref 4.x will convert old 3.x format .bib databases to a new format."
ewarn "The conversion is irreversible, backup .bib files before starting Jabref."
ewarn "Jabref 4.x is under heavy development and very unstable."
}

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@ -15,7 +15,8 @@ SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc nls static-libs test"
DEPEND="nls? ( sys-devel/gettext )
DEPEND="net-libs/libnsl:0=
nls? ( sys-devel/gettext )
doc? (
app-text/xmlto
app-text/docbook-xml-dtd:4.1.2
@ -25,7 +26,7 @@ DEPEND="nls? ( sys-devel/gettext )
app-text/openjade
app-text/sgml-common
)"
RDEPEND=""
RDEPEND="net-libs/libnsl:0="
S=${WORKDIR}/${MY_P}

@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/texlive-${PV#*_p}-source.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
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=""
# Note about blockers: it is a freetype2 based replacement for ttf2pk and

@ -1,2 +1 @@
DIST gitv-1.3.1.tar.gz 553719 SHA256 ad65999e64d1924a6c540efe7a3adebb949cf30be2dcb23a3ce41175ed21170c SHA512 e6a6773dcac18fdc36c891bd592d4dcb2eb20af6253df5886582fd223e040fb8296dc606d4fb25abd7a14f9dc1a712fe0e354821e234c8f54b1b5914af55dcbc WHIRLPOOL a200640371fce5a2af8be014b08a578a8e555a8b1a1ac1db138fe0f08cf8ffe4e36e24080043b61448f4653b0dc5d2df26ae56ec937219bb69b7159bb6e825d6
DIST gitv-1.3.tar.gz 21319 SHA256 6533196f9f2688846c7f4035ab1af82713f5e0e4aaf5c18335fa5007e0ad6555 SHA512 1a13d98ae9dd3e50a559d98881b6b0a8150186573e8f9fcdd9bd5cfdba1a679ea1c02b57f7d7be712dbfb5ec1bffbc4c0e8e1330cd64acf095c88400c499bfaf WHIRLPOOL 7c99b3e697c1e92ae829ad75a85ff2c777014420ed986a93d9d23a7df96af082d0c8c8a35949b1075fcbf8a754c203dd3055e787df075352f9d0fcafce199257

@ -2,6 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit vim-plugin
if [[ ${PV} == 9999 ]]; then
@ -9,7 +10,7 @@ if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://github.com/gregsexton/gitv.git"
else
SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
KEYWORDS="~amd64 ~x86 ~ppc-macos"
KEYWORDS="amd64 x86 ~ppc-macos"
fi
DESCRIPTION="vim plugin: gitk for vim"
@ -18,7 +19,8 @@ LICENSE="vim"
VIM_PLUGIN_HELPFILES="gitv"
RDEPEND="dev-vcs/git
RDEPEND="
dev-vcs/git
app-vim/fugitive"
src_prepare() {

@ -1,17 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit vim-plugin
DESCRIPTION="vim plugin: gitk for vim"
HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=3574"
SRC_URI="https://github.com/gregsexton/gitv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="vim"
KEYWORDS="amd64 x86 ~ppc-macos"
VIM_PLUGIN_HELPFILES="gitv"
RDEPEND="dev-vcs/git
app-vim/fugitive"

@ -1,3 +1,3 @@
DIST Catch-1.10.0.tar.gz 375205 SHA256 cb752cbc8033d7c967d6bd7bc3eed428f6d05f2511945db819d4a18a46853ada SHA512 07ea6c8fbef849000c69009478fc895fe520420d835a57881b832f8181ca28f04030027ab0f8614d590cff1c36d06598bd4f5723f44e252c3a2566da1be1341e WHIRLPOOL 74bc82eecbafa289c3abec540ebc47b0239eaf6224eaf6d408a88871e03338994d361194f6d92b15096f3c2a0672a24af424db5f490923be3638d1ed0f17a355
DIST Catch-1.9.7.tar.gz 371816 SHA256 751090d755072777c5bb98de6ead1f7919ea239d4b77bb028fb7b06624ec0d7a SHA512 573d324b3e0ffe1026bdd10410a9299eff6d3e0a316b2b84c687dc993fb33570620e26107667ce8b59ab66844cfbc39526ed6ba4e9dd1ba529c6b21ebd274b63 WHIRLPOOL 1d3bcf6b2a3d8af6fba7ded0e92d7381857360a4bbf2dd689474408c52612f874da35579ad0adaf13679e1d8aaddee101274cd29070a5a51d58e7d52b76473f2
DIST Catch-2.0.0-develop.3.tar.gz 381015 SHA256 c482fd4f0730cb82a05b1fc3eeee1beb599c5ae43c33719f5875cb23fa745b8f SHA512 52e6234379a435e7ddf3ee82a0689120a498f6be3c19dce9bf0a32059caa0a259fbc28c0e4f2e53841636874140970ec8cf7f15818ddfa9a1a5a80bc2922d0f0 WHIRLPOOL 537801b6c8f50a96f4f6a1594d6660a48e01e54ea83646a90e4d5c559f1f6ee6f582023f8d88bd69ad983035e3bacb0257ccaf1167eaa70b2e9302d031c07ded
DIST Catch-1.11.0.tar.gz 376132 SHA256 9e6111577e6dad2513a4229355f162023568af6a352d303367930758bed60f30 SHA512 33085c2671f78c7562eace909564b2730eabcaf4490cd463402e66ab4ac2be1fe4fe360916c11aa589ba4a010622444126ee2ae747783b5869b5d7276361f132 WHIRLPOOL b6d02053ce4eea0242cfe4d4fd5f5842b9279fc804c69837d7a2f9b652a1b2f768912fc10a20dae148757c9ff6aabdcf69daf6e85e652165871e58891ab57ef5
DIST Catch-2.0.0-develop.6.tar.gz 395416 SHA256 c66a7ecd0710ed27663a122f388872563456f83df654d22cc6a56a76315c59d3 SHA512 079172f063da06453d434d1b74b9a4ffeb45b40c90657ea410d6695756f23c581b1d574a88ab6537082df4e6e703e7bc9ce9084653abdc2a7033018e65a1bf5e WHIRLPOOL 9b7e2a72d43e52af3329f7f25e578dc07cdd1a81cf43dcbd0e22be68d56fa96595f1ece91769c14c006e2c64aa526cec1a70fa59a067f0c8a022851ece927af0

@ -10,7 +10,7 @@ MY_P=${PN^}-${MY_PV}
DESCRIPTION="Modern C++ header-only framework for unit-tests"
HOMEPAGE="https://github.com/philsquared/Catch"
SRC_URI="https://github.com/philsquared/Catch/archive/v${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
SRC_URI="https://github.com/philsquared/Catch/archive/V${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
LICENSE="Boost-1.0"
SLOT="0"

@ -9,7 +9,7 @@ HOMEPAGE="https://www.gtkmm.org"
LICENSE="LGPL-2.1+"
SLOT="3.0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="aqua doc test wayland X"
REQUIRED_USE="|| ( aqua wayland X )"

@ -9,7 +9,7 @@ SRC_URI="mirror://nongnu/m17n/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sh ~sparc x86"
IUSE=""
DEPEND="sys-devel/gettext"

@ -4,7 +4,7 @@ DIST mariadb-10.0.33.tar.gz 69211872 SHA256 e3e3d583c51761aee2fcd0e51bfa7d592c12
DIST mariadb-10.1.24.tar.gz 61780687 SHA256 b3df99ae5b1ec8cf6cede4cbc4ae3f54ce66464549cba6d56d9ff4d24e4d551e SHA512 0b8d81b53f6866a81f33559ce57ebf956fec3ba25da0bd58c8bee3b2ecc00a6c370340000209d18463f84501d3ba35994b51ef99224616c37cd38d2fc87b73e9 WHIRLPOOL 91261a05e3d8b0cad925c382e0cf9a40fcfd3d35ae320c4a9860db110cb5655d1e1f992f9dea8987e50a07dd4a66aa42c9a3470a7acb3d0d706bcef7bc890122
DIST mariadb-10.1.26.tar.gz 61887132 SHA256 ba88b1cb9967dea2909938a34ba89373b162b0d83e5c98a0f1c94540156bf73d SHA512 a7505c579728b58eb6a92bdee1f5dfea5c10c8389cb7a31eb99fe2c6bc416593925cf9708d3dec91ede12eb4e232098a0833af2185bdd60bc593c89d255f3c0b WHIRLPOOL 8fe0c23f70b441a1f8d32d1fedcd033443641288ef1a20c49fbedfe6f5da95cb82125faa68f676fd68c441d4bf096101f364e1b3976f54229f5d9d0d10edbe21
DIST mariadb-10.1.28.tar.gz 67559689 SHA256 292dc8fff420c4bdaf3a2c3381ec3c99292965db2b09de0d7fec414c00032bbd SHA512 ca10d28f6b966719c7488c2b4ba928b65cbe9dc32ccf2a28d29c4d0c2d46ea1c59c3e339230017b317132dcd216925a71769dfba80a7d6321079c74ac41926d8 WHIRLPOOL d8ff24346a9e8ada4a9ec0ea8fd7657ff4972d43347afb7a9d7725293437ba70e0035c365738084b1e4828344861f000bd963260176524da2188c2c3a1389f67
DIST mariadb-10.2.9.tar.gz 70858881 SHA256 12e0a01c52591ee77cf0f940fe65df024457fa16c70f08c6116048d576096124 SHA512 11ba0913144d7298ffa4c0a0128a3d1525a39b8205ffc580311751cf25a4e86159e46a32d3c8330c4ea028cdd50643eb5381651df654751ca3e4fb3d4698a373 WHIRLPOOL dba0a8dfd5079b314ffc399e116abf8582bdaf51657dfe6e72247ab92da874aca97af4ca27dbcfdca5634c926598a853b7a8ecd8a61fee453c2764085a05b949
DIST mariadb-10.2.10.tar.gz 72388999 SHA256 5c7b83c4d2f7501ef9f187d8c97688a24fd3e53dc43bb388f8e1cead61a92fc2 SHA512 39c198009f8b19f4a08226ef9842b50e24636580b67c1c92d59c61cce3aa1edbd466e253c281dfcdfc58ab573ae9a59aaacb0ce3e8b82222043ddd849fc3e239 WHIRLPOOL b64e99254764556d6de947e254a45c5c2743d9e825ee109354b3101641048b3509dd26471abdb6f7b90f3a208ac7d2d13ad70cbb966e05ac49b26ef2ecb12e6e
DIST mariadb-5.5.58.tar.gz 45784323 SHA256 26fdf8784a51e5d6f7624c0f4528433a6188065dd1bf92ef69e27db6b0a41002 SHA512 c5c8b52c613a1a3f30de2cd1d8e390f8110b0891af78ee2a24ef2c4b7b8c5f2e140970ca89865e8277e7486dbfd0ad01c1fdbf8791c67a9793392247d68fec63 WHIRLPOOL b507f3aaaced5da716de1a131dc4e69ace6f2ccd2ac58614d3d722b46b0b271ab0a452aef03b78d499b961f39a057ece5169f5af6fcce2e840aecd77ebf9295e
DIST mysql-extras-20160721-1526Z.tar.bz2 301788 SHA256 45198f8adb4a61fdd89a5d3c7966ce2fe9241381510e1f7b93e793502a32dfcb SHA512 c7450039780e4e2684c932ba7c291c1de25dd1a64e4c6e88aa13b790768b4100955f36ae4a3bf983569ea23b43be02da6dad3d5985c1163ec9e8aa91f0efd85d WHIRLPOOL becdf0d4d7b8b5a269246d2fcf1bc09c4313046468b264f07394ae9f1de2f736ad3fff8cad35e544df7a3623688050e6fb9635dfea3876ea082d19cf9fe88927
DIST mysql-extras-20170310-1426Z.tar.bz2 307052 SHA256 23f5becec389fc49e7cf0d52c6c914cbc8d7e3fc5851ee38881ee6884ffc5732 SHA512 2dbb3e46f14fbd0be9ee0e3a8ff2e4d5325f9a9be332014ea556283c0bc5f53349952d267d6713fac5b54e3167a66ddd36f18b18b79ca6b68ede399399488157 WHIRLPOOL 9f459d9e58938597e7919b29fc819d87920a51461d274bf87520fe322a67ad8638ef19212855ba8e37507d3b160d29ecad0099f4632f078cc503e1be0f809fb4

@ -61,7 +61,6 @@ PATCHES=(
"${MY_PATCH_DIR}"/20018_all_mariadb-10.2.8-without-clientlibs-tools.patch
"${MY_PATCH_DIR}"/20024_all_mariadb-10.2.6-mysql_st-regression.patch
"${MY_PATCH_DIR}"/20025_all_mariadb-10.2.6-gssapi-detect.patch
"${MY_PATCH_DIR}"/20026_all_mariadb-add-pkgdatadir.patch
)
# Be warned, *DEPEND are version-dependant
@ -106,7 +105,7 @@ COMMON_DEPEND="
systemd? ( sys-apps/systemd:= )
tokudb? ( app-arch/snappy )
)
>=dev-libs/libpcre-8.35:3=
>=dev-libs/libpcre-8.41-r1:3=
"
DEPEND="virtual/yacc
static? ( sys-libs/ncurses[static-libs] )
@ -601,46 +600,11 @@ multilib_src_test() {
fi
_disable_test() {
local rawtestname testname testsuite reason mysql_disabled_file mysql_disabled_dir
local rawtestname reason
rawtestname="${1}" ; shift
reason="${@}"
ewarn "test '${rawtestname}' disabled: '${reason}'"
testsuite="${rawtestname/.*}"
testname="${rawtestname/*.}"
for mysql_disabled_file in \
"${S}/mysql-test/disabled.def" \
"${S}/mysql-test/t/disabled.def" ; do
[[ -f ${mysql_disabled_file} ]] && break
done
#mysql_disabled_file="${S}/mysql-test/t/disabled.def"
#einfo "rawtestname=${rawtestname} testname=${testname} testsuite=${testsuite}"
echo ${testname} : ${reason} >> "${mysql_disabled_file}"
if [[ ( -n ${testsuite} ) && ( ${testsuite} != "main" ) ]]; then
for mysql_disabled_file in \
"${S}/mysql-test/suite/${testsuite}/disabled.def" \
"${S}/mysql-test/suite/${testsuite}/t/disabled.def" \
FAILED ; do
[[ -f ${mysql_disabled_file} ]] && break
done
if [[ ${mysql_disabled_file} != "FAILED" ]]; then
echo "${testname} : ${reason}" >> "${mysql_disabled_file}"
else
for mysql_disabled_dir in \
"${S}/mysql-test/suite/${testsuite}" \
"${S}/mysql-test/suite/${testsuite}/t" \
FAILED ; do
[[ -d ${mysql_disabled_dir} ]] && break
done
if [[ ${mysql_disabled_dir} != "FAILED" ]]; then
echo "${testname} : ${reason}" >> "${mysql_disabled_dir}/disabled.def"
else
ewarn "Could not find testsuite disabled.def location for ${rawtestname}"
fi
fi
fi
echo ${rawtestname} : ${reason} >> "${T}/disabled.def"
}
local TESTDIR="${BUILD_DIR}/mysql-test"
@ -680,6 +644,7 @@ multilib_src_test() {
# Run mysql tests
pushd "${TESTDIR}" > /dev/null || die
touch "${T}/disabled.def"
# These are failing in MariaDB 10.0 for now and are believed to be
# false positives:
#
@ -698,7 +663,7 @@ multilib_src_test() {
done
# run mysql-test tests
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder
perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder --skip-test=tokudb --skip-test-list="${T}/disabled.def"
retstatus_tests=$?
popd > /dev/null || die

@ -21,6 +21,7 @@ dev-db/mariadb
<flag name="openssl">Enable SSL connections and crypto functions using <pkg>dev-libs/openssl</pkg></flag>
<flag name="max-idx-128">Raise the max index per table limit from 64 to 128</flag>
<flag name="minimal">Install client programs only, no server</flag>
<flag name="numa">Enable NUMA support using <pkg>sys-process/numactl</pkg> (NUMA kernel support is also required)</flag>
<flag name="profiling">Add support for statement profiling (requires USE=community).</flag>
<flag name="server">Build the server program</flag>
<flag name="systemtap">Build support for profiling and tracing using <pkg>dev-util/systemtap</pkg></flag>

@ -13,12 +13,12 @@ CMAKE_MAKEFILE_GENERATOR=emake
inherit mysql-multilib-r1
# only to make repoman happy. it is really set in the eclass
IUSE="$IUSE"
IUSE="$IUSE numa"
# REMEMBER: also update eclass/mysql*.eclass before committing!
KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )"
DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) numa? ( sys-process/numactl )"
RDEPEND="${RDEPEND}"
MY_PATCH_DIR="${WORKDIR}/mysql-extras-${MY_EXTRAS_VER}"
@ -38,10 +38,6 @@ PATCHES=(
# If you want to add a single patch, copy the ebuild to an overlay
# and create your own mysql-extras tarball, looking at 000_index.txt
# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
# disable until we see what happens with it
MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 )
src_prepare() {
mysql-multilib-r1_src_prepare
if use libressl ; then
@ -50,6 +46,13 @@ src_prepare() {
fi
}
src_configure() {
# validate_password plugin uses exceptions when it shouldn't yet (until 5.7)
# disable until we see what happens with it
local MYSQL_CMAKE_NATIVE_DEFINES=( -DWITHOUT_VALIDATE_PASSWORD=1 -DWITH_NUMA=$(usex numa ON OFF) )
mysql-multilib-r1_src_configure
}
# Official test instructions:
# USE='server embedded extraengine perl openssl static-libs' \
# FEATURES='test userpriv -usersandbox' \

@ -21,6 +21,7 @@ IUSE="doc memcached pam ssl static-libs"
RDEPEND="
${POSTGRES_DEP}
net-libs/libnsl:0=
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
ssl? ( dev-libs/openssl:* )

@ -21,6 +21,7 @@ IUSE="doc memcached pam ssl static-libs"
RDEPEND="
${POSTGRES_DEP}
net-libs/libnsl:0=
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
ssl? ( dev-libs/openssl:* )

@ -21,6 +21,7 @@ IUSE="doc memcached pam ssl static-libs"
RDEPEND="
${POSTGRES_DEP}
net-libs/libnsl:0=
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
ssl? ( dev-libs/openssl:* )

@ -21,6 +21,7 @@ IUSE="doc memcached pam ssl static-libs"
RDEPEND="
${POSTGRES_DEP}
net-libs/libnsl:0=
memcached? ( dev-libs/libmemcached )
pam? ( sys-auth/pambase )
ssl? ( dev-libs/openssl:* )

@ -1,12 +0,0 @@
diff -Naur a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
--- a/src/bin/pg_ctl/pg_ctl.c 2011-04-14 23:18:15 -0400
+++ b/src/bin/pg_ctl/pg_ctl.c 2011-08-01 19:44:54 -0400
@@ -975,7 +975,7 @@
}
}
printf(_("%s: no server running\n"), progname);
- exit(1);
+ exit(3);
}

@ -1,141 +0,0 @@
diff -Naur a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile 2011-09-08 17:13:27.000000000 -0400
+++ b/contrib/Makefile 2011-09-16 21:58:34.080579316 -0400
@@ -5,56 +5,10 @@
include $(top_builddir)/src/Makefile.global
SUBDIRS = \
- adminpack \
- auth_delay \
- auto_explain \
- btree_gin \
- btree_gist \
- chkpass \
- citext \
- cube \
- dblink \
- dict_int \
- dict_xsyn \
- dummy_seclabel \
- earthdistance \
- file_fdw \
- fuzzystrmatch \
- hstore \
- intagg \
- intarray \
- isn \
- lo \
- ltree \
oid2name \
- pageinspect \
- passwordcheck \
- pg_archivecleanup \
- pg_buffercache \
- pg_freespacemap \
- pg_standby \
- pg_stat_statements \
- pg_test_fsync \
- pg_trgm \
- pg_upgrade \
- pg_upgrade_support \
pgbench \
- pgcrypto \
- pgrowlocks \
- pgstattuple \
- seg \
- spi \
- tablefunc \
- test_parser \
- tsearch2 \
- unaccent \
vacuumlo
-ifeq ($(with_openssl),yes)
-SUBDIRS += sslinfo
-else
-ALWAYS_SUBDIRS += sslinfo
-endif
ifeq ($(with_ossp_uuid),yes)
SUBDIRS += uuid-ossp
diff -Naur a/src/backend/Makefile b/src/backend/Makefile
--- a/src/backend/Makefile 2011-09-08 17:13:27.000000000 -0400
+++ b/src/backend/Makefile 2011-09-16 22:01:48.400579314 -0400
@@ -45,7 +45,7 @@
##########################################################################
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
+all: someheaders
ifneq ($(PORTNAME), cygwin)
ifneq ($(PORTNAME), win32)
@@ -114,7 +114,7 @@
endif # aix
# Update the commonly used headers before building the subdirectories
-$(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
+someheaders $(SUBDIRS:%=%-recursive): $(top_builddir)/src/include/parser/gram.h $(top_builddir)/src/include/catalog/schemapg.h $(top_builddir)/src/include/utils/fmgroids.h $(top_builddir)/src/include/utils/errcodes.h $(top_builddir)/src/include/utils/probes.h
# run this unconditionally to avoid needing to know its dependencies here:
submake-schemapg:
@@ -206,23 +206,7 @@
##########################################################################
-install: all installdirs install-bin
-ifeq ($(PORTNAME), cygwin)
-ifeq ($(MAKE_DLL), true)
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
-endif
-endif
-ifeq ($(PORTNAME), win32)
-ifeq ($(MAKE_DLL), true)
- $(INSTALL_DATA) libpostgres.a '$(DESTDIR)$(libdir)/libpostgres.a'
-endif
-endif
- $(MAKE) -C catalog install-data
- $(MAKE) -C tsearch install-data
- $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample'
- $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample'
- $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample'
- $(INSTALL_DATA) $(srcdir)/access/transam/recovery.conf.sample '$(DESTDIR)$(datadir)/recovery.conf.sample'
+install:
install-bin: postgres $(POSTGRES_IMP) installdirs
$(INSTALL_PROGRAM) postgres$(X) '$(DESTDIR)$(bindir)/postgres$(X)'
diff -Naur a/src/bin/Makefile b/src/bin/Makefile
--- a/src/bin/Makefile 2011-09-08 17:13:27.000000000 -0400
+++ b/src/bin/Makefile 2011-09-16 22:03:48.250579314 -0400
@@ -13,8 +13,7 @@
top_builddir = ../..
include $(top_builddir)/src/Makefile.global
-SUBDIRS = initdb pg_ctl pg_dump \
- psql scripts pg_config pg_controldata pg_resetxlog pg_basebackup
+SUBDIRS = pg_dump psql scripts pg_config
ifeq ($(PORTNAME), win32)
SUBDIRS += pgevent
diff -Naur a/src/Makefile b/src/Makefile
--- a/src/Makefile 2011-09-08 17:13:27.000000000 -0400
+++ b/src/Makefile 2011-09-16 22:29:17.650579302 -0400
@@ -14,17 +14,11 @@
SUBDIRS = \
port \
- timezone \
backend \
- backend/utils/mb/conversion_procs \
- backend/snowball \
include \
interfaces \
- backend/replication/libpqwalreceiver \
bin \
- pl \
- makefiles \
- test/regress
+ makefiles
# There are too many interdependencies between the subdirectories, so
# don't attempt parallel make here.

@ -1,29 +0,0 @@
--- a/src/timezone/pgtz.c 2015-02-02 15:45:23.000000000 -0500
+++ b/src/timezone/pgtz.c 2015-04-07 14:21:22.341832190 -0400
@@ -586,6 +586,12 @@
if (direntry->d_name[0] == '.')
continue;
+ /* if current working directory has the same name as current direntry name,
+ * then skip as this is a recursive fs loop
+ */
+ if (strncmp(direntry->d_name,tzdirsub,strlen(direntry->d_name)) == 0)
+ continue;
+
snprintf(tzdir + tzdir_orig_len, MAXPGPATH - tzdir_orig_len,
"/%s", direntry->d_name);
@@ -1615,6 +1621,13 @@
if (direntry->d_name[0] == '.')
continue;
+ /* copy current working directory so that there is no risk of modification by basename(),
+ * and compare to current direntry name; skip if they are the same as this is a recursive fs loop
+ */
+ snprintf(fullname, MAXPGPATH, "%s", dir->dirname[dir->depth]);
+ if (strncmp(direntry->d_name,basename(fullname),strlen(direntry->d_name)) == 0)
+ continue;
+
snprintf(fullname, MAXPGPATH, "%s/%s",
dir->dirname[dir->depth], direntry->d_name);
if (stat(fullname, &statbuf) != 0)

@ -1,110 +0,0 @@
vdiff -ru a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile 2015-06-29 15:42:18.000000000 -0400
+++ b/contrib/Makefile 2015-09-06 07:50:51.258463861 -0400
@@ -5,58 +5,9 @@
include $(top_builddir)/src/Makefile.global
SUBDIRS = \
- adminpack \
- auth_delay \
- auto_explain \
- bloom \
- btree_gin \
- btree_gist \
- chkpass \
- citext \
- cube \
- dblink \
- dict_int \
- dict_xsyn \
- earthdistance \
- file_fdw \
- fuzzystrmatch \
- hstore \
- intagg \
- intarray \
- isn \
- lo \
- ltree \
oid2name \
- pageinspect \
- passwordcheck \
- pg_buffercache \
- pg_freespacemap \
- pg_prewarm \
- pg_standby \
- pg_stat_statements \
- pg_trgm \
- pgcrypto \
- pgrowlocks \
- pgstattuple \
- pg_visibility \
- postgres_fdw \
- seg \
- spi \
- tablefunc \
- tcn \
- test_decoding \
- tsm_system_rows \
- tsm_system_time \
- tsearch2 \
- unaccent \
vacuumlo
-ifeq ($(with_openssl),yes)
-SUBDIRS += sslinfo
-else
-ALWAYS_SUBDIRS += sslinfo
-endif
-
ifneq ($(with_uuid),no)
SUBDIRS += uuid-ossp
else
diff -ru a/src/bin/Makefile b/src/bin/Makefile
--- a/src/bin/Makefile 2015-06-29 15:42:18.000000000 -0400
+++ b/src/bin/Makefile 2015-09-06 08:03:27.014847309 -0400
@@ -14,20 +14,8 @@
include $(top_builddir)/src/Makefile.global
SUBDIRS = \
- initdb \
- pg_archivecleanup \
- pg_basebackup \
pg_config \
- pg_controldata \
- pg_ctl \
pg_dump \
- pg_resetxlog \
- pg_rewind \
- pg_test_fsync \
- pg_test_timing \
- pg_upgrade \
- pg_xlogdump \
- pgbench \
psql \
scripts
diff -ru a/src/Makefile b/src/Makefile
--- a/src/Makefile 2015-06-29 15:42:18.000000000 -0400
+++ b/src/Makefile 2015-09-06 08:04:25.274568519 -0400
@@ -15,19 +15,11 @@
SUBDIRS = \
common \
port \
- timezone \
backend \
- backend/utils/mb/conversion_procs \
- backend/snowball \
include \
interfaces \
- backend/replication/libpqwalreceiver \
- fe_utils \
bin \
- pl \
- makefiles \
- test/regress \
- test/perl
+ makefiles
# There are too many interdependencies between the subdirectories, so
# don't attempt parallel make here.

@ -1,130 +0,0 @@
diff -Naruw a/contrib/Makefile b/contrib/Makefile
--- a/contrib/Makefile 2016-10-24 16:08:51.000000000 -0400
+++ b/contrib/Makefile 2016-10-28 11:41:00.450589656 -0400
@@ -5,58 +5,9 @@
include $(top_builddir)/src/Makefile.global
SUBDIRS = \
- adminpack \
- auth_delay \
- auto_explain \
- bloom \
- btree_gin \
- btree_gist \
- chkpass \
- citext \
- cube \
- dblink \
- dict_int \
- dict_xsyn \
- earthdistance \
- file_fdw \
- fuzzystrmatch \
- hstore \
- intagg \
- intarray \
- isn \
- lo \
- ltree \
oid2name \
- pageinspect \
- passwordcheck \
- pg_buffercache \
- pg_freespacemap \
- pg_prewarm \
- pg_standby \
- pg_stat_statements \
- pg_trgm \
- pgcrypto \
- pgrowlocks \
- pgstattuple \
- pg_visibility \
- postgres_fdw \
- seg \
- spi \
- tablefunc \
- tcn \
- test_decoding \
- tsm_system_rows \
- tsm_system_time \
- tsearch2 \
- unaccent \
vacuumlo
-ifeq ($(with_openssl),yes)
-SUBDIRS += sslinfo
-else
-ALWAYS_SUBDIRS += sslinfo
-endif
-
ifneq ($(with_uuid),no)
SUBDIRS += uuid-ossp
else
diff -Naruw a/src/backend/Makefile b/src/backend/Makefile
--- a/src/backend/Makefile 2016-10-24 16:08:51.000000000 -0400
+++ b/src/backend/Makefile 2016-10-28 11:48:58.571353118 -0400
@@ -51,7 +51,7 @@
##########################################################################
-all: submake-libpgport submake-schemapg postgres $(POSTGRES_IMP)
+all: someheaders
ifneq ($(PORTNAME), cygwin)
ifneq ($(PORTNAME), win32)
@@ -110,7 +110,7 @@
endif # aix
# Update the commonly used headers before building the subdirectories
-$(SUBDIRS:%=%-recursive): | generated-headers
+someheaders $(SUBDIRS:%=%-recursive): | generated-headers
# src/port needs a convenient way to force just errcodes.h to get built
submake-errcodes: $(top_builddir)/src/include/utils/errcodes.h
diff -Naruw a/src/bin/Makefile b/src/bin/Makefile
--- a/src/bin/Makefile 2016-10-24 16:08:51.000000000 -0400
+++ b/src/bin/Makefile 2016-10-28 11:42:26.000129832 -0400
@@ -14,19 +14,8 @@
include $(top_builddir)/src/Makefile.global
SUBDIRS = \
- initdb \
- pg_archivecleanup \
- pg_basebackup \
pg_config \
- pg_controldata \
- pg_ctl \
pg_dump \
- pg_resetxlog \
- pg_rewind \
- pg_test_fsync \
- pg_test_timing \
- pg_upgrade \
- pg_xlogdump \
pgbench \
psql \
scripts
diff -Naruw a/src/Makefile b/src/Makefile
--- a/src/Makefile 2016-10-24 16:08:51.000000000 -0400
+++ b/src/Makefile 2016-10-28 11:41:00.453922971 -0400
@@ -15,19 +15,11 @@
SUBDIRS = \
common \
port \
- timezone \
backend \
- backend/utils/mb/conversion_procs \
- backend/snowball \
include \
interfaces \
- backend/replication/libpqwalreceiver \
- fe_utils \
bin \
- pl \
- makefiles \
- test/regress \
- test/perl
+ makefiles
# There are too many interdependencies between the subdirectories, so
# don't attempt parallel make here.

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
KEYWORDS="~amd64 ~arm x86"
IUSE=""
RDEPEND="

@ -1,17 +0,0 @@
--- cmd_app.cpp.bak 2008-07-11 15:49:56.000000000 -0400
+++ cmd_app.cpp 2008-09-20 23:18:17.000000000 -0400
@@ -63,7 +63,13 @@
_tsearchenv_s("PK2DeviceFile.dat", "PATH", tempString);
if (_tcslen(tempString) < 17)
{
- _tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);
+ // Try /usr/share/pk2 first
+ _tcsncpy_s(tempString, "/usr/share/pk2/PK2DeviceFile.dat", 32);
+
+ if(access(tempString, 0))
+ // Well, that didn't work, default to the current directory
+ _tcsncpy_s(tempString, "PK2DeviceFile.dat", 17);
+
//_tcsncpy_s(tempString, "C:\\PICkit_2\\pk2cmd\\debug\\PK2DeviceFile.dat", 42);
//printf("DEBUG DEVICE FILE SETTING!!!!\n");
}

@ -4,9 +4,14 @@ DIST icedtea-bin-core-3.5.1-arm64.tar.xz 58951988 SHA256 f88a4f6c18956e6b1aba0e7
DIST icedtea-bin-core-3.5.1-ppc64.tar.xz 54197760 SHA256 999b47f42a4f952eeb8c4a603ea614463c380d66150f93e17d7974684f32fa8b SHA512 58116c0bd67dc8f6ba65c5150513c2f62319cf3cef48f0624926e8d874787f6cf222e0ec8012822a6d9151b4f18691f8a1b5b65bce3e3b5bee54a85f503928e3 WHIRLPOOL 3ea91a281fe74ec75415acaa0b5275578e2b016a1d9c743c0cb9f85bad546e09fc0f660bd5d24f55cc8f2f386413cc2f9a2b58f906308dc1aa338238c40cf8a1
DIST icedtea-bin-core-3.5.1-ppc64le.tar.xz 54240304 SHA256 0bac113ea9e165fcf2cf59c4c2476965c807d00d1c16e638f1803adb2ea5b05b SHA512 c781daf655362b571acdc78f4f3f8b86b1c132fb853ffe5cf4ac05968ae4d733bb90ee43d0d71f25418de399b1b25429dabdb9831dfbbbd98b937f4416c05487 WHIRLPOOL 320c92c8581064dcb5d715d7f457ce1926bd9e864d39569ced07e9d116fa2bd55f40441ec74a3b297ce0418aebc8bdd8b425d587fadc5bc4a53b351e457875d2
DIST icedtea-bin-core-3.5.1-x86.tar.xz 61349068 SHA256 85bea3a4291b8140a1ed5d7e5585fb3fdd67c0f05dbfde41df7882e7f3f4f171 SHA512 89bbcc3f5340894c6500179e3be8f75d9eead0480758db76133ca18ce6d216a6ede2f4ab820f56b220fd66060433d1c135fe7993339384d70cbfed0aa072ed20 WHIRLPOOL 6c3660bac05571c1a25e53ad20bb06d622e9286c6cd0c080c99e15b14ddba72567e8912ead3078745e2874ce0e9441bf879afd5d2fc8e10dc55fa1890ccb93e0
DIST icedtea-bin-core-3.6.0-amd64.tar.xz 61911044 SHA256 d2963f0200218c43489643d137520935f00fde1516c4e61f9b368dd053a79820 SHA512 630cba001ad511133ec7997c931891523e05062b6e5460aa392af551e71198481b7f13eee478f234ab9eb33efa059f7b54edf451cc9f5ed26a7f4d023f8a9cc6 WHIRLPOOL 9a5c7853e75754415cb0c1c1bca59e0fa77b229d77bcc5e525471dffc1f186242c8d8b4ace42492e4ac2a6f9087f10bf7cd6355d7248b9e73edd11f1a5c290c8
DIST icedtea-bin-core-3.6.0-arm.tar.xz 57965524 SHA256 09a4022a25b31df111475fafea10dbe3a05e69a7b0aeff0224d86903c3c6c9e6 SHA512 731a154fcbcaaf6cdc638b91b72bc65007798de2c31125279a362d3f521bf88a130e6d51ab185f3880687f5f2b07aaab01cf2665e28715ea83191ae6979fbdde WHIRLPOOL 1dbe765023aed33cbe655505b5c1723f6d9e1eed24d021c924b0f2f3ed4ea32164cc46ec9db23a205869692e6ac79320d8169c79ebdf509a7bd49bdb6b140735
DIST icedtea-bin-core-3.6.0-arm64.tar.xz 58962420 SHA256 5fecb710513230971b4d5c640c9fd91ed333264d14808ff1d32a447b6a9ed05c SHA512 83c65e73fdbf1852a8eefac0ad077fbe988a46ea95a6e709a975df8d7ad812b8ae21c62ba8cd1fb51647836f83d707d6c423c06043cd9be399c5f8a15373e9ac WHIRLPOOL ffc6b09c27623bb7a366bb842bb6c61a6858d5d1e4cce9fda49ddee9293513410a2b1e65ffb847c20c6894a0b7358c594a90184078b6f8451510330d4d61c04a
DIST icedtea-bin-core-3.6.0-x86.tar.xz 61382796 SHA256 79b1339a8563c3ff1c775ae313c43f5265befbe7a2bbd4ccdd69f1e61fb223be SHA512 0d2dc8d6a080cc0f85ae85fbea842b0ede86df4a1ee4d1db1ef48977039230b4060a753ed67670f154d8733fd74540485290b343ca755cd71f54bf92ad86270b WHIRLPOOL c77de0732e08df5ad2fa8f90fd0637920d5f781d5599945534f5dd2efdec4f71d058354d30b6308f9b36323570e093c18e8995c7d898a0c297abc528f1b78033
DIST icedtea-bin-core-7.2.6.11-amd64.tar.xz 53452816 SHA256 19db272211ea35da58ecc1ad8ac6f8daf0e2834501c3cab3ca765d6d28451967 SHA512 2801c07230c8fe041ff7b945afc67da582dc820c02ab4c948919ada7e728613a20afb86cf0f552102047c2e10738f0e16d388eebc5b3a44cb245e1eb2829ec4a WHIRLPOOL 1887e66db8312c56ac92b27eda55f19f6621fbb795eb94c888be6766c10b50ca257de961eb72f93702fcee4a37188242cb474c974f23421b958be94c479bb97d
DIST icedtea-bin-core-7.2.6.11-x86.tar.xz 55369568 SHA256 90143af039d56edebf073c38f199dd9c2f7a0f8f22ee28cdd25d5ce5f77c094e SHA512 90b2bd9b79bf287a6a76850e7d60f26de309b07180b8ca42709784c9ecef04e150a35760398b47967a87fb6391aea430ec22d6e7d1e7b8068e8069b27d26646c WHIRLPOOL bad37af054535d964e696d43ae99acde61228d84110350c852fff5ff97cd6fc6a70d053c4962aeb52b99c24a4b7c87625696e3c4fcb7f01c6363ae0ff5c86963
DIST icedtea-bin-doc-3.5.1.tar.xz 11682876 SHA256 09df364aac70225f2dc19e43c157e1283e6e76a6f813de61a1ce35be7ac87d08 SHA512 df43658202c08e10ada2f5179c9f6eae15ffed3981b95495cc7ee7a9b4bf3b5f7957dce156451ef589edb0f0b9f50eb4faff1942263dfec665a83e75fad55caf WHIRLPOOL 1563a7d4bfc21acaf576ff291a110ab9bf4280cf9c5f9e582665faa32fd87969213b98540c0ec4cdabaf64c0a94ddedc9cbe3e1d134ca59a3796d1a58b7f8015
DIST icedtea-bin-doc-3.6.0.tar.xz 11681684 SHA256 2b9c5898c645072b72a1810881626756d2afbfcda6d4f5633e86e084095d026b SHA512 a04d927cef6026833c7ba8d1127a4f0c2334969bade3ce6f2b6c03f174e8781de899e11467899721a9f450f6e87b64960b3583accede3269386251c1a8d6f1ed WHIRLPOOL 94008767054d0e3a66fb500fa1515c2606818204bda0c0ae87618e481017b34248d6a97cfe5702920dcb589d19a1365dbd5e99d78c7823f9b9c288a1f89265a4
DIST icedtea-bin-doc-7.2.6.11.tar.xz 10611016 SHA256 b1d785364491a62420f8fded47a936c292e962e5b208b852c7235e1a80f69667 SHA512 6a1d43f469b98288b138b0a0e520185d89e487c61afaadfa82afffd7b0c5c5377c2fb03ce6abfb12da22ce54eb989371d82dca5b49d561e63bd2230961c2fa17 WHIRLPOOL b7482657675223cbe924e75cb428191e7dd23ab203a56ccd466c522fa0d52299aca2b12f811d27b44a4a8e2b038216184c311344d44a0499530d0c7214f518d4
DIST icedtea-bin-examples-3.5.1-amd64.tar.xz 1856316 SHA256 990c86ce2a2c6e15db35d62a4ec49bb192476345d2d1f73b1faaa1f099c74884 SHA512 f32b55e03308c2e3cc7d8e823b53c8a6009e710c7120a665bafea1ae209664c24e2c0a3f408315461066dab67faa343199778ad0c255e3861b0c90f9bda72dbf WHIRLPOOL 5829a269bddf786786736dced0dbaa6db285e2184fc7cd3fe948415f2f0ad5a52ab8df6e16f5c1fe3cdc999072c5c474667e1507c2ac5d98fb5e78c3af903655
DIST icedtea-bin-examples-3.5.1-arm.tar.xz 1840324 SHA256 6d81c9781c69ddf98fe06d9942d7e1e695a2eb28e1b42b1b1b6a7b0d41922ec4 SHA512 f40461e5267f43e8990d88784bff02ab4b85b5d41bf9d4bd519dd6c9a215779ce37c19a8572dabe72cbfd84db27eac9d71d12b15f9f6c1549cfc1a607fd957b8 WHIRLPOOL 21df1a426b3a5f97389bf9704eac79ab7e6d17275b2b8c32e932e0ba13a1d3f513fa37ddb1408dc95cfc302b744b1106fde22b2e8fbc6e3557209036a0384419
@ -14,7 +19,12 @@ DIST icedtea-bin-examples-3.5.1-arm64.tar.xz 1835880 SHA256 c147717e0b97ba78c0a9
DIST icedtea-bin-examples-3.5.1-ppc64.tar.xz 1848368 SHA256 9453818b7160a5968f4fa9e2303982a093e77091dd82f7352344f5c4429a6976 SHA512 7d4ad879a00ebdf0c2bd6b33aa3e057ffe73a11e67f2bf80f781e7399943d9783ee1e88e0213d04de94e59284627a325168ac3913183bb04d8966b84f0d81dab WHIRLPOOL d04092cf4840c65ec402146738c36da10012d66aa3388a287150b3ebcd151f8ba88e891eece63ea7dcfea5aec8ecb04ef4e72d9492bff73dc74fdee0d8d0bf2e
DIST icedtea-bin-examples-3.5.1-ppc64le.tar.xz 1845336 SHA256 1332ae34d932fcb70c9f0684c292bebacad9837f446915e0d93b2e8213117b0e SHA512 7436d572ee16c9fc01fc1ab98f5dcdae7233e9c03f799637751b906e0f1e3c790673c0ea94312de997203aba11132167976e1008808ad90b7c4410a00f7752bf WHIRLPOOL b16392a13f80e232a0ff87084434c74484820b353b6a782e522fe767b70c85d92055242ca2de012eb73bd374c72d9ed58a411f8b0c49b7dca77d0c16333e0362
DIST icedtea-bin-examples-3.5.1-x86.tar.xz 1862744 SHA256 bfe2ca3d365c83eb56f74e5f1c92ae72b82ba1b350d0a72145723aa7c2227522 SHA512 a803c9c91401f1a85a81d49b261445121b9ee9b5858df6ee711900684421027b4543b6f789395dff30a38afc726d5cc2e5b8307ad18996cc88ef235e6f9546a5 WHIRLPOOL 4faf5df1382c6b4021e6bb2086c35c6192240658ca5f75fb5279431ad9bb49585f5eab0142ada0c0bce42684f145c3d01374e323d6a58d3928aa3ded0cbe06f9
DIST icedtea-bin-examples-3.6.0-amd64.tar.xz 1855840 SHA256 4c199d5dfc9397f551a6d53021ebfd13a435b3a9f55af927247e3802038741ac SHA512 17e6b323d4f957aa2241b305a1ba9a0e3426593be7f35cc926d4819cf059e1022a837dace23d8aa37af713912c5ac15291b9b0cabbd9022edce86cc2294d5293 WHIRLPOOL 0c38cab1eaf1c1a0dfe58f780268903ab7132b8084a2b428c286b368034d3c0b0171a84f6175a86f7bab77325c0c8e59e7c064cb90bb6d06afc9cb13a439f29d
DIST icedtea-bin-examples-3.6.0-arm.tar.xz 1840000 SHA256 459b10682419d23dd5373c42add1a8634881cd0885ed23c52ae4164cb641f839 SHA512 4a583857597c9d036f20b74ff620894499dc9b0463d517151f3683d092050bbc10f7eb5f84b98b6ec33e80d5ea4f250466a7c34f8a3106dc36b359865396cac3 WHIRLPOOL 672a0679d37cfa0c81e280b527686747d1b5cc5d80f2b8da00b10ed213070c5a4f944fbb79485d2d7b38dbfc06f2f754e62e86127d3ae8c8b92f50d601eaabf8
DIST icedtea-bin-examples-3.6.0-arm64.tar.xz 1835852 SHA256 9dd8c0d4e4f17dad9b6a03b654ab9b4a6c0ebd8a275cbd40c6ea344b7d157beb SHA512 c0e779acb241caf84b9639a2714edcd4d8fc329917003a05386cabf8f2e9e2277d35da5925c6550980a90baf0138710fec7db19a1ee0caacfcbf876e7651c31a WHIRLPOOL 9fd2f5e3f21304f784db560c75497930c23cb86af59bfc34990118ba7b818fa06b65e4cbf4454d006ec008437f12595ec51e829561e17dadf09d6c5268a04eaa
DIST icedtea-bin-examples-3.6.0-x86.tar.xz 1862508 SHA256 d5fb362b8336e01f38bd990b7639c6d2ed346f27d2e56696b53804dc9dbc1b68 SHA512 d0f39687cedd4c8282816ef923163a5506eda07bfd0850bb3dde78daa4b2e21749ea273be9a1deb9e3d3f32e3dd9d1e587132229840b057558a5cdaa11f18668 WHIRLPOOL e822ee196b9609b06388a897b8aaa62cffe6d6e6d8db058d1a5df303218d2359070672666b223bb2eeb9e8dcd40c222d95400d4576fe5f84f2a81c96b80fe780
DIST icedtea-bin-examples-7.2.6.11-amd64.tar.xz 1796180 SHA256 18757fb3b88ff425340a389109487931906c9237158ce75597be8d3e125e111b SHA512 c2f714674956cac81b24d1a929638a38fa972dd9aed1e05ae17397b58ea334053d2e5fd2800c8242c25c1f9ccddc814f4e42aa49cb82b00dca7e18b31a6f3670 WHIRLPOOL 72874ed26a3e0b363edc29187e94e6c9b2121c2946323639556c02050e3539ce92c10593ec797593c85224b3b9692313676741e030c068c4438b7897dad8508c
DIST icedtea-bin-examples-7.2.6.11-x86.tar.xz 1797116 SHA256 f2dd2bef16173d55c0865f471637475ff1a39d027cf7044f2c4dd5c251745abe SHA512 2b91c01e2495914d0c70a6c9885246ebf7b48a9edfdb8fc0f9904db65eb3aa65ce97cec50062e39e91fc55217abccc408a4893137379e88689873907f74fd4dc WHIRLPOOL 018f9b102f06f2304b66f006b3f6a17fad00daf9815140ce5dd383ab69ef2055ebb9d92ad25c3d4a5043eea0f512f25c83bc0ad6163b621c8e421698664dcba6
DIST icedtea-bin-src-3.5.1.tar.xz 45725832 SHA256 713c32f6d7b4a7ecd790a5749f6505ef11d4268643f254316f3d50ab38c0ff90 SHA512 f16d760c810c48dcd3f0d152a88e4adf14631cf6e4bbf3caa61cd0aa95a82fd7c6845708077b1ec0c61e91bd35bd9ef7e24d9b8266d9902cd32588c75f84ca17 WHIRLPOOL 9f43f63bbf884e4b78a305c737e9cf825cd0d4583cbd95c388aa65d0c136b8cd6a98c3896633d196fbf26bbc9575adf6c7edbca0eceeb4777b423fbe465dee56
DIST icedtea-bin-src-3.6.0.tar.xz 45737964 SHA256 c7723117082376d4376e1c6d3cd563727fc05727162726075d102354d6687465 SHA512 7747beb612bb693650ff00b61524daf092890f70eed9d31321b5a347b15ed4655e3337bc887ac8cb72938f4c67b6625e216ace8e4c428277c5a4518869ca9ecd WHIRLPOOL 915770d8b3e411da3617af1cad1e19e1e1e4ed0024a57ec3f591915ddc832b741253cec54238747729f47837cb4d03bcfa7a15e0dd96915c91e5c92d0acf7be0
DIST icedtea-bin-src-7.2.6.11.tar.xz 40213908 SHA256 f5bcfa36dcf9e4320b27ea66bda2e44396600a6e2ee1b4ab57483e0603b48177 SHA512 2a1c699ea3e781d2ff81ebbb803cd06ecf1438195a6d40f04eeb8dfb03cbc4eb4934a9563f6328a7ae4ce67f6bc14aa5cd72c84948e45632d0ab92cc14f6ecc5 WHIRLPOOL 71d1f05099e6b1f2633624b33f34d38471a13ddca187437cdc10f08cd4abb861715903b9cc856ee1dbacdef3b54eb8bb83df36f3ca2e27cea9b0a88dee2e691e

@ -0,0 +1,158 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
# Don't block arm. See bug #600134.
#MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} )
KEYWORDS="-* ~amd64 ~arm ~arm64 ~x86"
inherit java-vm-2 multilib-build toolchain-funcs
abi_uri() {
echo "${2-$1}? (
${BASE_URI}/${PN}-core-${PV}-${1}.tar.xz
examples? ( ${BASE_URI}/${PN}-examples-${PV}-${1}.tar.xz )
)"
}
BASE_URI="https://dev.gentoo.org/~chewi/distfiles"
SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz )
source? ( ${BASE_URI}/${PN}-src-${PV}.tar.xz )
multilib? ( amd64? ( abi_x86_32? ( ${BASE_URI}/${PN}-core-${PV}-x86.tar.xz ) ) )
$(abi_uri amd64)
$(abi_uri arm)
$(abi_uri arm64)
$(abi_uri x86)"
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org"
LICENSE="GPL-2-with-classpath-exception"
SLOT="8"
IUSE="+alsa big-endian +cups doc examples +gtk headless-awt multilib nsplugin pulseaudio selinux source +webstart"
REQUIRED_USE="gtk? ( !headless-awt ) nsplugin? ( !headless-awt )"
RESTRICT="preserve-libs strip"
QA_PREBUILT="opt/.*"
RDEPEND=">=dev-libs/glib-2.42:2%
>=media-libs/fontconfig-2.11:1.0%
>=media-libs/freetype-2.5.5:2%
>=media-libs/lcms-2.6:2%
>=sys-libs/zlib-1.2.8-r1%
virtual/jpeg:62%
alsa? ( >=media-libs/alsa-lib-1.0% )
cups? ( >=net-print/cups-2.0% )
gtk? (
>=dev-libs/atk-2.16.0%
>=x11-libs/cairo-1.14.2%
x11-libs/gdk-pixbuf:2%
>=x11-libs/gtk+-2.24:2%
>=x11-libs/pango-1.36%
)
!headless-awt? (
media-libs/giflib:0/7%
=media-libs/libpng-1.6*%
>=x11-libs/libX11-1.6%
>=x11-libs/libXcomposite-0.4%
>=x11-libs/libXext-1.3%
>=x11-libs/libXi-1.7%
>=x11-libs/libXrender-0.9.8%
>=x11-libs/libXtst-1.2%
)"
RDEPEND=">=sys-devel/gcc-5.4.0[multilib?]
>=sys-libs/glibc-2.23[multilib?]
virtual/ttf-fonts
selinux? ( sec-policy/selinux-java )
multilib? ( ${RDEPEND//%/[${MULTILIB_USEDEP}]} )
!multilib? ( ${RDEPEND//%/} )"
PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
nsplugin? ( >=dev-java/icedtea-web-1.6.1:0[nsplugin] )
pulseaudio? ( dev-java/icedtea-sound )"
S="${WORKDIR}"
pkg_pretend() {
if [[ "$(tc-is-softfloat)" != "no" ]]; then
die "These binaries require a hardfloat system."
fi
}
src_prepare() {
default
# I wouldn't normally use -f below but symlinks in the arm files
# make this fail otherwise and any other approach would be tedious.
if ! use alsa; then
rm -fv */jre/lib/*/libjsoundalsa.* || die
fi
if use headless-awt; then
rm -fvr */jre/lib/*/lib*{[jx]awt,splashscreen}* \
*/{,jre/}bin/policytool */bin/appletviewer || die
fi
}
multilib_src_install() {
local dest="/opt/${P}-${ABI}"
dest="${dest/%-${DEFAULT_ABI}/}"
local ddest="${ED}${dest#/}"
dodir "${dest}"
if multilib_is_native_abi; then
dodoc ${P}-${ABI}/doc/{ASSEMBLY_EXCEPTION,AUTHORS,NEWS,README,THIRD_PARTY_README}
use doc && dodoc -r ${P}/doc/html
# doins doesn't preserve executable bits.
cp -pRP ${P}-${ABI}/{bin,include,jre,lib,man} "${ddest}" || die
if use examples; then
cp -pRP ${P}-${ABI}/{demo,sample} "${ddest}" || die
fi
if use source; then
cp ${P}/src.zip "${ddest}" || die
fi
# Use default VMHANDLE.
java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
else
local x native=$(get_system_arch ${DEFAULT_ABI})
for x in {,/jre}/{bin,lib/$(get_system_arch)} /jre/lib/rt.jar; do
dodir "${dest}"${x%/*}
cp -pRP ${P}-${ABI}${x} "${ddest}"${x} || die
done
for x in ${P}-${DEFAULT_ABI}{,/jre}/lib/*; do
[[ ${x##*/} = ${native} ]] && continue
[[ -e "${ddest}"/${x#*/} ]] && continue
dosym "${EPREFIX}"/opt/${P}/${x#*/} "${dest}"/${x#*/}
done
# Use ABI-suffixed VMHANDLE.
VMHANDLE+="-${ABI}" java-vm_install-env "${FILESDIR}/icedtea-bin.env.sh"
fi
# Both icedtea itself and the icedtea ebuild set PAX markings but we
# disable them for the icedtea-bin build because the line below will
# respect end-user settings when icedtea-bin is actually installed.
java-vm_set-pax-markings "${ddest}"
# Each invocation appends to the config.
java-vm_revdep-mask "${EPREFIX}${dest}"
}
src_install() {
if use multilib; then
multilib_foreach_abi multilib_src_install
else
multilib_src_install
fi
java-vm_sandbox-predict /proc/self/coredump_filter
}

@ -6,17 +6,17 @@ DIST icedtea-2.6-jdk-082c6e8b8812.tar.bz2 32843611 SHA256 ce4eca8a320c7514a7ecaa
DIST icedtea-2.6-langtools-cddb1f9f8b9c.tar.bz2 1711691 SHA256 650a2d3881ba02ea10cbb6ddeef3888103fccaa904cb23517e07b3acd26d4c7f SHA512 6301ca17725dcf085b4dea74d453bb2ec9e7620b6791bdba6cf70fd4fac3f53679c8281db17c343ae4639a3c5431d9af09d76619825e2a8f3072bf46e09a9ce1 WHIRLPOOL 75111e57719c8d7956046ffb573682074a9013e6b01636d5083018fae34a6986f58eef2c89281d7708b644cd9847f11c24a6f1f6d18b8ef03ac4f9b801f07628
DIST icedtea-2.6-openjdk-499e7894cc44.tar.bz2 130600 SHA256 0d521feed6275102ba3b3ee394330fefe20463dd63caa7197c7fd93e132519fe SHA512 95a0168b109266dfe7af97355f34888559f1978201fc7fe9c1b7b15074793d850a68ce031603bb62c4ad6790e8575ebf7e73fca2fdd8f03c9ab0a4e24e3e07b8 WHIRLPOOL 264b87945b13cf6a0adde36b084bb6889a0567e80b035ab4296b8f8bbe433c058ccfa09e32ba1a14914b5b44ea1ecf2a56c8f894c18d31087b0aed504b04a39f
DIST icedtea-2.6.11.tar.xz 2117880 SHA256 20063c314535e4ed4b8099e497b880e4f346c85e7315a2573d0f398b973777c5 SHA512 b77b5cf632d357f6ca87f2a9cfe179b95941a10e669997feb2506da56baa09fa5b94ea6025471ac6e4165bd9769799c84159d5fa39c19f1111bdb8770314d587 WHIRLPOOL 80af9323a6a8315f0a68a75db736ec35fbfa53a1b30f052cfa80256aa1dd04e9619ef9ccf9999333bc90826ca3b57750c4f62b64549ee39a71e73f7cc57d277b
DIST icedtea-3.5-aarch32-b93c39bf2bcf.tar.xz 6743892 SHA256 38e24d556aa269a5168e251b1fa97e84467a722fff27fa2f81de315854f18a33 SHA512 11d25efc36eb776fab3dd411c585d7c3ca6793ac54e17952ed43d22a6928a72fdf4625e836edafb07be3c6ee8612e258c749f5f661d61fb4b90675ed93896e48 WHIRLPOOL a4f931e56b27fab5dfa9a8ff053899b51182407eaa7b6db8a00a83915535b48f241776d7d089b532e6bb89ed629273621c9a65faf71a9efbc095ff679bd7a612
DIST icedtea-3.5-corba-b5485d6bc171.tar.xz 937092 SHA256 0b03af9726b6d47811166ab8343b553de33b4285f780c6c6df98a2e697613a0c SHA512 19d4e311edd3ed5f388373e3c819a9317dbaa561c4a22c924079cef284d16ce06d5468510b84fe3f1867570e8caed915ec4edc2479bd44686493bcf9fbf523de WHIRLPOOL dd4735a77cd8f82bae443a5330a2af97f9c925fa66e94b59cdeb6475dc521e5cd44fa0815ab5c703b1a966e8238789c150985ab354b032ab687575411a5166b7
DIST icedtea-3.5-hotspot-ecaa25cbc662.tar.xz 6820580 SHA256 a6e974e8447a661e5ae5a17e44b703395d7fc551af540890de4dcda481ebee38 SHA512 c16b5db736b553acb74bce50f37213a181fc26a6fdc7ef9242aa40c46afea78e52ec08a167f5fe29023e0ecef1f92b45b51250208d63ef88f5686fe2b12d4c34 WHIRLPOOL f513fe1e03e6f400991e9fceeacc6eef668a8135c4e7833bebac1b2fb43242195e2b3c3476e339f4e01704b042eb0606e716d3ae974bd226c026cc42eb94cc9f
DIST icedtea-3.5-jaxp-c8bf6508b7a5.tar.xz 2296924 SHA256 96a844aec7d873a260a22622b028165d862bd5842a64091ed0818309a49225a0 SHA512 5f932ce9453412d3a1b3108cf143836712cc46676093441b02db24652d4d30dbf21849cbb6fe75071961312c747289b8feccdf23c94b9e9ab2b78bdefd7c72df WHIRLPOOL d6d31ec9a2cf395e4d03c63a3ad81ef4192d699fa95b57e94265a4481144519db3f54c127bc71b9d220180fab1c4132bf1955a67c6531ff49dd0d679e50e1f4a
DIST icedtea-3.5-jaxws-4fb919272935.tar.xz 2267608 SHA256 86ae65fb5a7566216639b915abdf6f2c8522c0bfcc1bf4fe521bc3ce0a72046e SHA512 3259181c303fc1642816e5d3291d81e80fb62764edd38734876e9581d4d1fcb718bf5f2cc8dbf0362f218105effa50fa50a4e4b79e08501e991ff4bdbbf881cb WHIRLPOOL 967599341e5cc990bcb65ddcc58fc4f2a84bdad7aa33e5b7b7114f65167e2d6ce918a8fd70913a368d252c2ce143ff45504e9cb7fa12f0ed3c66ec4b2ed826fc
DIST icedtea-3.5-jdk-db0baea3a4f0.tar.xz 39030920 SHA256 65286cbd774afd95b8fd2c50c30d9d33d08156243805b10cb373a6463e66dea4 SHA512 9f60583ffd61d8dec73f17c7dbbf12e275c9c46b8cbafc59a969b11a0b65ae1f6366051fc1c76538b217a2b55510e112a815b279a9c19046f7035d2680ca2b9f WHIRLPOOL 8c70a610cb2d77d4c571c165ae4e118450d21425576f77585a0b694ba2abe417f06b235d808822f3449fdfd3d1491b67411ca6ffc4c80a81e515a73fbb7fd8cf
DIST icedtea-3.5-langtools-74bbbc7a8bd3.tar.xz 2066912 SHA256 fe554a5d3bcd7d5f2a545f6e06a50e3d5adf2619d1566b80acb0b3926953566b SHA512 856fecddf01c6eb89055bd905d0df1d61d4a1605f4663ff33357c1d4372150ddf4d5d2e6e8f2c4d8c92071075b7090c9fdbe5a10d2c0c61b1d242fe938dc1b8c WHIRLPOOL 874b16298640e6555366b387a8257f4405c76e92b7764d0807cd5c33d418c4b03be4486f06f7b7c1fba4997a48ebf4f07f06f4de17f472f040c293f70385cced
DIST icedtea-3.5-nashorn-bad6bd2d128e.tar.xz 2225708 SHA256 9e47a8838ff9f6aca596c9f07e6af6a24f7db486d1809a6e07d77cd2ecc32555 SHA512 3e3ca6942b32c1b342a108cdd08d72da49249c88c4f5da04b2e822dcb12d144584a10eb7e5c109f9bf49cd84ab957577db83d55ff31471ef76b0748b44b54896 WHIRLPOOL ca2e99d1853a75f1f3c4a6073133d2389b16c7fbd5aa84ae83177898e9972fd1b72bfffd2ab47b1bfa99cb3c509c4420fe4b385bfe1acd95b83285534ac55235
DIST icedtea-3.5-openjdk-80ab5dd98579.tar.xz 333312 SHA256 5834862d650ed290d88610d60abbfbb1f8bf47cd485051e1617ffee011cede28 SHA512 13ea05cdc90f18a1600c7771314fcf2d07bfef186e7fe9125cf37e4a62f51a1d26dab653ee294fd9079419b3297f812c6b9c516def11ede8355dd2f6d8e7a08a WHIRLPOOL 0fae338f860e1c78f835962716212020f56c50a0dc56fe3d68542f7aa34f0b33578c9d9feb7526d441734c56534aa555a87c8fa504025a839fe59c594c5bb821
DIST icedtea-3.5-shenandoah-26bb4cd21d34.tar.xz 6928840 SHA256 71b862293bd17e96f5f1a57553c17ae32dca5b4586ba592118b7d16aee63547a SHA512 3cd1856a1dbcdfc7fac3293b7a8b449dc7632b797dab9b665cb9248bcb14f3bb635760f3eaebafbe3f662a24c5125dbb2572c525dbe5d02f02806ae6d8a2eaec WHIRLPOOL 1f4cdb1c068650f4c9fe1c8239cdb6a3fd668d67e8a740f6f088b9d8834bad13fbdcc485ba2e0b6d6049e3f820ee44e38b2da46889217a46f3954cc12ab36b82
DIST icedtea-3.5.1.tar.xz 1492912 SHA256 8eaa6ac93d4a1989460109246f78427acc5493f847c7b2fc80d3a5d918d811c9 SHA512 2f9283606c275c1b326b39a649cedf0ff3a6b59be1ac455f44ced2fac16fba36758a63f227fa66c1f8ddf252a67540f6332fdf415f9dcbd09fe28308d1989cf6 WHIRLPOOL c6915b3ee3829da96dc890d28188b16e89269041309d8317a7dc17338791e16589ab72c0c0708a97dd492caf770dab2e5875703319993f5aede95078da4aee59
DIST icedtea-3.6-aarch32-7b008fa0fb6d.tar.xz 6742092 SHA256 c20ed439e32c6d72321097289bf7ac19bfae172a90efe23e08c54e63c53b402c SHA512 5cb9d97eac22fbc576b45201785a9d620daed744a2f43eb711371ff561c7d132ebdc3f291d785d285d4801c0d9b1c3bfaf57488fc8c9d31b69ba8ccd18f6c1b1 WHIRLPOOL 0ba359548f05f888d83534d0308a6bd7501ac6d95dc1f88338e8836959951a2bcea6f686785ffa4945049a345776d0a06dd03b6eebbee289b82df1da41a69be6
DIST icedtea-3.6-corba-13a5a8a3c66f.tar.xz 938380 SHA256 ad9d8ee4124afa374fb362fc2cbbcbd9efae186ade413a539e36004e70603662 SHA512 5af5898c71e2f8b4feeb55d0976828ed89cc089048b64c5b8ffe55bc0db267e58c21bc6099737a50245352f6b1ccb510fbca3871c371bbc5109323c9a372e698 WHIRLPOOL 6cb3052a8dcf02781af9cc4cfe387f63c69c97f626bc2b2798a86b9c87d593f67d9cee844b2c17d2f2569c3d1b525e50184b0957d9a90f9e864d2bab02acc379
DIST icedtea-3.6-hotspot-9bad7d4825fb.tar.xz 6820148 SHA256 2fd0b65c57255136b0fcf8ba0b5f5acdbb409af9c35ae4e84cfe7f93fdbfcfd5 SHA512 231775c3f7610388f2f5b11b60aed927e9f50cf0a65bf0675402b72c77ec1c4253e6151cbe0a27f9254297af024eae0f0ddd30a3d4b084699e730249202b9c51 WHIRLPOOL ceb043db7daec74e29b1f565da98baab7433b03ac97c960b3eb48e1b25eec532ae93c25cc280da1b44287a3213b5ccab8b2fa073d3684a40bc47c445a0f88ee5
DIST icedtea-3.6-jaxp-947a7b1ce48b.tar.xz 2297468 SHA256 b1b7b78a1079153410c1a1d20c749f92660faceb25d7e51515731bf4c6cd5f1d SHA512 b557ef3a702ec2689578485d6a7444350aa6ce55b0eea6757996b52026e877861f6989a33b4b429dc56cbf7ff81c142696dac893552bdc7330213f45cbbea665 WHIRLPOOL d786592b1ca1d6e6b0bc31c4d6d966cf9bc8ed3e4a1f75ab4f85ceccb204a307883b330c7bb11891828a9cd806478405a684872164af951aa8b58c2c9e6ca77b
DIST icedtea-3.6-jaxws-eafb356c44d0.tar.xz 2268316 SHA256 33fa2d3507498dd94d0313a2d8cd989ee1a56ef19d7203f01df79f82a1680e05 SHA512 2857819706bfad4b69e228a3cb4a139d094f605f1961dd739913015219cb38871f604b806aae4d584bc6e1b35b92406a7e9cf2b2afedee18cc4fdbfe14120f4d WHIRLPOOL 2a39b2cb4f832f09b5e6ebdb3d1d5a27bc8484e89ecfad8672a6e257a606eea0a1f145af59236275fa8510f76f47bf5e494c3bfde1a72522b5bd617c77c7e5d8
DIST icedtea-3.6-jdk-a05e38417041.tar.xz 39075276 SHA256 e86575ce39c19b46f0ca9d0c6a807504f3eee092e8307aa7614cc8822742446f SHA512 7dcf19770ef989093a309efa6ac154482ed33ac6a72e61f1b646798bf55fdc5e81ce5333abeec01f25a8296a00ba34d8ff95f6de89155f92e8a52218faefb8e9 WHIRLPOOL 46a74746cfc8ed112ab68780a0e96d127853b955623ee804b8eb849b9d4156568565a1ac106c3e700f24ea027cb234b5b17d1afd2550f375876288f507f5c45f
DIST icedtea-3.6-langtools-61a1c711f7ab.tar.xz 2065880 SHA256 2ced1f044e25d5f659413bb8fc93cf0c46dbffd2af7096f7cdb24cb67968c611 SHA512 92787dcd32ef1f19c1bc01d0dc1e604c09af81dc380eef6584f6c7bc221b285cc14ec5c13226178e2f44e904353af69f416bafe55db6ad414ad79db4878220d8 WHIRLPOOL 964a88d1adea56b81627586c6e672bb63b6f8370eeb01972d78e8f6563a4efbbc49a97e1446080f477513c925d0d13dd0f94a70d5e45a34b686dc8b1514bb777
DIST icedtea-3.6-nashorn-a2d2fc80c97a.tar.xz 2231644 SHA256 7245ba3bd15896e6f41300f370dd16a64bfa8fa6bdd69a099c0f14bd7e6546a8 SHA512 950989f71c7fef858eb8cd20024a2094e8d102b921d05fb1e4a320a431c3306178269e737f02318c448f57cd540ae6996552880ae419ef647e7dedb6b4a6ebbf WHIRLPOOL 4d58e5d04644bf41bef5e50aadb3807b7b8884a0eef691816e9d5a2a2124a76ec6562419e07c15e837171bf90d951e60acd0a654481efba23987a6759eae1f5b
DIST icedtea-3.6-openjdk-eb577ed6ec93.tar.xz 333636 SHA256 cb76591cd13fbb276ce2ac695e3b416ec58072f660c6d93c27bf003c03821d57 SHA512 db794e9bd39f8994b29677dec62b5f47e5ab92b75a3c9c1922903095269a94d4f44b57a73360d64671f3c9a1403d83dbd0251354818842b2f95ac13073d19f27 WHIRLPOOL d63d7d61f4cc64e4019f88a85b9cc5eeee8ef6b3346f2eeca57e151ac3182e7878d52f1827d8a2304f233014ce4926b7ba100f000b90fd7de29167ec90ace887
DIST icedtea-3.6-shenandoah-7eeed7dc4676.tar.xz 6935216 SHA256 0e04e065df996b967c1c9b5b14765c0b55e91c1efd5bc55a733eefca6bb21586 SHA512 4f3938acc6c49a5b9178618fd4f60a0458cbe5a3df82cb46a5dcafc6e63a74216eea55c42fee5a7ad964cc39ea816f3734dd3a8806cc71feba86e150760b3a55 WHIRLPOOL 4e79d937f5190681f6a2172099bbcb3be068b7c3115e1fe2228bfc552b2f8e2280f3f53a9bac162f2d89b11ff5cb3801ec74ed72caf00a230a26427f500ae0a6
DIST icedtea-3.6.0.tar.xz 1489504 SHA256 d0a0a9ce58b3ed29f2deecef8b78f28a79315f4a6330ee833410f79cbf48417e SHA512 7e19b66267266453b4aabeefcebe0d889604b329a5ad0338cc54cb49cef2b806fbc7cc0dd7078df231b04e033abe0c47de1b4c78e2f68682d9243e3064159c28 WHIRLPOOL 8c7d823537ac818f99b01f95ef141c6cac21825c55b8bdb26ecf40154224d673429aa86e3d8960e57255fe425a7661c8ee7a24a862876d2084d81a6f1ae70845
DIST icedtea-cacao-c182f119eaad.tar.gz 4485353 SHA256 eade43f6c5da8b3b5a64e6b206b624eaca88539f80101d7164d6aa426eb590b1 SHA512 2ccb947d71b80d84b83295d473c19952e98698a1fd944fc7c12004ff1af29af2989d46fbd95b5daf95eae2fda9de7c7f88f964fa887a6345b4f57d0c490bee23 WHIRLPOOL 8da9aff897bb7119d99ca825e70b4e79663f04d86a58c23cbf50b2bf56e96d833cc09d18380e510671c0ea65a3e19ae4cd1470741fc3b2c6cd6bcd1b9b9323b4
DIST icedtea-cacao-c182f119eaad.tar.xz 3056520 SHA256 bf48f6b725a4dc0c936f6770a67ab4074c3bb35352d5de727368350d32549808 SHA512 22e8a031db5f93f82b276b310c175f1e926e48d64e1e50bebe51138e0f66391cd005501491a959d31663f338f27a29ec984ac29f77078f59472856e4d08edef7 WHIRLPOOL ad72950f37af738b6a6b472b8410a8c8ba52c53d6243976ba983f1802e082c7778d831db202468b7ec5e036dbea1513af6345c666c68b52bae2a95941567cdf0
DIST icedtea-jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz 317187 SHA256 31810266666c23822942aac62a78019c2c4589e1c5ee48329cbf42652d4437bc SHA512 a31348481e1c02747f5bb9db333f855c45a1555aa187ee35de5ef553a10a8a47dfcc1beb1e69502046c1758438b91958a328e0a0015812c153221f67734a70a6 WHIRLPOOL 2d629f581a257d51b814aa771173c952445f502e5bd6e21ae7e748e1683fc7820d13f9fd9bf6cacbffeed2097e74628107778f223d617bba71c33f4b124e44c4

@ -13,16 +13,16 @@ ICEDTEA_BRANCH=$(get_version_component_range 1-2)
ICEDTEA_PKG=icedtea-${ICEDTEA_VER}
ICEDTEA_PRE=$(get_version_component_range _)
CORBA_TARBALL="b5485d6bc171.tar.xz"
JAXP_TARBALL="c8bf6508b7a5.tar.xz"
JAXWS_TARBALL="4fb919272935.tar.xz"
JDK_TARBALL="db0baea3a4f0.tar.xz"
LANGTOOLS_TARBALL="74bbbc7a8bd3.tar.xz"
OPENJDK_TARBALL="80ab5dd98579.tar.xz"
NASHORN_TARBALL="bad6bd2d128e.tar.xz"
HOTSPOT_TARBALL="ecaa25cbc662.tar.xz"
SHENANDOAH_TARBALL="26bb4cd21d34.tar.xz"
AARCH32_TARBALL="b93c39bf2bcf.tar.xz"
CORBA_TARBALL="13a5a8a3c66f.tar.xz"
JAXP_TARBALL="947a7b1ce48b.tar.xz"
JAXWS_TARBALL="eafb356c44d0.tar.xz"
JDK_TARBALL="a05e38417041.tar.xz"
LANGTOOLS_TARBALL="61a1c711f7ab.tar.xz"
OPENJDK_TARBALL="eb577ed6ec93.tar.xz"
NASHORN_TARBALL="a2d2fc80c97a.tar.xz"
HOTSPOT_TARBALL="9bad7d4825fb.tar.xz"
SHENANDOAH_TARBALL="7eeed7dc4676.tar.xz"
AARCH32_TARBALL="7b008fa0fb6d.tar.xz"
CACAO_TARBALL="cacao-c182f119eaad.tar.xz"
JAMVM_TARBALL="jamvm-ec18fb9e49e62dce16c5094ef1527eed619463aa.tar.gz"
@ -128,7 +128,7 @@ RDEPEND="${COMMON_DEP}
selinux? ( sec-policy/selinux-java )"
# ca-certificates, perl and openssl are used for the cacerts keystore generation
# perl is needed for running the SystemTap tests
# perl is needed for running the SystemTap tests and the bootstrap javac
# lsb-release is used to obtain distro information for the version & crash dump output
# attr is needed for xattr.h which defines the extended attribute syscalls used by NIO2
# x11-libs/libXt is needed for headers only (Intrinsic.h, IntrinsicP.h, Shell.h, StringDefs.h)
@ -159,6 +159,23 @@ PDEPEND="webstart? ( >=dev-java/icedtea-web-1.6.1:0 )
S="${WORKDIR}"/${ICEDTEA_PKG}
# @FUNCTION: get_systemtap_arch
# @DESCRIPTION:
# Get arch name used in /usr/share/systemtap/tapset so we can
# install OpenJDK tapsets.
get_systemtap_arch() {
local abi=${1-${ABI}}
case ${abi} in
*_fbsd) get_systemtap_arch ${abi%_fbsd} ;;
amd64*) echo x86_64 ;;
ppc*) echo powerpc ;;
x86*) echo i386 ;;
*) echo ${abi} ;;
esac
}
icedtea_check_requirements() {
local CHECKREQS_DISK_BUILD
@ -344,6 +361,7 @@ src_install() {
local dest="/usr/$(get_libdir)/icedtea${SLOT}"
local ddest="${ED}${dest#/}"
local stapdest="/usr/share/systemtap/tapset/$(get_systemtap_arch)"
if ! use alsa; then
rm -v "${ddest}"/jre/lib/$(get_system_arch)/libjsoundalsa.* || die
@ -359,6 +377,14 @@ src_install() {
dosym /usr/share/doc/${PF} /usr/share/doc/${PN}${SLOT}
# Link SystemTap tapsets into SystemTap installation directory
mkdir -p "${ED}/${stapdest}"
for tapsets in "${ddest}"/tapset/*.stp; do
tapname=$(basename ${tapsets})
destname=${tapname/./-${SLOT}.}
dosym "${dest}"/tapset/${tapname} ${stapdest}/${destname}
done
# Fix the permissions.
find "${ddest}" \! -type l \( -perm /111 -exec chmod 755 {} \; -o -exec chmod 644 {} \; \) || die

@ -21,6 +21,7 @@ IUSE="debug emacs erlang examples java mono profile readline threads trail"
DEPEND="!dev-libs/mpatrol
!dev-util/mono-debugger
net-libs/libnsl:0=
readline? ( sys-libs/readline:= )
erlang? ( dev-lang/erlang )
java? ( >=virtual/jdk-1.6:= )

@ -21,6 +21,7 @@ IUSE="debug emacs erlang examples java minimal readline threads"
DEPEND="!dev-libs/mpatrol
!dev-util/mono-debugger
net-libs/libnsl:0=
readline? ( sys-libs/readline:= )
erlang? ( dev-lang/erlang )
java? ( >=virtual/jdk-1.6:= )"

@ -1,3 +1,4 @@
DIST MoarVM-2017.07.tar.gz 4396077 SHA256 21c6c85464bcc012af4fa3ed5fe2a54262439f197c5141cfc71f57e2841ba67a SHA512 675633bdc97e30eb6a7a2208338b7124215a92ed1a129076b0e59f9f2f0996b903120e3aa2a915a370c637d6529fdccef0bbcc31ce91c1485df60f9ce7e9e689 WHIRLPOOL 83b38aae50904680c58970f51bb33aa2b112a0cb8b92f04900085083e3e12c0905829107759782531b301714283dfdb044508133b02e4d4a5f271d6bd5eca6bc
DIST MoarVM-2017.08.1.tar.gz 4440494 SHA256 ce032fcbd3ff195825cb0c52c8844b611e63c54a57854602236e3a2a570fa643 SHA512 52331993b59fdad8d30161f3e95e8bfcf16c69e452f8fa32492fa551d225ed7eb9e0ac015049e40d119e8e7958c529b966f34a0175ae686000264eb02478a749 WHIRLPOOL 72ce60a47eea7e9588b0da3d4cc9c6bb070686f1ff8524f0f157e9a93cd2531c876457f9e23c599069a0cb6dd45e9d6f528bde437ebbf634e3dbe4b15207b94a
DIST MoarVM-2017.09.1.tar.gz 4579930 SHA256 1c09b70a6b454abb48baaa9432e90c33002983cdb96328418f1be1a572e11f47 SHA512 c7b675a3894a2b58d15eefb52519b6b7e4519561525b6095327ab7621e29c3ea3c077c625bd48123cd514b4e32d2e7cbdb3861319d3e32de134d7f8475540fee WHIRLPOOL fa7e78cc0430a84395b4ffbd56adffda3220a6982e0ffc565f0357ad72b158e216ddfa1e9fe7e7c1e70c6eeff12d6d944b30112b468942ec7523bb940e9e642f
DIST MoarVM-2017.10.tar.gz 4789334 SHA256 27cddd50db65359aed82bc6a9bd0e52988a52ee89e7e353eb63185c267d22a5b SHA512 f79e60b22615cbbb5b16d4b810c864f7cbc2c36e73769b132b84edb03e0d975da6f7db153492a3101c86946d728a21af6225d61e752e36557c2c6f1bcd91859c WHIRLPOOL b02c447366d0fc94e140a0da00e50961f631a239c0d4055a24a3c18fdab53cdaafa47cb38d6baf7e507c2c6f8d4ca03e147fd5b5e14a0ae06824c5f6e84d3c34

@ -0,0 +1,58 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
inherit flag-o-matic
MY_PN="MoarVM"
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
inherit git-r3
KEYWORDS=""
S="${WORKDIR}/${P}"
else
SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/${MY_PN}-${PV}"
fi
DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
HOMEPAGE="http://moarvm.org"
LICENSE="Artistic-2"
SLOT="0"
IUSE="asan clang debug doc +jit static-libs optimize ubsan"
RDEPEND="dev-libs/libatomic_ops
dev-libs/libuv
dev-lang/lua:0[deprecated]
dev-lua/LuaBitOp
virtual/libffi"
DEPEND="${RDEPEND}
clang? ( >=sys-devel/clang-3.1 )
dev-lang/perl"
DOCS=( CREDITS README.markdown )
# Tests are conducted via nqp
RESTRICT=test
src_configure() {
use doc && DOCS+=( docs/* )
local myconfigargs=(
"--prefix=/usr"
"--has-libuv"
"--has-libatomic_ops"
"--has-libffi"
"--libdir=$(get_libdir)"
"--compiler=$(usex clang clang gcc)"
"$(usex asan --asan)"
"$(usex debug --debug --no-debug)"
"$(usex optimize --optimize= --no-optimize)"
"$(usex static-libs --static)"
"$(usex ubsan --ubsan)"
)
use optimize && filter-flags '-O*'
perl Configure.pl "${myconfigargs[@]}" || die
}

@ -1,3 +1,4 @@
DIST nqp-2017.07.tar.gz 3713517 SHA256 31fefc7fa02441b45ff0ca465b58a8b391522b7090965a85323134aa17cb1166 SHA512 55ef0827c6e013b898d8a5034d2568e787bb89b510234cd58239f13c9f8f9ff24bb3790838aeade79fe09d721c2d2384c94bc4714b24f3d602a9b4a0dbcdcafc WHIRLPOOL 71ee1e98810b32a8fe5220fb0efd5d99c393bbf1b1fd13898cf21c7ba82d5815a9136cc6965077cb58a8777c040f4578b3a50fb180b01e190d8f9f6b82366bae
DIST nqp-2017.08.tar.gz 3718841 SHA256 70e202096c1ca12ccaec700633807e64c21a395ca45a581c762f3a1d417fa76a SHA512 b86e58f1465ca0baaafd3424739b3ad0da8b5b764e53afa36d77c5058015a66d6180c97e56adfa8de2892e28669b3bcc688d16009669ad995170ca6e68c8b486 WHIRLPOOL c3c737d76099d22047860b97926f4af7202d2b1e4783d926a88fd9f914d0c0d0eeb65829f7c4d0d7af4e541b7c09a380f2db9a3c87889b6f2ed06a44aaa8d365
DIST nqp-2017.09.tar.gz 3724208 SHA256 ac6e1d2cdd8239cb2636c62ee6500e9bb346c63d4934c4dca125bc714cc023c0 SHA512 a932f6d5ea24ad1857339cd5d7314f75b5bb08628df63e180c3675e0e5a8d04fe12add1cf2d04c55e0454bc4c0e5e59cfd57f793c242dfa2459f06ae8a2097cb WHIRLPOOL c015a9b6a82d07fbae86dd1195ddf5e82faecdbed83fa939f02e8a2f9748d5b6cf1e6156792a43ce40b14f58c74c9ad7190f8c319a846aee7e3bb61fb9daf73f
DIST nqp-2017.10.tar.gz 3768260 SHA256 8b244961c88a71af605e4f0b24e0bbeb36a8ab33f26e9451dffed71f27d9945b SHA512 fd43e1f7d768de58aae98afc031ad5fa5d28e767bac4f4acf913b356c107035c98c6551ad34f17f7a7a76269f96905882e348e5f821d7edf2cf7ffbee50798bc WHIRLPOOL 2050ac7bbd171167639d90eae11fcbb6d68eacd3723450b4bb0ccefd265d4b46eeec6985b5f1b06feb8b14f4ebbc42e8af523e9b67558df0c447719bd199e8fd

@ -0,0 +1,159 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit java-pkg-opt-2 multibuild
if [[ ${PV} == "9999" ]]; then
EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
inherit git-r3
KEYWORDS=""
else
SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
inherit vcs-snapshot
KEYWORDS="~amd64 ~x86"
fi
DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
HOMEPAGE="http://rakudo.org/"
LICENSE="Artistic-2"
SLOT="0"
IUSE="doc clang java +moar test"
REQUIRED_USE="|| ( java moar )"
CDEPEND="java? (
dev-java/asm:4
dev-java/jline:0
dev-java/jna:4
)
moar? ( ~dev-lang/moarvm-${PV}[clang=] )"
RDEPEND="${CDEPEND}
java? ( >=virtual/jre-1.7 )"
DEPEND="${CDEPEND}
clang? ( sys-devel/clang )
java? ( >=virtual/jdk-1.7 )
dev-lang/perl"
pkg_pretend() {
if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
ewarn "already being installed. So if it fails, try uninstalling both"
ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
ewarn "(see Bug #584394)"
fi
}
java_prepare() {
# Don't clean stage0 jars.
einfo "Cleaning upstream jars"
java-pkg_clean 3rdparty/
# Don't use jars we just deleted.
sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
src/vm/jvm/runners/nqp-j || die
}
src_prepare() {
MULTIBUILD_VARIANTS=()
use moar && MULTIBUILD_VARIANTS+=( moar )
use java && MULTIBUILD_VARIANTS+=( jvm )
multibuild_copy_sources
# This will pull in conditional java_prepare
default
}
nqp_configure() {
pushd "${BUILD_DIR}" > /dev/null || die
local myconfargs=(
"--backend=${MULTIBUILD_VARIANT}"
"--prefix=/usr" )
perl Configure.pl "${myconfargs[@]}" || die
popd || die
}
nqp_compile() {
if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
emake -j1 \
-C "${BUILD_DIR}" \
THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
emake -j1 \
-C "${BUILD_DIR}"
fi
}
nqp_test() {
emake -j1 \
-C "${BUILD_DIR}" \
test
}
nqp_install() {
# This is the actual reason we need multibuild.eclass.
# We need to distinguish the install procedure for MoarVM and JVM backends.
case "${MULTIBUILD_VARIANT}" in
moar)
emake \
DESTDIR="${ED}" \
-C "${BUILD_DIR}" \
install
;;
jvm)
pushd "${BUILD_DIR}" > /dev/null || die
# Set JAVA_PKG_JARDEST early.
java-pkg_init_paths_
# Upstream sets the classpath to this location. Perhaps it's
# used to locate the additional libraries?
java-pkg_addcp "${JAVA_PKG_JARDEST}"
insinto "${JAVA_PKG_JARDEST}"
local jar
for jar in *.jar; do
if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
# jars for NQP itself.
java-pkg_dojar ${jar}
else
# jars used by NQP.
doins ${jar}
fi
done
# Upstream uses -Xbootclasspath/a, which is faster due to lack
# of verification, but gjl isn't flexible enough yet. :(
java-pkg_dolauncher ${PN}-j --main ${PN}
dosym ${PN}-j /usr/bin/${PN}
dobin tools/jvm/eval-client.pl
popd > /dev/null || die
;;
*)
die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
;;
esac
}
src_configure() {
multibuild_foreach_variant nqp_configure
}
src_compile() {
multibuild_foreach_variant nqp_compile
}
src_test() {
multibuild_foreach_variant nqp_test
}
src_install() {
multibuild_foreach_variant nqp_install
dodoc CREDITS README.pod
use doc && dodoc -r docs/*
}

@ -1,6 +1,6 @@
DIST ocaml-4.04.2.tar.gz 4061873 SHA256 6277a477956fc7b76f28af9941dce2984d0df809a0361093eb2e28234bf9c8ed SHA512 8b6a0319307cbb7451594d2f7c63851299d3e7d6ae7879e7525373304f9fd5a9b01d503ecd313a12a3cae24a4a7cb909f7aeebbb70efaa5277137189ea4558cb WHIRLPOOL b8b4fe7b86525686765cb02f221e6a75c06466cb172348474a18163648f7269bd29ca2bea4dcb890ce6fef86b91743139bfaa4e4fbda53d288d696b8572c5639
DIST ocaml-4.05.0.tar.gz 4431750 SHA256 e5d8a6f629020c580473d8afcfcb06c3966d01929f7b734f41dc0c737cd8ea3f SHA512 9a060ae4b741e1687277403e5bdb8f6eda2e2ebf6c45f7c0149b66ea1213cb26d13febfbb3f11c12543e244cfdd053b786b09c4145e2348e5d89a7206f7de225 WHIRLPOOL 75531b9f1f229aab9813b665908bd3df10abe4648c7362584f19e3faeceecadea8fa7bda14dc17466d98d3aac9dc1ce9ca8b40de3434d861060f461c4f972845
DIST ocaml-4.06.0-beta2.tar.gz 4566450 SHA256 65130faa992c11a629f0c08621f64cc4ee34368d3df64636fcf1af31f2cb4b26 SHA512 d4c46ccf01e38736b946879298347cedb81dbf3d26fc877fefc11eb42743cf8e0133b419805f3ca0fed52d7338549f18ca5ad378f2661939e526b6f803f26483 WHIRLPOOL 102da0db2e7d3e0615dd5f23180df51b8589ce3833e8dbd1842248c0a0f3bfcaf3fd50c753b2e7129880fc29d9c6a7b0170d3c52d570f2eb2437c56cd1e38a28
DIST ocaml-4.06.0.tar.gz 4575476 SHA256 011879c913e8f988ecdac020b205e2baa4023052efed25013bdb9a6b0d5c6a80 SHA512 612884cd7b185838539aefcf43ac2ed21f415c3054542a8a94a3c2e24a2054548f75277c404521fb3c1e2e3742f82dd66437a74310348ef611b71d425d2047db WHIRLPOOL f08cd4f229dc384deb1b8905289ebd035bdfb30837da484efd97e2470ff68d53bfd1ac0fa1e105bb523fefc86eb0713802d2345b828c9e3dd8f8f8bc0287c6ca
DIST ocaml-patches-10.tar.bz2 943 SHA256 4fbd5ca4ed1755f8a37d8c101342552a4f60c8c0b651e46a703b8da8a9451894 SHA512 fe39066c25267f2ff828e6746bcda5f5b1e40e22a063d83268cfcc2fcda28dbd7e714751466491385d054ba2eadff2d0a4c407d5fe5db2f98931bdde612f07e9 WHIRLPOOL 752bfc72838654b8448bb0d5516f10eba77eb399fb71953bbad129db206567340f29b8d8568c2ec728e3fe17ccb858fd161ee3d451570d9447c9f63f5d7ac582
DIST ocaml-patches-8.tar.bz2 1803 SHA256 bce7ea483842f6e201cdf3de266928b39b5b45322315010291ed28f811720525 SHA512 fc477fbb5bdec60a3c4d3dfa110119bb579560ac0e0e57e30e076da72643bda6359c06fd3745fd3436c5d611dbbd888ec2921e9d1920f4929df633c35a797411 WHIRLPOOL ae73b5377744add3afce012b5745fafd70c0f92f75cd6cf91560e0f2ba359a91f7276afed13db145c307be9fdf79c339c2c69be6946565354c68d701fa61a4be
DIST ocaml-patches-9.tar.bz2 1700 SHA256 1709c257536e9a8fdd25bfa651c4fb1aaff4c97596dbaa70eb4d4afc7020ae92 SHA512 cc19f9104fac69aecc5effa8cb772342e1fb61cdcd38ba0176efe04cf3d710b1c56d5178748f3bd29099af91fa684da432a8ef8d42de76dbd1b6954a255ea6c0 WHIRLPOOL 185406937ff0fdbfba3eed0e2e4267efac5aff1a15fc3cc5ea4434a57bf4a790bd21a801613d768328f3ab5046a0c85a0b73681c6711c348d0d0755a723c4857

@ -19,6 +19,7 @@ IUSE="opengl nls doc examples gdbm +gmp ssl +unicode pcre"
RDEPEND="sys-libs/readline
dev-libs/libffi
net-libs/libnsl:0=
opengl? ( media-libs/freeglut )
nls? ( sys-devel/gettext )
unicode? ( >=dev-libs/icu-2.6:= )

@ -347,6 +347,12 @@ src_configure() {
# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
# xlocale.h is going away in glibc-2.26, so it's counterproductive
# if we use it and include it in CORE/perl.h ... Perl builds just
# fine with glibc and locale.h only.
# However, the darwin prefix people have no locale.h ...
use elibc_glibc && myconf -Ui_xlocale
# This flag makes compiling crash in interesting ways
filter-flags "-malign-double"
@ -511,7 +517,6 @@ src_configure() {
-Dsh="${EPREFIX}"/bin/sh \
-Dtargetsh="${EPREFIX}"/bin/sh \
-Uusenm \
-Ui_xlocale \
"${myconf[@]}" \
"${EXTRA_ECONF[@]}"

@ -347,6 +347,12 @@ src_configure() {
# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
# xlocale.h is going away in glibc-2.26, so it's counterproductive
# if we use it and include it in CORE/perl.h ... Perl builds just
# fine with glibc and locale.h only.
# However, the darwin prefix people have no locale.h ...
use elibc_glibc && myconf -Ui_xlocale
# This flag makes compiling crash in interesting ways
filter-flags "-malign-double"
@ -511,7 +517,6 @@ src_configure() {
-Dsh="${EPREFIX}"/bin/sh \
-Dtargetsh="${EPREFIX}"/bin/sh \
-Uusenm \
-Ui_xlocale \
"${myconf[@]}" \
"${EXTRA_ECONF[@]}"

@ -347,6 +347,12 @@ src_configure() {
# Perl has problems compiling with -Os in your flags with glibc
use elibc_uclibc || replace-flags "-Os" "-O2"
# xlocale.h is going away in glibc-2.26, so it's counterproductive
# if we use it and include it in CORE/perl.h ... Perl builds just
# fine with glibc and locale.h only.
# However, the darwin prefix people have no locale.h ...
use elibc_glibc && myconf -Ui_xlocale
# This flag makes compiling crash in interesting ways
filter-flags "-malign-double"
@ -511,7 +517,6 @@ src_configure() {
-Dsh="${EPREFIX}"/bin/sh \
-Dtargetsh="${EPREFIX}"/bin/sh \
-Uusenm \
-Ui_xlocale \
"${myconf[@]}" \
"${EXTRA_ECONF[@]}"

@ -17,7 +17,7 @@ SRC_URI="https://github.com/mgorny/${PN}/releases/download/${P}/${P}.tar.bz2"
LICENSE="BSD-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE=""
# eselect-python because of /usr/bin/python* collisions and new config

@ -16,7 +16,7 @@ SRC_URI="https://www.python.org/ftp/python/${PV}/${MY_P}.tar.xz
LICENSE="PSF-2"
SLOT="2.7"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
IUSE="-berkdb build doc elibc_uclibc examples gdbm hardened ipv6 libressl +ncurses +readline sqlite +ssl +threads tk +wide-unicode wininst +xml"
# Do not add a dependency on dev-lang/python to this ebuild.

@ -1,3 +1,4 @@
DIST rakudo-2017.07.tar.gz 2984621 SHA256 a1d55c2bfef84c32739535e0638e87496ececf4c97a74796f97fa97edb51edea SHA512 a80fba71bce8a6537962c5728ef1b54c6bfd275b9a4b7caacc6497f12a826b293a3a2bf8c412b21e91bb29bd3a325d9da17ecd8abb0ba2ffd4b8eecf0297d39f WHIRLPOOL 6c45f3e323bae859b00a2c97d37e40e0fe1e97daf359a692de8a9fd176899805ced1b5ebc98f57f471efca9ce35061b191b85132d7945c0bd39859cf9fbe2e4b
DIST rakudo-2017.08.tar.gz 2992885 SHA256 bd18bcb41e0174f3ea4a857da9e599a11d68c21535fd0bee52885ada4a3b32b5 SHA512 61091f1181bc1d95433650ecc8ee318cf7ef4ee1a67d492020654e8abd5095368d8a0e3d20647f336de5864eba5f8ef4cf1ce54d09763cf79cc1b7c5c457a300 WHIRLPOOL 4862b5b40a14754c7ef995fabe8ce4451f85836c4dfb8135e92cc0f9a8523db967c0b7a92f55c510f0c5d2f054d74fb57aa6bbd524eef2e53c6e973ada43bef6
DIST rakudo-2017.09.tar.gz 3006759 SHA256 c20be0429428a5987d8b1957554f56bc02fbd6e903bb24a8b10e9ad99d7fef08 SHA512 6ae257430436586a519cc411771c5a19c3bf6aefcb5b02cd1751184ccd8f2fe860ce33c53421ff1fd48a598f27532932a1754407fb0f6a1861da0808c5876b9b WHIRLPOOL 3d526ca03815f66686c63092a8e74af37f64d30f9e2cdd60ddf261480248846f73355c93346b485a70b7c4c1d1b986948dadae3783591fecd434b0225f03ec8d
DIST rakudo-2017.10.tar.gz 3049348 SHA256 f32bbc36c6abab220f7695d259f76f9f849d4064e461b2c7b4ad62d472086d2b SHA512 f3832a5dcd0048a7d9018c46e8430245b3d6565516d61f4dc57ff06d5dbf38afab7b9a4791a0f88ef4422899418f3ce550e5271cef668ab74804f898c8c5faaa WHIRLPOOL b2bcfd2bb25ff51a68ca8fcf2690e520287f45ce7c4eb8cb7b2a85e51261ad8ee3c0bff5f871a85bb161936807051ab9bdafb9b888eb682e5f350f06375d20ea

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

Loading…
Cancel
Save