Sync with portage [Mon May 16 00:44:34 MSK 2016].

mhiretskiy 345
root 8 years ago
parent b24d7b0787
commit cafe3c77ce

@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-3" LICENSE="GPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86 ~x64-macos" KEYWORDS="amd64 ~x86 ~x64-macos"
IUSE="test" IUSE="test"
RDEPEND=" RDEPEND="

@ -1 +1 @@
DIST calamares-2.2.1.tar.gz 4733060 SHA256 1775444f286b37994a6970e878db09bf48dfa687c57435eed05c27d3064f34fa SHA512 f6864277857cef616598526936ee91b01245aac8c4fa67cbb69bf365523177d0042c46846af4116496974d74672582a7b6b6b925a9da0aa7819ad6b238ec7980 WHIRLPOOL 0ddc38a2c8ac06892e0dbee2117e100479c28548fed792c9be9ccc547fb49247cc4c69fd88e5d503786ba93d1a1f28ef84979c2a32a97c5fb94a3952f29e9535 DIST calamares-2.2.2.tar.gz 2015468 SHA256 d9cf132ae263a48455596d4a7e522d5199c7717dc9b7f3568cefe588082667a9 SHA512 f78dc1a4a5fc9911c4ac78f36b3e7ccb7ccf10d690778662871cc6d1010ce0fce295171a949eb6613c42d4c8a3689234138984ec7846d492a5c854f1fe513f38 WHIRLPOOL 1f9579acf64813675b076ab3efa2cc31f742cb89d53c15f1103e681af0e988df6ad086c738c56e533744b31d48afdfa2dc2a196328720a89bad557aa43202f27

@ -1,3 +1,4 @@
DIST KeePass-2.30-Source.zip 4767753 SHA256 4a3c3c217bc05b13bf903612b89a09b67ed1df68fdecd83324f2ef372313e9e4 SHA512 05404f273f6a7df33887b036aa0dba335124a7b2ae30b61957f8dc9c959cdd3342fdfa22a7d59ba5e9180f039fed5ecbac0a3154eb9d342a5a3a8a057d763182 WHIRLPOOL 4ddec9e592724b60724a2deaaf959dacc91f77d1ae97dd07af940f8efd882a008b4424ba68a4fcbd9ebe8d75c2b8a9a644ff7144ed593cfb3f0e361c0364a780 DIST KeePass-2.30-Source.zip 4767753 SHA256 4a3c3c217bc05b13bf903612b89a09b67ed1df68fdecd83324f2ef372313e9e4 SHA512 05404f273f6a7df33887b036aa0dba335124a7b2ae30b61957f8dc9c959cdd3342fdfa22a7d59ba5e9180f039fed5ecbac0a3154eb9d342a5a3a8a057d763182 WHIRLPOOL 4ddec9e592724b60724a2deaaf959dacc91f77d1ae97dd07af940f8efd882a008b4424ba68a4fcbd9ebe8d75c2b8a9a644ff7144ed593cfb3f0e361c0364a780
DIST KeePass-2.31-Source.zip 4714301 SHA256 555b1a30f374f7077bf15906b09ab36b40fd3fc5753673a3c0ee3f30f0ed7881 SHA512 e2e81e7d60bc58a18ea3b9a82741bdd6e5be88bcfcf447ae587f6177a8ff97e7c82c02fb0695142f8321c7b5f92aa982254629928dd0c12393d659380f46026d WHIRLPOOL b8b572bd7db7ce9bc67ae0a241c71cd30595753d06bfed85efafece2b3cce4893c5cc213ee44cabd81c6ff12fc2fc98234d845ed94d0068d8111d116ccc39333 DIST KeePass-2.31-Source.zip 4714301 SHA256 555b1a30f374f7077bf15906b09ab36b40fd3fc5753673a3c0ee3f30f0ed7881 SHA512 e2e81e7d60bc58a18ea3b9a82741bdd6e5be88bcfcf447ae587f6177a8ff97e7c82c02fb0695142f8321c7b5f92aa982254629928dd0c12393d659380f46026d WHIRLPOOL b8b572bd7db7ce9bc67ae0a241c71cd30595753d06bfed85efafece2b3cce4893c5cc213ee44cabd81c6ff12fc2fc98234d845ed94d0068d8111d116ccc39333
DIST KeePass-2.32-Source.zip 4721787 SHA256 7c49b62c8de758dee7e9c2d6108c169d468b4e65f21e297649d3dd8c2b757385 SHA512 6c6345cedc505eaaec28c6e89e225bdad5d5ac169c364a7e04b06bbdef4223829662f6e12a7432a3785f73cbc6798ba578468be04ab1063eb96135346570c7c3 WHIRLPOOL 6ba1bff9df311950068e34f9044f5b9e29e6e571e1928093f7ad6dc23c8b7ad26a89371fc425df0f5b41d3781aa29c0c6ad4d8c0c0f077248e4ee7f9022dabe3 DIST KeePass-2.32-Source.zip 4721787 SHA256 7c49b62c8de758dee7e9c2d6108c169d468b4e65f21e297649d3dd8c2b757385 SHA512 6c6345cedc505eaaec28c6e89e225bdad5d5ac169c364a7e04b06bbdef4223829662f6e12a7432a3785f73cbc6798ba578468be04ab1063eb96135346570c7c3 WHIRLPOOL 6ba1bff9df311950068e34f9044f5b9e29e6e571e1928093f7ad6dc23c8b7ad26a89371fc425df0f5b41d3781aa29c0c6ad4d8c0c0f077248e4ee7f9022dabe3
DIST KeePass-2.33-Source.zip 4738822 SHA256 5120a490289155a8b49c8e6893a2cc4b20fe859b34f815f17a017bae449f9958 SHA512 acbc226f96783f0d77d8b70b6a223de80ab7fd73bd750cedf0a52a46e60ed5e816281ec0bc168aea03a0fbb9bb2869ea410d208620bc46b30e53829f22644375 WHIRLPOOL 1bdcb19e6e15860f5423f5646f4481e4c6f43c474422c096a808bf5fb862268ddd42d22c67096fa2ebd2f41811d30592a69389561bd6619d0cf0c0da7ae74c0a

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="amd64 ~x86"
IUSE="aot" IUSE="aot"
COMMON_DEPEND=">=dev-lang/mono-2.10.5" COMMON_DEPEND=">=dev-lang/mono-2.10.5"

@ -0,0 +1,113 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils fdo-mime gnome2-utils mono-env multilib
MY_PN="KeePass"
DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
HOMEPAGE="http://keepass.info/"
SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="aot"
COMMON_DEPEND=">=dev-lang/mono-2.10.5"
RDEPEND="${COMMON_DEPEND}
dev-dotnet/libgdiplus[cairo]"
DEPEND="${COMMON_DEPEND}
app-arch/unzip"
S=${WORKDIR}
src_prepare() {
# Force text mode for >grep-2.21 (bug #574480)
epatch "${FILESDIR}/${PN}-2.31-force-text-grep.patch"
# Remove Windows-specific things
pushd Build > /dev/null || die
. PrepMonoDev.sh || die
popd > /dev/null || die
# KeePass looks for some XSL files in the same folder as the executable,
# we prefer to have it in /usr/share/KeePass
epatch "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch"
# bug # 558094
if has_version ">=dev-lang/mono-4" ; then
sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
fi
}
src_compile() {
# Build with Release target
xbuild /target:KeePass /property:Configuration=Release || die
# Run Ahead Of Time compiler on the binary
if use aot; then
cp Ext/KeePass.exe.config Build/KeePass/Release/
mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
fi
}
src_install() {
# Wrapper script to launch mono
make_wrapper ${PN} "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
# Some XSL files
insinto /usr/share/${PN}/XSL
doins Ext/XSL/*
insinto /usr/$(get_libdir)/${PN}/
exeinto /usr/$(get_libdir)/${PN}/
doins Ext/KeePass.exe.config
# Default configuration, simply says to use user-specific configuration
doins Ext/KeePass.config.xml
# The actual executable
doexe Build/KeePass/Release/KeePass.exe
# Copy the AOT compilation result
if use aot; then
doexe Build/KeePass/Release/KeePass.exe.so
fi
# Prepare the icons
newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
# Create a desktop entry and associate it with the KeePass mime type
make_desktop_entry ${PN} ${MY_PN} ${PN} "System;Security" "MimeType=application/x-keepass2;"
# MIME descriptor for .kdbx files
insinto /usr/share/mime/packages/
doins "${FILESDIR}/${PN}.xml"
}
pkg_preinst() {
gnome2_icon_savelist
}
pkg_postinst() {
gnome2_icon_cache_update
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
if ! has_version x11-misc/xdotool ; then
elog "Optional dependencies:"
elog " x11-misc/xdotool (enables autotype)"
fi
elog "Some systems may experience issues with copy and paste operations."
elog "If you encounter this, please install x11-misc/xsel."
}
pkg_postrm() {
gnome2_icon_cache_update
fdo-mime_mime_database_update
fdo-mime_desktop_database_update
}

@ -12,7 +12,7 @@ SRC_URI="https://www.keepassx.org/releases/${PV}/${P}.tar.gz"
LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )" LICENSE="|| ( GPL-2 GPL-3 ) BSD GPL-2 LGPL-2.1 LGPL-3+ CC0-1.0 public-domain || ( LGPL-2.1 GPL-3 )"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux" KEYWORDS="amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
IUSE="test" IUSE="test"
DEPEND=" DEPEND="

@ -11,7 +11,7 @@ SRC_URI="http://mmonit.com/monit/dist/${P}.tar.gz"
LICENSE="AGPL-3" LICENSE="AGPL-3"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux" KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux"
IUSE="libressl pam ssl" IUSE="libressl pam ssl"
RDEPEND=" RDEPEND="

@ -14,7 +14,7 @@ LICENSE="Apache-2.0"
SLOT="0" SLOT="0"
IUSE="" IUSE=""
# will need the same keywords as puppet # will need the same keywords as puppet
KEYWORDS="~amd64 ~x86" KEYWORDS="amd64 ~x86"
RDEPEND+=">=virtual/jdk-1.7.0" RDEPEND+=">=virtual/jdk-1.7.0"
DEPEND+="" DEPEND+=""

@ -14,7 +14,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_REPO_URI="git://anongit.gentoo.org/proj/python-updater.git" EGIT_REPO_URI="git://anongit.gentoo.org/proj/python-updater.git"
else else
SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2" SRC_URI="https://dev.gentoo.org/~floppym/dist/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
fi fi
LICENSE="GPL-2" LICENSE="GPL-2"

@ -14,7 +14,7 @@ SRC_URI="https://github.com/balabit/syslog-ng/releases/download/${P}/${P}.tar.gz
LICENSE="GPL-2+ LGPL-2.1+" LICENSE="GPL-2+ LGPL-2.1+"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd" IUSE="amqp caps dbi geoip ipv6 json libressl mongodb pacct python redis smtp spoof-source systemd tcpd"
RESTRICT="test" RESTRICT="test"

@ -11,7 +11,7 @@ SRC_URI="${HOMEPAGE}${P}.tar.xz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="debug +doc isag nls lm_sensors selinux static" IUSE="debug +doc isag nls lm_sensors selinux static"
CDEPEND=" CDEPEND="

@ -15,7 +15,7 @@ SRC_URI="https://git.netfilter.org/${PN}2/snapshot/${COMMIT_ID}.tar.gz -> ${P}.t
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ia64 ~ppc ~x86" KEYWORDS="amd64 ~ia64 ~ppc ~x86"
IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog" IUSE="dbi doc json mysql nfacct +nfct +nflog pcap postgres sqlite -ulog"
RDEPEND=" RDEPEND="

@ -1,3 +1,3 @@
DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188 DIST clamav-unofficial-sigs-3.7.2.tar.gz 38549 SHA256 96e98e6e4434c5950fa9831c6a43236fed7eabae44beded16171305cf3f9bdb9 SHA512 ee07bf521cca229bc85acb887c8e520149955732797a9d220e24f09cb9e89f9bd189ad77dc781c03c60bdaaec2bfa91a6c96cf7a0b689759cddf3ff231b8b0a4 WHIRLPOOL af4925c8a9bb8c09472131f98026b809da13e122a530c4a48614014b8156a259d37303cb1042da98d0bd8b0f4abef3cd7c05f2d549f87e1b7cd533d4a8d4d188
DIST clamav-unofficial-sigs-4.9.2.tar.gz 40301 SHA256 70e05f63add7e03d5af2dba6bcd31fda98646577798d99e6902e5f264c302e93 SHA512 46ec2e59c3838f4cff88562eacbd00ee1ad108f8f45500b9cde268c3d46bd3f6be68ff6136b7f3a4f6b628ff0b24f5dd10b2199e611b473acd7df82abf27b2c8 WHIRLPOOL 3029ee278629c3e8cf5471564e7ff054fc335e066d03653df82d07a87fa0dda76e41c5572c93fd0f28a434d002f3bdadd60043540378504c289333092aca412a DIST clamav-unofficial-sigs-4.9.2.tar.gz 40301 SHA256 70e05f63add7e03d5af2dba6bcd31fda98646577798d99e6902e5f264c302e93 SHA512 46ec2e59c3838f4cff88562eacbd00ee1ad108f8f45500b9cde268c3d46bd3f6be68ff6136b7f3a4f6b628ff0b24f5dd10b2199e611b473acd7df82abf27b2c8 WHIRLPOOL 3029ee278629c3e8cf5471564e7ff054fc335e066d03653df82d07a87fa0dda76e41c5572c93fd0f28a434d002f3bdadd60043540378504c289333092aca412a
DIST clamav-unofficial-sigs-5.0.6.tar.gz 34090 SHA256 1c3640a8548a09a02e62a9bc57d81f3c757cd193902f445b9e530a4ba5331585 SHA512 2466faef1ed5bddf70623724248f08f035a3083bb7f1de6ba80d33fd780a15c2e819cff4fc3acdd4131a7fa277683f9ce3d4ad9e0322ac396af8cdf052350b9b WHIRLPOOL 0efd21c2aa2b7c80877301d6262cb6cc96b7c66a851cb0de2f1371c487dd37188cc4ab44f64f2c4224826826d0ce075674b9b079850db19e0349eb7159546394 DIST clamav-unofficial-sigs-5.3.1.tar.gz 113191 SHA256 f2b613c8fdc5197ab73fa499d5a5a82cc68889bf3c8b45bd90363e6f21154599 SHA512 2bd1d9dc8c1fb0490cc9c7776181a6e7cb180168cfa58ed0dd82901d41858cc463805fe7851f888bacdbfece5c46b012f85aad6e1966eb900a935f1d395ebdc5 WHIRLPOOL 4da9118e53f1af3cc7e88a64babad221c665678a5ccac4cb6c707286cf543414d12227d81d9fcae5c01361b8a15eca72e59df7669d47a6cf3662b813eacf2717

@ -23,34 +23,7 @@ RDEPEND="${DEPEND}
app-crypt/gnupg app-crypt/gnupg
dev-lang/perl dev-lang/perl
net-dns/bind-tools net-dns/bind-tools
net-misc/curl" || ( net-misc/wget net-misc/curl )"
src_prepare() {
# clamd listens on a local socket by default. The clamd_socket
# setting needs to be uncommented in the configuration file for it
# to take effect.
local socket_default="#clamd_socket=\"/var/run/clamav/clamd.sock\""
local socket_gentoo="clamd_socket=\"/var/run/clamav/clamd.sock\""
# The clamav init script doesn't provide a "reload" command,
# so we reload manually.
local reload_default="clamd_restart_opt=\"service clamd restart\""
local reload_gentoo="clamd_restart_opt=\"clamdscan --reload\""
sed -i "config/os.gentoo.conf" \
-e "s~${socket_default}~${socket_gentoo}~" \
-e "s~${reload_default}~${reload_gentoo}~" \
|| die "failed to update config/os.gentoo.conf"
# Uncomment the "create" line in the logrotate.d file, and tighten
# the permissions a bit.
local logrotate_gentoo=" create 0640 clamav clamav"
sed -e "s~# create 0644 clamav clamav~${logrotate_gentoo}~" \
-i "logrotate.d/${PN}" \
|| die "failed to tighten permissions in logrotate.d/${PN}"
eapply_user
}
src_install() { src_install() {
dosbin "${PN}.sh" dosbin "${PN}.sh"
@ -61,13 +34,13 @@ src_install() {
dodir "/var/lib/${PN}" dodir "/var/lib/${PN}"
insinto /etc/logrotate.d insinto /etc/logrotate.d
doins "logrotate.d/${PN}" doins "${FILESDIR}/${PN}.logrotate"
insinto "/etc/${PN}" insinto "/etc/${PN}"
doins config/master.conf doins config/{master,user}.conf
newins config/os.gentoo.conf os.conf newins config/os.gentoo.conf os.conf
doman "${PN}.8" doman "${FILESDIR}/${PN}.8"
dodoc README.md dodoc README.md
} }

@ -0,0 +1,75 @@
.\" Manual page for eXtremeSHOK.com ClamAV Unofficial Signature Updater
.TH clamav-unofficial-sigs 8 "07 May 2016" "Version: 5.3.0" "SCRIPT COMMANDS"
.SH NAME
clamav-unofficial-sigs \- Download, test, and install third-party ClamAV signature databases.
.SH SYNOPSIS
.B clamav-unofficial-sigs
.RI [ options ]
.SH DESCRIPTION
\fBclamav-unofficial-sigs\fP provides a simple way to download, test, and update third-party signature databases provided by Sanesecurity, FOXHOLE, OITC, Scamnailer, BOFHLAND, CRDF, Porcupine, Securiteinfo, MalwarePatrol, Yara-Rules Project, etc. It will also generate and install cron, logrotate, and man files.
.SH UPDATES
Script updates can be found at: \fBhttps://github.com/extremeshok/clamav-unofficial-sigs\fP
.SH OPTIONS
This script follows the standard GNU command line syntax.
.LP
\fB Usage: clamav\-unofficial\-sigs.sh \fR [OPTION] [PATH|FILE]
.TP
\fB \-c, \-\-config \fR Use a specific configuration file or directory eg: '\-c /your/dir' or ' \-c /your/file.name' Note: If a directory is specified the directory must contain atleast: master.conf, os.conf or user.conf Default Directory: configgentoo
.TP
\fB \-F, \-\-force \fR Force all databases to be downloaded, could cause ip to be blocked
.TP
\fB \-h, \-\-help \fR Display this script's help and usage information
.TP
\fB \-V, \-\-version \fR Output script version and date information
.TP
\fB \-v, \-\-verbose \fR Be verbose, enabled when not run under cron
.TP
\fB \-s, \-\-silence \fR Only output error messages, enabled when run under cron
.TP
\fB \-d, \-\-decode\-sig \fR Decode a third\-party signature either by signature name (eg: Sanesecurity.Junk.15248) or hexadecimal string. This flag will 'NOT' decode image signatures
.TP
\fB \-e, \-\-encode\-string \fR Hexadecimal encode an entire input string that can be used in any '*.ndb' signature database file
.TP
\fB \-f, \-\-encode\-formatted \fR Hexadecimal encode a formatted input string containing signature spacing fields '{}, (), *', without encoding the spacing fields, so that the encoded signature can be used in any '*.ndb' signature database file
.TP
\fB \-g, \-\-gpg\-verify \fR GPG verify a specific Sanesecurity database file eg: '\-g filename.ext' (do not include file path)
.TP
\fB \-i, \-\-information \fR Output system and configuration information for viewing or possible debugging purposes
.TP
\fB \-m, \-\-make\-database \fR Make a signature database from an ascii file containing data strings, with one data string per line. Additional information is provided when using this flag
.TP
\fB \-t, \-\-test\-database \fR Clamscan integrity test a specific database file eg: '\-s filename.ext' (do not include file path)
.TP
\fB \-o, \-\-output\-triggered \fR If HAM directory scanning is enabled in the script's configuration file, then output names of any third\-party signatures that triggered during the HAM directory scan
.TP
\fB \-w, \-\-whitelist \fR Adds a signature whitelist entry in the newer ClamAV IGN2 format to 'my\-whitelist.ign2' in order to temporarily resolve a false\-positive issue with a specific third\-party signature. Script added whitelist entries will automatically be removed if the original signature is either modified or removed from the third\-party signature database
.TP
\fB \-\-check\-clamav \fR If ClamD status check is enabled and the socket path is correctly specifiedthen test to see if clamd is running or not
.TP
\fB \-\-install\-all \fR Install and generate the cron, logroate and man files, autodetects the values based on your config files
.TP
\fB \-\-install\-cron \fR Install and generate the cron file, autodetects the values based on your config files
.TP
\fB \-\-install\-logrotate \fR Install and generate the logrotate file, autodetects the values based on your config files
.TP
\fB \-\-install\-man \fR Install and generate the man file, autodetects the values based on your config files
.TP
\fB \-\-remove\-script \fR Remove the clamav\-unofficial\-sigs script and all of its associated files and databases from the system
.TP
.SH SEE ALSO
.BR clamd (8),
.BR clamscan (1)
.SH COPYRIGHT
Copyright (c) Adrian Jon Kriel :: admin@extremeshok.com
.TP
You are free to use, modify and distribute, however you may not remove this notice.
.SH LICENSE
BSD (Berkeley Software Distribution)
.SH BUGS
Report bugs to \fBhttps://github.com/extremeshok/clamav-unofficial-sigs\fP
.SH AUTHOR
Adrian Jon Kriel :: admin@extremeshok.com
Originially based on Script provide by Bill Landry

@ -0,0 +1,4 @@
/var/log/clamav-unofficial-sigs/clamav-unofficial-sigs.log {
create 0640 clamav clamav
missingok
}

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~ppc ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc" IUSE="bzip2 clamdtop iconv ipv6 libressl milter metadata-analysis-api selinux static-libs uclibc"
CDEPEND="bzip2? ( app-arch/bzip2 ) CDEPEND="bzip2? ( app-arch/bzip2 )

@ -1,4 +1,4 @@
DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23 DIST dpkg_1.17.26.tar.xz 4410860 SHA256 aa4e758752cdfd7ecb118d7a7d31139a0c090c92aa494aa2e46603006deb1ec8 SHA512 4d2f2a7691dd34d47b62ec1f602d9bab612b151f05362607ec8e31037c4ba0baf5d609c46352240e9806e5781db8df9781e8a0ee9fd24faf54f8b43244a7e538 WHIRLPOOL 56decf0774f2d4405fb0934415c50749230c06fe9112e0ebb4458a8917538c83644eadb885d24350bbf713a6250dd5687956b70d47e22c06cf39ff87cb2d5a23
DIST dpkg_1.17.27.tar.xz 4413092 SHA256 90749c31b9f1fceb46dd9fab5b50de34272efef333cc16d9e144f514fd944bb6 SHA512 6f0229bf6c6b76be22d0baf4af21b1175b5397c4a84eb47f0d02bb93173207cc087015a53a2ed9feb7195d313d447d71a0d7361eb1238377c38f8be4465f8bbd WHIRLPOOL cc8525d391bbb42e399e4a1ecb526db1071122272f7eb1b23bdbbad361dfa0f7af8f1fac867f5fb2028d74171ecd3b175b813b2370b2982b17c1d05b39921455 DIST dpkg_1.17.27.tar.xz 4413092 SHA256 90749c31b9f1fceb46dd9fab5b50de34272efef333cc16d9e144f514fd944bb6 SHA512 6f0229bf6c6b76be22d0baf4af21b1175b5397c4a84eb47f0d02bb93173207cc087015a53a2ed9feb7195d313d447d71a0d7361eb1238377c38f8be4465f8bbd WHIRLPOOL cc8525d391bbb42e399e4a1ecb526db1071122272f7eb1b23bdbbad361dfa0f7af8f1fac867f5fb2028d74171ecd3b175b813b2370b2982b17c1d05b39921455
DIST dpkg_1.18.4.tar.xz 4377024 SHA256 fe89243868888ce715bf45861f26264f767d4e4dbd0d6f1a26ce60bbbbf106da SHA512 047a1b38b685d48557aaf8baa847042d7b4ef38de1bcc069108a7b12f29fd84c16caccaeb79c9a1f6445ea8a3327f5d81ff692dfadd0151a0c8e2ed4e24b5f45 WHIRLPOOL 9dee8af7762b8b581758d1def871fe5b2151982c486cd15bc73b2fdd5895e6b483acc3a44035225e436e4c1534234ea95da53611876fd45b352b7491e902d98a
DIST dpkg_1.18.6.tar.xz 4617492 SHA256 dd0bc323baafe7aae1571a41d37ab92452171e7a2ce34429f77621fdc0e5dea2 SHA512 84bec49af80ca6e003413dcfbd8da6962f397c8319fbcd93a1c83ed613b4f9a5512ee51d01512203475e97e6570a802238515647cbd5aeab096c13104c50dd33 WHIRLPOOL a8ce16147f933ca6f1d902b7e25cbc34100b710429886eef5b2cfdb333d418d94c33bfd1a7b9bcd5f91e5729ebb70cb38398122d90e4d01304e6c3ce21825ffc DIST dpkg_1.18.6.tar.xz 4617492 SHA256 dd0bc323baafe7aae1571a41d37ab92452171e7a2ce34429f77621fdc0e5dea2 SHA512 84bec49af80ca6e003413dcfbd8da6962f397c8319fbcd93a1c83ed613b4f9a5512ee51d01512203475e97e6570a802238515647cbd5aeab096c13104c50dd33 WHIRLPOOL a8ce16147f933ca6f1d902b7e25cbc34100b710429886eef5b2cfdb333d418d94c33bfd1a7b9bcd5f91e5729ebb70cb38398122d90e4d01304e6c3ce21825ffc
DIST dpkg_1.18.7.tar.xz 4617284 SHA256 ace36d3a6dc750a42baf797f9e75ec580a21f92bb9ff96b482100755d6d9b87b SHA512 f5a0d35040338eecd303d2c39469f2cb38e8e135df2179c0ad6cbf67cb509303df528cb03db9fb26db82456171320ee2ba9b31f18c4b994af3fdcecb2e8a0a80 WHIRLPOOL fe7adc4f07ec239a3c09e3d7e237c007853b456875d1789b2ad9bae93ea35b1c008ec4bfcf28417241e4060af7913dadd2ab62cc620cd18bfa8644ee0523b02b

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}_${PV}_src_all.tar.bz2"
LICENSE="LGPL-2.1 rar? ( unRAR )" LICENSE="LGPL-2.1 rar? ( unRAR )"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="doc kde rar +pch static wxwidgets abi_x86_x32" IUSE="doc kde rar +pch static wxwidgets abi_x86_x32"
REQUIRED_USE="kde? ( wxwidgets )" REQUIRED_USE="kde? ( wxwidgets )"

@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/dar/${P}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux" KEYWORDS="amd64 ~ppc ~sparc ~x86 ~amd64-linux"
IUSE="acl dar32 dar64 doc gcrypt lzo nls static static-libs" IUSE="acl dar32 dar64 doc gcrypt lzo nls static static-libs"
RESTRICT="test" # need to be run as root RESTRICT="test" # need to be run as root

@ -0,0 +1 @@
DIST untangle-https-backup-0.0.4.tar.gz 15603 SHA256 ebd67322c22f69eaf42884bf4503b8590b71b9f6ea13e449a7dbe71aa5420968 SHA512 15346786365e5ec1c8548ea1abb87d980442ac56839eef13626ebb39355c5715135885a887c6acaa2bec61b2ea6983d73354589c58afb8ccd076f85937277e0c WHIRLPOOL 33d8dbe2401b8c6888b742ff0a6347b0c7c5014305a9a0c215dd4c25565aee4ba5956de7e10c05dccaf45b05811a78a23024421d0bc54eb3a60088a6a2e5c736

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>mjo@gentoo.org</email>
<name>Michael Orlitzky</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,27 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PYTHON_COMPAT=( python{3_3,3_4,3_5} )
PYTHON_REQ_USE="ssl(+)"
inherit distutils-r1
DESCRIPTION="Back up Untangle configurations via the web admin UI"
HOMEPAGE="http://michael.orlitzky.com/code/untangle-https-backup.php"
SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
LICENSE="AGPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
RDEPEND=""
src_install() {
distutils-r1_src_install
doman "doc/man8/${PN}.8"
dodoc "doc/${PN}.example.ini"
}

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
@ -48,7 +48,7 @@ src_compile() {
} }
src_install() { src_install() {
DIROPTIONS="--mode=0775" diropts --mode=0775
dodir /opt/${PN} dodir /opt/${PN}
local dest="${D}/opt/${PN}/" local dest="${D}/opt/${PN}/"
cp -pPR bin/ lib/ printable_docs/ "${dest}" cp -pPR bin/ lib/ printable_docs/ "${dest}"

@ -1,4 +1,4 @@
# Copyright 1999-2014 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
@ -54,7 +54,7 @@ src_compile() {
} }
src_install() { src_install() {
DIROPTIONS="--mode=0775" diropts --mode=0775
dodir /opt/${PN} dodir /opt/${PN}
local dest="${D}/opt/${PN}/" local dest="${D}/opt/${PN}/"
cp -pPR bin/ lib/ "${dest}" || die cp -pPR bin/ lib/ "${dest}" || die

@ -1,4 +1,4 @@
# Copyright 1999-2015 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
@ -14,7 +14,7 @@ SRC_URI="mirror://apache/jakarta/jmeter/source/jakarta-${P}_src.tgz"
LICENSE="Apache-2.0" LICENSE="Apache-2.0"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="amd64 ~x86"
IUSE="beanshell" IUSE="beanshell"
@ -60,7 +60,7 @@ src_compile() {
} }
src_install() { src_install() {
DIROPTIONS="--mode=0775" diropts --mode=0775
dodir /opt/${PN} dodir /opt/${PN}
local dest="${D}/opt/${PN}/" local dest="${D}/opt/${PN}/"
cp -pPR bin/ lib/ "${dest}" || die cp -pPR bin/ lib/ "${dest}" || die

@ -14,7 +14,7 @@ SRC_URI="mirror://sourceforge/${PN}/$([[ -z ${PV/*_alpha*} ]] && echo 'alpha')/$
LICENSE="GPL-2 LGPL-2.1 CDDL-Schily" LICENSE="GPL-2 LGPL-2.1 CDDL-Schily"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris" KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="acl caps nls unicode" IUSE="acl caps nls unicode"
RDEPEND="acl? ( virtual/acl ) RDEPEND="acl? ( virtual/acl )

@ -1,2 +1,3 @@
DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0 DIST letsencrypt-0.1.0.tar.gz 524821 SHA256 1c1ac7b41e5e0fc0e41a7ef159ac9147a4aafff54453d57b519eb05bf52ade14 SHA512 6a786290362741ac97dcb4b59bc4cba56f3e8b5193bbc10be19086d462f76e6124259c42bac36afe9eb818f4bb9edec34f8e2a02bd8c855e3b35404f4ee81f96 WHIRLPOOL cdc41a3466de54ab8ddfeedea9935205d78383028769dcfbc876be0c2ef80c2d14f5d0e4a9c56a751163718f5ababb07848822989a060de7031ea8ebdf6424a0
DIST letsencrypt-0.5.0.tar.gz 650853 SHA256 503535fa356c45b46a166ea84875bb1fd43e994afee1485bbc3b6849d46c5d43 SHA512 bffa5123a702c02d74c21453a5f5583055986132eb4ae58b72d066c1c5514a1b6832fc381490998c107fbfc1ac8cd403b19b9a1c87006db4e6081e686c2a2fd0 WHIRLPOOL cd72b3f5d6aa95fe983c16d2c71038777ec37a5fdd74a4b51b31cfb72e16e5868c9dc3ec701a30da80e7b99e9409a0fb183f4eba76c58a86434bae0a32dd8169 DIST letsencrypt-0.5.0.tar.gz 650853 SHA256 503535fa356c45b46a166ea84875bb1fd43e994afee1485bbc3b6849d46c5d43 SHA512 bffa5123a702c02d74c21453a5f5583055986132eb4ae58b72d066c1c5514a1b6832fc381490998c107fbfc1ac8cd403b19b9a1c87006db4e6081e686c2a2fd0 WHIRLPOOL cd72b3f5d6aa95fe983c16d2c71038777ec37a5fdd74a4b51b31cfb72e16e5868c9dc3ec701a30da80e7b99e9409a0fb183f4eba76c58a86434bae0a32dd8169
DIST letsencrypt-0.6.0.tar.gz 686826 SHA256 58eaa6be4ae90af07d682296e42dbac924b5602c51002445059596313e182a09 SHA512 966fdbff13ac9651ebb5fafae86a58a45538d57a43eb6d157358bbecef4286634bb61dd13b94e0ca5b006980a35cc5fe55b4a12efdeadc2530653d844516c926 WHIRLPOOL 0bd424395b9002a04f6c900b208aea758f74e9864d75f6aa87fc30573f046c63f9791aa8bcce0a5452831192d1579e9b52fda5ed77befd6e4f361dab976d6369

@ -0,0 +1,42 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=(python{2_7,3_4,3_5})
if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/certbot/certbot.git"
inherit git-r3
KEYWORDS=""
S=${WORKDIR}/${P}/${PN}
else
SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
KEYWORDS="~amd64 ~arm"
S=${WORKDIR}/certbot-${PV}/acme
fi
inherit distutils-r1
DESCRIPTION="An implementation of the ACME protocol"
HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0"
SLOT="0"
IUSE="test"
RDEPEND=">=dev-python/cryptography-0.8[${PYTHON_USEDEP}]
dev-python/mock[${PYTHON_USEDEP}]
>=dev-python/ndg-httpsclient-0.4[${PYTHON_USEDEP}]
dev-python/pyasn1[${PYTHON_USEDEP}]
>=dev-python/pyopenssl-0.15[${PYTHON_USEDEP}]
dev-python/pyrfc3339[${PYTHON_USEDEP}]
dev-python/pytz[${PYTHON_USEDEP}]
dev-python/requests[${PYTHON_USEDEP}]
dev-python/six[${PYTHON_USEDEP}]"
DEPEND="test? ( ${RDEPEND} dev-python/nose[${PYTHON_USEDEP}] )
dev-python/setuptools[${PYTHON_USEDEP}]"
python_test() {
nosetests -w ${PN} || die
}

@ -6,20 +6,20 @@ EAPI=5
PYTHON_COMPAT=(python{2_7,3_4,3_5}) PYTHON_COMPAT=(python{2_7,3_4,3_5})
if [[ ${PV} == 9999* ]]; then if [[ ${PV} == 9999* ]]; then
EGIT_REPO_URI="https://github.com/letsencrypt/letsencrypt.git" EGIT_REPO_URI="https://github.com/certbot/certbot.git"
inherit git-r3 inherit git-r3
KEYWORDS="" KEYWORDS=""
S=${WORKDIR}/${P}/${PN} S=${WORKDIR}/${P}/${PN}
else else
SRC_URI="https://github.com/letsencrypt/letsencrypt/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz" SRC_URI="https://github.com/certbot/certbot/archive/v${PV}.tar.gz -> letsencrypt-${PV}.tar.gz"
KEYWORDS="~amd64" KEYWORDS="~amd64 ~arm"
S=${WORKDIR}/letsencrypt-${PV}/acme S=${WORKDIR}/certbot-${PV}/acme
fi fi
inherit distutils-r1 inherit distutils-r1
DESCRIPTION="An implementation of the ACME protocol" DESCRIPTION="An implementation of the ACME protocol"
HOMEPAGE="https://github.com/letsencrypt/letsencrypt https://letsencrypt.org/" HOMEPAGE="https://github.com/certbot/certbot https://letsencrypt.org/"
LICENSE="Apache-2.0" LICENSE="Apache-2.0"
SLOT="0" SLOT="0"

@ -12,7 +12,7 @@ SRC_URI="http://kde-apps.org/CONTENT/content-files/134003-${P}.tar.gz"
LICENSE="LGPL-2.1" LICENSE="LGPL-2.1"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="amd64 ~x86"
IUSE="" IUSE=""
DEPEND=" DEPEND="

@ -1,2 +1,3 @@
DIST pgpdump-0.29.tar.gz 62779 SHA256 6215d9af806399fec73d81735cf20ce91033a7a89a82c4318c4d1659083ff663 SHA512 ef948791c864d871e30c92ae1bf3dbb5cb09b9665ca97c4644412410266cd82b8509683ce55406192d7d70179d6eeb81f92ee2efd29443a44285df9e21010292 WHIRLPOOL f38f823132ed1e06bf9e7c87ee4b208abc7c2666fed8567434e496ee6032a19b5febaab3f34a27fbbaead99da91963c899ba873e6fe11b76ec3ad8d1227d8d79 DIST pgpdump-0.29.tar.gz 62779 SHA256 6215d9af806399fec73d81735cf20ce91033a7a89a82c4318c4d1659083ff663 SHA512 ef948791c864d871e30c92ae1bf3dbb5cb09b9665ca97c4644412410266cd82b8509683ce55406192d7d70179d6eeb81f92ee2efd29443a44285df9e21010292 WHIRLPOOL f38f823132ed1e06bf9e7c87ee4b208abc7c2666fed8567434e496ee6032a19b5febaab3f34a27fbbaead99da91963c899ba873e6fe11b76ec3ad8d1227d8d79
DIST pgpdump-0.30.tar.gz 63152 SHA256 8c36a005baee8dd6e730e5735c7ac2bbc8826a1bb29f500c0202d00fd62baad4 SHA512 e250dc82bb890a7645a41f6ddbfad9155ddf70f2ea53b09e771e9b6851d05d3fba88e16b106681ab092174e79ad709ed860be25bfded1ca7f369b357e8c72730 WHIRLPOOL 80a054e53d262ad5d349ecb10a5f421c1308de248ad9e2884eb4f37244f79efb3428dedd6d1d2d6b59cdb20b76c95f8ac6674fab3b47635944e0012c8eeaa59c DIST pgpdump-0.30.tar.gz 63152 SHA256 8c36a005baee8dd6e730e5735c7ac2bbc8826a1bb29f500c0202d00fd62baad4 SHA512 e250dc82bb890a7645a41f6ddbfad9155ddf70f2ea53b09e771e9b6851d05d3fba88e16b106681ab092174e79ad709ed860be25bfded1ca7f369b357e8c72730 WHIRLPOOL 80a054e53d262ad5d349ecb10a5f421c1308de248ad9e2884eb4f37244f79efb3428dedd6d1d2d6b59cdb20b76c95f8ac6674fab3b47635944e0012c8eeaa59c
DIST pgpdump-0.31.tar.gz 63808 SHA256 206ae52d4a8bbfa095b6ceefcc8b53ccabcdb75696db3bae5e05c15433729813 SHA512 10d138baf0e3c9a47f6c8549a94b14eaa8babf95a09265e3a5b91469598726d6ee94cc7c481688c2d2b63917d6daba1bb368923aaf75adac6b18694d9a2940c4 WHIRLPOOL b706d92da109305b72900e7f31aec70b2a9a286e49ab13a03801623ac8997df5c8dc1f30d829aef35dd8d898786748b37dcdeb8cc178f3cddac0662f014a6b03

@ -0,0 +1,29 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
inherit eutils
DESCRIPTION="A PGP packet visualizer"
HOMEPAGE="http://www.mew.org/~kazu/proj/pgpdump/"
SRC_URI="http://www.mew.org/~kazu/proj/pgpdump/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86"
IUSE=""
DEPEND="sys-libs/zlib
app-arch/bzip2"
RDEPEND="${DEPEND}"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.28-respect-ldflags.patch
}
src_install() {
dobin pgpdump
doman pgpdump.1
dodoc CHANGES README.md
}

@ -12,7 +12,7 @@ SRC_URI="https://github.com/cernekee/${PN}/archive/v${PV}.tar.gz"
LICENSE="LGPL-2.1+" LICENSE="LGPL-2.1+"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
IUSE="gtk" IUSE="gtk"
RDEPEND=" RDEPEND="

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="BSD" LICENSE="BSD"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
IUSE="bindist" IUSE="bindist"
RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=] RDEPEND=">=dev-libs/openssl-0.9.8:*[bindist=]

@ -4,7 +4,7 @@
EAPI="6" EAPI="6"
inherit toolchain-funcs eutils inherit toolchain-funcs eutils flag-o-matic
MY_PV=${PV//./} MY_PV=${PV//./}
DESCRIPTION="A very powerful editor for programmers" DESCRIPTION="A very powerful editor for programmers"

@ -13,7 +13,7 @@ SRC_URI="http://ess.r-project.org/downloads/ess/${MY_P}.tgz"
LICENSE="GPL-2+ GPL-3+ Texinfo-manual" LICENSE="GPL-2+ GPL-3+ Texinfo-manual"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos" KEYWORDS="amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
DEPEND="app-text/texi2html DEPEND="app-text/texi2html
virtual/latex-base" virtual/latex-base"

@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tgz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="amd64 ~x86"
IUSE="alsa" IUSE="alsa"
DEPEND="dev-libs/atk DEPEND="dev-libs/atk

@ -0,0 +1,9 @@
diff --git a/Ganeti/HTools/QC.hs b/Ganeti/HTools/QC.hs
index 534a7b1..6f99a96 100644
--- a/Ganeti/HTools/QC.hs
+++ b/Ganeti/HTools/QC.hs
@@ -753,3 +753,3 @@ prop_ClusterAllocBalance node =
let nl = makeSmallCluster node count
- (hnode, nl') = IntMap.deleteFindMax nl
+ ((_k, hnode), nl') = IntMap.deleteFindMax nl
il = Container.empty

@ -34,6 +34,7 @@ src_prepare() {
epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629 epatch "${FILESDIR}"/${PN}-0.2.8-use-QC-1.patch #316629
epatch "${FILESDIR}"/${PN}-0.3.1-base-4.patch #424299 epatch "${FILESDIR}"/${PN}-0.3.1-base-4.patch #424299
epatch "${FILESDIR}"/${PN}-0.3.1-ghc-7.10.patch epatch "${FILESDIR}"/${PN}-0.3.1-ghc-7.10.patch
epatch "${FILESDIR}"/${PN}-0.3.1-containers.patch
} }
src_compile() { src_compile() {

@ -20,7 +20,7 @@ HOMEPAGE="http://www.virtualbox.org/"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
IUSE="alsa doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc" IUSE="alsa debug doc headless java libressl lvm pam pulseaudio +opengl python +qt4 +sdk +udev vboxwebsrv vnc"
RDEPEND="!app-emulation/virtualbox-bin RDEPEND="!app-emulation/virtualbox-bin
~app-emulation/virtualbox-modules-${PV} ~app-emulation/virtualbox-modules-${PV}
@ -182,6 +182,7 @@ src_prepare() {
src_configure() { src_configure() {
local myconf local myconf
use alsa || myconf+=( --disable-alsa ) use alsa || myconf+=( --disable-alsa )
use debug && myconf+=( --build-debug )
use doc || myconf+=( --disable-docs ) use doc || myconf+=( --disable-docs )
use java || myconf+=( --disable-java ) use java || myconf+=( --disable-java )
use lvm || myconf+=( --disable-devmapper ) use lvm || myconf+=( --disable-devmapper )
@ -230,7 +231,9 @@ src_compile() {
} }
src_install() { src_install() {
cd "${S}"/out/linux.${ARCH}/release/bin || die local binpath="release"
use debug && binpath="debug"
cd "${S}"/out/linux.${ARCH}/${binpath}/bin || die
local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile local vbox_inst_path="/usr/$(get_libdir)/${PN}" each fwfile

@ -3,7 +3,6 @@ DIST lwip-1.3.0.tar.gz 398933 SHA256 772e4d550e07826665ed0528c071dd5404ef7dbe182
DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db DIST newlib-1.16.0.tar.gz 12024353 SHA256 db426394965c48c1d29023e1cc6d965ea6b9a9035d8a849be2750ca4659a3d07 SHA512 40eb96bbc6736a16b6399e0cdb73e853d0d90b685c967e77899183446664d64570277a633fdafdefc351b46ce210a99115769a1d9f47ac749d7e82837d4d1ac3 WHIRLPOOL 47f7afd525f482d79d9e964f0e75ee8a77e59551bd19cd94f9b95ac3af9406afa381c9d8d224f76eb568441ab613b2b194f8e5be50aa222f9ed2d9b9761829db
DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e DIST pciutils-2.2.9.tar.bz2 212265 SHA256 f60ae61cfbd5da1d849d0beaa21f593c38dac9359f0b3ddc612f447408265b24 SHA512 2b3d98d027e46d8c08037366dde6f0781ca03c610ef2b380984639e4ef39899ed8d8b8e4cd9c9dc54df101279b95879bd66bfd4d04ad07fef41e847ea7ae32b5 WHIRLPOOL ce801947fcf7ba0b56710029f25e746d3e03a80699af9d3570efcd417b12b546264f286b2e78b1402cca766c08e35bdd0ff0a692ab4ad419295f00bcfe91130e
DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383 DIST polarssl-1.1.4-gpl.tgz 611340 SHA256 2d29fd04a0d0ba29dae6bd29fb418944c08d3916665dcca74afb297ef37584b6 SHA512 88da614e4d3f4409c4fd3bb3e44c7587ba051e3fed4e33d526069a67e8180212e1ea22da984656f50e290049f60ddca65383e5983c0f8884f648d71f698303ad WHIRLPOOL 39448c00dda142a836a78381b446c7b586272a44d8afc867a7ea702228f105bb2adffe757bd6c23af090cff64ef32e7af0c373dccc5145ff4c11552cf3f28383
DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5 DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276

@ -1,143 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='xml,threads'
inherit flag-o-matic eutils multilib python-single-r1 toolchain-funcs
XEN_EXTFILES_URL="http://xenbits.xensource.com/xen-extfiles"
LIBPCI_URL=ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci
GRUB_URL=mirror://gnu-alpha/grub
SRC_URI="
http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz
$GRUB_URL/grub-0.97.tar.gz
$XEN_EXTFILES_URL/zlib-1.2.3.tar.gz
$LIBPCI_URL/pciutils-2.2.9.tar.bz2
$XEN_EXTFILES_URL/lwip-1.3.0.tar.gz
$XEN_EXTFILES_URL/newlib/newlib-1.16.0.tar.gz
$XEN_EXTFILES_URL/polarssl-1.1.4-gpl.tgz"
S="${WORKDIR}/xen-${PV}"
DESCRIPTION="allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem"
HOMEPAGE="http://xen.org/"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="custom-cflags"
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="sys-devel/gettext
sys-devel/bin86
sys-apps/texinfo"
RDEPEND=">=app-emulation/xen-tools-${PV}"
pkg_setup() {
python-single-r1_pkg_setup
}
retar-externals() {
# Purely to unclutter src_prepare
local set="grub-0.97.tar.gz lwip-1.3.0.tar.gz newlib-1.16.0.tar.gz polarssl-1.1.4-gpl.tgz zlib-1.2.3.tar.gz"
# epatch can't patch in $WORKDIR, requires a sed; Bug #455194. Patchable, but sed informative
sed -e s':AR=${AR-"ar rc"}:AR=${AR-"ar"}:' \
-i "${WORKDIR}"/zlib-1.2.3/configure
sed -e 's:^AR=ar rc:AR=ar:' \
-e s':$(AR) $@:$(AR) rc $@:' \
-i "${WORKDIR}"/zlib-1.2.3/{Makefile,Makefile.in}
einfo "zlib Makefile edited"
cd "${WORKDIR}"
tar czp zlib-1.2.3 -f zlib-1.2.3.tar.gz
tar czp grub-0.97 -f grub-0.97.tar.gz
tar czp lwip -f lwip-1.3.0.tar.gz
tar czp newlib-1.16.0 -f newlib-1.16.0.tar.gz
tar czp polarssl-1.1.4 -f polarssl-1.1.4-gpl.tgz
mv $set "${S}"/stubdom/
einfo "tarballs moved to source"
}
src_prepare() {
# 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 {} \;
fi
# Patch the unmergeable newlib, fix most of the leftover gcc QA issues
cp "${FILESDIR}"/newlib-implicits.patch stubdom || die
# Patch stubdom/Makefile to patch insource newlib & prevent internal downloading
epatch "${FILESDIR}"/${PN/-pvgrub/}-4.3-externals.patch
# fix jobserver in Makefile
epatch "${FILESDIR}"/${PN}-4.2-jserver.patch
#Substitute for internal downloading. pciutils copied only due to the only .bz2
cp "${DISTDIR}"/pciutils-2.2.9.tar.bz2 ./stubdom/ || die "pciutils not copied to stubdom"
retar-externals || die "re-tar procedure failed"
}
src_configure() {
local myconf="--prefix=${PREFIX}/usr \
--libdir=${PREFIX}/usr/$(get_libdir) \
--libexecdir=${PREFIX}/usr/libexec \
--disable-werror \
--disable-xen"
econf ${myconf}
}
src_compile() {
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow
fi
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" -C tools/include
if use x86; then
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
elif use amd64; then
emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" \
XEN_TARGET_ARCH="x86_64" -C stubdom pv-grub
if has_multilib_profile; then
multilib_toolchain_setup x86
emake CC="$(tc-getCC)" AR="$(tc-getAR)" \
XEN_TARGET_ARCH="x86_32" -C stubdom pv-grub
fi
fi
}
src_install() {
if use x86; then
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
fi
if use amd64; then
emake XEN_TARGET_ARCH="x86_64" DESTDIR="${D}" -C stubdom install-grub
if has_multilib_profile; then
emake XEN_TARGET_ARCH="x86_32" DESTDIR="${D}" -C stubdom install-grub
fi
fi
}
pkg_postinst() {
elog "Official Xen Guide and the offical wiki page:"
elog "https://wiki.gentoo.org/wiki/Xen"
elog "http://wiki.xen.org/wiki/Main_Page"
}

@ -1,8 +1,6 @@
DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac DIST ovmf-20150629.tar.bz2 24265640 SHA256 9f316dc44e192fa9d5d7486cf1dae3f3094ab4f20f282f80d6251632c2cd6118 SHA512 b15a896b5222b920a500ec8a1eba5d670505441ffd02accf9b6c0deb9a12c1c5513a016f91eae5cb33f75ee9f28435dc957686e6ce8b5d0744c11a7d7262fffd WHIRLPOOL 8db4360dcb85f183dbd827f7381787c84065f94eaf746068b11ef7b30412b16cc0ba75effb04f01dea5f4f67967721f7aca11a2550035e95c59645c7964526ac
DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5 DIST ovmf-20151110.tar.bz2 27518370 SHA256 74199f6b5c6f756881323242742c396c52096db5f61700a4eb839343f9ab0604 SHA512 dda185af2fc0b9a8d5fc7e1e96db6aa31807782fe77d38491896164d125c30d2277db3d71a7dce7bbd569723b344b97dfebbc78ddddca0a095721f6b1ae3a1d3 WHIRLPOOL 145fb1c873cce96b81b269b44800987ca1b7350425b682fd5a5799648b0270c6c17bb337ad7e06650e6b66a9ac6eef8d9c9239f1478a687be4af187e60c3f3f5
DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a DIST seabios-1.8.2.tar.gz 538497 SHA256 f59479307fdae840de398b75aacb2333c8eba24a5964d68c77e32ca6c987ee61 SHA512 798d222d5f5725a805cde9e6000b5ce714d0551fd4a3c2642cc6e77b2bdab1a9e239939a358a23bbe0e00112f5ad70696c87d20b90655463c835541fc04e1a00 WHIRLPOOL 9cda0ad502a59dd718c543b759ac3fcf5acb4adee70c3da9bfea95ab188415acf6425827de77f45421ec3be8fd9e0c37fb486e62828217ba3e83f88d942a3f4a
DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5 DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
@ -11,9 +9,9 @@ DIST xen-gentoo-patches-6.tar.xz 23864 SHA256 96e774bd03c9df341fdb2f5d6cf231549c
DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8 DIST xen-ovmf-patches-1.tar.xz 4724 SHA256 d14e98e62c78c9f4b8a7e7b4a04de6dabf300f393eff44154d06f93aa43d7703 SHA512 a17467762f6d92018ff9bce783ce148039f23159405e801ec2aef4c3db72c3976c6f1e41d8c2a2cb704a9654556a2050302f284cfe8e32f28f393b8e2c6d2f1c WHIRLPOOL de53ad07f20aa14fe76d974db92d5b6808f0a2dd26a627b818914990add7adad8e6135d42641819dc22947031981c5815bae5aeeed0f28785c90beda0a6ff6c8
DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633 DIST xen-ovmf-patches-2.tar.xz 4344 SHA256 495d61d718440057f8b0b54fb57061450dd764c6e87fe5f8bda1785bcddba770 SHA512 0bdc83029a01b613f5c1ca029bd45aebe211c332f09db91a0cc7d6b6f85a81dbbfdc20c62f0d20e973ee41b155a6551a4fad518cb792e1d508bf070e23d6a1d3 WHIRLPOOL 8346d68fa5d2a8e8a5c007b55e2b85cf48df045cc8c4818f09c756d28a52dd856671f37b4a53478e9b96ca9d2eca0c67fd15f009a94d1d2dfed8e83e596d9633
DIST xen-qemu-patches-0.tar.gz 3224 SHA256 ff1ac02a6d91e4abdbe069e1bb75d0b798deff5c2c72d1efb5459c72f4278f00 SHA512 4fd0c663a733436188aca364e927ac430d9bbef9859da65c074d7fd66c330645b05ff1f3e849f4581dfcd7054801d65edcff8445c1c63c2725f11e3903415af0 WHIRLPOOL 5504d7ffbd3c1970026c1f43252d9c76f10c5448ede247719e2698aa8f8e93b20e4cc353da5582b3b6887fb3fd7d1e13765f664ea60daeb6020f052eaca9b9f4 DIST xen-qemu-patches-0.tar.gz 3224 SHA256 ff1ac02a6d91e4abdbe069e1bb75d0b798deff5c2c72d1efb5459c72f4278f00 SHA512 4fd0c663a733436188aca364e927ac430d9bbef9859da65c074d7fd66c330645b05ff1f3e849f4581dfcd7054801d65edcff8445c1c63c2725f11e3903415af0 WHIRLPOOL 5504d7ffbd3c1970026c1f43252d9c76f10c5448ede247719e2698aa8f8e93b20e4cc353da5582b3b6887fb3fd7d1e13765f664ea60daeb6020f052eaca9b9f4
DIST xen-qemu-patches-2.tar.gz 4690 SHA256 5850513c6c6e1c68da7a04526bfc3f7ee049b1c5cbcd370d2dfcee94b49f84e9 SHA512 fb1adcccffdd53193699287049da719f826ab8ab819130e7747cb6de9f6f9446fde223e26772a6ee7380ee0691acffac2c970691583ef6cb06f3c597acac824e WHIRLPOOL ea6dc377c69261246d68342b0bf33bdcd07447f1d3547862da10dd0e72d0a6d96fcdfb5df422e88fd7119a6edc7c8990f02d33bbb4c401534aba55b287ac63fe
DIST xen-qemu-patches-3.tar.gz 7866 SHA256 40ec7e127c149d25f783f050c693776db4f5ded7b488fba3be4b88c85c33d981 SHA512 ca1c5a10c986dcc6e39fbcb606493532203f051d622fbd7318b4c6f69b686889d81c143c7eaf7c91b1e925aa4f7667fb8f80d887ac2b45172a9db4c4231e7feb WHIRLPOOL 1aee478c6eb39fd204a0b88c02770a304765f7dba979bdebd4dd882c77b947038219aab99be95010c308207eb18d276c127c1bb5c69c62e0ef2bbb618fd99e17
DIST xen-security-patches-10.tar.gz 13289 SHA256 8937b3c0045f83ac0685ce129c99be8ab035f2ed92605d0c1100d4f898d978a3 SHA512 698963479149bd63695b3ffd7d108b798ce6c694560f2908b639f3a1b00d37d4994fbc1e0e21aaba1f3a113653d5b37c28679bc1d97d75a805844345c9c070c0 WHIRLPOOL 8c2433c35499819906abf5cb8898dac23cbf7523cc4b4e9291e696eb2871971a7300d3f54865ac32738a1b67c1de18e227085f14c5717b60ec951d5038fa0493 DIST xen-security-patches-10.tar.gz 13289 SHA256 8937b3c0045f83ac0685ce129c99be8ab035f2ed92605d0c1100d4f898d978a3 SHA512 698963479149bd63695b3ffd7d108b798ce6c694560f2908b639f3a1b00d37d4994fbc1e0e21aaba1f3a113653d5b37c28679bc1d97d75a805844345c9c070c0 WHIRLPOOL 8c2433c35499819906abf5cb8898dac23cbf7523cc4b4e9291e696eb2871971a7300d3f54865ac32738a1b67c1de18e227085f14c5717b60ec951d5038fa0493
DIST xen-security-patches-11.tar.gz 12639 SHA256 285e009010387be18bc8588f4dca3b3ec86a637a4afb13a7a5a23b0406a36d68 SHA512 af0f0f1bacbbb3d2141267dea623f5f69e95190ddd9ef62a5c0e9eef548c248a230dc08cc07e77e206e9f8ad19fd24bc1828e25c44370091673af4dff66f5c8a WHIRLPOOL 8b085a726f8f2ed9a354103dc29f83b427db934cfaa87b9391fba934c18562765f5f99ef560189bc8d0814d37fbf5deb57a5992e4d76ebddac06c8ffb74da8de
DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d DIST xen-security-patches-7.tar.xz 22604 SHA256 e831c71f830316f452eb8645a5e7ca497264587aa8b353945fd9535f485166e3 SHA512 051769f4118f5c6d5d961759f547526d3fb0e86a4c1dee265a7f0224f10a88e2217b5b5fcf8dbfc706a1ec3c8d1632ab688d3f70dfd89d830261dc7391dd41c2 WHIRLPOOL 8e6dfb4e1700a07e3e3207b67afaddc5d6aa6fd84db9b3e76bd9ff54f682740fed01070e5860bb5378d50903d5777b55dff88eb3444d45bdd63dba657889393d
DIST xen-security-patches-8.tar.gz 9416 SHA256 3c0e6e8428f1890c8dda72ac94244fa3d6611b3612ef59ffed29b59481806a12 SHA512 f5ee325a8b25079ea256cb5a2e039e6738dee999be6d9d91ade875663c36f72a086bcb0bd1bb243483afb921da401c5d7453fea7405323fdaf8cf6e06a221049 WHIRLPOOL c30f14bb8a1a3ad22a962d4050027fa89a373f742c3eb7a161e1490beb186c6221f24247cd84b07e7f266c38aae6ef386f2e4db29a4b43cceaaaa54b644bb4f1
DIST xen-security-patches-9.tar.gz 9793 SHA256 2167d7bc2a631cf13d5b49c9577dbc8d128517e8ecbf90ef85c38f52ab3187aa SHA512 42f4997f35cc06333584a9a3c65366493094b60a6c67928b6165f3fb7d35d3a8f9dc0c3eadd4522de0d99bcc8511afba1d5e543396399b37983eb547abedca44 WHIRLPOOL 8abb68b4ac10fbc2b590c8a29cd2474d5392d3958542dad7f21ba4ad51c7541bb1686ed2629323e214c3e72b0de7212f25a4681f653d4179404c9f4c53e3d83a DIST xen-security-patches-9.tar.gz 9793 SHA256 2167d7bc2a631cf13d5b49c9577dbc8d128517e8ecbf90ef85c38f52ab3187aa SHA512 42f4997f35cc06333584a9a3c65366493094b60a6c67928b6165f3fb7d35d3a8f9dc0c3eadd4522de0d99bcc8511afba1d5e543396399b37983eb547abedca44 WHIRLPOOL 8abb68b4ac10fbc2b590c8a29cd2474d5392d3958542dad7f21ba4ad51c7541bb1686ed2629323e214c3e72b0de7212f25a4681f653d4179404c9f4c53e3d83a
DIST xen-upstream-patches-0.tar.gz 2297 SHA256 bf21272ad029391d30bf31896efcadc75267538f6c7de5d239453f19659d58ee SHA512 3f5d60aaebd181bddab4dd02e0064de2f75672f44a687a7331fa40e81d56763fea84504081a449d11403b21ad0ba2dac075f0b1796809ef8d16e244f6be99e3d WHIRLPOOL 4ebe79c8f2ea1c45e88e59941e477ed5639dbca3fe95c9a67e07afb0f4b6fb8b7fea8e58422d7c8f906299e4f37c14b4db15200997e5a92b647df98fa93e10c7 DIST xen-upstream-patches-0.tar.gz 2297 SHA256 bf21272ad029391d30bf31896efcadc75267538f6c7de5d239453f19659d58ee SHA512 3f5d60aaebd181bddab4dd02e0064de2f75672f44a687a7331fa40e81d56763fea84504081a449d11403b21ad0ba2dac075f0b1796809ef8d16e244f6be99e3d WHIRLPOOL 4ebe79c8f2ea1c45e88e59941e477ed5639dbca3fe95c9a67e07afb0f4b6fb8b7fea8e58422d7c8f906299e4f37c14b4db15200997e5a92b647df98fa93e10c7

@ -4,24 +4,29 @@
EAPI=5 EAPI=5
MY_PV=${PV/_/-}
PYTHON_COMPAT=( python2_7 ) PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='xml,threads' PYTHON_REQ_USE='ncurses,xml,threads'
inherit eutils bash-completion-r1 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 if [[ $PV == *9999 ]]; then
inherit git-r3
KEYWORDS="" KEYWORDS=""
REPO="xen-unstable.hg" REPO="xen.git"
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}" S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else else
KEYWORDS="~amd64 ~arm ~x86" KEYWORDS="~amd64 ~arm ~x86"
UPSTREAM_VER= UPSTREAM_VER=0
SECURITY_VER=7 SECURITY_VER=7
# vars set to reflect https://dev.gentoo.org/~idella4/ # vars set to reflect https://dev.gentoo.org/~idella4/
SEC_VER=11 # first instance of UPS_VER (usptream ver)
QEMU_VER=0 UPS_VER=0
SEC_VER=10
QEMU_VER=3
# xen-tools's gentoo patches tarball # xen-tools's gentoo patches tarball
GENTOO_VER=4 GENTOO_VER=4
# xen-tools's gentoo patches version which apply to this specific ebuild # xen-tools's gentoo patches version which apply to this specific ebuild
@ -29,11 +34,12 @@ else
# xen-tools ovmf's patches # xen-tools ovmf's patches
OVMF_VER=1 OVMF_VER=1
SEABIOS_VER=1.7.5 SEABIOS_VER=1.8.2
OVMF_PV=20150629 OVMF_PV=20150629
[[ -n ${UPSTREAM_VER} ]] && \ [[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
[[ -n ${SECURITY_VER} ]] && \ [[ -n ${SECURITY_VER} ]] && \
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz
@ -55,18 +61,16 @@ else
S="${WORKDIR}/xen-${MY_PV}" S="${WORKDIR}/xen-${MY_PV}"
fi fi
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} DESCRIPTION="Xen tools including QEMU and xl"
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/" HOMEPAGE="http://xen.org/"
DOCS=( README docs/README.xen-bugtool ) DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0/${MAJOR_V}"
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
# >=dev-lang/ocaml-4 stable # >=dev-lang/ocaml-4 stable
# Masked in profiles/eapi-5-files instead # Masked in profiles/eapi-5-files instead
IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios" IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam +qemu-traditional python pygrub screen sdl static-libs system-qemu system-seabios"
REQUIRED_USE="hvm? ( || ( qemu system-qemu ) ) REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
${PYTHON_REQUIRED_USE} ${PYTHON_REQUIRED_USE}
@ -88,11 +92,9 @@ DEPEND="${COMMON_DEPEND}
x86? ( sys-devel/dev86 x86? ( sys-devel/dev86
sys-power/iasl ) sys-power/iasl )
pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
hvm? ( media-libs/libsdl )
${PYTHON_DEPS} ${PYTHON_DEPS}
api? ( dev-libs/libxml2 api? ( dev-libs/libxml2
net-misc/curl ) net-misc/curl )
pygrub? ( $(python_gen_impl_dep ncurses) )
ovmf? ( $(python_gen_impl_dep sqlite) ) ovmf? ( $(python_gen_impl_dep sqlite) )
!amd64? ( >=sys-apps/dtc-1.4.0 ) !amd64? ( >=sys-apps/dtc-1.4.0 )
amd64? ( sys-devel/bin86 amd64? ( sys-devel/bin86
@ -118,19 +120,21 @@ DEPEND="${COMMON_DEPEND}
) )
hvm? ( x11-proto/xproto hvm? ( x11-proto/xproto
!net-libs/libiscsi ) !net-libs/libiscsi )
qemu? ( x11-libs/pixman ) qemu? (
x11-libs/pixman
sdl? ( media-libs/libsdl[X] )
)
system-qemu? ( app-emulation/qemu[xen] ) system-qemu? ( app-emulation/qemu[xen] )
ocaml? ( dev-ml/findlib ocaml? ( dev-ml/findlib
>=dev-lang/ocaml-4 )" >=dev-lang/ocaml-4 )"
RDEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND}
sys-apps/iproute2 sys-apps/iproute2[-minimal]
net-misc/bridge-utils net-misc/bridge-utils
screen? ( screen? (
app-misc/screen app-misc/screen
app-admin/logrotate app-admin/logrotate
) )"
virtual/udev"
# hvmloader is used to bootstrap a fully virtualized kernel # hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032 # Approved by QA team in bug #144032
@ -170,25 +174,27 @@ pkg_setup() {
src_prepare() { src_prepare() {
# Upstream's patchset # Upstream's patchset
if [[ -n ${UPSTREAM_VER} ]]; then if [[ -n ${UPSTREAM_VER} ]]; then
einfo "Try to apply Xen Upstream patcheset" einfo "Try to apply Xen Upstream patch set"
EPATCH_SUFFIX="patch" \ EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \ EPATCH_FORCE="yes" \
EPATCH_OPTS="-p1" \ EPATCH_OPTS="-p1" \
epatch "${WORKDIR}"/patches-upstream epatch "${WORKDIR}"/patches-upstream \
"${WORKDIR}"/libexec.patch
fi fi
# Security patchset # Security patchset
if [[ -n ${SECURITY_VER} ]]; then if [[ -n ${SECURITY_VER} ]]; then
einfo "Try to apply Xen Security patcheset" einfo "Try to apply Xen Security patch set"
source "${WORKDIR}"/patches-security/${PV}.conf source "${WORKDIR}"/patches-security/${PV}.conf
# apply main xen patches # apply main xen patches
# Two parallel systems, both work # Two parallel systems, both work side by side
# Over time they may concdense into one. This will suffice for now # Over time they may concdense into one. This will suffice for now
EPATCH_SUFFIX="patch" EPATCH_SUFFIX="patch"
EPATCH_FORCE="yes" EPATCH_FORCE="yes"
for i in ${XEN_SECURITY_MAIN}; do for i in ${XEN_SECURITY_MAIN}; do
epatch "${WORKDIR}"/patches-security/xen/$i epatch "${WORKDIR}"/patches-security/xen/$i
done done
for i in "${WORKDIR}"/xen-sec/xsa*.patch; do for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
epatch $i epatch $i
done done
@ -196,7 +202,7 @@ src_prepare() {
# apply qemu-traditional patches # apply qemu-traditional patches
pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null pushd "${S}"/tools/qemu-xen-traditional/ > /dev/null
for i in ${XEN_SECURITY_QEMUT}; do for i in ${XEN_SECURITY_QEMUT}; do
epatch "${WORKDIR}"/patches-security/qemut/$i epatch "${WORKDIR}"/patches-security/qemut/$i
done done
for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
epatch $i epatch $i
@ -233,16 +239,14 @@ src_prepare() {
fi fi
# Ovmf's patchset # Ovmf's patchset
if use ovmf; then if [[ -n ${OVMF_VER} ]] && use ovmf; then
if [[ -n ${OVMF_VER} ]];then einfo "Try to apply Ovmf patch set"
einfo "Try to apply Ovmf patch set" pushd "${WORKDIR}"/ovmf-*/ > /dev/null
pushd "${WORKDIR}"/ovmf-*/ > /dev/null EPATCH_SUFFIX="patch" \
EPATCH_SUFFIX="patch" \ EPATCH_FORCE="yes" \
EPATCH_FORCE="yes" \ EPATCH_OPTS="-p1" \
EPATCH_OPTS="-p1" \ epatch "${WORKDIR}"/patches-ovmf
epatch "${WORKDIR}"/patches-ovmf popd > /dev/null
popd > /dev/null
fi
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
fi fi
@ -271,6 +275,11 @@ src_prepare() {
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} + || die "failed to re-set custom-cflags" -i {} + || die "failed to re-set custom-cflags"
else
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
unset CPPFLAGS
fi fi
if ! use pygrub; then if ! use pygrub; then
@ -290,8 +299,18 @@ src_prepare() {
export CPATH="${WORKDIR}"/extra-headers export CPATH="${WORKDIR}"/extra-headers
fi fi
# Don't bother with qemu, only needed for fully virtualised guests if use qemu; then
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 sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
fi fi
@ -342,10 +361,12 @@ src_configure() {
$(use_enable api xenapi) \ $(use_enable api xenapi) \
$(use_enable ovmf) \ $(use_enable ovmf) \
$(use_enable ocaml ocamltools) \ $(use_enable ocaml ocamltools) \
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
" "
use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
use qemu || myconf+=" --with-system-qemu" use qemu || myconf+=" --with-system-qemu"
use amd64 && myconf+=" --enable-qemu-traditional" use amd64 && myconf+=" $(use_enable qemu-traditional)"
econf ${myconf} econf ${myconf}
} }
@ -354,13 +375,10 @@ src_compile() {
local myopt local myopt
use debug && myopt="${myopt} debug=y" use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow append-flags -fno-strict-overflow
fi fi
unset LDFLAGS
unset CFLAGS
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
use doc && emake -C docs txt html use doc && emake -C docs txt html
@ -422,11 +440,6 @@ src_install() {
# for xendomains # for xendomains
keepdir /etc/xen/auto keepdir /etc/xen/auto
# Temp QA workaround
dodir "$(get_udevdir)"
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
rm -rf "${D}"/etc/udev
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
@ -440,19 +453,6 @@ pkg_postinst() {
elog "Recommended to utilise the xencommons script to config sytem At boot" elog "Recommended to utilise the xencommons script to config sytem At boot"
elog "Add by use of rc-update on completion of the install" elog "Add by use of rc-update on completion of the install"
# TODO: we need to have the current Python slot here.
if ! has_version "dev-lang/python[ncurses]"; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
if has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then if ! use hvm; then
echo echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
@ -466,10 +466,4 @@ pkg_postinst() {
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" 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" elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
fi fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
} }

@ -4,40 +4,46 @@
EAPI=5 EAPI=5
MY_PV=${PV/_/-}
PYTHON_COMPAT=( python2_7 ) PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE='xml,threads' PYTHON_REQ_USE='ncurses,xml,threads'
inherit eutils bash-completion-r1 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 if [[ $PV == *9999 ]]; then
inherit git-r3
KEYWORDS="" KEYWORDS=""
REPO="xen-unstable.hg" REPO="xen.git"
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}" EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
S="${WORKDIR}/${REPO}" S="${WORKDIR}/${REPO}"
live_eclass="mercurial"
else else
KEYWORDS="amd64 ~arm ~arm64 x86" KEYWORDS="~amd64 ~arm ~arm64 ~x86"
UPSTREAM_VER= UPSTREAM_VER=
SECURITY_VER=7 SECURITY_VER=2
# vars set to reflect https://dev.gentoo.org/~idella4/ # vars set to reflect https://dev.gentoo.org/~idella4/
SEC_VER=8 # first instance of UPS_VER (usptream ver)
QEMU_VER=0 UPS_VER=
SEC_VER=
QEMU_VER=2
# xen-tools's gentoo patches tarball # xen-tools's gentoo patches tarball
GENTOO_VER=4 GENTOO_VER=6
# xen-tools's gentoo patches version which apply to this specific ebuild # xen-tools's gentoo patches version which apply to this specific ebuild
GENTOO_GPV=0 GENTOO_GPV=0
# xen-tools ovmf's patches # xen-tools ovmf's patches
OVMF_VER=1 OVMF_VER=2
SEABIOS_VER=1.7.5 SEABIOS_VER=1.8.2
OVMF_PV=20150629 # OVMF upstream 52a99493cce88a9d4ec8a02d7f1bd1a1001ce60d
OVMF_PV=20151110
[[ -n ${UPSTREAM_VER} ]] && \ [[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz" UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P/-tools/}-upstream-patches-${UPSTREAM_VER}.tar.xz
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-upstream-patches-${UPS_VER}.tar.gz"
[[ -n ${SECURITY_VER} ]] && \ [[ -n ${SECURITY_VER} ]] && \
SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz # SECURITY_PATCHSET_URI="https://dev.gentoo.org/~idella4/distfiles/${PN}-security-patches-${SECURITY_VER}.tar.gz
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-qemu-patches-${QEMU_VER}.tar.gz"
[[ -n ${GENTOO_VER} ]] && \ [[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz" GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN/-tools}-gentoo-patches-${GENTOO_VER}.tar.xz"
[[ -n ${OVMF_VER} ]] && \ [[ -n ${OVMF_VER} ]] && \
@ -55,18 +61,16 @@ else
S="${WORKDIR}/xen-${MY_PV}" S="${WORKDIR}/xen-${MY_PV}"
fi fi
inherit bash-completion-r1 eutils flag-o-matic multilib python-single-r1 toolchain-funcs udev ${live_eclass} DESCRIPTION="Xen tools including QEMU and xl"
DESCRIPTION="Xend daemon and tools"
HOMEPAGE="http://xen.org/" HOMEPAGE="http://xen.org/"
DOCS=( README docs/README.xen-bugtool ) DOCS=( README docs/README.xen-bugtool )
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0/${MAJOR_V}"
# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make # Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
# >=dev-lang/ocaml-4 stable # >=dev-lang/ocaml-4 stable
# Masked in profiles/eapi-5-files instead # Masked in profiles/eapi-5-files instead
IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +pam python pygrub screen static-libs system-qemu system-seabios" IUSE="api custom-cflags debug doc flask hvm qemu ocaml ovmf +qemu-traditional +pam python pygrub screen sdl static-libs system-qemu system-seabios"
REQUIRED_USE="hvm? ( || ( qemu system-qemu ) ) REQUIRED_USE="hvm? ( || ( qemu system-qemu ) )
${PYTHON_REQUIRED_USE} ${PYTHON_REQUIRED_USE}
@ -88,11 +92,9 @@ DEPEND="${COMMON_DEPEND}
x86? ( sys-devel/dev86 x86? ( sys-devel/dev86
sys-power/iasl ) sys-power/iasl )
pam? ( dev-python/pypam[${PYTHON_USEDEP}] ) pam? ( dev-python/pypam[${PYTHON_USEDEP}] )
hvm? ( media-libs/libsdl )
${PYTHON_DEPS} ${PYTHON_DEPS}
api? ( dev-libs/libxml2 api? ( dev-libs/libxml2
net-misc/curl ) net-misc/curl )
pygrub? ( $(python_gen_impl_dep ncurses) )
ovmf? ( $(python_gen_impl_dep sqlite) ) ovmf? ( $(python_gen_impl_dep sqlite) )
!amd64? ( >=sys-apps/dtc-1.4.0 ) !amd64? ( >=sys-apps/dtc-1.4.0 )
amd64? ( sys-devel/bin86 amd64? ( sys-devel/bin86
@ -118,19 +120,21 @@ DEPEND="${COMMON_DEPEND}
) )
hvm? ( x11-proto/xproto hvm? ( x11-proto/xproto
!net-libs/libiscsi ) !net-libs/libiscsi )
qemu? ( x11-libs/pixman ) qemu? (
x11-libs/pixman
sdl? ( media-libs/libsdl[X] )
)
system-qemu? ( app-emulation/qemu[xen] ) system-qemu? ( app-emulation/qemu[xen] )
ocaml? ( dev-ml/findlib ocaml? ( dev-ml/findlib
>=dev-lang/ocaml-4 )" >=dev-lang/ocaml-4 )"
RDEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND}
sys-apps/iproute2 sys-apps/iproute2[-minimal]
net-misc/bridge-utils net-misc/bridge-utils
screen? ( screen? (
app-misc/screen app-misc/screen
app-admin/logrotate app-admin/logrotate
) )"
virtual/udev"
# hvmloader is used to bootstrap a fully virtualized kernel # hvmloader is used to bootstrap a fully virtualized kernel
# Approved by QA team in bug #144032 # Approved by QA team in bug #144032
@ -170,39 +174,16 @@ pkg_setup() {
src_prepare() { src_prepare() {
# Upstream's patchset # Upstream's patchset
if [[ -n ${UPSTREAM_VER} ]]; then if [[ -n ${UPSTREAM_VER} ]]; then
einfo "Try to apply Xen Upstream patcheset" einfo "Try to apply Xen Upstream patch set"
EPATCH_SUFFIX="patch" \ EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \ EPATCH_FORCE="yes" \
EPATCH_OPTS="-p1" \ EPATCH_OPTS="-p1" \
epatch "${WORKDIR}"/patches-upstream epatch "${WORKDIR}"/patches-upstream \
"${WORKDIR}"/libexec.patch
fi fi
# Security patchset # Security patchset
if [[ -n ${SECURITY_VER} ]]; then if [[ -n ${QEMU_VER} ]]; then
einfo "Try to apply Xen Security patcheset"
source "${WORKDIR}"/patches-security/${PV}.conf
# apply main xen patches
# Two parallel systems, both work
# Over time they may concdense into one. This will suffice for now
EPATCH_SUFFIX="patch"
EPATCH_FORCE="yes"
for i in ${XEN_SECURITY_MAIN}; do
epatch "${WORKDIR}"/patches-security/xen/$i
done
for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
epatch $i
done
# 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
for i in "${WORKDIR}"/qemu-patches/qemut/xsa*.patch; do
epatch $i
done
popd > /dev/null
# apply qemu-xen/upstream patches # apply qemu-xen/upstream patches
pushd "${S}"/tools/qemu-xen/ > /dev/null pushd "${S}"/tools/qemu-xen/ > /dev/null
for i in ${XEN_SECURITY_QEMUU}; do for i in ${XEN_SECURITY_QEMUU}; do
@ -271,6 +252,11 @@ src_prepare() {
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \ -e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
-i {} + || die "failed to re-set custom-cflags" -i {} + || die "failed to re-set custom-cflags"
else
unset CFLAGS
unset LDFLAGS
unset ASFLAGS
unset CPPFLAGS
fi fi
if ! use pygrub; then if ! use pygrub; then
@ -290,8 +276,18 @@ src_prepare() {
export CPATH="${WORKDIR}"/extra-headers export CPATH="${WORKDIR}"/extra-headers
fi fi
# Don't bother with qemu, only needed for fully virtualised guests if use qemu; then
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 sed -e "s:install-tools\: tools/qemu-xen-traditional-dir:install-tools\: :g" -i Makefile || die
fi fi
@ -326,6 +322,9 @@ src_prepare() {
-e 's:^#vif.default.script=:vif.default.script=:' \ -e 's:^#vif.default.script=:vif.default.script=:' \
-i tools/examples/xl.conf || die -i tools/examples/xl.conf || die
# Bug #575868 converted to a sed statement, typo of one char
sed -e "s:granters:granter's:" -i xen/include/public/grant_table.h || die
epatch_user epatch_user
} }
@ -342,10 +341,12 @@ src_configure() {
$(use_enable api xenapi) \ $(use_enable api xenapi) \
$(use_enable ovmf) \ $(use_enable ovmf) \
$(use_enable ocaml ocamltools) \ $(use_enable ocaml ocamltools) \
--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored') \
" "
use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin" use system-seabios && myconf+=" --with-system-seabios=/usr/share/seabios/bios.bin"
use qemu || myconf+=" --with-system-qemu" use qemu || myconf+=" --with-system-qemu"
use amd64 && myconf+=" --enable-qemu-traditional" use amd64 && myconf+=" $(use_enable qemu-traditional)"
econf ${myconf} econf ${myconf}
} }
@ -354,13 +355,10 @@ src_compile() {
local myopt local myopt
use debug && myopt="${myopt} debug=y" use debug && myopt="${myopt} debug=y"
use custom-cflags || unset CFLAGS
if test-flag-CC -fno-strict-overflow; then if test-flag-CC -fno-strict-overflow; then
append-flags -fno-strict-overflow append-flags -fno-strict-overflow
fi fi
unset LDFLAGS
unset CFLAGS
emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt} emake V=1 CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" -C tools ${myopt}
use doc && emake -C docs txt html use doc && emake -C docs txt html
@ -422,11 +420,6 @@ src_install() {
# for xendomains # for xendomains
keepdir /etc/xen/auto keepdir /etc/xen/auto
# Temp QA workaround
dodir "$(get_udevdir)"
mv "${D}"/etc/udev/* "${D}/$(get_udevdir)"
rm -rf "${D}"/etc/udev
# Remove files failing QA AFTER emake installs them, avoiding seeking absent files # Remove files failing QA AFTER emake installs them, avoiding seeking absent files
find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \ find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-o -name openbios-ppc -o -name palcode-clipper \) -delete || die -o -name openbios-ppc -o -name palcode-clipper \) -delete || die
@ -440,19 +433,6 @@ pkg_postinst() {
elog "Recommended to utilise the xencommons script to config sytem At boot" elog "Recommended to utilise the xencommons script to config sytem At boot"
elog "Add by use of rc-update on completion of the install" elog "Add by use of rc-update on completion of the install"
# TODO: we need to have the current Python slot here.
if ! has_version "dev-lang/python[ncurses]"; then
echo
ewarn "NB: Your dev-lang/python is built without USE=ncurses."
ewarn "Please rebuild python with USE=ncurses to make use of xenmon.py."
fi
if has_version "sys-apps/iproute2[minimal]"; then
echo
ewarn "Your sys-apps/iproute2 is built with USE=minimal. Networking"
ewarn "will not work until you rebuild iproute2 without USE=minimal."
fi
if ! use hvm; then if ! use hvm; then
echo echo
elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm" elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
@ -466,10 +446,4 @@ pkg_postinst() {
elog "with the qemu capable xen. It is up to the user to distinguish between and utilise" 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" elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
fi fi
if grep -qsF XENSV= "${ROOT}/etc/conf.d/xend"; then
echo
elog "xensv is broken upstream (Gentoo bug #142011)."
elog "Please remove '${ROOT%/}/etc/conf.d/xend', as it is no longer needed."
fi
} }

@ -1,11 +1,8 @@
DIST xen-4.5.2.tar.gz 18416220 SHA256 4c9e5dac4eea484974e9f76da2756c8e0973b4e884d28d37e955df9ebf00e7e8 SHA512 e0ce01a5356c254bfde48fae0b0e005c42c1615a7ccf4c1ba7dcf90784777b53995e9a9ae4575e3f19ef341014b34cb8c06e39d68be359f7fd69830501a144dd WHIRLPOOL b50ce28e58d8419915f7f85de7ab23128719fa07c54f28165c4ba864ffe57230230fa7cb61dd2ed7608b8bc178a072124aedc30c61a45fb8b745fc616715219b
DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d DIST xen-4.6.0-upstream-patches-0.tar.xz 19280 SHA256 8ef2d139f86cb52d2208a17c974e5a85356183ee359ab4b91882067548806e0c SHA512 9fde8d9def1d75e50c10069af7f9fea4b5b6992b7089eb554e1e2a4c78dd080f2977128d0dd541eeb735b951e7d6614a07101f7703457e7743ac6b3be962cdfe WHIRLPOOL 861c7f150811912422f6f5eb77437744d1456740a43bef3dfd88a2e6d6836c0e8460b788ccd4f14a7144652d65a825c08aa984ec4240b2b1ac6d09237695d19d
DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8 DIST xen-4.6.0.tar.gz 19694350 SHA256 6fa1c2431df55aa5950d248e6093b8c8c0f11c357a0adbd348a2186478e80909 SHA512 b4b02f306ffea360f539dd8c231b2f58c00c3638fdb665cb659c7291b475b40f1075bc59d49a6144767729e57b8bc40a1cfd9030d61de2b8fa4ac97d43655c2b WHIRLPOOL d3f01183440ca1875b6e850bd116db0c382383433e50c0902d3268e9e36b39d184fc65e925bdb5363ef4ca7a232fee15b4749c89baf789137b8a8248565c75a8
DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5 DIST xen-4.6.1.tar.gz 19693042 SHA256 44cc2fccba1e147ef4c8da0584ce0f24189c8743de0e3e9a9226da88ddb5f589 SHA512 f01a0b7874abf8b3a81432428d7ba2d5aceb9d75ae20310f8ef49a3a0df927720a51d49090f74fda7f374c779e121ad26da6966a6f2623ed1a7743b4c080427c WHIRLPOOL b4eec12118d602d1b41edee32ed7c0c61646974060bc44e3eedaf78f7c3015c151998f72573fd2bab1992263dd98f09992772334bae7826048d187de7ed022e5
DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
DIST xen-security-patches-00.tar.gz 4280 SHA256 1cb3d3d4af15202ce8ea5d6a5982b8c9a4623e565c732c64f5ec949cf55a11c0 SHA512 06e8fa8bda712564a18712640087a920545da3dc6bd6d94762f7f7fee33afb807f2d517e8d6177a683baf8ec04832acf57557f8125973f00e7de6109b3d5131b WHIRLPOOL 8b1b7caa37b73f442f440f599d9ae8d1562c6361c693b4d18540dbe7de4fa8046e3139f19dfdff35a316466ed7f017a3a99d430eb28e0716a0c6b52d8aec5b0b DIST xen-security-patches-00.tar.gz 4280 SHA256 1cb3d3d4af15202ce8ea5d6a5982b8c9a4623e565c732c64f5ec949cf55a11c0 SHA512 06e8fa8bda712564a18712640087a920545da3dc6bd6d94762f7f7fee33afb807f2d517e8d6177a683baf8ec04832acf57557f8125973f00e7de6109b3d5131b WHIRLPOOL 8b1b7caa37b73f442f440f599d9ae8d1562c6361c693b4d18540dbe7de4fa8046e3139f19dfdff35a316466ed7f017a3a99d430eb28e0716a0c6b52d8aec5b0b
DIST xen-security-patches-10.tar.gz 13289 SHA256 8937b3c0045f83ac0685ce129c99be8ab035f2ed92605d0c1100d4f898d978a3 SHA512 698963479149bd63695b3ffd7d108b798ce6c694560f2908b639f3a1b00d37d4994fbc1e0e21aaba1f3a113653d5b37c28679bc1d97d75a805844345c9c070c0 WHIRLPOOL 8c2433c35499819906abf5cb8898dac23cbf7523cc4b4e9291e696eb2871971a7300d3f54865ac32738a1b67c1de18e227085f14c5717b60ec951d5038fa0493 DIST xen-security-patches-10.tar.gz 13289 SHA256 8937b3c0045f83ac0685ce129c99be8ab035f2ed92605d0c1100d4f898d978a3 SHA512 698963479149bd63695b3ffd7d108b798ce6c694560f2908b639f3a1b00d37d4994fbc1e0e21aaba1f3a113653d5b37c28679bc1d97d75a805844345c9c070c0 WHIRLPOOL 8c2433c35499819906abf5cb8898dac23cbf7523cc4b4e9291e696eb2871971a7300d3f54865ac32738a1b67c1de18e227085f14c5717b60ec951d5038fa0493
DIST xen-security-patches-11.tar.gz 12639 SHA256 285e009010387be18bc8588f4dca3b3ec86a637a4afb13a7a5a23b0406a36d68 SHA512 af0f0f1bacbbb3d2141267dea623f5f69e95190ddd9ef62a5c0e9eef548c248a230dc08cc07e77e206e9f8ad19fd24bc1828e25c44370091673af4dff66f5c8a WHIRLPOOL 8b085a726f8f2ed9a354103dc29f83b427db934cfaa87b9391fba934c18562765f5f99ef560189bc8d0814d37fbf5deb57a5992e4d76ebddac06c8ffb74da8de
DIST xen-security-patches-8.tar.gz 9416 SHA256 3c0e6e8428f1890c8dda72ac94244fa3d6611b3612ef59ffed29b59481806a12 SHA512 f5ee325a8b25079ea256cb5a2e039e6738dee999be6d9d91ade875663c36f72a086bcb0bd1bb243483afb921da401c5d7453fea7405323fdaf8cf6e06a221049 WHIRLPOOL c30f14bb8a1a3ad22a962d4050027fa89a373f742c3eb7a161e1490beb186c6221f24247cd84b07e7f266c38aae6ef386f2e4db29a4b43cceaaaa54b644bb4f1
DIST xen-security-patches-9.tar.gz 9793 SHA256 2167d7bc2a631cf13d5b49c9577dbc8d128517e8ecbf90ef85c38f52ab3187aa SHA512 42f4997f35cc06333584a9a3c65366493094b60a6c67928b6165f3fb7d35d3a8f9dc0c3eadd4522de0d99bcc8511afba1d5e543396399b37983eb547abedca44 WHIRLPOOL 8abb68b4ac10fbc2b590c8a29cd2474d5392d3958542dad7f21ba4ad51c7541bb1686ed2629323e214c3e72b0de7212f25a4681f653d4179404c9f4c53e3d83a DIST xen-security-patches-9.tar.gz 9793 SHA256 2167d7bc2a631cf13d5b49c9577dbc8d128517e8ecbf90ef85c38f52ab3187aa SHA512 42f4997f35cc06333584a9a3c65366493094b60a6c67928b6165f3fb7d35d3a8f9dc0c3eadd4522de0d99bcc8511afba1d5e543396399b37983eb547abedca44 WHIRLPOOL 8abb68b4ac10fbc2b590c8a29cd2474d5392d3958542dad7f21ba4ad51c7541bb1686ed2629323e214c3e72b0de7212f25a4681f653d4179404c9f4c53e3d83a
DIST xen-upstream-patches-0.tar.gz 2297 SHA256 bf21272ad029391d30bf31896efcadc75267538f6c7de5d239453f19659d58ee SHA512 3f5d60aaebd181bddab4dd02e0064de2f75672f44a687a7331fa40e81d56763fea84504081a449d11403b21ad0ba2dac075f0b1796809ef8d16e244f6be99e3d WHIRLPOOL 4ebe79c8f2ea1c45e88e59941e477ed5639dbca3fe95c9a67e07afb0f4b6fb8b7fea8e58422d7c8f906299e4f37c14b4db15200997e5a92b647df98fa93e10c7 DIST xen-upstream-patches-0.tar.gz 2297 SHA256 bf21272ad029391d30bf31896efcadc75267538f6c7de5d239453f19659d58ee SHA512 3f5d60aaebd181bddab4dd02e0064de2f75672f44a687a7331fa40e81d56763fea84504081a449d11403b21ad0ba2dac075f0b1796809ef8d16e244f6be99e3d WHIRLPOOL 4ebe79c8f2ea1c45e88e59941e477ed5639dbca3fe95c9a67e07afb0f4b6fb8b7fea8e58422d7c8f906299e4f37c14b4db15200997e5a92b647df98fa93e10c7

@ -1,192 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
MY_PV=${PV/_/-}
MY_P=${PN}-${PV/_/-}
if [[ $PV == *9999 ]]; then
inherit git-r3
KEYWORDS=""
EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
SRC_URI=""
else
KEYWORDS="amd64 ~arm ~arm64 -x86"
UPSTREAM_VER=
SECURITY_VER=0
# var set to reflect https://dev.gentoo.org/~idella4/
SEC_VER=8
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/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
SRC_URI="http://bits.xensource.com/oss-xen/release/${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/"
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask xsm"
DEPEND="${PYTHON_DEPS}
efi? ( >=sys-devel/binutils-2.22[multitarget] )
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"
RESTRICT="test"
# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"
REQUIRED_USE="flask? ( xsm )
arm? ( debug )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
python-any-r1_pkg_setup
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
if use flask ; then
export "XSM_ENABLE=y"
export "FLASK_ENABLE=y"
elif use xsm ; then
export "XSM_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
if [[ -n ${SECURITY_VER} ]]; then
einfo "Try to apply Xen Security patcheset"
# 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"
for i in ${XEN_SECURITY_MAIN}; do
epatch "${WORKDIR}"/patches-security/xen/$i
done
for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
epatch $i
done
fi
# Gentoo's patchset
if [[ -n ${GENTOO_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-gentoo
fi
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
if use efi; then
epatch "${FILESDIR}"/${PN}-4.5-efi.patch
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
# remove -Werror for gcc-4.6's sake
find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
xargs sed -i 's/ *-Werror */ /'
# not strictly necessary to fix this
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
epatch_user
}
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
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
}
pkg_postinst() {
elog "Official Xen Guide and the unoffical wiki page:"
elog " https://wiki.gentoo.org/wiki/Xen"
elog " http://en.gentoo-wiki.com/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"
}

@ -1,192 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils multilib mount-boot flag-o-matic python-any-r1 toolchain-funcs
MY_PV=${PV/_/-}
MY_P=${PN}-${PV/_/-}
if [[ $PV == *9999 ]]; then
inherit git-r3
KEYWORDS=""
EGIT_REPO_URI="git://xenbits.xen.org/${PN}.git"
SRC_URI=""
else
KEYWORDS="~amd64 ~arm -x86"
UPSTREAM_VER=
SECURITY_VER=0
# var set to reflect https://dev.gentoo.org/~idella4/
SEC_VER=11
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/~idella4/distfiles/${PN/-tools}-security-patches-${SECURITY_VER}.tar.xz
https://dev.gentoo.org/~idella4/distfiles/${PN/-tools}-security-patches-${SEC_VER}.tar.gz"
[[ -n ${GENTOO_VER} ]] && \
GENTOO_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-gentoo-patches-${GENTOO_VER}.tar.xz"
SRC_URI="http://bits.xensource.com/oss-xen/release/${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/"
LICENSE="GPL-2"
SLOT="0"
IUSE="custom-cflags debug efi flask xsm"
DEPEND="${PYTHON_DEPS}
efi? ( >=sys-devel/binutils-2.22[multitarget] )
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
RDEPEND=""
PDEPEND="~app-emulation/xen-tools-${PV}"
RESTRICT="test"
# Approved by QA team in bug #144032
QA_WX_LOAD="boot/xen-syms-${PV}"
REQUIRED_USE="flask? ( xsm )
arm? ( debug )"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
python-any-r1_pkg_setup
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
if use flask ; then
export "XSM_ENABLE=y"
export "FLASK_ENABLE=y"
elif use xsm ; then
export "XSM_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
if [[ -n ${SECURITY_VER} ]]; then
einfo "Try to apply Xen Security patcheset"
# 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"
for i in ${XEN_SECURITY_MAIN}; do
epatch "${WORKDIR}"/patches-security/xen/$i
done
for i in "${WORKDIR}"/xen-sec/xsa*.patch; do
epatch $i
done
fi
# Gentoo's patchset
if [[ -n ${GENTOO_VER} ]]; then
EPATCH_SUFFIX="patch" \
EPATCH_FORCE="yes" \
epatch "${WORKDIR}"/patches-gentoo
fi
# Drop .config
sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't drop"
if use efi; then
epatch "${FILESDIR}"/${PN}-4.5-efi.patch
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
# remove -Werror for gcc-4.6's sake
find "${S}" -name 'Makefile*' -o -name '*.mk' -o -name 'common.make' | \
xargs sed -i 's/ *-Werror */ /'
# not strictly necessary to fix this
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
epatch_user
}
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
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
}
pkg_postinst() {
elog "Official Xen Guide and the unoffical wiki page:"
elog " https://wiki.gentoo.org/wiki/Xen"
elog " http://en.gentoo-wiki.com/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"
}

@ -1,3 +1,4 @@
DIST ibus-hangul-1.4.0.tar.gz 439462 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a SHA512 a2ed7c5ec344d31a37fa3decc502d0b2d724f08c668e6072eade7aa5bdbaba0b5812daf5fb5503e6477d0b289f248894eb81f70729e2a87a40516b1d4d09a6de WHIRLPOOL 06c2eeb6d975c414cd3209500ef562e834c02e7e1c96915cc977a9ff9d8779128e978d52cc8f11940d6a9c23ef34f285d2be63b978f2fe6c3aaf253349e8b949 DIST ibus-hangul-1.4.0.tar.gz 439462 SHA256 a955ec0c9ea90ecd8e8d0fd2de1596a5ba1186463862c387d74a418d1707ca0a SHA512 a2ed7c5ec344d31a37fa3decc502d0b2d724f08c668e6072eade7aa5bdbaba0b5812daf5fb5503e6477d0b289f248894eb81f70729e2a87a40516b1d4d09a6de WHIRLPOOL 06c2eeb6d975c414cd3209500ef562e834c02e7e1c96915cc977a9ff9d8779128e978d52cc8f11940d6a9c23ef34f285d2be63b978f2fe6c3aaf253349e8b949
DIST ibus-hangul-1.4.1.tar.gz 484065 SHA256 8b7cbc124850df9fb78cdcb38b138f10c648b5519d36a92107616606678b662d SHA512 80d893c33e06108e1477bab067d24e333c9fbfaa3f1a839d9070f2b78694ff80965d9dd23cded3a512f1ed71b60ea5e8390ef9f87d2b63858b09158f90d74b9f WHIRLPOOL 0ec6a6d357e2b6234ddd448c72fa04668381b4de0e82d892e83378f3f1d40a31f5a28c667b68045555cdc74ed441640acc81c91d051683f664ea754021ea526c DIST ibus-hangul-1.4.1.tar.gz 484065 SHA256 8b7cbc124850df9fb78cdcb38b138f10c648b5519d36a92107616606678b662d SHA512 80d893c33e06108e1477bab067d24e333c9fbfaa3f1a839d9070f2b78694ff80965d9dd23cded3a512f1ed71b60ea5e8390ef9f87d2b63858b09158f90d74b9f WHIRLPOOL 0ec6a6d357e2b6234ddd448c72fa04668381b4de0e82d892e83378f3f1d40a31f5a28c667b68045555cdc74ed441640acc81c91d051683f664ea754021ea526c
DIST ibus-hangul-1.4.2.tar.gz 483967 SHA256 de79dff94028673f1a00b24f9af35f37f59c12b1737d171a24ac4d34fad20b89 SHA512 ba046d3d234db71043e5dd2fbc8d38443dff4d422e360a09b05dd4c411705967495195b71f8feb5986683c20984217934e3bfe45547b4e43b83aa3f33756963f WHIRLPOOL 046a9b67f6730ffbecd9be13b734fbfc87614dd0e4a72b4e5f866bc6149719e7f5a8b9300faad48470ba20432d3baebd5d7bb173e04885802686237f6c421805 DIST ibus-hangul-1.4.2.tar.gz 483967 SHA256 de79dff94028673f1a00b24f9af35f37f59c12b1737d171a24ac4d34fad20b89 SHA512 ba046d3d234db71043e5dd2fbc8d38443dff4d422e360a09b05dd4c411705967495195b71f8feb5986683c20984217934e3bfe45547b4e43b83aa3f33756963f WHIRLPOOL 046a9b67f6730ffbecd9be13b734fbfc87614dd0e4a72b4e5f866bc6149719e7f5a8b9300faad48470ba20432d3baebd5d7bb173e04885802686237f6c421805
DIST ibus-hangul-1.5.0.tar.gz 505707 SHA256 a22d4030bb20f73914a9d8a28c71b823123a5d1902a30f8328111af50f4f1788 SHA512 a9bef9ad887d1b41555af12e7589a9c4c69ddf4f61890907d90cbab6b9bf4cb6df4739c54d34ee1b2507486a1cb568f826bb4641e9ccee8ccfa11ff2d7e962bb WHIRLPOOL fef54dd65cb6ecee1a703f93db9d46d08ce12fa15df00c59197bd4dea1bb1d00bec4e25d765ffe2e1cae7da796d16ceb04bd46657617d363e0933f6beebf55f0

@ -10,7 +10,7 @@ inherit python-single-r1
DESCRIPTION="The Hangul engine for IBus input platform" DESCRIPTION="The Hangul engine for IBus input platform"
HOMEPAGE="https://github.com/ibus/ibus/wiki" HOMEPAGE="https://github.com/ibus/ibus/wiki"
SRC_URI="https://ibus.googlecode.com/files/${P}.tar.gz" SRC_URI="https://github.com/choehwanjin/ibus-hangul/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"

@ -0,0 +1,44 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit python-single-r1
DESCRIPTION="The Hangul engine for IBus input platform"
HOMEPAGE="https://github.com/ibus/ibus/wiki"
SRC_URI="https://github.com/choehwanjin/ibus-hangul/releases/download/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="nls"
RDEPEND=">=app-i18n/ibus-1.4[python,${PYTHON_USEDEP}]
=dev-python/pygobject-2*[${PYTHON_USEDEP}]
=dev-python/pygtk-2*[${PYTHON_USEDEP}]
>=app-i18n/libhangul-0.1
nls? ( virtual/libintl )
${PYTHON_DEPS}"
DEPEND="${RDEPEND}
virtual/pkgconfig
nls? (
dev-util/intltool
>=sys-devel/gettext-0.17
)"
REQUIRED_USE=${PYTHON_REQUIRED_USE}
DOCS="AUTHORS ChangeLog NEWS README"
src_prepare() {
sed -ie "s:python:${EPYTHON}:" \
setup/ibus-setup-hangul.in || die
}
src_configure() {
econf $(use_enable nls)
}

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86" KEYWORDS="amd64 ~ppc ~x86"
IUSE="nls" IUSE="nls"
RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 ) RDEPEND="|| ( >=app-i18n/scim-0.99.8 >=app-i18n/scim-cvs-0.99.8 )

@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/scim/${P}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
IUSE="nls" IUSE="nls"
RDEPEND="x11-libs/libXt RDEPEND="x11-libs/libXt

@ -1 +1,2 @@
DIST skk-jisyo-201101.tar.bz2 7880875 SHA256 a57d9a39b705d13f8c90caf9ce8cf3f729852020a6e5b43bcc9e1d7383b252b4 SHA512 bbdaa6916bda9b545b4afc665fd9c7023797a2f1d2568c019b8f06515eca24f707cdcee8d85f3b0ea2793df4836a233eb131e78572229676cca909591f3e3648 WHIRLPOOL 11b4d880fb41f5fb3c704cc18c664ef0f043f6d232f34be6ba1c3737c7d9ccb0aec2361234ceea933e4ec4dbacc344de58af5d975c74412b847044df4aff89d9 DIST skk-jisyo-201101.tar.bz2 7880875 SHA256 a57d9a39b705d13f8c90caf9ce8cf3f729852020a6e5b43bcc9e1d7383b252b4 SHA512 bbdaa6916bda9b545b4afc665fd9c7023797a2f1d2568c019b8f06515eca24f707cdcee8d85f3b0ea2793df4836a233eb131e78572229676cca909591f3e3648 WHIRLPOOL 11b4d880fb41f5fb3c704cc18c664ef0f043f6d232f34be6ba1c3737c7d9ccb0aec2361234ceea933e4ec4dbacc344de58af5d975c74412b847044df4aff89d9
DIST skk-jisyo-201605.tar.xz 6288104 SHA256 170e8260bc692d43f3cd321a06cf393a02239c462e76657bcde886ddb6d2cb8d SHA512 1093d363fe571c3e3e05fa54046fc4b88cbed2fbd104838576c83694556585401c3affa0afb2ed078c6f1b06f62a7b14145b1305f6fef089f160b4073900c7a1 WHIRLPOOL f9f5ce13ba7cf86beb41214d682ad514a4181d3867afefd2daf44c829be1ae7f0bcb9c7e39f1a50fa01deab8f205226e7b3916231431e531b9ea474935f642c1

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata> <pkgmetadata>
<maintainer type="project"> <maintainer type="project">
<email>cjk@gentoo.org</email> <email>cjk@gentoo.org</email>
<name>Cjk</name> <name>Cjk</name>
</maintainer> </maintainer>
</pkgmetadata> </pkgmetadata>

@ -0,0 +1,59 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
MY_PN=${PN^^}
DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
SRC_URI="mirror://gentoo/${P}.tar.xz
https://dev.gentoo.org/~hattya/distfiles/${P}.tar.xz"
LICENSE="GPL-2 freedist public-domain"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris"
IUSE="cdb"
DEPEND="sys-apps/gawk
cdb? (
|| (
dev-db/tinycdb
dev-db/cdb
)
)"
RDEPEND=""
DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
src_prepare() {
rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
eapply_user
}
src_compile() {
if use cdb; then
local cdbmake="cdbmake" f
if has_version dev-db/tinycdb; then
cdbmake="cdb -c"
fi
for f in {,zipcode/}${MY_PN}.*; do
LC_ALL=C gawk '
/^[^;]/ {
s = substr($0, index($0, " ") + 1)
print "+" length($1) "," length(s) ":" $1 "->" s
}
END {
print ""
}
' ${f} | ${cdbmake} ${f}.cdb || die
done
fi
}
src_install() {
insinto /usr/share/skk
doins {,zipcode/}${MY_PN}.*
}

@ -1,67 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
ECVS_SERVER="openlab.jp:/circus/cvsroot"
ECVS_USER="guest"
ECVS_PASS="guest"
ECVS_MODULE="skk/dic"
inherit cvs
DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
#SRC_URI="mirror://gentoo/${P}.tar.bz2"
SRC_URI=""
LICENSE="GPL-2 public-domain freedist"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="cdb"
COMMON_DEPEND="cdb? ( dev-db/cdb )"
DEPEND="${COMMON_DEPEND}
sys-apps/gawk"
RDEPEND="${COMMON_DEPEND}
!app-i18n/skk-jisyo-extra
!app-i18n/skk-jisyo-cdb"
S="${WORKDIR}/${ECVS_MODULE}"
src_unpack() {
cvs_src_unpack
cd "${S}"
rm SKK-JISYO.wrong.annotated SKK-JISYO.china_taiwan.header
rm SKK-JISYO.noregist SKK-JISYO.not_wrong SKK-JISYO.hukugougo
rm SKK-JISYO.notes SKK-JISYO.requested SKK-JISYO.pubdic+
}
src_compile() {
# bug 184457
unset LANG LC_ALL LC_CTYPE
for f in SKK-JISYO.* zipcode/SKK-JISYO.* ; do
mv ${f} ${f}.annotated
gawk -f "${FILESDIR}"/unannotation.awk ${f}.annotated > $(basename ${f}) || die
if use cdb ; then
gawk '
/^[^;]/ {
s = substr($0, index($0, " ") + 1)
print "+" length($1) "," length(s) ":" $1 "->" s
}
END {
print ""
}
' $(basename ${f}) | cdbmake $(basename ${f}).cdb "${T}"/$(basename ${f}) || die
fi
rm ${f}.annotated
done
}
src_install() {
# install dictionaries
insinto /usr/share/skk
doins SKK-JISYO.* || die
dodoc ChangeLog* READMEs/committers.txt edict_doc.txt
}

@ -0,0 +1,78 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
USE_RUBY="ruby20 ruby21"
inherit cvs ruby-single
MY_PN=${PN^^}
DESCRIPTION="Jisyo (dictionary) files for the SKK Japanese-input software"
HOMEPAGE="http://openlab.ring.gr.jp/skk/dic.html"
ECVS_SERVER="openlab.jp:/circus/cvsroot"
ECVS_MODULE="skk/dic"
ECVS_USER="guest"
ECVS_PASS="guest"
LICENSE="GPL-2 freedist public-domain"
SLOT="0"
KEYWORDS=""
IUSE="cdb"
DEPEND="${RUBY_DEPS}
app-i18n/skktools
sys-apps/gawk
cdb? (
|| (
dev-db/tinycdb
dev-db/cdb
)
)"
RDEPEND=""
S="${WORKDIR}/${ECVS_MODULE}"
DOCS=( ChangeLog{,.{1..3}} READMEs/committers.txt edict_doc.txt zipcode/README.ja )
SKKTOOLS_DIR="${EPREFIX}/usr/share/skktools/convert2skk"
src_prepare() {
rm -f ${MY_PN}.{wrong*,noregist,not_wrong,hukugougo,notes,requested,pubdic+}
eapply_user
}
src_compile() {
local ctdic="${MY_PN}.china_taiwan" ruby
mv ${ctdic}{.header,}
for ruby in ${USE_RUBY}; do
if has_version dev-lang/ruby:${ruby:4:1}.${ruby:5}; then
${ruby} ${SKKTOOLS_DIR}/ctdicconv.rb csv/${ctdic##*.}.csv | skkdic-expr2 >> ${ctdic}
break
fi
done
if use cdb; then
local cdbmake="cdbmake" f
if has_version dev-db/tinycdb; then
cdbmake="cdb -c"
fi
for f in {,zipcode/}${MY_PN}.*; do
LC_ALL=C gawk '
/^[^;]/ {
s = substr($0, index($0, " ") + 1)
print "+" length($1) "," length(s) ":" $1 "->" s
}
END {
print ""
}
' ${f} | ${cdbmake} ${f}.cdb || die
done
fi
}
src_install() {
insinto /usr/share/skk
doins {,zipcode/}${MY_PN}.*
}

@ -0,0 +1 @@
DIST skktools-1.3.3_p20150901.tar.gz 483005 SHA256 24f26e76ba6321b43de69353ad2d33b59d5ecee724764e99c6383d9d4f9c9acf SHA512 dbb15068239158c31a706da2fd5afcb8514d088854bdd4f0d05bb8b9e10947cbdce584ff3698571d601e3b357a1ba11b4608f0457615062016862ac89fb91b83 WHIRLPOOL 81cd503de4d05bbab096628e357e0ced4a87cf4df87d7a0f380a8dbe0850fbd7f65d2f1bf249a6b5bf19fb6b1605d0796b6a9408c0fcd7b5ad700d069f396895

@ -0,0 +1,2 @@
(add-to-list 'load-path "@SITELISP@")
(autoload 'skk-convert-jisyo-to-xml "skk-xml" nil t)

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
<upstream>
<remote-id type="github">skk-dev/skktools</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,68 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
inherit elisp-common vcs-snapshot
EGIT_COMMIT="28e36bac97dc8ed089bac409bef15f1831b6adde"
DESCRIPTION="SKK utilities to manage dictionaries"
HOMEPAGE="http://openlab.jp/skk/"
SRC_URI="https://github.com/skk-dev/skktools/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="emacs"
RDEPEND="dev-libs/glib:2
sys-libs/gdbm
emacs? ( virtual/emacs )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
DOCS=( ChangeLog README.md )
SITEFILE="50${PN}-gentoo.el"
src_configure() {
econf --with-gdbm
}
src_compile() {
default
if use emacs; then
elisp-compile *.el
fi
}
src_install() {
default
dodoc READMEs/*
local d
for d in convert2skk filters; do
newdoc ${d}/README.md README.${d}
rm -f ${d}/README.md
done
insinto /usr/share/${PN}
doins *.awk *.scm
rm -rf convert2skk/obsolete
doins -r convert2skk filters
if use emacs; then
elisp-install ${PN} *.el{,c}
elisp-site-file-install "${FILESDIR}"/${SITEFILE}
fi
}
pkg_postinst() {
use emacs && elisp-site-regen
}
pkg_postrm() {
use emacs && elisp-site-regen
}

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/tomoe/${P}.tar.gz"
LICENSE="LGPL-2.1" LICENSE="LGPL-2.1"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="amd64 ~x86"
IUSE="doc hyperestraier mysql ruby python static-libs subversion" IUSE="doc hyperestraier mysql ruby python static-libs subversion"
RDEPEND=">=dev-libs/glib-2.4 RDEPEND=">=dev-libs/glib-2.4

@ -1,4 +1,4 @@
# Copyright 1999-2009 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
@ -61,7 +61,7 @@ pkg_postinst() {
elog "Remember to" elog "Remember to"
elog "$ export LANG=en_US.UTF-8" elog "$ export LANG=en_US.UTF-8"
elog "(or any other UTF-8 locale) and" elog "(or any other UTF-8 locale) and"
elog "$ export LD_PRELOAD=${DESTTREE}/lib/xvnkb.so" elog "$ export LD_PRELOAD=/usr/lib/xvnkb.so"
elog "before starting X Window" elog "before starting X Window"
elog "More documents are in /usr/share/doc/${PF}" elog "More documents are in /usr/share/doc/${PF}"
ewarn "Programs with suid/sgid will have LD_PRELOAD cleared" ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"

@ -1,4 +1,4 @@
# Copyright 1999-2012 Gentoo Foundation # Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$ # $Id$
@ -57,7 +57,7 @@ pkg_postinst() {
elog "Remember to" elog "Remember to"
elog "$ export LANG=en_US.UTF-8" elog "$ export LANG=en_US.UTF-8"
elog "(or any other UTF-8 locale) and" elog "(or any other UTF-8 locale) and"
elog "$ export LD_PRELOAD=${DESTTREE}/lib/xvnkb.so" elog "$ export LD_PRELOAD=/usr/$(get_libdir)/xvnkb.so"
elog "before starting X Window" elog "before starting X Window"
elog "More documents are in /usr/share/doc/${PF}" elog "More documents are in /usr/share/doc/${PF}"
ewarn "Programs with suid/sgid will have LD_PRELOAD cleared" ewarn "Programs with suid/sgid will have LD_PRELOAD cleared"

@ -0,0 +1 @@
DIST yaskkserv-1.1.0.tar.xz 75108 SHA256 b7297220492e1dc4cf0b48bc2ff1dd9fd3e88cf6f8a318a45a667574112ef56a SHA512 9956a9b2fe587491b7c5f76482f13f91d1c87d445f2ff7effa5ffb68efe076f54f1c63e95b980d889963ac507ed49fa37f76f9deb239da7b7409da5be025c000 WHIRLPOOL 7a7b4379a57b7c44dbe91a14d392d5c1c76860df32ea4d890652abef3c9445f1ef87ac72c5e003ec3de7e07019f046d12e1506710a4798f72b79321aa5a98d2c

@ -0,0 +1,93 @@
--- a/Makefile
+++ b/Makefile
@@ -57,16 +57,16 @@
$(MAKE) --no-print-directory -C $(SOURCE_PATH) -f $(MAKEFILE) test
install_common_ :
- $(MKDIR) -p $(PREFIX)/bin
- $(INSTALL) $(VAR_PATH)/yaskkserv_make_dictionary/yaskkserv_make_dictionary $(PREFIX)/bin/yaskkserv_make_dictionary
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/bin
+ $(INSTALL) $(VAR_PATH)/yaskkserv_make_dictionary/yaskkserv_make_dictionary $(DESTDIR)$(PREFIX)/bin/yaskkserv_make_dictionary
install : install_normal
install_all : install_common_
- $(MKDIR) -p $(PREFIX)/sbin
- $(INSTALL) $(VAR_PATH)/yaskkserv_simple/yaskkserv_simple $(PREFIX)/sbin/yaskkserv_simple
- $(INSTALL) $(VAR_PATH)/yaskkserv_normal/yaskkserv_normal $(PREFIX)/sbin/yaskkserv_normal
- $(INSTALL) $(VAR_PATH)/yaskkserv_hairy/yaskkserv_hairy $(PREFIX)/sbin/yaskkserv_hairy
+ $(MKDIR) -p $(DESTDIR)$(PREFIX)/sbin
+ $(INSTALL) $(VAR_PATH)/yaskkserv_simple/yaskkserv_simple $(DESTDIR)$(PREFIX)/sbin/yaskkserv_simple
+ $(INSTALL) $(VAR_PATH)/yaskkserv_normal/yaskkserv_normal $(DESTDIR)$(PREFIX)/sbin/yaskkserv_normal
+ $(INSTALL) $(VAR_PATH)/yaskkserv_hairy/yaskkserv_hairy $(DESTDIR)$(PREFIX)/sbin/yaskkserv_hairy
install_simple : install_common_
$(MKDIR) -p $(PREFIX)/sbin
--- a/source/Makefile.bsd_cygwin_linux_gcc.common
+++ b/source/Makefile.bsd_cygwin_linux_gcc.common
@@ -16,16 +16,16 @@
endif # DEBUG
INCLUDE_FLAGS = -I . -I $(VAR_PATH) -I $(PROJECT_ROOT)/source/skk -I $(PROJECT_ROOT)/source/skk/architecture -I $(PROJECT_ROOT)/source/skk/architecture/$(ARCHITECTURE_LOWER_CASE)
-LIBRARY_FLAGS = -L/usr/lib
+LIBRARY_FLAGS =
-CPPFLAGS = $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(CXXFLAGS_DEFINE) -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
+CPPFLAGS += $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(CXXFLAGS_DEFINE) -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
-CXXFLAGS = $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(OPTIMIZE_FLAGS) $(CXXFLAGS_WARNING) -fno-exceptions -fno-rtti -fmessage-length=0 -pipe -fPIC -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
+CXXFLAGS += $(DEBUG_FLAGS) $(CXXFLAGS_ARCHITECTURE) $(CXXFLAGS_BYTE_ORDER) $(CXXFLAGS_CONFIG) $(INCLUDE_FLAGS) $(OPTIMIZE_FLAGS) $(CXXFLAGS_WARNING) -fno-exceptions -fno-rtti -fmessage-length=0 -pipe -fPIC -D $(PROJECT_IDENTIFIER)_VERSION=\"$(PROJECT_VERSION)\"
-LDFLAGS = $(DEBUG_FLAGS) $(LDFLAGS_ARCHITECTURE) $(OPTIMIZE_FLAGS) -pipe $(LIBRARY_FLAGS) -fPIC
+LDFLAGS += $(DEBUG_FLAGS) $(LDFLAGS_ARCHITECTURE) $(OPTIMIZE_FLAGS) -pipe $(LIBRARY_FLAGS) -fPIC
CXX = $(CCACHE) $(COMPILER)
LD = $(COMPILER)
CPP = $(CXX)
LD = $(CXX)
-STRIP = strip
+STRIP = true
--- a/source/yaskkserv_hairy/Makefile.bsd_cygwin_linux_gcc
+++ b/source/yaskkserv_hairy/Makefile.bsd_cygwin_linux_gcc
@@ -12,7 +12,7 @@
# RUN_FLAGS = --port=9999 --google-japanese-input=dictionary --google-suggest --google-japanese-input-timeout=1.1 https://www.google.com
# RUN_FLAGS = --port=9999 --google-japanese-input=dictionary --google-japanese-input-timeout=1.1 http://www.google.com /home/wac/local/share/skk/SKK-JISYO.total+zipcode.yaskkserv
# RUN_FLAGS = --port=9999 --google-japanese-input=dictionary --google-japanese-input-timeout=1.1 http://www.google.com
-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_SERVER_HAIRY) $(CXXFLAGS_WARNING_SERVER_HAIRY)
+CXXFLAGS += $(CXXFLAGS_WARNING_SERVER_HAIRY)
SOURCES = ${wildcard *.cpp}
OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
--- a/source/yaskkserv_make_dictionary/Makefile.bsd_cygwin_linux_gcc
+++ b/source/yaskkserv_make_dictionary/Makefile.bsd_cygwin_linux_gcc
@@ -5,7 +5,7 @@
TARGET_BASE = yaskkserv_make_dictionary
RUN_FLAGS =
-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_TOOL) $(CXXFLAGS_WARNING_TOOL)
+CXXFLAGS += $(CXXFLAGS_WARNING_TOOL)
SOURCES = ${wildcard *.cpp}
OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
--- a/source/yaskkserv_normal/Makefile.bsd_cygwin_linux_gcc
+++ b/source/yaskkserv_normal/Makefile.bsd_cygwin_linux_gcc
@@ -5,7 +5,7 @@
TARGET_BASE = yaskkserv_normal
RUN_FLAGS = --check-update --port=9999 /var/tmp/SKK-JISYO.total+zipcode.yaskkserv
-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_SERVER_NORMAL) $(CXXFLAGS_WARNING_SERVER_NORMAL)
+CXXFLAGS += $(CXXFLAGS_WARNING_SERVER_NORMAL)
SOURCES = ${wildcard *.cpp}
OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}
--- a/source/yaskkserv_simple/Makefile.bsd_cygwin_linux_gcc
+++ b/source/yaskkserv_simple/Makefile.bsd_cygwin_linux_gcc
@@ -5,7 +5,7 @@
TARGET_BASE = yaskkserv_simple
RUN_FLAGS = --port=9999 /var/tmp/SKK-JISYO.total+zipcode.yaskkserv
-CXXFLAGS += $(CXXFLAGS_OPTIMIZE_SERVER_SIMPLE) $(CXXFLAGS_WARNING_SERVER_SIMPLE)
+CXXFLAGS += $(CXXFLAGS_WARNING_SERVER_SIMPLE)
SOURCES = ${wildcard *.cpp}
OBJECTS = ${addprefix $(VAR_PATH)/$(TARGET_BASE)/,$(SOURCES:.cpp=.o)}

@ -0,0 +1,10 @@
# Select yaskkserv server type:
# - simple
# Without dictionary reloading
# - normal
# - hairy
# With "Server completion" and "Google Japanese Input API"
YASKKSERV_SERVER_TYPE="normal"
# Options to pass to yaskkserv
YASKKSERV_OPTS="/usr/share/skk/SKK-JISYO.L.yaskkserv"

@ -0,0 +1,14 @@
#!/sbin/openrc-run
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
command=/usr/sbin/${SVCNAME}_${YASKKSERV_SERVER_TYPE}
command_args="--no-daemonize ${YASKKSERV_OPTS}"
command_background="true"
pidfile=${pidfile:-/run/${SVCNAME}.pid}
depend() {
need net
use logger
}

@ -0,0 +1,12 @@
[Unit]
Description=Yet Another SKK server
After=yaskkserv.socket
Requires=yaskkserv.socket
[Service]
User=nobody
EnvironmentFile=/etc/conf.d/yaskkserv
ExecStart=/usr/sbin/yaskkserv${YASKKSERV_SERVER_TYPE} --no-daemonize ${YASKKSERV_OPTS}
[Install]
WantedBy=multi-user.target

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="project">
<email>cjk@gentoo.org</email>
<name>Cjk</name>
</maintainer>
<upstream>
<remote-id type="github">wachikun/yaskkserv</remote-id>
</upstream>
</pkgmetadata>

@ -0,0 +1,79 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6"
inherit toolchain-funcs systemd
DESCRIPTION="Yet Another SKK server"
HOMEPAGE="http://umiushi.org/~wac/yaskkserv/"
SRC_URI="http://umiushi.org/~wac/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="gnutls libressl systemd"
RDEPEND="app-i18n/skk-jisyo
gnutls? ( net-libs/gnutls )
!gnutls? (
!libressl? ( dev-libs/openssl:0 )
libressl? ( dev-libs/libressl )
)
systemd? ( virtual/udev[systemd] )"
DEPEND="${RDEPEND}
dev-lang/perl"
REQUIRED_USE="?? ( gnutls libressl )"
PATCHES=( "${FILESDIR}"/${PN}-gentoo.patch )
DOCS=( README.md )
HTML_DOCS=( documentation/. )
src_configure() {
econf \
$(use_enable gnutls) \
$(use_enable systemd) \
--compiler="${tc_getCXX}"
}
src_install() {
emake DESTDIR="${D}" install_all
einstalldocs
newinitd "${FILESDIR}"/${PN}.initd ${PN}
newconfd "${FILESDIR}"/${PN}.confd ${PN}
systemd_dounit examples/${PN}.socket
systemd_dounit "${FILESDIR}"/${PN}.service
}
pkg_postinst() {
pkg_config
elog "You need to run:"
elog " emerge --config =${CATEGORY}/${PF}"
elog "after updating app-i18n/skk-jisyo from next time."
}
pkg_postrm() {
rm -f "${ROOT}"/usr/share/skk/SKK-JISYO.*.${PN}
rmdir "${ROOT}"/usr/share/skk 2>/dev/null
}
pkg_config() {
local f
for f in "${ROOT}"/usr/share/skk/SKK-JISYO.*; do
case ${f} in
*.cdb)
;;
*.${PN})
[[ -f ${f%.*} ]] || rm -f "${f}"
;;
*)
[[ ${f} -nt ${f}.${PN} ]] && ${PN}_make_dictionary "${f}" "${f}.${PN}"
;;
esac
done
}

@ -1 +1,2 @@
DIST brewtarget_2.1.0.orig.tar.xz 8576552 SHA256 5d34c6ed169d6589c85dd5383850512a0e36ab2b2233f9ed566f3a0fb4adb9be SHA512 980867c7d5d0d9c6a3c7dc659677c384522fa468c4c86b54d2e77e59b577352abdcaa245d04f01ee4d4d433426925f9df472821c81346e13457b6c58a35fe9c5 WHIRLPOOL df22343055dd133efb918afde589bd86bb0596adde2005a3cda70c8c7817392b762d4ae238feb4d026272108e6053743a1becfe953402d2f646f336a17bcf072 DIST brewtarget_2.1.0.orig.tar.xz 8576552 SHA256 5d34c6ed169d6589c85dd5383850512a0e36ab2b2233f9ed566f3a0fb4adb9be SHA512 980867c7d5d0d9c6a3c7dc659677c384522fa468c4c86b54d2e77e59b577352abdcaa245d04f01ee4d4d433426925f9df472821c81346e13457b6c58a35fe9c5 WHIRLPOOL df22343055dd133efb918afde589bd86bb0596adde2005a3cda70c8c7817392b762d4ae238feb4d026272108e6053743a1becfe953402d2f646f336a17bcf072
DIST brewtarget_2.3.1.orig.tar.xz 9449200 SHA256 1541856e9f835d896045ea3f0aeaf9ed254c8225e9fe0e540a0b4e5bd467ceb0 SHA512 2ff29496df6df1b4507594905f5b3cdedd472a3e767c5f5dda00d306d092a7bec6f9d67350a830416f0ab457553339ba2f9dd2ea8476ed1dfa7dd4c49adda086 WHIRLPOOL c9e539cd91ebb9d48cecf3a2f21cc5522fcd5b04f99d07a32c98af117949cad467621b09ad26e0ca16c91dce411f70ec5523fd98d98e9f28d6efe44e2c27886d

@ -0,0 +1,57 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=6
PLOCALES="ca cs da de el en es et eu fr gl hu it lv nb nl pl pt ru sr sv tr zh"
inherit cmake-utils l10n
DESCRIPTION="Application to create and manage beer recipes"
HOMEPAGE="http://www.brewtarget.org/"
SRC_URI="https://github.com/Brewtarget/${PN}/releases/download/v${PV}/${PN}_${PV}.orig.tar.xz"
LICENSE="GPL-3 WTFPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtdeclarative:5
dev-qt/qtgui:5
dev-qt/qtmultimedia:5
dev-qt/qtnetwork:5
dev-qt/qtprintsupport:5
dev-qt/qtsql:5[sqlite]
dev-qt/qtsvg:5
dev-qt/qtwebkit:5
dev-qt/qtwidgets:5
dev-qt/qtxml:5
"
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5
"
remove_locale() {
sed -i -e "/bt_${1}\.ts/d" CMakeLists.txt || die
}
src_prepare() {
l10n_find_plocales_changes "${S}/translations" bt_ .ts
l10n_for_each_disabled_locale_do remove_locale
# Tests are bogus, don't build them
sed -i -e '/Qt5Test/d' CMakeLists.txt || die
sed -i -e '/=Tests=/,/=Installs=/d' src/CMakeLists.txt || die
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
-DDO_RELEASE_BUILD=ON
-DNO_MESSING_WITH_FLAGS=ON
)
cmake-utils_src_configure
}

@ -13,9 +13,9 @@
</maintainer> </maintainer>
<maintainer type="project"> <maintainer type="project">
<email>proxy-maint@gentoo.org</email> <email>proxy-maint@gentoo.org</email>
<name>Proxy Maintainers Project <name>Proxy Maintainers Project</name>
</name>
</maintainer> </maintainer>
<upstream> <upstream>
<maintainer status="active"> <maintainer status="active">
<email>talex5@gmail.com</email> <email>talex5@gmail.com</email>
@ -24,6 +24,7 @@
<bugs-to>http://rox.sourceforge.net/desktop/lists</bugs-to> <bugs-to>http://rox.sourceforge.net/desktop/lists</bugs-to>
<remote-id type="sourceforge">rox</remote-id> <remote-id type="sourceforge">rox</remote-id>
</upstream> </upstream>
<longdescription lang="en"> <longdescription lang="en">
ROX-Filer is a fast and powerful graphical file manager for the ROX-Filer is a fast and powerful graphical file manager for the
X Window System. You can use it as a small and fast filer within your X Window System. You can use it as a small and fast filer within your

@ -0,0 +1,58 @@
From f69ece17fd3d6414ef2634336c7e780207b0f4a7 Mon Sep 17 00:00:00 2001
From: Alexandre Rostovtsev <tetromino@gentoo.org>
Date: Sun, 15 May 2016 15:15:50 -0400
Subject: [PATCH] build: embedded copy of SQLite requires -ldl and -pthread
https://bugzilla.gnome.org/show_bug.cgi?id=766487
---
configure.ac | 8 ++++++++
src/sqlite/Makefile.am | 9 +++++++--
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 2ccda7a..b6c978a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -719,6 +719,14 @@ if test "x$enable_journal" = "xno" ; then
AC_DEFINE(DISABLE_JOURNAL, 1, [Define if we disable the journal])
fi
+####################################################################
+# Check for SQLite
+####################################################################
+
+# Our copy of sqlite requires libdl on some platforms
+AC_CHECK_LIB(dl, dlsym, [LIBDL=-ldl], [LIBDL=])
+AC_SUBST(LIBDL)
+
##################################################################
# Check for libtracker-common, make sure libstemmer exists
##################################################################
diff --git a/src/sqlite/Makefile.am b/src/sqlite/Makefile.am
index 8b0ac18..354f054 100644
--- a/src/sqlite/Makefile.am
+++ b/src/sqlite/Makefile.am
@@ -3,7 +3,8 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-DSQLITE_THREADSAFE=1 \
-DSQLITE_ENABLE_FTS4 \
- -DSQLITE_ENABLE_FTS3_TOKENIZER
+ -DSQLITE_ENABLE_FTS3_TOKENIZER \
+ -pthread
noinst_LTLIBRARIES = libtracker-sqlite.la
@@ -12,5 +13,9 @@ libtracker_sqlite_la_SOURCES = \
sqlite3.h \
sqlite3ext.h
+libtracker_sqlite_la_LDFLAGS = \
+ -pthread
+
libtracker_sqlite_la_LIBADD = \
- $(BUILD_LIBS)
+ $(BUILD_LIBS) \
+ $(LIBDL)
--
2.8.2

@ -141,6 +141,9 @@ src_prepare() {
# Ensure embedded sqlite.h is in the include path (from 1.6 branch) # Ensure embedded sqlite.h is in the include path (from 1.6 branch)
epatch "${FILESDIR}"/${P}-include-path.patch epatch "${FILESDIR}"/${P}-include-path.patch
# embedded sqlite underlinking, https://bugzilla.gnome.org/show_bug.cgi?id=766487
epatch "${FILESDIR}"/${P}-sqlite-underlinking.patch
eautoreconf # See bug #367975 eautoreconf # See bug #367975
gnome2_src_prepare gnome2_src_prepare
vala_src_prepare vala_src_prepare

@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.xz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86" KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk" IUSE="cairo debug examples hunspell +minimal +pdf scripts templates tk"
# a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a} # a=$(ls resources/translations/po/scribus.*ts | sed -e 's:\.: :g' | awk '{print $2}'); echo ${a}

@ -13,7 +13,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools" IUSE="debug +dep doc nls optimization +required-use security strong-optimization strong-security sqlite swap-remote tools"
BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 ) BOTHDEPEND="sqlite? ( >=dev-db/sqlite-3 )

@ -17,7 +17,7 @@ LICENSE="GPL-2"
SLOT="0" SLOT="0"
IUSE="" IUSE=""
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux" KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
DEPEND="sys-apps/portage[${PYTHON_USEDEP}]" DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND} RDEPEND="${DEPEND}

@ -16,7 +16,7 @@ SRC_URI="https://dev.gentoo.org/~floppym/distfiles/INIT.${KSH_PV}.tgz
LICENSE="CPL-1.0 EPL-1.0" LICENSE="CPL-1.0 EPL-1.0"
SLOT="0" SLOT="0"
KEYWORDS="~alpha ~amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" KEYWORDS="~alpha amd64 arm ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
IUSE="" IUSE=""
RDEPEND="!app-shells/pdksh" RDEPEND="!app-shells/pdksh"

@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
LICENSE="MPL-2.0" LICENSE="MPL-2.0"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~arm ~x86" KEYWORDS="amd64 ~arm ~x86"
IUSE="doc test" IUSE="doc test"
RDEPEND=" RDEPEND="

@ -1,4 +1,3 @@
DIST pandoc-1.12.1.tar.gz 991330 SHA256 ce9ac36ba558654dc30793887581ffa6b5c086557418fbec61556cdc1ccb5e33 SHA512 79507c7e447b35ce8b93371968da833153e74bc8a298db623d864f977abf2fa40aebf6bce8bbb5a8f825b8f734afe0a6013018041e29cb530abb12a2b8f02979 WHIRLPOOL b6245a6790fdc6952fd47545c0944806b9ab98ca89b37e6278cc654feb4a0747d0c5ee4eab1f516e55b489d249845e214ec08804c80ad43a96dc0b2d5478e7e0
DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743 WHIRLPOOL 795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1 DIST pandoc-1.12.4.2.tar.gz 1048263 SHA256 2f47f5f36498d26aa9cda7b93bcee76afedeeca7463478b5eda076209ba27f45 SHA512 fd9f056350bb8b4981eaa0960f841a3e8b40956cc3ee1593a3e2eaef4256d494c5d1c6fd537419e95498ccc9115408e5cb56ce1d6783a33824dc67af059a3743 WHIRLPOOL 795a27f9106d9848abb1cf120cdfe92fdaf839e5097e5bb17533859f4b56f958d92b5027483cb08dd7a4d448e106487fd9d37f2a9d67ed4479647acca2ed77a1
DIST pandoc-1.13.2.1.tar.gz 1999641 SHA256 66da6eb690b8de41eccf05620e165630854d74c08cf69dbfb68d0ea84589785f SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d WHIRLPOOL 2413041022e237454439f60e32cd7a2bb38452abe7ff78ce72594e54fa05122db6802713c7fa2145b0e23b0a085fa883c5cc5e7ad899d24ae3d5a47a4e1f6622 DIST pandoc-1.13.2.1.tar.gz 1999641 SHA256 66da6eb690b8de41eccf05620e165630854d74c08cf69dbfb68d0ea84589785f SHA512 3505e456705da7a370ebd9628959475a9dabaede5cf50b24a780783a814ac9e1efc84dfce37215dbc472af3cacbf05d13e8f447b6602700b2648fd13d170808d WHIRLPOOL 2413041022e237454439f60e32cd7a2bb38452abe7ff78ce72594e54fa05122db6802713c7fa2145b0e23b0a085fa883c5cc5e7ad899d24ae3d5a47a4e1f6622
DIST pandoc-1.14.0.4.tar.gz 2052114 SHA256 01955bfb1f397ec22bbce10e2df7b4f2214b7289bf79bf51eb7ae0e3b427fadf SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443 WHIRLPOOL bc95f9b480b2336c7e0470187609a12d5e1f3ef5074af0bebb72c622d7c056efa74fa682190c08d9721f16b919d9264b859b2cbede2ac192870c419a60b5ef8c DIST pandoc-1.14.0.4.tar.gz 2052114 SHA256 01955bfb1f397ec22bbce10e2df7b4f2214b7289bf79bf51eb7ae0e3b427fadf SHA512 57d5e43179ae499ec95ec09fbdbf22ad1d7406fcb7151e9c608d9c0ac69e3b5f7eea6b50fd5d2526d52e9227e7fb05c5bda9da13a21537c582f1c2d4b9779443 WHIRLPOOL bc95f9b480b2336c7e0470187609a12d5e1f3ef5074af0bebb72c622d7c056efa74fa682190c08d9721f16b919d9264b859b2cbede2ac192870c419a60b5ef8c

@ -1,42 +0,0 @@
--- pandoc-1.11.1-orig/tests/lhs-test.html+lhs 2013-03-18 09:26:59.000000000 +1100
+++ pandoc-1.11.1/tests/lhs-test.html+lhs 2013-09-14 10:27:51.318546683 +1000
@@ -30,7 +30,7 @@
<h1>lhs test</h1>
<p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
<pre class="sourceCode literate literatehaskell"><code class="sourceCode literatehaskell"><span class="ot">&gt; unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=&gt;</span> (b <span class="ot">-&gt;</span> c <span class="ot">-&gt;</span> d) <span class="ot">-&gt;</span> a (b, c) d
-<span class="ot">&gt;</span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span>
+<span class="ot">&gt;</span> unsplit <span class="fu">=</span> arr <span class="fu">.</span> uncurry
<span class="ot">&gt;</span> <span class="co">-- arr (\op (x,y) -&gt; x `op` y)</span></code></pre>
<p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
<pre><code>f *** g = first f &gt;&gt;&gt; second g</code></pre>
--- pandoc-1.11.1-orig/tests/lhs-test.html 2013-03-18 09:26:59.000000000 +1100
+++ pandoc-1.11.1/tests/lhs-test.html 2013-09-14 10:27:28.671546899 +1000
@@ -30,7 +30,7 @@
<h1>lhs test</h1>
<p><code>unsplit</code> is an arrow that takes a pair of values and combines them to return a single value:</p>
<pre class="sourceCode literate haskell"><code class="sourceCode haskell"><span class="ot">unsplit ::</span> (<span class="dt">Arrow</span> a) <span class="ot">=&gt;</span> (b <span class="ot">-&gt;</span> c <span class="ot">-&gt;</span> d) <span class="ot">-&gt;</span> a (b, c) d
-unsplit <span class="fu">=</span> arr <span class="fu">.</span> <span class="fu">uncurry</span>
+unsplit <span class="fu">=</span> arr <span class="fu">.</span> uncurry
<span class="co">-- arr (\op (x,y) -&gt; x `op` y)</span></code></pre>
<p><code>(***)</code> combines two arrows into a new arrow by running the two arrows on a pair of values (one arrow on the first item of the pair and one arrow on the second item of the pair).</p>
<pre><code>f *** g = first f &gt;&gt;&gt; second g</code></pre>
--- pandoc-1.11.1-orig/tests/lhs-test.latex 2013-09-14 10:46:07.412536229 +1000
+++ pandoc-1.11.1/tests/lhs-test.latex 2013-09-14 10:45:51.638536380 +1000
@@ -21,7 +21,7 @@
\usepackage{color}
\usepackage{fancyvrb}
\newcommand{\VerbBar}{|}
-\DefineShortVerb[commandchars=\\\{\}]{\|}
+\newcommand{\VERB}{\Verb[commandchars=\\\{\}]}
\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
% Add ',fontsize=\small' for more characters per line
\newenvironment{Shaded}{}{}
@@ -73,7 +73,7 @@
\begin{Shaded}
\begin{Highlighting}[]
\OtherTok{unsplit ::} \NormalTok{(}\DataTypeTok{Arrow} \NormalTok{a) }\OtherTok{=>} \NormalTok{(b }\OtherTok{->} \NormalTok{c }\OtherTok{->} \NormalTok{d) }\OtherTok{->} \NormalTok{a (b, c) d}
-\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.} \FunctionTok{uncurry}
+\NormalTok{unsplit }\FunctionTok{=} \NormalTok{arr }\FunctionTok{.} \NormalTok{uncurry}
\CommentTok{-- arr (\textbackslash{}op (x,y) -> x `op` y)}
\end{Highlighting}
\end{Shaded}

@ -1,24 +0,0 @@
Fails on ghc-7.6 only as:
tables.man
../dist/build/pandoc/pandoc --data-dir .. tables.native -r native -w man --columns=78
- 141 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
+ 141 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
- 177 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
+ 177 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
- 247 cw(10.50n) lw(9.63n) rw(11.38n) lw(23.63n).
+ 247 cw(10.50n) lw(9.62n) rw(11.38n) lw(23.62n).
diff --git a/tests/Tests/Old.hs b/tests/Tests/Old.hs
index 9e74935..d4cf2a9 100644
--- a/tests/Tests/Old.hs
+++ b/tests/Tests/Old.hs
@@ -126,7 +126,7 @@ tests = [ testGroup "markdown"
]
, testGroup "other writers" $ map (\f -> testGroup f $ writerTests f)
[ "opendocument" , "context" , "texinfo"
- , "man" , "plain" , "rtf", "org", "asciidoc"
+ {- , "man" -} , "plain" , "rtf", "org", "asciidoc"
]
]

@ -1,62 +0,0 @@
--- pandoc-1.11.1-orig/pandoc.cabal 2013-03-18 09:26:59.000000000 +1100
+++ pandoc-1.11.1/pandoc.cabal 2013-08-10 12:52:49.969834000 +1000
@@ -232,7 +232,7 @@
citeproc-hs >= 0.3.7 && < 0.4,
pandoc-types >= 1.10 && < 1.11,
json >= 0.4 && < 0.8,
- tagsoup >= 0.12.5 && < 0.13,
+ tagsoup >= 0.12.5 && < 0.14,
base64-bytestring >= 0.1 && < 1.1,
zlib >= 0.5 && < 0.6,
highlighting-kate >= 0.5.3.7 && < 0.6,
--- /dev/null 2013-08-09 12:59:27.506999856 +1000
+++ pandoc-1.11.1/src/Text/Pandoc/Compat/TagSoupEntity.hs 2013-08-10 12:28:14.261739000 +1000
@@ -0,0 +1,15 @@
+{-# LANGUAGE CPP #-}
+module Text.Pandoc.Compat.TagSoupEntity (lookupEntity
+ ) where
+
+import qualified Text.HTML.TagSoup.Entity as TE
+
+lookupEntity :: String -> Maybe Char
+#if MIN_VERSION_tagsoup(0,13,0)
+lookupEntity = str2chr . TE.lookupEntity
+ where str2chr :: Maybe String -> Maybe Char
+ str2chr (Just [c]) = Just c
+ str2chr _ = Nothing
+#else
+lookupEntity = TE.lookupEntity
+#endif
--- pandoc-1.11.1-orig/src/Text/Pandoc/Parsing.hs 2013-03-18 09:26:57.000000000 +1100
+++ pandoc-1.11.1/src/Text/Pandoc/Parsing.hs 2013-08-10 12:28:14.262814000 +1000
@@ -159,7 +159,7 @@
import Text.Pandoc.Shared
import qualified Data.Map as M
import Text.TeXMath.Macros (applyMacros, Macro, parseMacroDefinitions)
-import Text.HTML.TagSoup.Entity ( lookupEntity )
+import Text.Pandoc.Compat.TagSoupEntity ( lookupEntity )
import Data.Default
import qualified Data.Set as Set
import Control.Monad.Reader
--- pandoc-1.11.1-orig/src/Text/Pandoc/Readers/DocBook.hs 2013-03-18 09:26:57.000000000 +1100
+++ pandoc-1.11.1/src/Text/Pandoc/Readers/DocBook.hs 2013-08-10 12:28:14.264936000 +1000
@@ -4,7 +4,7 @@
import Text.Pandoc.Definition
import Text.Pandoc.Builder
import Text.XML.Light
-import Text.HTML.TagSoup.Entity (lookupEntity)
+import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
import Data.Generics
import Data.Monoid
import Data.Char (isSpace)
--- pandoc-1.11.1-orig/src/Text/Pandoc/XML.hs 2013-03-18 09:26:57.000000000 +1100
+++ pandoc-1.11.1/src/Text/Pandoc/XML.hs 2013-08-10 12:28:17.333957000 +1000
@@ -39,7 +39,7 @@
import Text.Pandoc.Pretty
import Data.Char (ord, isAscii, isSpace)
-import Text.HTML.TagSoup.Entity (lookupEntity)
+import Text.Pandoc.Compat.TagSoupEntity (lookupEntity)
-- | Remove everything between <...>
stripTags :: String -> String

@ -1,42 +0,0 @@
commit fa978e13658f76be109243224f7491550db74240
Author: John MacFarlane <fiddlosopher@gmail.com>
Date: Tue May 7 20:22:09 2013 -0700
Use latest highlighting-kate and texmath.
Closes #849.
diff --git a/pandoc.cabal b/pandoc.cabal
index 5f290a9..ea9e850 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -241,7 +241,7 @@ Library
old-locale >= 1 && < 1.1,
time >= 1.2 && < 1.5,
HTTP >= 4000.0.5 && < 4000.3,
- texmath >= 0.6.1.3 && < 0.7,
+ texmath >= 0.6.1.5 && < 0.7,
xml >= 1.3.12 && < 1.4,
random >= 1 && < 1.1,
extensible-exceptions >= 0.1 && < 0.2,
@@ -251,7 +251,7 @@ Library
tagsoup >= 0.12.5 && < 0.13,
base64-bytestring >= 0.1 && < 1.1,
zlib >= 0.5 && < 0.6,
- highlighting-kate >= 0.5.3.7 && < 0.6,
+ highlighting-kate >= 0.5.3.9 && < 0.6,
data-default >= 0.4 && < 0.6,
temporary >= 1.1 && < 1.2,
blaze-html >= 0.5 && < 0.7,
diff --git a/tests/lhs-test.latex b/tests/lhs-test.latex
index 16e9a79..2a5025a 100644
--- a/tests/lhs-test.latex
+++ b/tests/lhs-test.latex
@@ -22,6 +22,7 @@
\IfFileExists{microtype.sty}{\usepackage{microtype}}{}
\usepackage{color}
\usepackage{fancyvrb}
+\newcommand{\VerbBar}{|}
\DefineShortVerb[commandchars=\\\{\}]{\|}
\DefineVerbatimEnvironment{Highlighting}{Verbatim}{commandchars=\\\{\}}
% Add ',fontsize=\small' for more characters per line

@ -1,251 +0,0 @@
--- pandoc-1.13.2-orig/pandoc.cabal 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/pandoc.cabal 2015-01-05 10:39:17.951823846 +1100
@@ -250,7 +250,7 @@
hslua >= 0.3 && < 0.4,
binary >= 0.5 && < 0.8,
SHA >= 1.6 && < 1.7,
- haddock-library >= 1.1 && < 1.2,
+ haddock-library >= 1.1 && < 1.3,
old-time,
deepseq-generics >= 0.1 && < 0.2,
JuicyPixels >= 3.1.6.1 && < 3.3
--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Haddock.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Readers/Haddock.hs 2015-01-05 14:24:34.371820789 +1100
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
{- |
Module : Text.Pandoc.Readers.Haddock
Copyright : Copyright (C) 2013 David Lazar
@@ -29,7 +30,12 @@
readHaddock :: ReaderOptions -- ^ Reader options
-> String -- ^ String to parse
-> Pandoc
-readHaddock opts = B.doc . docHToBlocks . trace' . parseParas
+readHaddock opts =
+#if MIN_VERSION_haddock_library(1,2,0)
+ B.doc . docHToBlocks . trace' . _doc . parseParas
+#else
+ B.doc . docHToBlocks . trace' . parseParas
+#endif
where trace' x = if readerTrace opts
then trace (show x) x
else x
--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/LaTeX.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Readers/LaTeX.hs 2015-01-05 11:20:35.193045904 +1100
@@ -592,7 +592,7 @@
unescapeURL :: String -> String
unescapeURL ('\\':x:xs) | isEscapable x = x:unescapeURL xs
- where isEscapable c = c `elem` "#$%&~_^\\{}"
+ where isEscapable c = c `elem` ("#$%&~_^\\{}" :: String)
unescapeURL (x:xs) = x:unescapeURL xs
unescapeURL [] = ""
@@ -1224,7 +1224,7 @@
<* optional sp
<* optional (char ',')
<* optional sp)
- where isBibtexKeyChar c = isAlphaNum c || c `elem` ".:;?!`'()/*@_+=-[]*"
+ where isBibtexKeyChar c = isAlphaNum c || c `elem` (".:;?!`'()/*@_+=-[]*" :: String)
cites :: CitationMode -> Bool -> LP [Citation]
cites mode multi = try $ do
--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/Org.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Readers/Org.hs 2015-01-05 11:24:53.294689830 +1100
@@ -1,5 +1,6 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE FlexibleContexts #-}
{-
Copyright (C) 2014 Albert Krewinkel <tarleb@moltkeplatz.de>
@@ -1168,7 +1169,7 @@
isUri :: String -> Bool
isUri s = let (scheme, path) = break (== ':') s
- in all (\c -> isAlphaNum c || c `elem` ".-") scheme
+ in all (\c -> isAlphaNum c || c `elem` (".-" :: String)) scheme
&& not (null path)
isAbsoluteFilePath :: String -> Bool
@@ -1214,7 +1215,7 @@
solidify = map replaceSpecialChar
where replaceSpecialChar c
| isAlphaNum c = c
- | c `elem` "_.-:" = c
+ | c `elem` ("_.-:" :: String) = c
| otherwise = '-'
-- | Parses an inline code block and marks it as an babel block.
@@ -1465,7 +1466,7 @@
parseAsMathMLSym :: String -> Maybe Inlines
parseAsMathMLSym cs = B.str <$> MathMLEntityMap.getUnicode (clean cs)
-- dropWhileEnd would be nice here, but it's not available before base 4.5
- where clean = reverse . dropWhile (`elem` "{}") . reverse . drop 1
+ where clean = reverse . dropWhile (`elem` ("{}" :: String)) . reverse . drop 1
state :: ParserState
state = def{ stateOptions = def{ readerParseRaw = True }}
--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/RST.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Readers/RST.hs 2015-01-05 11:21:59.819266953 +1100
@@ -1,4 +1,5 @@
{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE FlexibleContexts #-}
{-
Copyright (C) 2006-2014 John MacFarlane <jgm@berkeley.edu>
@@ -708,7 +709,7 @@
toChunks :: String -> [String]
toChunks = dropWhile null
. map (trim . unlines)
- . splitBy (all (`elem` " \t")) . lines
+ . splitBy (all (`elem` (" \t" :: String))) . lines
codeblock :: Maybe String -> String -> String -> RSTParser Blocks
codeblock numberLines lang body =
--- pandoc-1.13.2-orig/src/Text/Pandoc/Readers/TWiki.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Readers/TWiki.hs 2015-01-05 11:25:22.450138135 +1100
@@ -1,4 +1,4 @@
-{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances #-}
+{-# LANGUAGE RelaxedPolyRec, FlexibleInstances, TypeSynonymInstances, FlexibleContexts #-}
-- RelaxedPolyRec needed for inlinesBetween on GHC < 7
{-
Copyright (C) 2014 Alexander Sulfrian <alexander.sulfrian@fu-berlin.de>
--- pandoc-1.13.2-orig/src/Text/Pandoc/Templates.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Templates.hs 2015-01-05 10:45:45.255969737 +1100
@@ -124,7 +124,7 @@
-> String -- ^ Name of writer
-> IO (Either E.IOException String)
getDefaultTemplate user writer = do
- let format = takeWhile (`notElem` "+-") writer -- strip off extensions
+ let format = takeWhile (`notElem` ("+-" :: String)) writer -- strip off extensions
case format of
"native" -> return $ Right ""
"json" -> return $ Right ""
@@ -288,7 +288,7 @@
reservedWords = ["else","endif","for","endfor","sep"]
skipEndline :: Parser ()
-skipEndline = P.try $ P.skipMany (P.satisfy (`elem` " \t")) >> P.char '\n' >> return ()
+skipEndline = P.try $ P.skipMany (P.satisfy (`elem` (" \t" :: String))) >> P.char '\n' >> return ()
pConditional :: Parser Template
pConditional = do
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ConTeXt.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/ConTeXt.hs 2015-01-05 11:36:04.213852145 +1100
@@ -119,7 +119,7 @@
toLabel :: String -> String
toLabel z = concatMap go z
where go x
- | elem x "\\#[]\",{}%()|=" = "ux" ++ printf "%x" (ord x)
+ | elem x ("\\#[]\",{}%()|=" :: String) = "ux" ++ printf "%x" (ord x)
| otherwise = [x]
-- | Convert Elements to ConTeXt
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/EPUB.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/EPUB.hs 2015-01-05 11:35:29.166882307 +1100
@@ -1,4 +1,4 @@
-{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns #-}
+{-# LANGUAGE PatternGuards, CPP, ScopedTypeVariables, ViewPatterns, FlexibleContexts #-}
{-
Copyright (C) 2010-2014 John MacFarlane <jgm@berkeley.edu>
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/ICML.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/ICML.hs 2015-01-05 11:35:07.163880901 +1100
@@ -1,4 +1,4 @@
-{-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE OverloadedStrings, FlexibleContexts #-}
{- |
Module : Text.Pandoc.Writers.ICML
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/LaTeX.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/LaTeX.hs 2015-01-05 11:32:29.461099578 +1100
@@ -240,7 +240,7 @@
where go [] = ""
go (x:xs)
| (isLetter x || isDigit x) && isAscii x = x:go xs
- | elem x "-+=:;." = x:go xs
+ | elem x ("-+=:;." :: String) = x:go xs
| otherwise = "ux" ++ printf "%x" (ord x) ++ go xs
-- | Puts contents into LaTeX command.
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Markdown.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/Markdown.hs 2015-01-05 11:34:25.437241616 +1100
@@ -323,9 +323,9 @@
then Just $ writerColumns opts
else Nothing
let rendered = render colwidth contents
- let escapeDelimiter (x:xs) | x `elem` ".()" = '\\':x:xs
- | otherwise = x : escapeDelimiter xs
- escapeDelimiter [] = []
+ let escapeDelimiter (x:xs) | x `elem` (".()" :: String) = '\\':x:xs
+ | otherwise = x : escapeDelimiter xs
+ escapeDelimiter [] = []
let contents' = if isEnabled Ext_all_symbols_escapable opts &&
not (stPlain st) && beginsWithOrderedListMarker rendered
then text $ escapeDelimiter rendered
@@ -681,7 +681,7 @@
mapM (inlineToMarkdown opts) (avoidBadWraps lst) >>= return . cat
where avoidBadWraps [] = []
avoidBadWraps (Space:Str (c:cs):xs)
- | c `elem` "-*+>" = Str (' ':c:cs) : avoidBadWraps xs
+ | c `elem` ("-*+>" :: String) = Str (' ':c:cs) : avoidBadWraps xs
avoidBadWraps (x:xs) = x : avoidBadWraps xs
escapeSpaces :: Inline -> Inline
@@ -821,8 +821,8 @@
sdoc <- inlineListToMarkdown opts sinlines
let k' = text (modekey m ++ "@" ++ k)
r = case sinlines of
- Str (y:_):_ | y `elem` ",;]@" -> k' <> sdoc
- _ -> k' <+> sdoc
+ Str (y:_):_ | y `elem` (",;]@" :: String) -> k' <> sdoc
+ _ -> k' <+> sdoc
return $ pdoc <+> r
modekey SuppressAuthor = "-"
modekey _ = ""
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/OpenDocument.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/OpenDocument.hs 2015-01-05 11:36:22.915591722 +1100
@@ -1,4 +1,4 @@
-{-# LANGUAGE PatternGuards, OverloadedStrings #-}
+{-# LANGUAGE PatternGuards, OverloadedStrings, FlexibleContexts #-}
{-
Copyright (C) 2008-2014 Andrea Rossato <andrea.rossato@ing.unitn.it>
and John MacFarlane.
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/RST.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/RST.hs 2015-01-05 11:32:00.815007351 +1100
@@ -105,7 +105,7 @@
-> State WriterState Doc
keyToRST (label, (src, _)) = do
label' <- inlineListToRST label
- let label'' = if ':' `elem` (render Nothing label')
+ let label'' = if ':' `elem` ((render Nothing label') :: String)
then char '`' <> label' <> char '`'
else label'
return $ nowrap $ ".. _" <> label'' <> ": " <> text src
@@ -333,12 +333,12 @@
okAfterComplex :: Inline -> Bool
okAfterComplex Space = True
okAfterComplex LineBreak = True
- okAfterComplex (Str (c:_)) = isSpace c || c `elem` "-.,:;!?\\/'\")]}>–—"
+ okAfterComplex (Str (c:_)) = isSpace c || c `elem` ("-.,:;!?\\/'\")]}>–—" :: String)
okAfterComplex _ = False
okBeforeComplex :: Inline -> Bool
okBeforeComplex Space = True
okBeforeComplex LineBreak = True
- okBeforeComplex (Str (c:_)) = isSpace c || c `elem` "-:/'\"<([{–—"
+ okBeforeComplex (Str (c:_)) = isSpace c || c `elem` ("-:/'\"<([{–—" :: String)
okBeforeComplex _ = False
isComplex :: Inline -> Bool
isComplex (Emph _) = True
--- pandoc-1.13.2-orig/src/Text/Pandoc/Writers/Texinfo.hs 2014-12-20 19:18:27.000000000 +1100
+++ pandoc-1.13.2/src/Text/Pandoc/Writers/Texinfo.hs 2015-01-05 11:33:07.407217820 +1100
@@ -368,7 +368,7 @@
-- periods, commas, colons, and parentheses are disallowed in node names
disallowedInNode :: Char -> Bool
-disallowedInNode c = c `elem` ".,:()"
+disallowedInNode c = c `elem` (".,:()" :: String)
-- | Convert inline element to Texinfo
inlineToTexinfo :: Inline -- ^ Inline to convert

@ -1,74 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI=5
# ebuild generated by hackport 0.3.4.9999
CABAL_FEATURES="bin lib profile haddock hoogle hscolour test-suite"
inherit haskell-cabal
DESCRIPTION="Conversion between markup formats"
HOMEPAGE="http://johnmacfarlane.net/pandoc"
SRC_URI="mirror://hackage/packages/archive/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0/${PV}"
KEYWORDS="amd64 x86"
IUSE="embed_data_files +http-conduit"
RDEPEND=">=dev-haskell/aeson-0.6:=[profile?] <dev-haskell/aeson-0.7:=[profile?]
>=dev-haskell/attoparsec-0.10:=[profile?] <dev-haskell/attoparsec-0.11:=[profile?]
>=dev-haskell/base64-bytestring-0.1:=[profile?] <dev-haskell/base64-bytestring-1.1:=[profile?]
>=dev-haskell/blaze-html-0.5:=[profile?] <dev-haskell/blaze-html-0.7:=[profile?]
>=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?]
>=dev-haskell/data-default-0.4:=[profile?] <dev-haskell/data-default-0.6:=[profile?]
>=dev-haskell/extensible-exceptions-0.1:=[profile?] <dev-haskell/extensible-exceptions-0.2:=[profile?]
>=dev-haskell/highlighting-kate-0.5.5:=[profile?] <dev-haskell/highlighting-kate-0.6:=[profile?]
>=dev-haskell/hslua-0.3:=[profile?] <dev-haskell/hslua-0.4:=[profile?]
>=dev-haskell/http-4000.0.5:=[profile?] <dev-haskell/http-4000.3:=[profile?]
>=dev-haskell/mtl-1.1:=[profile?] <dev-haskell/mtl-2.2:=[profile?]
>=dev-haskell/network-2:=[profile?] <dev-haskell/network-2.5:=[profile?]
>=dev-haskell/pandoc-types-1.12.3:=[profile?] <dev-haskell/pandoc-types-1.13:=[profile?]
>=dev-haskell/parsec-3.1:=[profile?] <dev-haskell/parsec-3.2:=[profile?]
>=dev-haskell/random-1:=[profile?] <dev-haskell/random-1.1:=[profile?]
>=dev-haskell/syb-0.1:=[profile?] <dev-haskell/syb-0.5:=[profile?]
>=dev-haskell/tagsoup-0.12.5:=[profile?] <dev-haskell/tagsoup-0.14:=[profile?]
>=dev-haskell/temporary-1.1:=[profile?] <dev-haskell/temporary-1.2:=[profile?]
>=dev-haskell/texmath-0.6.4:=[profile?] <dev-haskell/texmath-0.7:=[profile?]
>=dev-haskell/text-0.11:=[profile?]
>=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?]
>=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?]
>=dev-haskell/xml-1.3.12:=[profile?] <dev-haskell/xml-1.4:=[profile?]
>=dev-haskell/yaml-0.8.3:=[profile?] <dev-haskell/yaml-0.9:=[profile?]
>=dev-haskell/zip-archive-0.1.3.3:=[profile?] <dev-haskell/zip-archive-0.2:=[profile?]
>=dev-haskell/zlib-0.5:=[profile?] <dev-haskell/zlib-0.6:=[profile?]
>=dev-lang/ghc-7.0.1:=
embed_data_files? ( dev-haskell/hsb2hs )
http-conduit? ( >=dev-haskell/http-conduit-1.9:=[profile?] <dev-haskell/http-conduit-1.10:=[profile?]
>=dev-haskell/http-types-0.8:=[profile?] <dev-haskell/http-types-0.9:=[profile?] )
"
DEPEND="${RDEPEND}
dev-haskell/alex
>=dev-haskell/cabal-1.10.0.0
dev-haskell/happy
test? ( >=dev-haskell/ansi-terminal-0.5 <dev-haskell/ansi-terminal-0.7
>=dev-haskell/diff-0.2 <dev-haskell/diff-0.4
>=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3
>=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7
>=dev-haskell/test-framework-0.3 <dev-haskell/test-framework-0.9
>=dev-haskell/test-framework-hunit-0.2 <dev-haskell/test-framework-hunit-0.4
>=dev-haskell/test-framework-quickcheck2-0.2.9 <dev-haskell/test-framework-quickcheck2-0.4 )
"
src_prepare() {
cabal_chdeps \
'text >= 0.11 && < 0.12' 'text >= 0.11'
}
src_configure() {
haskell-cabal_src_configure \
$(cabal_flag embed_data_files embed_data_files) \
$(cabal_flag http-conduit http-conduit)
}

@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rtomayko/ronn/"
LICENSE="MIT" LICENSE="MIT"
SLOT="0" SLOT="0"
KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd" KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~x64-macos"
IUSE="" IUSE=""

@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_PF}.tar.bz2"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~x86" KEYWORDS="amd64 ~x86"
IUSE="nls" IUSE="nls"
RDEPEND="sys-libs/zlib RDEPEND="sys-libs/zlib

@ -15,7 +15,7 @@ SRC_URI="https://${PN}.googlecode.com/files/${P}.tgz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris" KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
IUSE="emacs tk vim-syntax" IUSE="emacs tk vim-syntax"
DEPEND="${PYTHON_DEPS} DEPEND="${PYTHON_DEPS}

@ -1,5 +1,4 @@
DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f DIST xapian-omega-1.2.19.tar.xz 419804 SHA256 ca0a9afe2d1ced933408fc0b089c96cd55f90d7b06ae9708eb84294cd77e35ed SHA512 95be43eb25c7da59db7c396879a1bc35df70f0412a66d56c8ef1bc90d7f5930bc8e83fc5e1b3bc8a791fa92ea6e705fb0df5833265f4e95cd8bcce49dda7c976 WHIRLPOOL 101c34c2603d1287685a642b2d9be2aa1eb2779161b1f662f0ba7f91563b319eb0b0dd6def688122df991e56b6fe491cfec5ed93c10ee205948c5885c0d83f2f
DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920 DIST xapian-omega-1.2.22.tar.xz 437556 SHA256 a7d4b00f6830d003490c0f727fc03584e703cd6e96738e03930f135cd966381b SHA512 c90ef3658cfb7f0337aa946ad04a7173d0aa89e5179c8b9edbfd78156c11d93d6a9ef6055142d26ecd95af8b0cbdf3b061e505c75f37f5e1e3b2ffc272fbaa3b WHIRLPOOL fa500c681fe1c8b82c3d469183ce987b38cd91f110ed1cd7b4e5372525a503c28e310abb15afc31892f2fa4fbd8e74bce07c1b618996541500b3f8d114b06920
DIST xapian-omega-1.2.23.tar.xz 437912 SHA256 55c790204fc0b1ddbd4bdae73aa55eed40671475e13252a71a53a01f80d172ef SHA512 1ea2b090b75f7ab530bbb6af79eb26931684796f9b0a987530f44e7f7f9527929644880f7528198e0ea22f69feabd014783c0b01edaa6673b54f83091e9a5428 WHIRLPOOL 522833f6dc47693885238caac1da80141d909a2c7c89bc5f302e064f5ebded132329000a223f9a11b412adea25c412ff4a99c0f5de9cf25582e62dca02a3bae6 DIST xapian-omega-1.2.23.tar.xz 437912 SHA256 55c790204fc0b1ddbd4bdae73aa55eed40671475e13252a71a53a01f80d172ef SHA512 1ea2b090b75f7ab530bbb6af79eb26931684796f9b0a987530f44e7f7f9527929644880f7528198e0ea22f69feabd014783c0b01edaa6673b54f83091e9a5428 WHIRLPOOL 522833f6dc47693885238caac1da80141d909a2c7c89bc5f302e064f5ebded132329000a223f9a11b412adea25c412ff4a99c0f5de9cf25582e62dca02a3bae6
DIST xapian-omega-1.3.5.tar.xz 486076 SHA256 f7a549cecd85fcecf0ec087fe7d839ce6d712b1c25fd1988c80f19df8958f47a SHA512 a063c9584487321a27393bb531dc807d53e572ae439938fd9dd584d7f0970366eaa20ae18200bdafd22aea5e30000f932dde390f123d39d90ade1b7934bbfc10 WHIRLPOOL 7c0f02a2122bcf0c0c2fbd8692f138de73ce5e01bf01eb6d7a2c8e4459dbaa91f9e98a6ffa9cc8e9efa0b31b312191ecdb7743c960238cec762278087cda10b7
DIST xapian-omega-1.3.6.tar.xz 486352 SHA256 ffa5a151b827e8227d47cadacbdb18854e6d339bf6595892cc304f9a4e3d8abb SHA512 78e607880343d056cac777d0e1b59f89a405fd190c16554322e2e289ffdde0a537238e013ded2fe7c10b6cabfed86360fe0c022c185d896822eb968945886000 WHIRLPOOL b0035a987df4bfc34abc68c658c01a804327d6c1ea87e687a20675f03cb208dec421775e124b55d4a1cd624d82432ad89b3a45c5e77eaed3e8d67cd909420217 DIST xapian-omega-1.3.6.tar.xz 486352 SHA256 ffa5a151b827e8227d47cadacbdb18854e6d339bf6595892cc304f9a4e3d8abb SHA512 78e607880343d056cac777d0e1b59f89a405fd190c16554322e2e289ffdde0a537238e013ded2fe7c10b6cabfed86360fe0c022c185d896822eb968945886000 WHIRLPOOL b0035a987df4bfc34abc68c658c01a804327d6c1ea87e687a20675f03cb208dec421775e124b55d4a1cd624d82432ad89b3a45c5e77eaed3e8d67cd909420217

@ -1,20 +0,0 @@
commit 755169cc3b0991bb783ade963da3a473db147067
Author: Olly Betts <olly@survex.com>
Date: Tue Jan 12 17:24:11 2016 +1300
Need to AC_SUBST probed value of ZLIB_LIBS
Noted by Paul Wise
diff --git a/xapian-applications/omega/configure.ac b/xapian-applications/omega/configure.ac
index db56262..36d894e 100644
--- a/xapian-applications/omega/configure.ac
+++ b/xapian-applications/omega/configure.ac
@@ -120,6 +120,7 @@ AC_SEARCH_LIBS([zlibVersion], [z zlib zdll], [], [
AC_MSG_ERROR([zlibVersion() not found in -lz, -lzlib, or -lzdll (you may need to install the zlib1g-dev or zlib-devel package)])
])
ZLIB_LIBS=$LIBS
+AC_SUBST([ZLIB_LIBS])
LIBS=$SAVE_LIBS
dnl libmagic used to detect MIME types for files we don't detect by extension.

@ -1,46 +0,0 @@
# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="5"
DESCRIPTION="An application built on Xapian, consisting of indexers and a CGI search frontend"
SRC_URI="http://www.oligarchy.co.uk/xapian/${PV}/xapian-omega-${PV}.tar.xz"
HOMEPAGE="http://www.xapian.org/"
S="${WORKDIR}/xapian-omega-${PV}"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86"
IUSE=""
DEPEND="dev-libs/xapian:0/1.3.6
dev-lang/perl
dev-libs/libpcre
sys-libs/zlib"
RDEPEND="${DEPEND}"
src_install () {
emake DESTDIR="${D}" install
# Protect /etc/omega.conf
echo "CONFIG_PROTECT=\"/etc/omega.conf\"" > "${T}"/20xapian-omega
doenvd "${T}"/20xapian-omega
dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
#move docs to /usr/share/doc/${PF}.
mv "${D}/usr/share/doc/xapian-omega" "${D}/usr/share/doc/${PF}" || die
# Directory containing Xapian databases:
keepdir /var/lib/omega/data
# Directory containing OmegaScript templates:
keepdir /var/lib/omega/templates
mv "${S}"/templates/* "${D}"/var/lib/omega/templates || die
# Directory to write Omega logs to:
keepdir /var/log/omega
# Directory containing any cdb files for the $lookup OmegaScript command:
keepdir /var/lib/omega/cdb
}

@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/xchm/${P}.tar.gz"
LICENSE="GPL-2" LICENSE="GPL-2"
SLOT="0" SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86" KEYWORDS="amd64 ~ppc ~x86"
IUSE="" IUSE=""
DEPEND=">=dev-libs/chmlib-0.36 DEPEND=">=dev-libs/chmlib-0.36

@ -15,10 +15,7 @@ SRC_URI="https://github.com/mileszs/${MY_PN}/archive/${PV}.zip -> ${MY_P}.zip"
LICENSE="vim" LICENSE="vim"
KEYWORDS="~amd64 ~x86" KEYWORDS="~amd64 ~x86"
DEPEND=" DEPEND="app-arch/unzip"
sys-apps/ack RDEPEND="sys-apps/ack"
app-arch/unzip"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}" S="${WORKDIR}/${MY_P}"

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

Loading…
Cancel
Save