Sync with portage [Thu May 14 16:55:36 MSK 2015].

mhiretskiy
root 9 years ago
parent 4d2bc2153e
commit 823a7943ae

@ -1,2 +1 @@
DIST ec2-ami-tools-1.4.0.5.zip 139373 SHA256 e5a8f49826c85c9df2421e36d618fb9bc1951bb0eeb45680c4379a0362c50d6e SHA512 e9754b26b61e168760002ac3c15d83c8d9f702e478c2295df42ae9e08e7d1788c73b60f7292867d8df553225a82e70ac335419dbcc226e3f0e251f1950a66621 WHIRLPOOL c71b102824595ceeeee693ad5cfca5dd7120510b2f4165fd7010f9cf9de3d4bcb5242166ee58b8295f4ff7f2a1dccaa834bb277ccf325928ede9307bd18da980
DIST ec2-ami-tools-1.5.6.zip 156541 SHA256 7aa6f2e581d52febf8850b3657a2f01c2f0180d91d33bdb1c246d485c1194708 SHA512 77ce82acbccf32bb1b900ef0b8c7440d4fc05e9b883081432935c6fef94b1f27191a0147e73c9eec680eca94c62075ab81bb8b0c33bec56bb2b861876de0129d WHIRLPOOL 1c7d20edde821e307eb8190413658e48d49a9c17d73b6c67a93b89f6b22512b1149c524d0a8111c5e6d36ca26465ae4a7f44cf4adf523318692dbef9213ce1ac

@ -1,52 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/ec2-ami-tools/ec2-ami-tools-1.4.0.5-r3.ebuild,v 1.2 2014/08/10 01:37:43 patrick Exp $
EAPI="5"
inherit versionator
DESCRIPTION="These command-line tools serve as the client interface to the Amazon EC2 web service"
HOMEPAGE="http://developer.amazonwebservices.com/connect/entry.jspa?externalID=368&categoryID=88"
SRC_URI="http://s3.amazonaws.com/ec2-downloads/${P}.zip"
LICENSE="Amazon
|| ( Ruby GPL-2 )"
SLOT="0"
KEYWORDS="~amd64 ~x86"
ruby_slot="1.9"
DEPEND="app-arch/unzip"
RDEPEND="dev-lang/ruby:${ruby_slot}[ssl]
net-misc/rsync
net-misc/curl"
src_prepare() {
# Simplify the scripts to always run Ruby 19, since Gentoo supports
# alternative implementations as well it is not guaranteed that ruby is ruby19.
sed -i -e "\$s:^ruby:exec ruby${ruby_slot/./}:" bin/* || die 'Sed failed.'
# Remove a left behind license file.
rm lib/ec2/oem/LICENSE.txt || die 'Removal of LICENSE failed.'
}
src_install() {
dobin bin/*
insinto /usr
doins -r lib
insinto /etc/ec2/amitools
doins etc/ec2/amitools/*
dodir /etc/env.d
echo "EC2_AMITOOL_HOME=/usr" >> "${T}"/99${PN} || die "Can't write environment variable."
doenvd "${T}"/99${PN}
}
pkg_postinst() {
ewarn "Remember to run \`env-update && source /etc/profile\` if you plan"
ewarn "to use these tools in a shell before logging out (or restarting"
ewarn "your login manager)."
}

@ -4,3 +4,4 @@ DIST mcelog-1.0pre3.tar.gz 176649 SHA256 0782e0aa952fa4bd641071e6b501774a63993a8
DIST mcelog-100.tar.gz 288423 SHA256 b18f029ec9f498b6249b3a3dfef7753ac9d45ebf3382af452cb3e14d49274bab SHA512 efd7864daaafe5d149fc27259d4fa72221372842d41ad57c046c967fd1eb710ef921f45111e95bfe76df119276b3b9af1bf1094a9411037eb1f5ac06e319e87d WHIRLPOOL 9f2f7fdbb3c94b7740f486005641a90529e240c34f3709989e6e0d448c96369f4562408aa678ea992f47f396cdfb60c71eadf75475c52ff0cd6318a99c4ad2eb
DIST mcelog-103.tar.gz 289648 SHA256 0ff3d20b449cac5289fec65c662a0cafd4062e75d6b45d11a265e57804f0c230 SHA512 5473f563927a49c3ab7c2affddc638248b0baf4d4a5326db889bfd37889a477f7fe37113cbeb2f2a4962f0427cc73ce4afe3b17f032956c8fa866c3eb080795e WHIRLPOOL c041aeadfe3844755d86ad62be81136d8c51dcaad85c96df1739f39b395c9a069c46cce7b687556d7703d8a05645d8bfb59955fdea3e99dcf0d3ebbfc5399bf1
DIST mcelog-109.tar.gz 291753 SHA256 0b842274e9d19f14d26d0797ebcfeb0cfcf5a34675fc0a2a6e9d4145e5176333 SHA512 f6b241c7a531b20d84714c66987b6ff75f064a8d1e2fe04fe376a2f600065f0890b68fac7c9683a0fdf4c2f30e0d5d95323435a62a1c6abcd3475163e5c95bd8 WHIRLPOOL 6abe80bdc5ee14d49d0c6a27d643863c696f3a8865d5874a963dec04a923c21fe2931249f9173dd0268b86345062f16fc488a63063c4dcb500420eec8531b8e5
DIST mcelog-117.tar.gz 296068 SHA256 0e0422e8693e4592a85ed344738004dcedcd930234ab862b0bdcb6ae7aa44f2b SHA512 664e4d9224ec1878153561bebdf4f6c58ea44cf0d494a04eb38cdd73cc8158fabdb0b4823f2303e39818f104298208206dfb9ff64ef13654dadfb5e7a4f5e723 WHIRLPOOL 1919bb2069f216d6a649c883bb9a9417edc9b51d639a73a81f5d5a8d06d874447dc839401858b1d402bbed588077dab93273d012768cb5d1b3fff3ec378d662e

@ -0,0 +1,53 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-admin/mcelog/mcelog-117.ebuild,v 1.1 2015/05/14 00:00:04 hasufell Exp $
EAPI=5
inherit linux-info eutils systemd toolchain-funcs
DESCRIPTION="A tool to log and decode Machine Check Exceptions"
HOMEPAGE="http://mcelog.org/"
SRC_URI="https://github.com/andikleen/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="selinux"
RDEPEND="selinux? ( sec-policy/selinux-mcelog )"
CONFIG_CHECK="~X86_MCE"
# TODO: add mce-inject to the tree to support test phase
RESTRICT="test"
src_prepare() {
epatch "${FILESDIR}"/${PN}-0.8_pre1-timestamp-${PN}.patch \
"${FILESDIR}"/${PN}-1.0_pre3_p20120918-build.patch \
"${FILESDIR}"/${PN}-1.0_pre3_p20120918-bashism.patch
tc-export CC
}
src_install() {
default
insinto /etc/cron.daily
newins ${PN}.cron ${PN}
insinto /etc/logrotate.d/
newins ${PN}.logrotate ${PN}
newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
systemd_dounit "${FILESDIR}"/${PN}.service
dodoc *.pdf
}
pkg_postinst() {
einfo "The default configuration set is now installed in /etc/${PN}"
einfo "you might want to edit those files."
einfo
einfo "A sample cronjob is installed into /etc/cron.daily"
einfo "without executable bit (system service is the preferred method now)"
}

@ -1,38 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/cfv/cfv-1.18.3.ebuild,v 1.5 2012/12/02 22:17:29 swegener Exp $
EAPI="3"
PYTHON_DEPEND="2"
inherit python
DESCRIPTION="Utility to test and create .sfv, .csv, .crc and md5sum files"
HOMEPAGE="http://cfv.sourceforge.net/"
SRC_URI="mirror://sourceforge/cfv/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
IUSE="bittorrent"
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
DEPEND=""
RDEPEND="dev-python/python-fchksum
bittorrent? (
|| (
net-p2p/bittorrent
net-p2p/bittornado
)
)"
src_compile() {
true
}
src_install() {
dobin cfv || die "dobin failed"
doman cfv.1 || die "doman failed"
dodoc README Changelog || die "dodoc failed"
python_convert_shebangs -r 2 "${ED}"
}

@ -1,49 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/deltarpm/deltarpm-3.6_pre20110223.ebuild,v 1.1 2012/05/15 08:41:59 pacho Exp $
EAPI="4"
PYTHON_DEPEND="python? 2:2.7"
inherit eutils toolchain-funcs python
SNAPSHOT="20110223"
DESCRIPTION="tools to create and apply deltarpms"
HOMEPAGE="http://gitorious.org/deltarpm/deltarpm"
SRC_URI="http://pkgs.fedoraproject.org/repo/pkgs/${PN}/${PN}-git-${SNAPSHOT}.tar.bz2/70f8884be63614ca7c3fc888cf20ebc8/${PN}-git-${SNAPSHOT}.tar.bz2"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="python"
DEPEND="sys-libs/zlib
app-arch/xz-utils
app-arch/bzip2
<app-arch/rpm-5"
S="${WORKDIR}/${PN}-git-${SNAPSHOT}"
pkg_setup() {
if use python; then
python_set_active_version 2
python_pkg_setup
fi
}
src_prepare() {
sed -i \
-e '/^prefix/s:/local::' \
-e '/^mandir/s:/man:/share/man:' \
Makefile || die
epatch "${FILESDIR}/3.6_pre20110223-build.patch"
}
src_compile() {
emake -j1 CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)"
if use python; then
emake CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" python
fi
}

@ -1,60 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/ipkg-utils/ipkg-utils-1.7.050831-r1.ebuild,v 1.4 2011/03/05 23:46:44 arfrever Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.*"
inherit distutils eutils toolchain-funcs versionator
MY_P="${PN}-$(get_version_component_range 3)"
DESCRIPTION="Tools for working with the ipkg binary package format"
HOMEPAGE="http://www.openembedded.org/"
SRC_URI="http://handhelds.org/download/packages/ipkg-utils/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~x86"
IUSE="minimal"
DEPEND="!minimal? (
app-crypt/gnupg
net-misc/curl
)"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${MY_P}"
PYTHON_MODNAME="ipkg.py"
src_prepare() {
epatch "${FILESDIR}/${PN}-tar_call_fixes.patch"
epatch "${FILESDIR}/${P}-hashlib.patch"
sed '/python setup.py build/d' -i Makefile
if use minimal; then
elog "ipkg-upload is not installed when the \`minimal' USE flag is set. If you"
elog "need ipkg-upload then rebuild this package without the \`minimal' USE flag."
fi
}
src_compile() {
distutils_src_compile
emake CC="$(tc-getCC)" || die "emake failed"
}
src_install() {
distutils_src_install
use minimal && rm "${ED}usr/bin/ipkg-upload"
}
pkg_postinst() {
distutils_pkg_postinst
elog "Consider installing sys-apps/fakeroot for use with the ipkg-build command,"
elog "that makes it possible to build packages as a normal user."
}

@ -1,3 +1 @@
DIST lzma463.tar.bz2 288057 SHA256 42396b90eedfef31951c1411902ed21ca9fb62d506c49dd1a2d4a7c56e53fbb3 SHA512 9e1fab5c54611c8ba9db2f4a0495d8a50d68a053d42e57a30f3a05021c68790d20578feac7c6ecc96777180633a552948e731e37dba0a07c9160e83e35e69fe8 WHIRLPOOL e1117a5867639b2569fbf4d5f2dc52c1bc0e5b2bbae4680aec20cc3482d1977c4304953955fbf29f33f371687dc4c9c62d155b6acb585bcbefe3e55cdcfb0c48
DIST lzma465.tar.bz2 288122 SHA256 c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e SHA512 690f005cfa9d3a65db03baddad57cf8dd79f861ac72d2e1bc18a151f3673d5f8043e3331f5dc3fba713dfd7b01ebf0817a2c0b6a1b22e1f7d8255a42b85ea4ac WHIRLPOOL 34a08888ac6874c1ac4ff181774b02eec993cc90a28531596122183c975c2e29fd9852d066acd24c0fe1f213ae9e03e7daf3fc9417c587043e968d973551027f
DIST lzma920.tar.bz2 534077 SHA256 8ac221acdca8b6f6dd110120763af42b3707363752fc04e63c7bbff76774a445 SHA512 1c495530834107430a675fb48c006093edc301ec7a2c2f273efd62ff260f3056503bb2c3ddef63e82f5ff04b1347381055cf6cacd59eee9d451c4d841c13cd35 WHIRLPOOL 5ae0d8ece9d3d753ee3efa1b6422c15698a7f20d3783381cac7c5e10422ab532919018f44bac3050329745474c34b1115bc2006e70f4c6287600b89edca99db2

@ -1,33 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma/lzma-4.63.ebuild,v 1.3 2012/11/19 12:50:45 jer Exp $
inherit toolchain-funcs
DESCRIPTION="LZMA Stream Compressor from the SDK"
HOMEPAGE="http://www.7-zip.org/sdk.html"
SRC_URI="mirror://sourceforge/sevenzip/${PN}463.tar.bz2"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~arm ~amd64 ~ia64 ~mips ~sparc ~x86"
IUSE="doc"
S=${WORKDIR}
src_compile() {
cd CPP/7zip/Compress/LZMA_Alone
emake -f makefile.gcc \
CXX="$(tc-getCXX) ${CXXFLAGS}" \
CXX_C="$(tc-getCC) ${CFLAGS}" \
|| die "Make failed"
}
src_install() {
newbin CPP/7zip/Compress/LZMA_Alone/lzma lzma_alone|| die
dodoc history.txt
use doc && dodoc 7zC.txt 7zFormat.txt lzma.txt Methods.txt
einfo "Starting from app-arch/lzma version 4.63 binary name was changed"
einfo "to /usr/bin/lzma_alone to avoid conflict with lzma-utils package"
}

@ -1,34 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/lzma/lzma-4.65.ebuild,v 1.3 2012/11/19 12:50:45 jer Exp $
inherit toolchain-funcs versionator
MY_P="${PN}$(replace_all_version_separators '')"
DESCRIPTION="LZMA Stream Compressor from the SDK"
HOMEPAGE="http://www.7-zip.org/sdk.html"
SRC_URI="mirror://sourceforge/sevenzip/${MY_P}.tar.bz2"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~mips ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc"
S=${WORKDIR}
src_compile() {
cd CPP/7zip/Compress/LZMA_Alone
emake -f makefile.gcc \
CXX="$(tc-getCXX) ${CXXFLAGS}" \
CXX_C="$(tc-getCC) ${CFLAGS}" \
|| die "Make failed"
}
src_install() {
newbin CPP/7zip/Compress/LZMA_Alone/lzma lzma_alone || die
dodoc history.txt
use doc && dodoc 7zC.txt 7zFormat.txt lzma.txt Methods.txt
einfo "Starting from app-arch/lzma version 4.63 binary name was changed"
einfo "to /usr/bin/lzma_alone to avoid conflict with lzma-utils package"
}

@ -1,5 +1,4 @@
DIST ppmd_10.1-5.debian.tar.gz 13961 SHA256 f16807685e5a5a27479ea5aa8a243cddcda2e75c2550c19ee335f8b8ffcc221e SHA512 2ed53df72491fe8bce3b8a3b5b3d5ca483f702bc981495f9fd04a5b7828a9fd87057be21083ab2bddd868c5016de868c930e7a2abd9825ec501f3e03276e0137 WHIRLPOOL 7b726891d01321b5690c731433d811c543d0f7093ebf4344e61ceea9e5d6c0eb054562c73e52a044df5969deff991a963f792cd393c846881d1e61d77268d07c
DIST ppmd_10.1.orig.tar.gz 22048 SHA256 827eb40401a2432551bb97262760462be32613cbbd4afbd94d50067d72570a1c SHA512 8349a24f3a46a0c3dfd779766507d3d12a208f8c988ffe87054b513fa1240a0749a8ea3c9112ba31dc1dfe271574295aa1cb953bedb02efa4992a870d699cf54 WHIRLPOOL 3403365464f545874b0a5debd76abcd001506069b6209a15ae598774ad73f528f6f5432cc75445ff878cba01b02107daeb458bf41b8cd663a0c0359e25880dc5
DIST ppmd_9.1-14.diff.gz 11929 SHA256 323189cb90cd130debd4dbceb84d1649a0a4ca476a29fb2802319b42af001b5b SHA512 73905f755a4ace015134475c2399f5d7b66ac6ecd8bf52c26aa9959c3ce497e7abd4d2e63c746830863a696894353e6668c5736a5a2918d8982e316c18728257 WHIRLPOOL 50ce768da79bca26d06dec2d1231e727337fc838f7bd691bb4059ddb0e03f7b1f1a1dc710dfdfb500e7c177bb110db93abc3b4159172e1f1b644f417e226940b
DIST ppmd_9.1-16.debian.tar.gz 12750 SHA256 2b2a5d723f622145c9566e44d1480d916a356fe220d7a9fb6f7a66b47ee954de SHA512 6748d088154b9bde1a562c881d6a03f88c02f0c9d92e2aef290b3ee864f11c0b2a0c0b8514743a5e77f9535076bdadbc64aa47c40b3e1f5d957105ba03ceca3c WHIRLPOOL c3b2251159f302ce93b4550fd8d300d211b4b6d370a72ab14ee482e66e58010523c3c60c880e231c16cc767336b7b4e9821a70a072fda7375c061507db93f2ee
DIST ppmd_9.1.orig.tar.gz 48508 SHA256 5667c1345d450206d04259ef718ba74c15d0af86906adb0e0399c09b0c01b689 SHA512 35f0d2550fa6236c143d752d6af68e8abc125d85430194f99b17977b2d64bf10ad232f64ff68903e7d4e61a84b33f680461f0640e83b48574d8d09bec1d223e9 WHIRLPOOL a93dbc96cd5dcf4685f749baa049400cbc4850f148cc5ed33f8425c26a2aa72b3fac5f26b724f05810831b23a9fac4bd9657e762aab22e951c6630be344a6f36

@ -1,43 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/ppmd/ppmd-9.1_p16.ebuild,v 1.2 2013/03/13 22:06:59 tomwij Exp $
EAPI="3"
inherit eutils flag-o-matic toolchain-funcs
PATCHV="${P##*_p}"
MY_P="${P%%_*}"
MY_P="${MY_P/-/_}"
DESCRIPTION="PPM based compressor -- better behaved than bzip2"
HOMEPAGE="http://packages.qa.debian.org/p/ppmd.html"
SRC_URI="mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}.orig.tar.gz
mirror://debian/pool/main/${PN::1}/${PN}/${MY_P}-${PATCHV}.debian.tar.gz"
LICENSE="public-domain"
SLOT="0"
KEYWORDS="-alpha -amd64 ~hppa -ia64 ~mips ~ppc ~sparc ~x86 ~x86-interix -amd64-linux -ia64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}/${PN}-i1
src_prepare() {
EPATCH_FORCE=yes EPATCH_SUFFIX=patch epatch "${WORKDIR}"/debian/patches/
epatch "${FILESDIR}/${PN}-p10-makefile.patch"
sed b/Makefile \
-e 's|$(CXX)|& $(CFLAGS) $(LDFLAGS)|g' > Makefile \
|| die "sed b/Makefile"
}
src_configure() {
tc-export CXX
replace-flags -O3 -O2
append-flags -fno-inline-functions -fno-exceptions -fno-rtti
}
src_install() {
emake -j1 install DESTDIR="${ED}" || die "failed installing"
doman "${WORKDIR}/debian/ppmd.1" || die "failed installing manpage"
dodoc "read_me.txt" || die "failed installed readme"
}

@ -1,29 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/threadzip/threadzip-1.2.ebuild,v 1.1 2014/01/29 08:38:18 vapier Exp $
EAPI="4"
PYTHON_COMPAT=( python2_7 )
inherit python-single-r1
DESCRIPTION="threaded compressor logic for zlib/lzma"
HOMEPAGE="http://code.google.com/p/threadzip/"
SRC_URI="http://threadzip.googlecode.com/files/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="lzma"
DEPEND=""
RDEPEND="lzma? ( dev-python/pylzma[${PYTHON_USEDEP}] )"
src_install() {
local x
for x in un '' ; do
newbin python/thread${x}zip.py thread${x}zip
done
python_fix_shebang "${ED}"/usr/bin
}

@ -1,3 +1,2 @@
DIST lzma465.tar.bz2 288122 SHA256 c935fd04dd8e0e8c688a3078f3675d699679a90be81c12686837e0880aa0fa1e SHA512 690f005cfa9d3a65db03baddad57cf8dd79f861ac72d2e1bc18a151f3673d5f8043e3331f5dc3fba713dfd7b01ebf0817a2c0b6a1b22e1f7d8255a42b85ea4ac WHIRLPOOL 34a08888ac6874c1ac4ff181774b02eec993cc90a28531596122183c975c2e29fd9852d066acd24c0fe1f213ae9e03e7daf3fc9417c587043e968d973551027f
DIST upx-3.09-src.tar.bz2 884001 SHA256 f61a95694d9b8f8c486ee25c9cceab483b9262a29d6ed31c8d3ae4aca0f55c9a SHA512 5dfc4587cb6e0c1f668f7363eccbda0a329e5438837c22afe5b66e1b7d6a2502ec911013efc1ceb91186b6af2e0a590df2de5260fefde7fba49544ded3e66a25 WHIRLPOOL 760edbbeba8874dbae85d893e2f7b944ea2d3a8862a6c3f21e3a6c27f557f12ed12998a9f6f29c108849ce830e882d51447739365bb033c14c24fa7dad4df972
DIST upx-3.91-src.tar.bz2 904747 SHA256 527ce757429841f51675352b1f9f6fc8ad97b18002080d7bf8672c466d8c6a3c SHA512 7e9a392fe11daf7baf9632f2c448ef9936da7dfab215f86ba417e9f097770949acb653aaabe6cc5ed812efc486cb35e0c1e128c80026b02825713d8b12251cf5 WHIRLPOOL 1e20491528c9c7da50985c4484c0062799a243adebfd8292ea3c136b93d865842e85e164e15f1005d0e821b83aa7162e7113553cafd5f0b584d9b08aa6c7938e

@ -1,44 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-arch/upx-ucl/upx-ucl-3.09.ebuild,v 1.2 2013/03/13 22:20:37 tomwij Exp $
EAPI="5"
inherit eutils toolchain-funcs flag-o-matic
LZMA_VER=465
#LZMA_VER=920
MY_P="${P/-ucl}-src"
DESCRIPTION="Ultimate Packer for eXecutables (free version using UCL compression and not NRV)"
HOMEPAGE="http://upx.sourceforge.net/"
SRC_URI="http://upx.sourceforge.net/download/${MY_P}.tar.bz2
lzma? ( mirror://sourceforge/sevenzip/lzma${LZMA_VER}.tar.bz2 )"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
IUSE="lzma zlib"
RDEPEND=">=dev-libs/ucl-1.02
!app-arch/upx
!app-arch/upx-bin"
DEPEND="${RDEPEND}
dev-lang/perl"
S="${WORKDIR}/${MY_P}"
src_configure() {
use zlib && append-cppflags -DWITH_ZLIB=1
}
src_compile() {
tc-export CXX
emake UPX_LZMADIR="${WORKDIR}" all
}
src_install() {
newbin src/upx.out upx
dodoc BUGS NEWS PROJECTS README* THANKS TODO doc/*.txt
dohtml doc/upx.html
doman doc/upx.1
}

@ -1,2 +1,3 @@
DIST pinentry-0.9.0.tar.bz2 464272 SHA256 90045a07ab8e1a8e1ecf5d19b51691f195525e579fa5d71d7e92c120b05490ab SHA512 2cc53a5c3852edaf6e940228d9b43fe4709344eba5fe230b7afd22b2c0239d0b258917d75661d80590b2d61c6fe9dac8ad15a0b4a0a0e7fba90a9e1c07364edd WHIRLPOOL 3f77a8aa2d44c7206d877e31088ec927473441e61f06e788330545d75ac489e6e9d5bf0026b23d0824304dad54ce8e61c4571d186df7ad0edc2d644ca3af04ac
DIST pinentry-0.9.1.tar.bz2 482295 SHA256 9cd08e856b395df3adc7124170b53f77c6d5c8bf88e899e818648ec70d3e9695 SHA512 2462d25a471a6053a0d1b67a05d1a828b9d14ca4aeced352376ff16b6aa4d03fd6d1013aee1b07b97f9ee73f218065c48fe2746bbf27f3cb2bd9aa0b9c9c1a50 WHIRLPOOL 2e74e31567b26d0ee1d0d962f9c4dee6bd9c5a8679751dc85a14d3f2d47bc83aa068ac9810261c1e47a08eacb25777926be3de0db9e3d20d3d8348033c6b13c5
DIST pinentry-0.9.2.tar.bz2 495742 SHA256 fd8bc1592ceb22bb492b07cb29b1b140bb882c859e6503b974254c0a4b4134d1 SHA512 68ba5643b9dc4e71b28f964172c7f37a67d1b22914c649c612e001c7c5ca0c40a0a2ec0974f50dbdc8dd98cc6266688c71d67e922db4334536797d331b0203cf WHIRLPOOL 457c8408ed04b2b5f72761d0b24cf1f07b1b81bb431cc666ee88015fda5a868a4ad296ac82fc98c79d5af5c1fdfdc597cb38914088143fb08e7838c9b572a090

@ -0,0 +1,47 @@
From 29236f84aca64be72c97a9b5513457a4e45afbc6 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Mon, 11 May 2015 16:14:58 +0200
Subject: [PATCH] Implement cmd_confirm in terms of cmd_message.
* pinentry/pinentry.c (cmd_confirm): Implement cmd_confirm in terms of
cmd_message.
---
pinentry/pinentry.c | 22 +---------------------
1 file changed, 1 insertion(+), 21 deletions(-)
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index f28c576..11a8027 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -1146,27 +1146,7 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line)
static int
cmd_message (ASSUAN_CONTEXT ctx, char *line)
{
- int result;
-
- pinentry.one_button = 1;
- pinentry.quality_bar = 0;
- pinentry.close_button = 0;
- pinentry.locale_err = 0;
- pinentry.specific_err = 0;
- result = (*pinentry_cmd_handler) (&pinentry);
- if (pinentry.error)
- {
- free (pinentry.error);
- pinentry.error = NULL;
- }
-
- if (pinentry.close_button)
- assuan_write_status (ctx, "BUTTON_INFO", "close");
-
- return result ? 0
- : (pinentry.specific_err? pinentry.specific_err :
- pinentry.locale_err? ASSUAN_Locale_Problem
- : 0);
+ return cmd_confirm (ctx, "--one-button");
}
/* GETINFO <what>
--
2.1.4

@ -0,0 +1,518 @@
From be87785005d256b7f3dacc607ba5ea0a14de8593 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Tue, 12 May 2015 17:07:49 +0200
Subject: [PATCH] Add a GNOME3 pinentry based on gcr.
* configure.ac (--enable-pinentry-gnome3): Option to enable the GNOME3
pinentry.
(pinentry_gnome_3): Set to yes if enabled and gcr-3 and gcr-base-3 gcr
is available.
(GNOME3CFLAGS): Define and AC_SUBST.
(GNOME3LIBS): Define and AC_SUBST.
(GCR_API_SUBJECT_TO_CHANGE): Define.
(BUILD_PINENTRY_GNOME_3): Define.
* Makefile.am (pinentry_gnome_3): Define.
(SUBDIRS): Add ${pinentry_gnome_3}.
* gnome3/Makefile.am: New file.
* gnome3/pinentry-gnome3.c: New file.
---
Makefile.am | 11 +-
configure.ac | 62 +++++++++--
gnome3/Makefile.am | 39 +++++++
gnome3/pinentry-gnome3.c | 271 +++++++++++++++++++++++++++++++++++++++++++++++
4 files changed, 370 insertions(+), 13 deletions(-)
create mode 100644 gnome3/Makefile.am
create mode 100644 gnome3/pinentry-gnome3.c
diff --git a/Makefile.am b/Makefile.am
index f8f7aac..177f37e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
# Makefile.am
-# Copyright (C) 2002, 2012 g10 Code GmbH
+# Copyright (C) 2002, 2012, 2015 g10 Code GmbH
#
# This file is part of PINENTRY.
#
@@ -46,6 +46,12 @@ else
pinentry_gtk_2 =
endif
+if BUILD_PINENTRY_GNOME_3
+pinentry_gnome_3 = gnome3
+else
+pinentry_gnome_3 =
+endif
+
if BUILD_PINENTRY_QT4
pinentry_qt4 = qt4
else
@@ -59,7 +65,8 @@ pinentry_w32 =
endif
SUBDIRS = assuan secmem pinentry ${pinentry_curses} ${pinentry_tty} \
- ${pinentry_gtk_2} ${pinentry_qt4} ${pinentry_w32} doc
+ ${pinentry_gtk_2} ${pinentry_gnome_3} ${pinentry_qt4} \
+ ${pinentry_w32} doc
install-exec-local:
diff --git a/configure.ac b/configure.ac
index c50ce68..9948d1f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -274,28 +274,34 @@ fi
dnl
-dnl Check for GTK+-2 pinentry program.
+dnl Check for GTK+-2 / GNOME3 pinentry programs.
dnl
AC_ARG_ENABLE(pinentry-gtk2,
AC_HELP_STRING([--enable-pinentry-gtk2], [build GTK+-2 pinentry]),
pinentry_gtk_2=$enableval, pinentry_gtk_2=maybe)
+AC_ARG_ENABLE(pinentry-gnome3,
+ AC_HELP_STRING([--enable-pinentry-gnome3], [build GNOME 3 pinentry]),
+ pinentry_gnome_3=$enableval, pinentry_gnome_3=maybe)
+
dnl check for pkg-config
-if test "$pinentry_gtk_2" != "no"; then
+if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test x"${PKG_CONFIG}" = xno ; then
pinentry_gtk_2=no
+ pinentry_gnome_3=no
fi
fi
dnl check if the module gtk+-2.0 exists
-if test "$pinentry_gtk_2" != "no"; then
+if test "$pinentry_gtk_2" != "no" -o "$pinentry_gnome_3" != "no"; then
AC_MSG_CHECKING([for gtk+-2])
"${PKG_CONFIG}" --exists gtk+-2.0
if test $? -ne 0 ; then
AC_MSG_RESULT([no])
AC_MSG_WARN([pkg-config could not find the module gtk+-2.0])
pinentry_gtk_2=no
+ pinentry_gnome_3=no
else
AC_MSG_RESULT([yes])
AC_MSG_CHECKING([gtk+-2 version >= 2.4.0])
@@ -305,17 +311,45 @@ if test "$pinentry_gtk_2" != "no"; then
if test $? -ne 0 ; then
AC_MSG_WARN([building GTK+-2 pinentry disabled])
pinentry_gtk_2=no
+ pinentry_gnome_3=no
else
GTK2CFLAGS=`"${PKG_CONFIG}" --cflags gtk+-2.0`
GTK2LIBS=`"${PKG_CONFIG}" --libs gtk+-2.0`
AC_SUBST(GTK2CFLAGS)
AC_SUBST(GTK2LIBS)
- pinentry_gtk_2=yes
+ if test "$pinentry_gtk_2" != "no"
+ then
+ pinentry_gtk_2=yes
+ fi
+ if test "$pinentry_gnome_3" != "no"
+ then
+ pinentry_gnome_3=yes
+ fi
fi
fi
fi
AM_CONDITIONAL(BUILD_PINENTRY_GTK_2, test "$pinentry_gtk_2" = "yes")
+if test "$pinentry_gnome_3" != "no"; then
+ AC_MSG_CHECKING([for gcr])
+ "${PKG_CONFIG}" --exists gcr-3,gcr-base-3
+ if test $? -ne 0 ; then
+ AC_MSG_RESULT([no])
+ AC_MSG_WARN([pkg-config could not find the module gcr-3,gcr-base-3])
+ pinentry_gnome_3=no
+ else
+ AC_MSG_RESULT([yes])
+ GNOME3CFLAGS=`"${PKG_CONFIG}" --cflags gcr-3,gcr-base-3`
+ GNOME3LIBS=`"${PKG_CONFIG}" --libs gcr-3,gcr-base-3`
+ AC_SUBST(GNOME3CFLAGS)
+ AC_SUBST(GNOME3LIBS)
+ AC_DEFINE(GCR_API_SUBJECT_TO_CHANGE, 1, [Nod nod])
+ pinentry_gnome_3=yes
+ fi
+fi
+
+AM_CONDITIONAL(BUILD_PINENTRY_GNOME_3, test "$pinentry_gnome_3" = "yes")
+
dnl
dnl Check for libsecret.
dnl
@@ -450,16 +484,20 @@ else
if test "$pinentry_qt4" = "yes"; then
PINENTRY_DEFAULT=pinentry-qt4
else
- if test "$pinentry_curses" = "yes"; then
- PINENTRY_DEFAULT=pinentry-curses
+ if test "$pinentry_gnome_3" = "yes"; then
+ PINENTRY_DEFAULT=pinentry-gnome3
else
- if test "$pinentry_tty" = "yes"; then
- PINENTRY_DEFAULT=pinentry-tty
+ if test "$pinentry_curses" = "yes"; then
+ PINENTRY_DEFAULT=pinentry-curses
else
- if test "$pinentry_w32" = "yes"; then
- PINENTRY_DEFAULT=pinentry-w32
+ if test "$pinentry_tty" = "yes"; then
+ PINENTRY_DEFAULT=pinentry-tty
else
- AC_MSG_ERROR([[No pinentry enabled.]])
+ if test "$pinentry_w32" = "yes"; then
+ PINENTRY_DEFAULT=pinentry-w32
+ else
+ AC_MSG_ERROR([[No pinentry enabled.]])
+ fi
fi
fi
fi
@@ -475,6 +513,7 @@ pinentry/Makefile
curses/Makefile
tty/Makefile
gtk+-2/Makefile
+gnome3/Makefile
qt4/Makefile
w32/Makefile
doc/Makefile
@@ -493,6 +532,7 @@ AC_MSG_NOTICE([
Curses Pinentry ..: $pinentry_curses
TTY Pinentry .....: $pinentry_tty
GTK+-2 Pinentry ..: $pinentry_gtk_2
+ GNOME 3 Pinentry .: $pinentry_gnome_3
Qt4 Pinentry .....: $pinentry_qt4 $pinentry_qt4_clip_msg
W32 Pinentry .....: $pinentry_w32
diff --git a/gnome3/Makefile.am b/gnome3/Makefile.am
new file mode 100644
index 0000000..78df706
--- /dev/null
+++ b/gnome3/Makefile.am
@@ -0,0 +1,39 @@
+# Makefile.am - PIN entry GTK+ frontend.
+# Copyright (C) 2002, 2015 g10 Code GmbH
+#
+# This file is part of PINENTRY.
+#
+# PINENTRY is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PINENTRY is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+
+## Process this file with automake to produce Makefile.in
+
+bin_PROGRAMS = pinentry-gnome3
+
+if FALLBACK_CURSES
+ncurses_include = $(NCURSES_INCLUDE)
+libcurses = ../pinentry/libpinentry-curses.a $(LIBCURSES) $(LIBICONV)
+else
+ncurses_include =
+libcurses =
+endif
+
+AM_CPPFLAGS = $(COMMON_CFLAGS) $(GNOME3CFLAGS) \
+ $(ncurses_include) -I$(top_srcdir)/assuan \
+ -I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
+LDADD = $(COMMON_LIBS) \
+ ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
+ $(LIBCAP) $(GNOME3LIBS) $(libcurses)
+
+pinentry_gnome3_SOURCES = pinentry-gnome3.c
diff --git a/gnome3/pinentry-gnome3.c b/gnome3/pinentry-gnome3.c
new file mode 100644
index 0000000..74ec89c
--- /dev/null
+++ b/gnome3/pinentry-gnome3.c
@@ -0,0 +1,271 @@
+/* pinentry-gnome3.c
+ Copyright (C) 2015 g10 Code GmbH
+
+ pinentry-gnome-3 is a pinentry application for GNOME 3. It tries
+ to follow the Gnome Human Interface Guide as close as possible.
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <gtk/gtk.h>
+#include <gcr/gcr-base.h>
+
+#include <string.h>
+
+#include "assuan.h"
+
+#include "memory.h"
+
+#include "pinentry.h"
+
+#ifdef FALLBACK_CURSES
+#include "pinentry-curses.h"
+#endif
+
+
+#define PGMNAME "pinentry-gnome3"
+
+#ifndef VERSION
+# define VERSION
+#endif
+
+static gchar *
+pinentry_utf8_validate (gchar *text)
+{
+ gchar *result;
+
+ if (!text)
+ return NULL;
+
+ if (g_utf8_validate (text, -1, NULL))
+ return g_strdup (text);
+
+ /* Failure: Assume that it was encoded in the current locale and
+ convert it to utf-8. */
+ result = g_locale_to_utf8 (text, -1, NULL, NULL, NULL);
+ if (!result)
+ {
+ gchar *p;
+
+ result = p = g_strdup (text);
+ while (!g_utf8_validate (p, -1, (const gchar **) &p))
+ *p = '?';
+ }
+ return result;
+}
+
+static GcrPrompt *
+create_prompt (pinentry_t pe, int confirm)
+{
+ GcrPrompt *prompt;
+ GError *error = NULL;
+ char *msg;
+
+ /* Create the prompt. */
+ prompt = GCR_PROMPT (gcr_system_prompt_open (-1, NULL, &error));
+ if (! prompt)
+ {
+ g_warning ("couldn't create prompt for gnupg passphrase: %s",
+ error->message);
+ g_error_free (error);
+ return NULL;
+ }
+
+ /* Set the messages for the various buttons, etc. */
+ if (pe->title)
+ {
+ msg = pinentry_utf8_validate (pe->title);
+ gcr_prompt_set_title (prompt, msg);
+ g_free (msg);
+ }
+
+ if (pe->description)
+ {
+ msg = pinentry_utf8_validate (pe->description);
+ gcr_prompt_set_description (prompt, msg);
+ g_free (msg);
+ }
+
+ /* An error occured during the last prompt. */
+ if (pe->error)
+ {
+ msg = pinentry_utf8_validate (pe->error);
+ gcr_prompt_set_warning (prompt, msg);
+ g_free (msg);
+ }
+
+ if (! pe->prompt && confirm)
+ gcr_prompt_set_message (prompt, "Message");
+ else if (! pe->prompt && ! confirm)
+ gcr_prompt_set_message (prompt, "Enter Passphrase");
+ else
+ {
+ msg = pinentry_utf8_validate (pe->prompt);
+ gcr_prompt_set_message (prompt, msg);
+ g_free (msg);
+ }
+
+ if (! confirm)
+ gcr_prompt_set_password_new (prompt, !!pe->repeat_passphrase);
+
+ if (pe->ok || pe->default_ok)
+ {
+ msg = pinentry_utf8_validate (pe->ok ?: pe->default_ok);
+ gcr_prompt_set_continue_label (prompt, msg);
+ g_free (msg);
+ }
+ /* XXX: Disable this button if pe->one_button is set. */
+ if (pe->cancel || pe->default_cancel)
+ {
+ msg = pinentry_utf8_validate (pe->cancel ?: pe->default_cancel);
+ gcr_prompt_set_cancel_label (prompt, msg);
+ g_free (msg);
+ }
+
+ if (confirm && pe->notok)
+ {
+ /* XXX: Add support for the third option. */
+ }
+
+ /* XXX: gcr expects a string; we have a int. */
+ // gcr_prompt_set_caller_window (prompt, pe->parent_wid);
+
+ if (! confirm && pe->allow_external_password_cache && pe->keyinfo)
+ {
+ if (pe->default_pwmngr)
+ {
+ msg = pinentry_utf8_validate (pe->default_pwmngr);
+ gcr_prompt_set_choice_label (prompt, msg);
+ g_free (msg);
+ }
+ else
+ gcr_prompt_set_choice_label
+ (prompt, "Automatically unlock this key, whenever I'm logged in");
+ }
+
+ return prompt;
+}
+
+static int
+gnome3_cmd_handler (pinentry_t pe)
+{
+ GcrPrompt *prompt = NULL;
+ GError *error = NULL;
+ int ret = -1;
+
+ if (pe->pin)
+ /* Passphrase mode. */
+ {
+ const char *password;
+
+ prompt = create_prompt (pe, 0);
+ if (! prompt)
+ /* Something went wrong. */
+ {
+ pe->canceled = 1;
+ return -1;
+ }
+
+ /* "The returned password is valid until the next time a method
+ is called to display another prompt." */
+ password = gcr_prompt_password_run (prompt, NULL, &error);
+ if (error)
+ /* Error. */
+ {
+ pe->specific_err = ASSUAN_General_Error;
+ g_error_free (error);
+ ret = -1;
+ }
+ else if (! password && ! error)
+ /* User cancelled the operation. */
+ ret = -1;
+ else
+ {
+ pinentry_setbufferlen (pe, strlen (password) + 1);
+ if (pe->pin)
+ strcpy (pe->pin, password);
+
+ if (pe->repeat_passphrase)
+ pe->repeat_okay = 1;
+
+ ret = 1;
+ }
+ }
+ else
+ /* Message box mode. */
+ {
+ GcrPromptReply reply;
+
+ prompt = create_prompt (pe, 1);
+ if (! prompt)
+ /* Something went wrong. */
+ {
+ pe->canceled = 1;
+ return -1;
+ }
+
+ /* XXX: We don't support a third button! */
+
+ reply = gcr_prompt_confirm_run (prompt, NULL, &error);
+ if (error)
+ {
+ pe->specific_err = ASSUAN_General_Error;
+ ret = 0;
+ }
+ else if (reply == GCR_PROMPT_REPLY_CONTINUE
+ /* XXX: Hack since gcr doesn't yet support one button
+ message boxes treat cancel the same as okay. */
+ || pe->one_button)
+ /* Confirmation. */
+ ret = 1;
+ else
+ /* GCR_PROMPT_REPLY_CANCEL */
+ {
+ pe->canceled = 1;
+ ret = 0;
+ }
+ }
+
+ if (prompt)
+ g_clear_object (&prompt);
+ return ret;
+}
+
+pinentry_cmd_handler_t pinentry_cmd_handler = gnome3_cmd_handler;
+
+int
+main (int argc, char *argv[])
+{
+ pinentry_init (PGMNAME);
+
+#ifdef FALLBACK_CURSES
+ if (pinentry_have_display (argc, argv))
+ gtk_init (&argc, &argv);
+ else
+ pinentry_cmd_handler = curses_cmd_handler;
+#else
+ gtk_init (&argc, &argv);
+#endif
+
+ pinentry_parse_opts (argc, argv);
+
+ if (pinentry_loop ())
+ return 1;
+
+ return 0;
+}
--
2.1.4

@ -0,0 +1,28 @@
From 3062742b945f95d72001896f8ba5468b9e63aa9b Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Wed, 13 May 2015 14:20:23 +0200
Subject: [PATCH 1/1] Don't interpret the handler's return value as the
passphrase's length.
* pinentry/pinentry.c (cmd_getpin): Don't interpret the return value
as the passphrase length. Use strlen instead.
---
pinentry/pinentry.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 53216fc..836ee14 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -1109,7 +1109,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
{
if (pinentry.repeat_okay)
assuan_write_status (ctx, "PIN_REPEATED", "");
- result = assuan_send_data (ctx, pinentry.pin, result);
+ result = assuan_send_data (ctx, pinentry.pin, strlen(pinentry.pin));
if (!result)
result = assuan_send_data (ctx, NULL, 0);
--
2.1.4

@ -0,0 +1,104 @@
From 496235af8dfd373b54e5610f86bf1cada175ac23 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Wed, 13 May 2015 21:47:11 +0200
Subject: [PATCH 1/1] Fix linking order to work when linked with --as-needed.
* curses/Makefile.am (LDADD): Add $(COMMON_LIBS) after all of the
local objects and object archives.
* gnome3/Makefile.am (LDADD): Likewise.
* gtk+-2/Makefile.am (LDADD): Likewise.
* qt4/Makefile.am (pinentry_qt4_LDADD): Likewise.
* tty/Makefile.am (LDADD): Likewise.
Reported-by: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
---
curses/Makefile.am | 5 ++---
gnome3/Makefile.am | 5 ++---
gtk+-2/Makefile.am | 5 ++---
qt4/Makefile.am | 6 +++---
tty/Makefile.am | 4 ++--
5 files changed, 11 insertions(+), 14 deletions(-)
diff --git a/curses/Makefile.am b/curses/Makefile.am
index e8ea031..4d764c7 100644
--- a/curses/Makefile.am
+++ b/curses/Makefile.am
@@ -22,9 +22,8 @@
bin_PROGRAMS = pinentry-curses
AM_CPPFLAGS = $(COMMON_CFLAGS) $(NCURSES_INCLUDE) -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) \
- ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
+LDADD = ../pinentry/libpinentry.a ../pinentry/libpinentry-curses.a \
../assuan/libassuan.a ../secmem/libsecmem.a \
- $(LIBCAP) $(LIBCURSES) $(LIBICONV)
+ $(COMMON_LIBS) $(LIBCAP) $(LIBCURSES) $(LIBICONV)
pinentry_curses_SOURCES = pinentry-curses.c
diff --git a/gnome3/Makefile.am b/gnome3/Makefile.am
index 78df706..46639de 100644
--- a/gnome3/Makefile.am
+++ b/gnome3/Makefile.am
@@ -32,8 +32,7 @@ endif
AM_CPPFLAGS = $(COMMON_CFLAGS) $(GNOME3CFLAGS) \
$(ncurses_include) -I$(top_srcdir)/assuan \
-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) \
- ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
- $(LIBCAP) $(GNOME3LIBS) $(libcurses)
+LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
+ $(COMMON_LIBS) $(LIBCAP) $(GNOME3LIBS) $(libcurses)
pinentry_gnome3_SOURCES = pinentry-gnome3.c
diff --git a/gtk+-2/Makefile.am b/gtk+-2/Makefile.am
index c98139f..7e37469 100644
--- a/gtk+-2/Makefile.am
+++ b/gtk+-2/Makefile.am
@@ -31,9 +31,8 @@ endif
AM_CPPFLAGS = $(COMMON_CFLAGS) $(GTK2CFLAGS) $(ncurses_include) \
-I$(top_srcdir)/secmem -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) \
- ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
- $(LIBCAP) $(GTK2LIBS) $(libcurses)
+LDADD = ../pinentry/libpinentry.a ../assuan/libassuan.a ../secmem/libsecmem.a \
+ $(COMMON_LIBS) $(LIBCAP) $(GTK2LIBS) $(libcurses)
pinentry_gtk_2_SOURCES = pinentry-gtk-2.c \
gtksecentry.c gtksecentry.h gseal-gtk-compat.h
diff --git a/qt4/Makefile.am b/qt4/Makefile.am
index 31274bb..816aade 100644
--- a/qt4/Makefile.am
+++ b/qt4/Makefile.am
@@ -38,10 +38,10 @@ AM_CPPFLAGS = $(COMMON_CFLAGS) \
-I$(top_srcdir) -I$(top_srcdir)/assuan -I$(top_srcdir)/secmem \
$(ncurses_include) -I$(top_srcdir)/pinentry
AM_CXXFLAGS = $(QT4_CORE_CFLAGS) $(QT4_GUI_CFLAGS)
-pinentry_qt4_LDADD = $(COMMON_LIBS) \
- $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) \
+pinentry_qt4_LDADD = \
../pinentry/libpinentry.a $(top_builddir)/assuan/libassuan.a \
- $(top_builddir)/secmem/libsecmem.a $(LIBCAP)
+ $(top_builddir)/secmem/libsecmem.a \
+ $(COMMON_LIBS) $(QT4_CORE_LIBS) $(QT4_GUI_LIBS) $(libcurses) $(LIBCAP)
BUILT_SOURCES = \
pinentryconfirm.moc qsecurelineedit.moc pinentrydialog.moc
diff --git a/tty/Makefile.am b/tty/Makefile.am
index 798c08f..aa805b2 100644
--- a/tty/Makefile.am
+++ b/tty/Makefile.am
@@ -21,8 +21,8 @@
bin_PROGRAMS = pinentry-tty
AM_CPPFLAGS = $(COMMON_CFLAGS) -I$(top_srcdir)/pinentry
-LDADD = $(COMMON_LIBS) ../pinentry/libpinentry.a \
+LDADD = ../pinentry/libpinentry.a \
../assuan/libassuan.a ../secmem/libsecmem.a \
- $(LIBCAP) $(LIBICONV)
+ $(COMMON_LIBS) $(LIBCAP) $(LIBICONV)
pinentry_tty_SOURCES = pinentry-tty.c
--
2.1.4

@ -0,0 +1,136 @@
From bdd81974633f8e31d582b62999ef9b004bc3b95e Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Wed, 13 May 2015 13:52:03 +0200
Subject: [PATCH 1/1] Make the management of pinentry.pin more explicit.
* pinentry/pinentry.c: Include <assert.h>.
(pinentry): Set pin_len to 0.
(pinentry_setbufferlen): If len is less than 2048, set it to 2048.
Add an assertion.
(pinentry_setbuffer_clear): New function that releases the pin buffer.
(pinentry_setbuffer_init): New function that initializes the pin
buffer.
(cmd_getpin): Use pinentry_setbuffer_init and pinentry_setbuffer_clear
instead of manual memory management.
(cmd_confirm): Use pinentry_setbuffer_clear instead of manual memory
management.
---
pinentry/pinentry.c | 52 +++++++++++++++++++++++++++++++++++++++-------------
1 file changed, 39 insertions(+), 13 deletions(-)
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 3a44851..53216fc 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -27,6 +27,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <assert.h>
#ifndef HAVE_W32CE_SYSTEM
# include <locale.h>
#endif
@@ -67,7 +68,7 @@ struct pinentry pinentry =
NULL, /* Not-Ok button. */
NULL, /* Cancel button. */
NULL, /* PIN. */
- 2048, /* PIN length. */
+ 0, /* PIN length. */
0, /* pin_from_cache. */
0, /* Display. */
0, /* TTY name. */
@@ -354,8 +355,18 @@ char *
pinentry_setbufferlen (pinentry_t pin, int len)
{
char *newp;
- if (len < pinentry.pin_len)
+
+ if (pin->pin_len)
+ assert (pin->pin);
+ else
+ assert (!pin->pin);
+
+ if (len < 2048)
+ len = 2048;
+
+ if (len <= pin->pin_len)
return NULL;
+
newp = secmem_realloc (pin->pin, len);
if (newp)
{
@@ -371,6 +382,28 @@ pinentry_setbufferlen (pinentry_t pin, int len)
return newp;
}
+static void
+pinentry_setbuffer_clear (pinentry_t pin)
+{
+ if (! pin->pin)
+ {
+ assert (pin->pin_len == 0);
+ return;
+ }
+
+ assert (pin->pin_len > 0);
+
+ secmem_free (pin->pin);
+ pin->pin = NULL;
+ pin->pin_len = 0;
+}
+
+static void
+pinentry_setbuffer_init (pinentry_t pin)
+{
+ pinentry_setbuffer_clear (pin);
+ pinentry_setbufferlen (pin, 0);
+}
/* Initialize the secure memory subsystem, drop privileges and return.
Must be called early. */
@@ -983,7 +1016,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
int set_prompt = 0;
int just_read_password_from_cache = 0;
- pinentry.pin = secmem_malloc (pinentry.pin_len);
+ pinentry_setbuffer_init (&pinentry);
if (!pinentry.pin)
return ASSUAN_Out_Of_Core;
@@ -1065,11 +1098,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
if (result < 0)
{
- if (pinentry.pin)
- {
- secmem_free (pinentry.pin);
- pinentry.pin = NULL;
- }
+ pinentry_setbuffer_clear (&pinentry);
if (pinentry.specific_err)
return pinentry.specific_err;
return pinentry.locale_err? ASSUAN_Locale_Problem: ASSUAN_Canceled;
@@ -1094,11 +1123,7 @@ cmd_getpin (ASSUAN_CONTEXT ctx, char *line)
password_cache_save (pinentry.keyinfo, pinentry.pin);
}
- if (pinentry.pin)
- {
- secmem_free (pinentry.pin);
- pinentry.pin = NULL;
- }
+ pinentry_setbuffer_clear (&pinentry);
return result;
}
@@ -1122,6 +1147,7 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line)
pinentry.locale_err = 0;
pinentry.specific_err = 0;
pinentry.canceled = 0;
+ pinentry_setbuffer_clear (&pinentry);
result = (*pinentry_cmd_handler) (&pinentry);
if (pinentry.error)
{
--
2.1.4

@ -0,0 +1,32 @@
From aa04dac66f2ee949e8789a3c91090b01646f2e57 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Mon, 11 May 2015 16:14:18 +0200
Subject: [PATCH] Fix memory allocation in pinentry_setbufferlen.
* pinentry/pinentry.c (pinentry_setbufferlen): Set PIN->PIN to a
buffer that is LEN bytes large, not 2 * PIN->PIN_LENGTH.
---
pinentry/pinentry.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 51c873c..f28c576 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -356,11 +356,11 @@ pinentry_setbufferlen (pinentry_t pin, int len)
char *newp;
if (len < pinentry.pin_len)
return NULL;
- newp = secmem_realloc (pin->pin, 2 * pin->pin_len);
+ newp = secmem_realloc (pin->pin, len);
if (newp)
{
pin->pin = newp;
- pin->pin_len *= 2;
+ pin->pin_len = len;
}
else
{
--
2.1.4

@ -0,0 +1,48 @@
From 831782b3b625ca81624fae0ee184da0d2fc46d96 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@gnu.org>
Date: Mon, 11 May 2015 16:35:12 +0200
Subject: [PATCH 1/1] Simplify code.
* pinentry/pinentry.c (cmd_confirm): Don't use nested ternary
expressions.
---
pinentry/pinentry.c | 23 +++++++++++++++--------
1 file changed, 15 insertions(+), 8 deletions(-)
diff --git a/pinentry/pinentry.c b/pinentry/pinentry.c
index 11a8027..3a44851 100644
--- a/pinentry/pinentry.c
+++ b/pinentry/pinentry.c
@@ -1132,14 +1132,21 @@ cmd_confirm (ASSUAN_CONTEXT ctx, char *line)
if (pinentry.close_button)
assuan_write_status (ctx, "BUTTON_INFO", "close");
- return result ? 0
- : (pinentry.specific_err? pinentry.specific_err :
- pinentry.locale_err? ASSUAN_Locale_Problem
- : (pinentry.one_button
- ? 0
- : (pinentry.canceled
- ? ASSUAN_Canceled
- : ASSUAN_Not_Confirmed)));
+ if (result)
+ return 0;
+
+ if (pinentry.specific_err)
+ return pinentry.specific_err;
+
+ if (pinentry.locale_err)
+ return ASSUAN_Locale_Problem;
+
+ if (pinentry.one_button)
+ return 0;
+
+ if (pinentry.canceled)
+ return ASSUAN_Canceled;
+ return ASSUAN_Not_Confirmed;
}
--
2.1.4

@ -0,0 +1,93 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-crypt/pinentry/pinentry-0.9.2-r1.ebuild,v 1.1 2015/05/14 08:12:20 k_f Exp $
EAPI=5
inherit qmake-utils autotools multilib eutils flag-o-matic toolchain-funcs
DESCRIPTION="Collection of simple PIN or passphrase entry dialogs which utilize the Assuan protocol"
HOMEPAGE="http://gnupg.org/aegypten2/index.html"
SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="clipboard gtk ncurses qt4 caps gnome-keyring static"
RDEPEND="
app-eselect/eselect-pinentry
caps? ( sys-libs/libcap )
gtk? ( x11-libs/gtk+:2 )
ncurses? ( sys-libs/ncurses )
qt4? ( >=dev-qt/qtgui-4.4.1:4 )
static? ( >=sys-libs/ncurses-5.7-r5[static-libs,-gpm] )
"
DEPEND="${RDEPEND}
sys-devel/gettext
gtk? ( virtual/pkgconfig )
qt4? ( virtual/pkgconfig )
gnome-keyring? ( app-crypt/libsecret )
"
REQUIRED_USE="
|| ( ncurses gtk qt4 )
gtk? ( !static )
qt4? ( !static )
static? ( ncurses )
"
DOCS=( AUTHORS ChangeLog NEWS README THANKS TODO )
src_prepare() {
epatch "${FILESDIR}/${PN}-0.8.2-ncurses.patch"
epatch "${FILESDIR}/${P}-handlers-return.patch"
epatch "${FILESDIR}/${P}-gnome3.patch"
epatch "${FILESDIR}/${P}-simplify.patch"
epatch "${FILESDIR}/${P}-cmd_confirm.patch"
epatch "${FILESDIR}/${P}-memory.patch"
epatch "${FILESDIR}/${P}-management.patch"
epatch "${FILESDIR}/${P}-linking-order.patch"
eautoreconf
}
src_configure() {
use static && append-ldflags -static
[[ "$(gcc-major-version)" -ge 5 ]] && append-cxxflags -std=gnu++11
# Issues finding qt on multilib systems
export QTLIB="${QTDIR}/$(get_libdir)"
econf \
--enable-pinentry-tty \
$(use_enable gtk pinentry-gtk2) \
$(use_enable ncurses pinentry-curses) \
$(use_enable ncurses fallback-curses) \
$(use_enable qt4 pinentry-qt4) \
$(use qt4 && use_enable clipboard pinentry-qt4-clipboard) \
$(use_with caps libcap) \
$(use_enable gnome-keyring libsecret) \
$(use_enable gnome-keyring pinentry-gnome3) \
MOC="$(qt4_get_bindir)"/moc
}
src_install() {
default
rm -f "${ED}"/usr/bin/pinentry || die
}
pkg_postinst() {
if ! has_version 'app-crypt/pinentry' || has_version '<app-crypt/pinentry-0.7.3'; then
elog "We no longer install pinentry-curses and pinentry-qt SUID root by default."
elog "Linux kernels >=2.6.9 support memory locking for unprivileged processes."
elog "The soft resource limit for memory locking specifies the limit an"
elog "unprivileged process may lock into memory. You can also use POSIX"
elog "capabilities to allow pinentry to lock memory. To do so activate the caps"
elog "USE flag and add the CAP_IPC_LOCK capability to the permitted set of"
elog "your users."
fi
eselect pinentry update ifunset
}
pkg_postrm() {
eselect pinentry update ifunset
}

@ -1,6 +1,2 @@
DIST qemu-2.1.2-20141214.tar.xz 5580 SHA256 bbf0e23f03f7ec5582ae522a194c5908a1ed85d42bf859100c99280af1ff21d2 SHA512 ca9bb37400d59cedeb1a659cb445758138c18ceb28ae2de2beee50b7aba39b1edf8d7317d777aa44def7c96437b5d4c19874b52e48d0272cb7de1c5dcc77f6d7 WHIRLPOOL 6ea13fe7cfaaa103d6d6e43445bba97358fcb6b434bccb5018e48176f9d4b90ce2100ffb17cd555fc4b9ee3fe98c281a6702d5a875d8a04674e177fbe90acffa
DIST qemu-2.1.2.tar.bz2 23563255 SHA256 fd10f5e45cf5a736fa5a3e1c279ae9821534e700beb7d1aab88a07648a394885 SHA512 73ef758c82b23eec649c807bee8937d7fbf267278f7777adbdb22b738672543b826d211a4b523f38cee3e2b01f05ccf40a75756fc19c911362988d8e86d5cd58 WHIRLPOOL 5703d0aa8bb4366bb7aeb44fa4f3d1b54f188de42cd8c82e894584f627802b80a3dde1aa3b15fe8602a1891ec61ac66b3cd44ec031385cca88768f375c15b554
DIST qemu-2.1.3.tar.bz2 23570694 SHA256 9b68fd0e6f6c401939bd1c9c6ab7052d84962007bb02919623474e9269f60a40 SHA512 119d89d85a54a4225716f7d1b20dc624705c1893e782b6f75e8a31ec11d4ba0ed60b78dd59322c2acc7f132c2f167461cf354d6a5f18925cf594746375b7b8fa WHIRLPOOL 9535d18037d12f719a85b648f4b65ce762fc4832ccb1b6b9ad88042be49ceb3d4813bd68ec1c0a91c21629018d376de7ddc479b69e81051d0f8c0e6af7a148e6
DIST qemu-2.2.0.tar.bz2 24316697 SHA256 b68c9b6c7c694f5489b5a6bffe993cd976ffbb78e7d178eb3bc016caf460039c SHA512 c1a42cc53a01175875411cad13defaab46f97740897b89f19fbf345106534f83fc707fae4a58d890f64eea475b940b934c7531a6ed04aa01f54cadb52b0b5909 WHIRLPOOL a9cb92406d4f2cfd6b7989c9876f7df4b305083241110e7b2bf16642cfd77531c48a48753745dfeb31b9aa7d71a2d4d3f8c5aba797918c9c60e920c79066ea2d
DIST qemu-2.2.1.tar.bz2 24483500 SHA256 4617154c6ef744b83e10b744e392ad111dd351d435d6563ce24d8da75b1335a0 SHA512 970ead0c92fc04502c6d3a8dbfafa5797667b3d276a1a25ddbe991d20d8e17a588905ecbffa77fb3b9d12e481ac3776ca4c38fe89a5e4c96dc2fb045214bfa9f WHIRLPOOL 9226ce4a4f5c7247d6ab34eb8b45c9a91416ee5849dbe25b9d15cddbd6aba2b8da77280f6055d363a81ddec515d28bf501351cb7e21ecfb4bfe42cdb7e349788
DIST qemu-2.3.0.tar.bz2 24683085 SHA256 b6bab7f763d5be73e7cb5ee7d4c8365b7a8df2972c52fa5ded18893bd8281588 SHA512 7a40d213c5696b27784abd2a3119e49d42c38c923be431826c73a8f14c19074435d7f1a652686c53baf08e81f5a3005b2ddc92d67c32f6a2b19659ab627e9eaa WHIRLPOOL 9dad6e342027c3be512b4e0b40e810e0a6f1dc84a16847aa5aac74d97f7a347e60d42e770335a090f83e90a1614294f86552a84edc1faafc7093d3e32602f5de

@ -1,81 +0,0 @@
fix already in upstream
From f17f4989fa193fa8279474c5462289a3cfe69aea Mon Sep 17 00:00:00 2001
From: Mike Frysinger <vapier@chromium.org>
Date: Fri, 8 Aug 2014 09:40:25 +0900
Subject: [PATCH] linux-user: fix readlink handling with magic exe symlink
The current code always returns the length of the path when it should
be returning the number of bytes it wrote to the output string.
Further, readlink is not supposed to append a NUL byte, but the current
snprintf logic will always do just that.
Even further, if you pass in a length of 0, you're suppoesd to get back
an error (EINVAL), but the current logic just returns 0.
Further still, if there was an error reading the symlink, we should not
go ahead and try to read the target buffer as it is garbage.
Simple test for the first two issues:
$ cat test.c
int main() {
char buf[50];
size_t len;
for (len = 0; len < 10; ++len) {
memset(buf, '!', sizeof(buf));
ssize_t ret = readlink("/proc/self/exe", buf, len);
buf[20] = '\0';
printf("readlink(/proc/self/exe, {%s}, %zu) = %zi\n", buf, len, ret);
}
return 0;
}
Now compare the output of the native:
$ gcc test.c -o /tmp/x
$ /tmp/x
$ strace /tmp/x
With what qemu does:
$ armv7a-cros-linux-gnueabi-gcc test.c -o /tmp/x -static
$ qemu-arm /tmp/x
$ qemu-arm -strace /tmp/x
Signed-off-by: Mike Frysinger <vapier@chromium.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
---
linux-user/syscall.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index fccf9f0..7c108ab 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -6636,11 +6636,22 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
p2 = lock_user(VERIFY_WRITE, arg2, arg3, 0);
if (!p || !p2) {
ret = -TARGET_EFAULT;
+ } else if (!arg3) {
+ /* Short circuit this for the magic exe check. */
+ ret = -TARGET_EINVAL;
} else if (is_proc_myself((const char *)p, "exe")) {
char real[PATH_MAX], *temp;
temp = realpath(exec_path, real);
- ret = temp == NULL ? get_errno(-1) : strlen(real) ;
- snprintf((char *)p2, arg3, "%s", real);
+ /* Return value is # of bytes that we wrote to the buffer. */
+ if (temp == NULL) {
+ ret = get_errno(-1);
+ } else {
+ /* Don't worry about sign mismatch as earlier mapping
+ * logic would have thrown a bad address error. */
+ ret = MIN(strlen(real), arg3);
+ /* We cannot NUL terminate the string. */
+ memcpy(p2, real, ret);
+ }
} else {
ret = get_errno(readlink(path(p), p2, arg3));
}
--
2.0.0

@ -1,50 +0,0 @@
https://bugs.gentoo.org/527088
From e6908bfe8e07f2b452e78e677da1b45b1c0f6829 Mon Sep 17 00:00:00 2001
From: Petr Matousek <pmatouse@redhat.com>
Date: Mon, 27 Oct 2014 12:41:44 +0100
Subject: [PATCH] vnc: sanitize bits_per_pixel from the client
bits_per_pixel that are less than 8 could result in accessing
non-initialized buffers later in the code due to the expectation
that bytes_per_pixel value that is used to initialize these buffers is
never zero.
To fix this check that bits_per_pixel from the client is one of the
values that the rfb protocol specification allows.
This is CVE-2014-7815.
Signed-off-by: Petr Matousek <pmatouse@redhat.com>
[ kraxel: apply codestyle fix ]
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
ui/vnc.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ui/vnc.c b/ui/vnc.c
index 0fe6eff..8bca597 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2026,6 +2026,16 @@ static void set_pixel_format(VncState *vs,
return;
}
+ switch (bits_per_pixel) {
+ case 8:
+ case 16:
+ case 32:
+ break;
+ default:
+ vnc_client_error(vs);
+ return;
+ }
+
vs->client_pf.rmax = red_max;
vs->client_pf.rbits = hweight_long(red_max);
vs->client_pf.rshift = red_shift;
--
2.1.2

@ -0,0 +1,86 @@
https://bugs.gentoo.org/549404
From e907746266721f305d67bc0718795fedee2e824c Mon Sep 17 00:00:00 2001
From: Petr Matousek <pmatouse@redhat.com>
Date: Wed, 6 May 2015 09:48:59 +0200
Subject: [PATCH] fdc: force the fifo access to be in bounds of the allocated buffer
During processing of certain commands such as FD_CMD_READ_ID and
FD_CMD_DRIVE_SPECIFICATION_COMMAND the fifo memory access could
get out of bounds leading to memory corruption with values coming
from the guest.
Fix this by making sure that the index is always bounded by the
allocated memory.
This is CVE-2015-3456.
Signed-off-by: Petr Matousek <pmatouse@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
---
hw/block/fdc.c | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index f72a392..d8a8edd 100644
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -1497,7 +1497,7 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
{
FDrive *cur_drv;
uint32_t retval = 0;
- int pos;
+ uint32_t pos;
cur_drv = get_cur_drv(fdctrl);
fdctrl->dsr &= ~FD_DSR_PWRDOWN;
@@ -1506,8 +1506,8 @@ static uint32_t fdctrl_read_data(FDCtrl *fdctrl)
return 0;
}
pos = fdctrl->data_pos;
+ pos %= FD_SECTOR_LEN;
if (fdctrl->msr & FD_MSR_NONDMA) {
- pos %= FD_SECTOR_LEN;
if (pos == 0) {
if (fdctrl->data_pos != 0)
if (!fdctrl_seek_to_next_sect(fdctrl, cur_drv)) {
@@ -1852,10 +1852,13 @@ static void fdctrl_handle_option(FDCtrl *fdctrl, int direction)
static void fdctrl_handle_drive_specification_command(FDCtrl *fdctrl, int direction)
{
FDrive *cur_drv = get_cur_drv(fdctrl);
+ uint32_t pos;
- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x80) {
+ pos = fdctrl->data_pos - 1;
+ pos %= FD_SECTOR_LEN;
+ if (fdctrl->fifo[pos] & 0x80) {
/* Command parameters done */
- if (fdctrl->fifo[fdctrl->data_pos - 1] & 0x40) {
+ if (fdctrl->fifo[pos] & 0x40) {
fdctrl->fifo[0] = fdctrl->fifo[1];
fdctrl->fifo[2] = 0;
fdctrl->fifo[3] = 0;
@@ -1955,7 +1958,7 @@ static uint8_t command_to_handler[256];
static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
{
FDrive *cur_drv;
- int pos;
+ uint32_t pos;
/* Reset mode */
if (!(fdctrl->dor & FD_DOR_nRESET)) {
@@ -2004,7 +2007,9 @@ static void fdctrl_write_data(FDCtrl *fdctrl, uint32_t value)
}
FLOPPY_DPRINTF("%s: %02x\n", __func__, value);
- fdctrl->fifo[fdctrl->data_pos++] = value;
+ pos = fdctrl->data_pos++;
+ pos %= FD_SECTOR_LEN;
+ fdctrl->fifo[pos] = value;
if (fdctrl->data_pos == fdctrl->data_len) {
/* We now have all parameters
* and will be able to treat the command
--
1.7.0.4

@ -27,6 +27,7 @@
<flag name='pulseaudio'>Enable pulseaudio output for sound emulation</flag>
<flag name='rbd'>Enable rados block device backend support, see http://ceph.newdream.net/wiki/QEMU-RBD</flag>
<flag name='sdl'>Enable the SDL-based console</flag>
<flag name='sdl2'>Use libsdl2 instead of libsdl</flag>
<flag name='spice'>Enable Spice protocol support via <pkg>app-emulation/spice</pkg></flag>
<flag name='ssh'>Enable SSH based block device support via <pkg>net-libs/libssh2</pkg></flag>
<flag name='static-softmmu'>Builds the Software MMU (system) targets as static binaries</flag>

@ -1,603 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.2-r2.ebuild,v 1.5 2015/04/08 07:30:33 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
user udev fcaps readme.gentoo pax-utils
BACKPORTS="20141214"
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
inherit git-2
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz
http://dev.gentoo.org/~tamiko/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
gtk infiniband iscsi +jpeg \
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
virtfs +vnc xattr xen xfs"
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
x86_64"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
use_targets="
$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
"
IUSE+=" ${use_targets}"
# Require at least one softmmu or user target.
# Block USE flag configurations known to not work.
REQUIRED_USE="|| ( ${use_targets} )
${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
qemu_softmmu_targets_ppc? ( fdt )
qemu_softmmu_targets_ppc64? ( fdt )
static? ( static-softmmu static-user )
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
#
# The attr lib isn't always linked in (although the USE flag is always
# respected). This is because qemu supports using the C library's API
# when available rather than always using the extranl library.
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-libs/zlib[static-libs(+)]
xattr? ( sys-apps/attr[static-libs(+)] )"
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
>=x11-libs/pixman-0.28.0[static-libs(+)]
aio? ( dev-libs/libaio[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
jpeg? ( virtual/jpeg[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] )
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
numa? ( sys-process/numactl[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
snappy? ( app-arch/snappy[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
X86_FIRMWARE_DEPEND="
>=sys-firmware/ipxe-1.0.0_p20130624
pin-upstream-blobs? (
~sys-firmware/seabios-1.7.5
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
!pin-upstream-blobs? (
sys-firmware/seabios
sys-firmware/sgabios
sys-firmware/vgabios
)"
CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
accessibility? ( app-accessibility/brltty )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
gtk? (
x11-libs/gtk+:3
x11-libs/vte:2.90
)
iscsi? ( net-libs/libiscsi )
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss !app-emulation/libcacard )
spice? ( >=app-emulation/spice-protocol-0.12.3 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
sys-apps/texinfo
virtual/pkgconfig
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
gtk? ( nls? ( sys-devel/gettext ) )
static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
static-user? ( ${USER_LIB_DEPEND} )
test? (
dev-libs/glib[utils]
sys-devel/bc
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-qemu )
"
STRIP_MASK="/usr/share/qemu/palcode-clipper"
QA_PREBUILT="
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper
usr/share/qemu/s390-ccw.img
usr/share/qemu/u-boot.e500
"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
usr/bin/qemu-cris
usr/bin/qemu-m68k
usr/bin/qemu-microblaze
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
usr/bin/qemu-or32
usr/bin/qemu-ppc
usr/bin/qemu-ppc64
usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
usr/bin/qemu-sparc32plus
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
you have the kernel module loaded before running kvm. The easiest way to
ensure that the kernel module is loaded is to load it on boot.\n
For AMD CPUs the module is called 'kvm-amd'\n
For Intel CPUs the module is called 'kvm-intel'\n
Please review /etc/conf.d/modules for how to load these\n\n
Make sure your user is in the 'kvm' group\n
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
qemu_support_kvm() {
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
use qemu_softmmu_targets_s390x; then
return 0
fi
return 1
}
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use the"
ERROR_TUN+=" virtual network device if using -net tap."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
ERROR_VHOST_NET+=" support"
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
fi
use python && CONFIG_CHECK+=" ~DEBUG_FS"
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
# Now do the actual checks setup above
check_extra_config
fi
fi
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
eerror "instances are still pointing to it. Please update your"
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
eerror "and the right system binary (e.g. qemu-system-x86_64)."
die "update your virt configs to not use qemu-kvm"
fi
}
pkg_setup() {
enewgroup kvm 78
}
src_prepare() {
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i -r \
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
# Cheap hack to disable gettext .mo generation.
use nls || rm -f po/*.po
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
epatch "${FILESDIR}"/${PN}-2.1.1-readlink-self.patch
epatch "${FILESDIR}"/${PN}-2.1.2-vnc-sanitize-bits.patch #527088
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/patches" epatch
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY
# Verbose builds
MAKEOPTS+=" V=1"
epatch_user
}
##
# configures qemu based on the build directory and the build type
# we are using.
#
qemu_src_configure() {
debug-print-function ${FUNCNAME} "$@"
local buildtype=$1
local builddir=$2
local static_flag="static-${buildtype}"
# audio options
local audio_opts="oss"
use alsa && audio_opts="alsa,${audio_opts}"
use sdl && audio_opts="sdl,${audio_opts}"
use pulseaudio && audio_opts="pa,${audio_opts}"
local conf_opts=(
--prefix=/usr
--sysconfdir=/etc
--libdir=/usr/$(get_libdir)
--docdir=/usr/share/doc/${PF}/html
--disable-bsd-user
--disable-guest-agent
--disable-strip
--disable-werror
--python="${PYTHON}"
--cc="$(tc-getCC)"
--cxx="$(tc-getCXX)"
--host-cc="$(tc-getBUILD_CC)"
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
--enable-docs
$(use_enable tci tcg-interpreter)
$(use_enable xattr attr)
)
# Disable options not used by user targets as the default configure
# options will autoprobe and try to link in a bunch of unused junk.
conf_softmmu() {
if [[ ${buildtype} == "user" ]] ; then
echo "--disable-${2:-$1}"
else
use_enable "$@"
fi
}
conf_opts+=(
$(conf_softmmu accessibility brlapi)
$(conf_softmmu aio linux-aio)
$(conf_softmmu bluetooth bluez)
$(conf_softmmu caps cap-ng)
$(conf_softmmu curl)
$(conf_softmmu fdt)
$(conf_softmmu glusterfs)
$(conf_softmmu gtk)
$(conf_softmmu infiniband rdma)
$(conf_softmmu iscsi libiscsi)
$(conf_softmmu jpeg vnc-jpeg)
$(conf_softmmu kernel_linux kvm)
$(conf_softmmu lzo)
$(conf_softmmu ncurses curses)
$(conf_softmmu nfs libnfs)
$(conf_softmmu numa)
$(conf_softmmu opengl glx)
$(conf_softmmu png vnc-png)
$(conf_softmmu rbd)
$(conf_softmmu sasl vnc-sasl)
$(conf_softmmu sdl)
$(conf_softmmu seccomp)
$(conf_softmmu smartcard smartcard-nss)
$(conf_softmmu snappy)
$(conf_softmmu spice)
$(conf_softmmu ssh libssh2)
$(conf_softmmu tls quorum)
$(conf_softmmu tls vnc-tls)
$(conf_softmmu tls vnc-ws)
$(conf_softmmu usb libusb)
$(conf_softmmu usbredir usb-redir)
$(conf_softmmu uuid)
$(conf_softmmu vde)
$(conf_softmmu vhost-net)
$(conf_softmmu virtfs)
$(conf_softmmu vnc)
$(conf_softmmu xen)
$(conf_softmmu xen xen-pci-passthrough)
$(conf_softmmu xfs xfsctl)
)
case ${buildtype} in
user)
conf_opts+=(
--enable-linux-user
--disable-system
--target-list="${user_targets}"
--disable-blobs
--disable-tools
)
;;
softmmu)
conf_opts+=(
--disable-linux-user
--enable-system
--target-list="${softmmu_targets}"
--with-system-pixman
--audio-drv-list="${audio_opts}"
)
use gtk && conf_opts+=( --with-gtkabi=3.0 )
;;
esac
# Add support for SystemTAP
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
if use ${static_flag}; then
conf_opts+=( --static --disable-pie )
else
gcc-specs-pie && conf_opts+=( --enable-pie )
fi
einfo "./configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
# FreeBSD's kernel does not support QEMU assigning/grabbing
# host USB devices yet
use kernel_FreeBSD && \
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
local target
python_export_best
softmmu_targets= softmmu_bins=()
user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
if use "qemu_softmmu_targets_${target}"; then
softmmu_targets+=",${target}-softmmu"
softmmu_bins+=( "qemu-system-${target}" )
fi
done
for target in ${IUSE_USER_TARGETS} ; do
if use "qemu_user_targets_${target}"; then
user_targets+=",${target}-linux-user"
user_bins+=( "qemu-${target}" )
fi
done
[[ -n ${softmmu_targets} ]] && \
einfo "Building the following softmmu targets: ${softmmu_targets}"
[[ -n ${user_targets} ]] && \
einfo "Building the following user targets: ${user_targets}"
if [[ -n ${softmmu_targets} ]]; then
mkdir "${S}/softmmu-build"
qemu_src_configure "softmmu" "${S}/softmmu-build"
fi
if [[ -n ${user_targets} ]]; then
mkdir "${S}/user-build"
qemu_src_configure "user" "${S}/user-build"
fi
}
src_compile() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
default
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
default
fi
}
src_test() {
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
pax-mark m */qemu-system-* #515550
emake -j1 check
emake -j1 check-report.html
fi
}
qemu_python_install() {
python_domodule "${S}/scripts/qmp/qmp.py"
python_doscript "${S}/scripts/kvm/kvm_stat"
python_doscript "${S}/scripts/kvm/vmxcap"
python_doscript "${S}/scripts/qmp/qmp-shell"
python_doscript "${S}/scripts/qmp/qemu-ga-client"
}
src_install() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
emake DESTDIR="${ED}" install
# Install binfmt handler init script for user targets
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
# This might not exist if the test failed. #512010
[[ -e check-report.html ]] && dohtml check-report.html
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
fi
if use python; then
python_foreach_impl qemu_python_install
fi
fi
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
pushd "${ED}"/usr/bin >/dev/null
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
popd >/dev/null
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
# Remove the docdir placed qmp-commands.txt
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
cd "${S}"
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
dodoc docs/qmp/*.txt
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
fi
# Remove vgabios since we're using the vgabios packaged one
if [[ -n ${softmmu_targets} ]]; then
rm "${ED}/usr/share/qemu/vgabios.bin"
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
# Remove sgabios since we're using the sgabios packaged one
rm "${ED}/usr/share/qemu/sgabios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
fi
# Remove iPXE since we're using the iPXE packaged one
rm "${ED}"/usr/share/qemu/pxe-*.rom
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
fi
fi
qemu_support_kvm && readme.gentoo_create_doc
}
pkg_postinst() {
if qemu_support_kvm; then
readme.gentoo_print_elog
ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
ewarn "save states has been removed starting with the 1.6.2 release"
ewarn
ewarn "It is recommended that you migrate any VMs that may be running"
ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
ewarn "any saved states with a newer qemu."
ewarn
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
if use x86 || use amd64; then
ewarn
ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
ewarn "installed. In order to use kvm acceleration, pass the flag"
ewarn "-enable-kvm when running your system target."
fi
fi
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
udev_reload
fi
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
if use virtfs && [ -n "${softmmu_targets}" ]; then
local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
fi
}
pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
echo " $(best_version sys-firmware/ipxe)"
echo " $(best_version sys-firmware/seabios)"
if has_version sys-firmware/seabios[binary]; then
echo " USE=binary"
else
echo " USE=''"
fi
echo " $(best_version sys-firmware/vgabios)"
}

@ -1,602 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.1.3.ebuild,v 1.3 2015/04/08 07:30:33 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
user udev fcaps readme.gentoo pax-utils
BACKPORTS=""
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
inherit git-2
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
gtk infiniband iscsi +jpeg \
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
virtfs +vnc xattr xen xfs"
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
x86_64"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
use_targets="
$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
"
IUSE+=" ${use_targets}"
# Require at least one softmmu or user target.
# Block USE flag configurations known to not work.
REQUIRED_USE="|| ( ${use_targets} )
${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
qemu_softmmu_targets_ppc? ( fdt )
qemu_softmmu_targets_ppc64? ( fdt )
static? ( static-softmmu static-user )
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
#
# The attr lib isn't always linked in (although the USE flag is always
# respected). This is because qemu supports using the C library's API
# when available rather than always using the extranl library.
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-libs/zlib[static-libs(+)]
xattr? ( sys-apps/attr[static-libs(+)] )"
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
>=x11-libs/pixman-0.28.0[static-libs(+)]
aio? ( dev-libs/libaio[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
jpeg? ( virtual/jpeg[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] )
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
numa? ( sys-process/numactl[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
snappy? ( app-arch/snappy[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
X86_FIRMWARE_DEPEND="
>=sys-firmware/ipxe-1.0.0_p20130624
pin-upstream-blobs? (
~sys-firmware/seabios-1.7.5
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
!pin-upstream-blobs? (
sys-firmware/seabios
sys-firmware/sgabios
sys-firmware/vgabios
)"
CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
accessibility? ( app-accessibility/brltty )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
gtk? (
x11-libs/gtk+:3
x11-libs/vte:2.90
)
iscsi? ( net-libs/libiscsi )
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss !app-emulation/libcacard )
spice? ( >=app-emulation/spice-protocol-0.12.3 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
sys-apps/texinfo
virtual/pkgconfig
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
gtk? ( nls? ( sys-devel/gettext ) )
static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
static-user? ( ${USER_LIB_DEPEND} )
test? (
dev-libs/glib[utils]
sys-devel/bc
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-qemu )
"
STRIP_MASK="/usr/share/qemu/palcode-clipper"
QA_PREBUILT="
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper
usr/share/qemu/s390-ccw.img
usr/share/qemu/u-boot.e500
"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
usr/bin/qemu-cris
usr/bin/qemu-m68k
usr/bin/qemu-microblaze
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
usr/bin/qemu-or32
usr/bin/qemu-ppc
usr/bin/qemu-ppc64
usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
usr/bin/qemu-sparc32plus
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
you have the kernel module loaded before running kvm. The easiest way to
ensure that the kernel module is loaded is to load it on boot.\n
For AMD CPUs the module is called 'kvm-amd'\n
For Intel CPUs the module is called 'kvm-intel'\n
Please review /etc/conf.d/modules for how to load these\n\n
Make sure your user is in the 'kvm' group\n
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
qemu_support_kvm() {
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
use qemu_softmmu_targets_s390x; then
return 0
fi
return 1
}
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use the"
ERROR_TUN+=" virtual network device if using -net tap."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
ERROR_VHOST_NET+=" support"
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
fi
use python && CONFIG_CHECK+=" ~DEBUG_FS"
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
# Now do the actual checks setup above
check_extra_config
fi
fi
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
eerror "instances are still pointing to it. Please update your"
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
eerror "and the right system binary (e.g. qemu-system-x86_64)."
die "update your virt configs to not use qemu-kvm"
fi
}
pkg_setup() {
enewgroup kvm 78
}
src_prepare() {
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i -r \
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
# Cheap hack to disable gettext .mo generation.
use nls || rm -f po/*.po
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
epatch "${FILESDIR}"/${PN}-2.1.1-readlink-self.patch
epatch "${FILESDIR}"/${PN}-2.1.2-vnc-sanitize-bits.patch #527088
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" \
EPATCH_SOURCE="${WORKDIR}/patches" epatch
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY
# Verbose builds
MAKEOPTS+=" V=1"
epatch_user
}
##
# configures qemu based on the build directory and the build type
# we are using.
#
qemu_src_configure() {
debug-print-function ${FUNCNAME} "$@"
local buildtype=$1
local builddir=$2
local static_flag="static-${buildtype}"
# audio options
local audio_opts="oss"
use alsa && audio_opts="alsa,${audio_opts}"
use sdl && audio_opts="sdl,${audio_opts}"
use pulseaudio && audio_opts="pa,${audio_opts}"
local conf_opts=(
--prefix=/usr
--sysconfdir=/etc
--libdir=/usr/$(get_libdir)
--docdir=/usr/share/doc/${PF}/html
--disable-bsd-user
--disable-guest-agent
--disable-strip
--disable-werror
--python="${PYTHON}"
--cc="$(tc-getCC)"
--cxx="$(tc-getCXX)"
--host-cc="$(tc-getBUILD_CC)"
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
--enable-docs
$(use_enable tci tcg-interpreter)
$(use_enable xattr attr)
)
# Disable options not used by user targets as the default configure
# options will autoprobe and try to link in a bunch of unused junk.
conf_softmmu() {
if [[ ${buildtype} == "user" ]] ; then
echo "--disable-${2:-$1}"
else
use_enable "$@"
fi
}
conf_opts+=(
$(conf_softmmu accessibility brlapi)
$(conf_softmmu aio linux-aio)
$(conf_softmmu bluetooth bluez)
$(conf_softmmu caps cap-ng)
$(conf_softmmu curl)
$(conf_softmmu fdt)
$(conf_softmmu glusterfs)
$(conf_softmmu gtk)
$(conf_softmmu infiniband rdma)
$(conf_softmmu iscsi libiscsi)
$(conf_softmmu jpeg vnc-jpeg)
$(conf_softmmu kernel_linux kvm)
$(conf_softmmu lzo)
$(conf_softmmu ncurses curses)
$(conf_softmmu nfs libnfs)
$(conf_softmmu numa)
$(conf_softmmu opengl glx)
$(conf_softmmu png vnc-png)
$(conf_softmmu rbd)
$(conf_softmmu sasl vnc-sasl)
$(conf_softmmu sdl)
$(conf_softmmu seccomp)
$(conf_softmmu smartcard smartcard-nss)
$(conf_softmmu snappy)
$(conf_softmmu spice)
$(conf_softmmu ssh libssh2)
$(conf_softmmu tls quorum)
$(conf_softmmu tls vnc-tls)
$(conf_softmmu tls vnc-ws)
$(conf_softmmu usb libusb)
$(conf_softmmu usbredir usb-redir)
$(conf_softmmu uuid)
$(conf_softmmu vde)
$(conf_softmmu vhost-net)
$(conf_softmmu virtfs)
$(conf_softmmu vnc)
$(conf_softmmu xen)
$(conf_softmmu xen xen-pci-passthrough)
$(conf_softmmu xfs xfsctl)
)
case ${buildtype} in
user)
conf_opts+=(
--enable-linux-user
--disable-system
--target-list="${user_targets}"
--disable-blobs
--disable-tools
)
;;
softmmu)
conf_opts+=(
--disable-linux-user
--enable-system
--target-list="${softmmu_targets}"
--with-system-pixman
--audio-drv-list="${audio_opts}"
)
use gtk && conf_opts+=( --with-gtkabi=3.0 )
;;
esac
# Add support for SystemTAP
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
if use ${static_flag}; then
conf_opts+=( --static --disable-pie )
else
gcc-specs-pie && conf_opts+=( --enable-pie )
fi
einfo "./configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
# FreeBSD's kernel does not support QEMU assigning/grabbing
# host USB devices yet
use kernel_FreeBSD && \
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
local target
python_export_best
softmmu_targets= softmmu_bins=()
user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
if use "qemu_softmmu_targets_${target}"; then
softmmu_targets+=",${target}-softmmu"
softmmu_bins+=( "qemu-system-${target}" )
fi
done
for target in ${IUSE_USER_TARGETS} ; do
if use "qemu_user_targets_${target}"; then
user_targets+=",${target}-linux-user"
user_bins+=( "qemu-${target}" )
fi
done
[[ -n ${softmmu_targets} ]] && \
einfo "Building the following softmmu targets: ${softmmu_targets}"
[[ -n ${user_targets} ]] && \
einfo "Building the following user targets: ${user_targets}"
if [[ -n ${softmmu_targets} ]]; then
mkdir "${S}/softmmu-build"
qemu_src_configure "softmmu" "${S}/softmmu-build"
fi
if [[ -n ${user_targets} ]]; then
mkdir "${S}/user-build"
qemu_src_configure "user" "${S}/user-build"
fi
}
src_compile() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
default
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
default
fi
}
src_test() {
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
pax-mark m */qemu-system-* #515550
emake -j1 check
emake -j1 check-report.html
fi
}
qemu_python_install() {
python_domodule "${S}/scripts/qmp/qmp.py"
python_doscript "${S}/scripts/kvm/kvm_stat"
python_doscript "${S}/scripts/kvm/vmxcap"
python_doscript "${S}/scripts/qmp/qmp-shell"
python_doscript "${S}/scripts/qmp/qemu-ga-client"
}
src_install() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
emake DESTDIR="${ED}" install
# Install binfmt handler init script for user targets
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
# This might not exist if the test failed. #512010
[[ -e check-report.html ]] && dohtml check-report.html
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
fi
if use python; then
python_foreach_impl qemu_python_install
fi
fi
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
pushd "${ED}"/usr/bin >/dev/null
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
popd >/dev/null
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
# Remove the docdir placed qmp-commands.txt
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
cd "${S}"
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
dodoc docs/qmp/*.txt
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
fi
# Remove vgabios since we're using the vgabios packaged one
if [[ -n ${softmmu_targets} ]]; then
rm "${ED}/usr/share/qemu/vgabios.bin"
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
# Remove sgabios since we're using the sgabios packaged one
rm "${ED}/usr/share/qemu/sgabios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
fi
# Remove iPXE since we're using the iPXE packaged one
rm "${ED}"/usr/share/qemu/pxe-*.rom
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
fi
fi
qemu_support_kvm && readme.gentoo_create_doc
}
pkg_postinst() {
if qemu_support_kvm; then
readme.gentoo_print_elog
ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
ewarn "save states has been removed starting with the 1.6.2 release"
ewarn
ewarn "It is recommended that you migrate any VMs that may be running"
ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
ewarn "any saved states with a newer qemu."
ewarn
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
if use x86 || use amd64; then
ewarn
ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
ewarn "installed. In order to use kvm acceleration, pass the flag"
ewarn "-enable-kvm when running your system target."
fi
fi
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
udev_reload
fi
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
if use virtfs && [ -n "${softmmu_targets}" ]; then
local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
fi
}
pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
echo " $(best_version sys-firmware/ipxe)"
echo " $(best_version sys-firmware/seabios)"
if has_version sys-firmware/seabios[binary]; then
echo " USE=binary"
else
echo " USE=''"
fi
echo " $(best_version sys-firmware/vgabios)"
}

@ -1,601 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.0.ebuild,v 1.6 2015/04/08 07:30:33 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
user udev fcaps readme.gentoo pax-utils
BACKPORTS=
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
inherit git-2
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
gtk infiniband iscsi +jpeg \
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
virtfs +vnc xattr xen xfs"
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
x86_64"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
use_targets="
$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
"
IUSE+=" ${use_targets}"
# Require at least one softmmu or user target.
# Block USE flag configurations known to not work.
REQUIRED_USE="|| ( ${use_targets} )
${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
qemu_softmmu_targets_ppc? ( fdt )
qemu_softmmu_targets_ppc64? ( fdt )
static? ( static-softmmu static-user )
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
#
# The attr lib isn't always linked in (although the USE flag is always
# respected). This is because qemu supports using the C library's API
# when available rather than always using the extranl library.
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-libs/zlib[static-libs(+)]
xattr? ( sys-apps/attr[static-libs(+)] )"
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
>=x11-libs/pixman-0.28.0[static-libs(+)]
aio? ( dev-libs/libaio[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
jpeg? ( virtual/jpeg[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] )
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
numa? ( sys-process/numactl[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
snappy? ( app-arch/snappy[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
X86_FIRMWARE_DEPEND="
>=sys-firmware/ipxe-1.0.0_p20130624
pin-upstream-blobs? (
~sys-firmware/seabios-1.7.5
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
!pin-upstream-blobs? (
sys-firmware/seabios
sys-firmware/sgabios
sys-firmware/vgabios
)"
CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
accessibility? ( app-accessibility/brltty )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
gtk? (
x11-libs/gtk+:3
x11-libs/vte:2.90
)
iscsi? ( net-libs/libiscsi )
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss !app-emulation/libcacard )
spice? ( >=app-emulation/spice-protocol-0.12.3 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
sys-apps/texinfo
virtual/pkgconfig
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
gtk? ( nls? ( sys-devel/gettext ) )
static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
static-user? ( ${USER_LIB_DEPEND} )
test? (
dev-libs/glib[utils]
sys-devel/bc
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-qemu )
"
STRIP_MASK="/usr/share/qemu/palcode-clipper"
QA_PREBUILT="
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper
usr/share/qemu/s390-ccw.img
usr/share/qemu/u-boot.e500
"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
usr/bin/qemu-cris
usr/bin/qemu-m68k
usr/bin/qemu-microblaze
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
usr/bin/qemu-or32
usr/bin/qemu-ppc
usr/bin/qemu-ppc64
usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
usr/bin/qemu-sparc32plus
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
you have the kernel module loaded before running kvm. The easiest way to
ensure that the kernel module is loaded is to load it on boot.\n
For AMD CPUs the module is called 'kvm-amd'\n
For Intel CPUs the module is called 'kvm-intel'\n
Please review /etc/conf.d/modules for how to load these\n\n
Make sure your user is in the 'kvm' group\n
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
qemu_support_kvm() {
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
use qemu_softmmu_targets_s390x; then
return 0
fi
return 1
}
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use the"
ERROR_TUN+=" virtual network device if using -net tap."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
ERROR_VHOST_NET+=" support"
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
fi
use python && CONFIG_CHECK+=" ~DEBUG_FS"
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
# Now do the actual checks setup above
check_extra_config
fi
fi
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
eerror "instances are still pointing to it. Please update your"
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
eerror "and the right system binary (e.g. qemu-system-x86_64)."
die "update your virt configs to not use qemu-kvm"
fi
}
pkg_setup() {
enewgroup kvm 78
}
src_prepare() {
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i -r \
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
# Cheap hack to disable gettext .mo generation.
use nls || rm -f po/*.po
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY
# Verbose builds
MAKEOPTS+=" V=1"
epatch_user
}
##
# configures qemu based on the build directory and the build type
# we are using.
#
qemu_src_configure() {
debug-print-function ${FUNCNAME} "$@"
local buildtype=$1
local builddir=$2
local static_flag="static-${buildtype}"
# audio options
local audio_opts="oss"
use alsa && audio_opts="alsa,${audio_opts}"
use sdl && audio_opts="sdl,${audio_opts}"
use pulseaudio && audio_opts="pa,${audio_opts}"
local conf_opts=(
--prefix=/usr
--sysconfdir=/etc
--libdir=/usr/$(get_libdir)
--docdir=/usr/share/doc/${PF}/html
--disable-bsd-user
--disable-guest-agent
--disable-strip
--disable-werror
--python="${PYTHON}"
--cc="$(tc-getCC)"
--cxx="$(tc-getCXX)"
--host-cc="$(tc-getBUILD_CC)"
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
--enable-docs
$(use_enable tci tcg-interpreter)
$(use_enable xattr attr)
)
# Disable options not used by user targets as the default configure
# options will autoprobe and try to link in a bunch of unused junk.
conf_softmmu() {
if [[ ${buildtype} == "user" ]] ; then
echo "--disable-${2:-$1}"
else
use_enable "$@"
fi
}
conf_opts+=(
$(conf_softmmu accessibility brlapi)
$(conf_softmmu aio linux-aio)
$(conf_softmmu bluetooth bluez)
$(conf_softmmu caps cap-ng)
$(conf_softmmu curl)
$(conf_softmmu fdt)
$(conf_softmmu glusterfs)
$(conf_softmmu gtk)
$(conf_softmmu infiniband rdma)
$(conf_softmmu iscsi libiscsi)
$(conf_softmmu jpeg vnc-jpeg)
$(conf_softmmu kernel_linux kvm)
$(conf_softmmu lzo)
$(conf_softmmu ncurses curses)
$(conf_softmmu nfs libnfs)
$(conf_softmmu numa)
$(conf_softmmu opengl glx)
$(conf_softmmu png vnc-png)
$(conf_softmmu rbd)
$(conf_softmmu sasl vnc-sasl)
$(conf_softmmu sdl)
$(conf_softmmu seccomp)
$(conf_softmmu smartcard smartcard-nss)
$(conf_softmmu snappy)
$(conf_softmmu spice)
$(conf_softmmu ssh libssh2)
$(conf_softmmu tls quorum)
$(conf_softmmu tls vnc-tls)
$(conf_softmmu tls vnc-ws)
$(conf_softmmu usb libusb)
$(conf_softmmu usbredir usb-redir)
$(conf_softmmu uuid)
$(conf_softmmu vde)
$(conf_softmmu vhost-net)
$(conf_softmmu virtfs)
$(conf_softmmu vnc)
$(conf_softmmu xen)
$(conf_softmmu xen xen-pci-passthrough)
$(conf_softmmu xfs xfsctl)
)
case ${buildtype} in
user)
conf_opts+=(
--enable-linux-user
--disable-system
--target-list="${user_targets}"
--disable-blobs
--disable-tools
)
;;
softmmu)
conf_opts+=(
--disable-linux-user
--enable-system
--target-list="${softmmu_targets}"
--with-system-pixman
--audio-drv-list="${audio_opts}"
)
use gtk && conf_opts+=( --with-gtkabi=3.0 )
;;
esac
# Add support for SystemTAP
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
if use ${static_flag}; then
conf_opts+=( --static --disable-pie )
else
gcc-specs-pie && conf_opts+=( --enable-pie )
fi
einfo "./configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
# FreeBSD's kernel does not support QEMU assigning/grabbing
# host USB devices yet
use kernel_FreeBSD && \
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
local target
python_export_best
softmmu_targets= softmmu_bins=()
user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
if use "qemu_softmmu_targets_${target}"; then
softmmu_targets+=",${target}-softmmu"
softmmu_bins+=( "qemu-system-${target}" )
fi
done
for target in ${IUSE_USER_TARGETS} ; do
if use "qemu_user_targets_${target}"; then
user_targets+=",${target}-linux-user"
user_bins+=( "qemu-${target}" )
fi
done
[[ -n ${softmmu_targets} ]] && \
einfo "Building the following softmmu targets: ${softmmu_targets}"
[[ -n ${user_targets} ]] && \
einfo "Building the following user targets: ${user_targets}"
if [[ -n ${softmmu_targets} ]]; then
mkdir "${S}/softmmu-build"
qemu_src_configure "softmmu" "${S}/softmmu-build"
fi
if [[ -n ${user_targets} ]]; then
mkdir "${S}/user-build"
qemu_src_configure "user" "${S}/user-build"
fi
}
src_compile() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
default
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
default
fi
}
src_test() {
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
pax-mark m */qemu-system-* #515550
emake -j1 check
emake -j1 check-report.html
fi
}
qemu_python_install() {
python_domodule "${S}/scripts/qmp/qmp.py"
python_doscript "${S}/scripts/kvm/kvm_stat"
python_doscript "${S}/scripts/kvm/vmxcap"
python_doscript "${S}/scripts/qmp/qmp-shell"
python_doscript "${S}/scripts/qmp/qemu-ga-client"
}
src_install() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
emake DESTDIR="${ED}" install
# Install binfmt handler init script for user targets
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
# This might not exist if the test failed. #512010
[[ -e check-report.html ]] && dohtml check-report.html
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
fi
if use python; then
python_foreach_impl qemu_python_install
fi
fi
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
pushd "${ED}"/usr/bin >/dev/null
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
popd >/dev/null
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
# Remove the docdir placed qmp-commands.txt
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
cd "${S}"
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
dodoc docs/qmp/*.txt
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
fi
# Remove vgabios since we're using the vgabios packaged one
if [[ -n ${softmmu_targets} ]]; then
rm "${ED}/usr/share/qemu/vgabios.bin"
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
# Remove sgabios since we're using the sgabios packaged one
rm "${ED}/usr/share/qemu/sgabios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
fi
# Remove iPXE since we're using the iPXE packaged one
rm "${ED}"/usr/share/qemu/pxe-*.rom
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
fi
fi
qemu_support_kvm && readme.gentoo_create_doc
}
pkg_postinst() {
if qemu_support_kvm; then
readme.gentoo_print_elog
ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
ewarn "save states has been removed starting with the 1.6.2 release"
ewarn
ewarn "It is recommended that you migrate any VMs that may be running"
ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
ewarn "any saved states with a newer qemu."
ewarn
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
if use x86 || use amd64; then
ewarn
ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
ewarn "installed. In order to use kvm acceleration, pass the flag"
ewarn "-enable-kvm when running your system target."
fi
fi
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
udev_reload
fi
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
if use virtfs && [ -n "${softmmu_targets}" ]; then
local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
fi
}
pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
echo " $(best_version sys-firmware/ipxe)"
echo " $(best_version sys-firmware/seabios)"
if has_version sys-firmware/seabios[binary]; then
echo " USE=binary"
else
echo " USE=''"
fi
echo " $(best_version sys-firmware/vgabios)"
}

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r1.ebuild,v 1.1 2015/04/12 00:29:22 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1-r2.ebuild,v 1.3 2015/05/14 07:09:58 ago Exp $
EAPI=5
@ -21,7 +21,7 @@ else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
KEYWORDS="amd64 ~ppc ~ppc64 x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
@ -260,6 +260,7 @@ src_prepare() {
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
epatch "${FILESDIR}"/${P}-CVE-2015-1779-1.patch #544328
epatch "${FILESDIR}"/${P}-CVE-2015-1779-2.patch #544328
epatch "${FILESDIR}"/${PN}-2.3.0-CVE-2015-3456.patch #549404
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch

@ -1,601 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.2.1.ebuild,v 1.2 2015/04/08 07:30:33 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="ncurses,readline"
inherit eutils flag-o-matic linux-info toolchain-funcs multilib python-r1 \
user udev fcaps readme.gentoo pax-utils
BACKPORTS=
if [[ ${PV} = *9999* ]]; then
EGIT_REPO_URI="git://git.qemu.org/qemu.git"
inherit git-2
SRC_URI=""
KEYWORDS=""
else
SRC_URI="http://wiki.qemu-project.org/download/${P}.tar.bz2
${BACKPORTS:+
http://dev.gentoo.org/~cardoe/distfiles/${P}-${BACKPORTS}.tar.xz}"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
fi
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
HOMEPAGE="http://www.qemu.org http://www.linux-kvm.org"
LICENSE="GPL-2 LGPL-2 BSD-2"
SLOT="0"
IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
gtk infiniband iscsi +jpeg \
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
virtfs +vnc xattr xen xfs"
COMMON_TARGETS="aarch64 alpha arm cris i386 m68k microblaze microblazeel mips
mips64 mips64el mipsel or32 ppc ppc64 s390x sh4 sh4eb sparc sparc64 unicore32
x86_64"
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} lm32 moxie ppcemb xtensa xtensaeb"
IUSE_USER_TARGETS="${COMMON_TARGETS} armeb mipsn32 mipsn32el ppc64abi32 sparc32plus"
use_targets="
$(printf ' qemu_softmmu_targets_%s' ${IUSE_SOFTMMU_TARGETS})
$(printf ' qemu_user_targets_%s' ${IUSE_USER_TARGETS})
"
IUSE+=" ${use_targets}"
# Require at least one softmmu or user target.
# Block USE flag configurations known to not work.
REQUIRED_USE="|| ( ${use_targets} )
${PYTHON_REQUIRED_USE}
qemu_softmmu_targets_arm? ( fdt )
qemu_softmmu_targets_microblaze? ( fdt )
qemu_softmmu_targets_ppc? ( fdt )
qemu_softmmu_targets_ppc64? ( fdt )
static? ( static-softmmu static-user )
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk )
virtfs? ( xattr )"
# Yep, you need both libcap and libcap-ng since virtfs only uses libcap.
#
# The attr lib isn't always linked in (although the USE flag is always
# respected). This is because qemu supports using the C library's API
# when available rather than always using the extranl library.
COMMON_LIB_DEPEND=">=dev-libs/glib-2.0[static-libs(+)]
sys-libs/zlib[static-libs(+)]
xattr? ( sys-apps/attr[static-libs(+)] )"
SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
>=x11-libs/pixman-0.28.0[static-libs(+)]
aio? ( dev-libs/libaio[static-libs(+)] )
caps? ( sys-libs/libcap-ng[static-libs(+)] )
curl? ( >=net-misc/curl-7.15.4[static-libs(+)] )
fdt? ( >=sys-apps/dtc-1.4.0[static-libs(+)] )
glusterfs? ( >=sys-cluster/glusterfs-3.4.0[static-libs(+)] )
infiniband? ( sys-infiniband/librdmacm[static-libs(+)] )
jpeg? ( virtual/jpeg[static-libs(+)] )
lzo? ( dev-libs/lzo:2[static-libs(+)] )
ncurses? ( sys-libs/ncurses[static-libs(+)] )
nfs? ( >=net-fs/libnfs-1.9.3[static-libs(+)] )
numa? ( sys-process/numactl[static-libs(+)] )
png? ( media-libs/libpng[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
snappy? ( app-arch/snappy[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
ssh? ( >=net-libs/libssh2-1.2.8[static-libs(+)] )
tls? ( net-libs/gnutls[static-libs(+)] )
usb? ( >=dev-libs/libusb-1.0.18[static-libs(+)] )
uuid? ( >=sys-apps/util-linux-2.16.0[static-libs(+)] )
vde? ( net-misc/vde[static-libs(+)] )
xfs? ( sys-fs/xfsprogs[static-libs(+)] )"
USER_LIB_DEPEND="${COMMON_LIB_DEPEND}"
X86_FIRMWARE_DEPEND="
>=sys-firmware/ipxe-1.0.0_p20130624
pin-upstream-blobs? (
~sys-firmware/seabios-1.7.5
~sys-firmware/sgabios-0.1_pre8
~sys-firmware/vgabios-0.7a
)
!pin-upstream-blobs? (
sys-firmware/seabios
sys-firmware/sgabios
sys-firmware/vgabios
)"
CDEPEND="!static-softmmu? ( ${SOFTMMU_LIB_DEPEND//\[static-libs(+)]} )
!static-user? ( ${USER_LIB_DEPEND//\[static-libs(+)]} )
qemu_softmmu_targets_i386? ( ${X86_FIRMWARE_DEPEND} )
qemu_softmmu_targets_x86_64? ( ${X86_FIRMWARE_DEPEND} )
accessibility? ( app-accessibility/brltty )
alsa? ( >=media-libs/alsa-lib-1.0.13 )
bluetooth? ( net-wireless/bluez )
gtk? (
x11-libs/gtk+:3
x11-libs/vte:2.90
)
iscsi? ( net-libs/libiscsi )
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
sdl? ( media-libs/libsdl[X] )
smartcard? ( dev-libs/nss !app-emulation/libcacard )
spice? ( >=app-emulation/spice-protocol-0.12.3 )
systemtap? ( dev-util/systemtap )
usbredir? ( >=sys-apps/usbredir-0.6 )
virtfs? ( sys-libs/libcap )
xen? ( app-emulation/xen-tools )"
DEPEND="${CDEPEND}
dev-lang/perl
=dev-lang/python-2*
sys-apps/texinfo
virtual/pkgconfig
kernel_linux? ( >=sys-kernel/linux-headers-2.6.35 )
gtk? ( nls? ( sys-devel/gettext ) )
static-softmmu? ( ${SOFTMMU_LIB_DEPEND} )
static-user? ( ${USER_LIB_DEPEND} )
test? (
dev-libs/glib[utils]
sys-devel/bc
)"
RDEPEND="${CDEPEND}
selinux? ( sec-policy/selinux-qemu )
"
STRIP_MASK="/usr/share/qemu/palcode-clipper"
QA_PREBUILT="
usr/share/qemu/openbios-ppc
usr/share/qemu/openbios-sparc64
usr/share/qemu/openbios-sparc32
usr/share/qemu/palcode-clipper
usr/share/qemu/s390-ccw.img
usr/share/qemu/u-boot.e500
"
QA_WX_LOAD="usr/bin/qemu-i386
usr/bin/qemu-x86_64
usr/bin/qemu-alpha
usr/bin/qemu-arm
usr/bin/qemu-cris
usr/bin/qemu-m68k
usr/bin/qemu-microblaze
usr/bin/qemu-microblazeel
usr/bin/qemu-mips
usr/bin/qemu-mipsel
usr/bin/qemu-or32
usr/bin/qemu-ppc
usr/bin/qemu-ppc64
usr/bin/qemu-ppc64abi32
usr/bin/qemu-sh4
usr/bin/qemu-sh4eb
usr/bin/qemu-sparc
usr/bin/qemu-sparc64
usr/bin/qemu-armeb
usr/bin/qemu-sparc32plus
usr/bin/qemu-s390x
usr/bin/qemu-unicore32"
DOC_CONTENTS="If you don't have kvm compiled into the kernel, make sure
you have the kernel module loaded before running kvm. The easiest way to
ensure that the kernel module is loaded is to load it on boot.\n
For AMD CPUs the module is called 'kvm-amd'\n
For Intel CPUs the module is called 'kvm-intel'\n
Please review /etc/conf.d/modules for how to load these\n\n
Make sure your user is in the 'kvm' group\n
Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
qemu_support_kvm() {
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386 \
use qemu_softmmu_targets_ppc || use qemu_softmmu_targets_ppc64 \
use qemu_softmmu_targets_s390x; then
return 0
fi
return 1
}
pkg_pretend() {
if use kernel_linux && kernel_is lt 2 6 25; then
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
elif use kernel_linux; then
if ! linux_config_exists; then
eerror "Unable to check your kernel for KVM support"
else
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
ERROR_KVM="You must enable KVM in your kernel to continue"
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
ERROR_KVM_AMD+=" your kernel configuration."
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
ERROR_TUN+=" into your kernel or loaded as a module to use the"
ERROR_TUN+=" virtual network device if using -net tap."
ERROR_BRIDGE="You will also need support for 802.1d"
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
use vhost-net && CONFIG_CHECK+=" ~VHOST_NET"
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
ERROR_VHOST_NET+=" support"
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
fi
use python && CONFIG_CHECK+=" ~DEBUG_FS"
ERROR_DEBUG_FS="debugFS support required for kvm_stat"
# Now do the actual checks setup above
check_extra_config
fi
fi
if grep -qs '/usr/bin/qemu-kvm' "${EROOT}"/etc/libvirt/qemu/*.xml; then
eerror "The kvm/qemu-kvm wrappers no longer exist, but your libvirt"
eerror "instances are still pointing to it. Please update your"
eerror "configs in /etc/libvirt/qemu/ to use the -enable-kvm flag"
eerror "and the right system binary (e.g. qemu-system-x86_64)."
die "update your virt configs to not use qemu-kvm"
fi
}
pkg_setup() {
enewgroup kvm 78
python_setup
}
src_prepare() {
# Alter target makefiles to accept CFLAGS set via flag-o
sed -i -r \
-e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
Makefile Makefile.target || die
# Cheap hack to disable gettext .mo generation.
use nls || rm -f po/*.po
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch
# Fix ld and objcopy being called directly
tc-export AR LD OBJCOPY
# Verbose builds
MAKEOPTS+=" V=1"
epatch_user
}
##
# configures qemu based on the build directory and the build type
# we are using.
#
qemu_src_configure() {
debug-print-function ${FUNCNAME} "$@"
local buildtype=$1
local builddir=$2
local static_flag="static-${buildtype}"
# audio options
local audio_opts="oss"
use alsa && audio_opts="alsa,${audio_opts}"
use sdl && audio_opts="sdl,${audio_opts}"
use pulseaudio && audio_opts="pa,${audio_opts}"
local conf_opts=(
--prefix=/usr
--sysconfdir=/etc
--libdir=/usr/$(get_libdir)
--docdir=/usr/share/doc/${PF}/html
--disable-bsd-user
--disable-guest-agent
--disable-strip
--disable-werror
--python="${PYTHON}"
--cc="$(tc-getCC)"
--cxx="$(tc-getCXX)"
--host-cc="$(tc-getBUILD_CC)"
$(use_enable debug debug-info)
$(use_enable debug debug-tcg)
--enable-docs
$(use_enable tci tcg-interpreter)
$(use_enable xattr attr)
)
# Disable options not used by user targets as the default configure
# options will autoprobe and try to link in a bunch of unused junk.
conf_softmmu() {
if [[ ${buildtype} == "user" ]] ; then
echo "--disable-${2:-$1}"
else
use_enable "$@"
fi
}
conf_opts+=(
$(conf_softmmu accessibility brlapi)
$(conf_softmmu aio linux-aio)
$(conf_softmmu bluetooth bluez)
$(conf_softmmu caps cap-ng)
$(conf_softmmu curl)
$(conf_softmmu fdt)
$(conf_softmmu glusterfs)
$(conf_softmmu gtk)
$(conf_softmmu infiniband rdma)
$(conf_softmmu iscsi libiscsi)
$(conf_softmmu jpeg vnc-jpeg)
$(conf_softmmu kernel_linux kvm)
$(conf_softmmu lzo)
$(conf_softmmu ncurses curses)
$(conf_softmmu nfs libnfs)
$(conf_softmmu numa)
$(conf_softmmu opengl glx)
$(conf_softmmu png vnc-png)
$(conf_softmmu rbd)
$(conf_softmmu sasl vnc-sasl)
$(conf_softmmu sdl)
$(conf_softmmu seccomp)
$(conf_softmmu smartcard smartcard-nss)
$(conf_softmmu snappy)
$(conf_softmmu spice)
$(conf_softmmu ssh libssh2)
$(conf_softmmu tls quorum)
$(conf_softmmu tls vnc-tls)
$(conf_softmmu tls vnc-ws)
$(conf_softmmu usb libusb)
$(conf_softmmu usbredir usb-redir)
$(conf_softmmu uuid)
$(conf_softmmu vde)
$(conf_softmmu vhost-net)
$(conf_softmmu virtfs)
$(conf_softmmu vnc)
$(conf_softmmu xen)
$(conf_softmmu xen xen-pci-passthrough)
$(conf_softmmu xfs xfsctl)
)
case ${buildtype} in
user)
conf_opts+=(
--enable-linux-user
--disable-system
--target-list="${user_targets}"
--disable-blobs
--disable-tools
)
;;
softmmu)
conf_opts+=(
--disable-linux-user
--enable-system
--target-list="${softmmu_targets}"
--with-system-pixman
--audio-drv-list="${audio_opts}"
)
use gtk && conf_opts+=( --with-gtkabi=3.0 )
;;
esac
# Add support for SystemTAP
use systemtap && conf_opts+=( --enable-trace-backend=dtrace )
# We always want to attempt to build with PIE support as it results
# in a more secure binary. But it doesn't work with static or if
# the current GCC doesn't have PIE support.
if use ${static_flag}; then
conf_opts+=( --static --disable-pie )
else
gcc-specs-pie && conf_opts+=( --enable-pie )
fi
einfo "./configure ${conf_opts[*]}"
cd "${builddir}"
../configure "${conf_opts[@]}" || die "configure failed"
# FreeBSD's kernel does not support QEMU assigning/grabbing
# host USB devices yet
use kernel_FreeBSD && \
sed -i -E -e "s|^(HOST_USB=)bsd|\1stub|" "${S}"/config-host.mak
}
src_configure() {
local target
python_export_best
softmmu_targets= softmmu_bins=()
user_targets= user_bins=()
for target in ${IUSE_SOFTMMU_TARGETS} ; do
if use "qemu_softmmu_targets_${target}"; then
softmmu_targets+=",${target}-softmmu"
softmmu_bins+=( "qemu-system-${target}" )
fi
done
for target in ${IUSE_USER_TARGETS} ; do
if use "qemu_user_targets_${target}"; then
user_targets+=",${target}-linux-user"
user_bins+=( "qemu-${target}" )
fi
done
[[ -n ${softmmu_targets} ]] && \
einfo "Building the following softmmu targets: ${softmmu_targets}"
[[ -n ${user_targets} ]] && \
einfo "Building the following user targets: ${user_targets}"
if [[ -n ${softmmu_targets} ]]; then
mkdir "${S}/softmmu-build"
qemu_src_configure "softmmu" "${S}/softmmu-build"
fi
if [[ -n ${user_targets} ]]; then
mkdir "${S}/user-build"
qemu_src_configure "user" "${S}/user-build"
fi
}
src_compile() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
default
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
default
fi
}
src_test() {
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
pax-mark m */qemu-system-* #515550
emake -j1 check
emake -j1 check-report.html
fi
}
qemu_python_install() {
python_domodule "${S}/scripts/qmp/qmp.py"
python_doscript "${S}/scripts/kvm/kvm_stat"
python_doscript "${S}/scripts/kvm/vmxcap"
python_doscript "${S}/scripts/qmp/qmp-shell"
python_doscript "${S}/scripts/qmp/qemu-ga-client"
}
src_install() {
if [[ -n ${user_targets} ]]; then
cd "${S}/user-build"
emake DESTDIR="${ED}" install
# Install binfmt handler init script for user targets
newinitd "${FILESDIR}/qemu-binfmt.initd-r1" qemu-binfmt
fi
if [[ -n ${softmmu_targets} ]]; then
cd "${S}/softmmu-build"
emake DESTDIR="${ED}" install
# This might not exist if the test failed. #512010
[[ -e check-report.html ]] && dohtml check-report.html
if use kernel_linux; then
udev_dorules "${FILESDIR}"/65-kvm.rules
fi
if use python; then
python_foreach_impl qemu_python_install
fi
fi
# Disable mprotect on the qemu binaries as they use JITs to be fast #459348
pushd "${ED}"/usr/bin >/dev/null
pax-mark m "${softmmu_bins[@]}" "${user_bins[@]}"
popd >/dev/null
# Install config file example for qemu-bridge-helper
insinto "/etc/qemu"
doins "${FILESDIR}/bridge.conf"
# Remove the docdir placed qmp-commands.txt
mv "${ED}/usr/share/doc/${PF}/html/qmp-commands.txt" "${S}/docs/qmp/"
cd "${S}"
dodoc Changelog MAINTAINERS docs/specs/pci-ids.txt
newdoc pc-bios/README README.pc-bios
dodoc docs/qmp/*.txt
# Remove SeaBIOS since we're using the SeaBIOS packaged one
rm "${ED}/usr/share/qemu/bios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
fi
# Remove vgabios since we're using the vgabios packaged one
if [[ -n ${softmmu_targets} ]]; then
rm "${ED}/usr/share/qemu/vgabios.bin"
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
fi
# Remove sgabios since we're using the sgabios packaged one
rm "${ED}/usr/share/qemu/sgabios.bin"
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../sgabios/sgabios.bin /usr/share/qemu/sgabios.bin
fi
# Remove iPXE since we're using the iPXE packaged one
rm "${ED}"/usr/share/qemu/pxe-*.rom
if use qemu_softmmu_targets_x86_64 || use qemu_softmmu_targets_i386; then
dosym ../ipxe/8086100e.rom /usr/share/qemu/pxe-e1000.rom
dosym ../ipxe/80861209.rom /usr/share/qemu/pxe-eepro100.rom
dosym ../ipxe/10500940.rom /usr/share/qemu/pxe-ne2k_pci.rom
dosym ../ipxe/10222000.rom /usr/share/qemu/pxe-pcnet.rom
dosym ../ipxe/10ec8139.rom /usr/share/qemu/pxe-rtl8139.rom
dosym ../ipxe/1af41000.rom /usr/share/qemu/pxe-virtio.rom
fi
fi
qemu_support_kvm && readme.gentoo_create_doc
}
pkg_postinst() {
if qemu_support_kvm; then
readme.gentoo_print_elog
ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
ewarn "save states has been removed starting with the 1.6.2 release"
ewarn
ewarn "It is recommended that you migrate any VMs that may be running"
ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
ewarn "any saved states with a newer qemu."
ewarn
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
if use x86 || use amd64; then
ewarn
ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
ewarn "installed. In order to use kvm acceleration, pass the flag"
ewarn "-enable-kvm when running your system target."
fi
fi
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
udev_reload
fi
fcaps cap_net_admin /usr/libexec/qemu-bridge-helper
if use virtfs && [ -n "${softmmu_targets}" ]; then
local virtfs_caps="cap_chown,cap_dac_override,cap_fowner,cap_fsetid,cap_setgid,cap_mknod,cap_setuid"
fcaps ${virtfs_caps} /usr/bin/virtfs-proxy-helper
fi
}
pkg_info() {
echo "Using:"
echo " $(best_version app-emulation/spice-protocol)"
echo " $(best_version sys-firmware/ipxe)"
echo " $(best_version sys-firmware/seabios)"
if has_version sys-firmware/seabios[binary]; then
echo " USE=binary"
else
echo " USE=''"
fi
echo " $(best_version sys-firmware/vgabios)"
}

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0.ebuild,v 1.1 2015/04/28 09:20:05 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-2.3.0-r1.ebuild,v 1.2 2015/05/13 23:11:02 vapier Exp $
EAPI=5
@ -257,6 +257,7 @@ src_prepare() {
use nls || rm -f po/*.po
epatch "${FILESDIR}"/qemu-1.7.0-cflags.patch
epatch "${FILESDIR}"/${P}-CVE-2015-3456.patch #549404
[[ -n ${BACKPORTS} ]] && \
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
epatch

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.97 2015/04/28 09:20:05 vapier Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu/qemu-9999.ebuild,v 1.99 2015/05/14 02:19:40 vapier Exp $
EAPI=5
@ -32,7 +32,7 @@ IUSE="accessibility +aio alsa bluetooth +caps +curl debug +fdt glusterfs \
gtk gtk2 infiniband iscsi +jpeg \
kernel_linux kernel_FreeBSD lzo ncurses nfs nls numa opengl +pin-upstream-blobs
+png pulseaudio python \
rbd sasl +seccomp sdl selinux smartcard snappy spice ssh static static-softmmu \
rbd sasl +seccomp sdl sdl2 selinux smartcard snappy spice ssh static static-softmmu
static-user systemtap tci test +threads tls usb usbredir +uuid vde +vhost-net \
virtfs +vnc xattr xen xfs"
@ -55,6 +55,7 @@ REQUIRED_USE="|| ( ${use_softmmu_targets} ${use_user_targets} )
qemu_softmmu_targets_microblaze? ( fdt )
qemu_softmmu_targets_ppc? ( fdt )
qemu_softmmu_targets_ppc64? ( fdt )
sdl2? ( sdl )
static? ( static-softmmu static-user )
static-softmmu? ( !alsa !pulseaudio !bluetooth !opengl !gtk !gtk2 )
virtfs? ( xattr )"
@ -83,7 +84,10 @@ SOFTMMU_LIB_DEPEND="${COMMON_LIB_DEPEND}
png? ( media-libs/libpng:0=[static-libs(+)] )
rbd? ( sys-cluster/ceph[static-libs(+)] )
sasl? ( dev-libs/cyrus-sasl[static-libs(+)] )
sdl? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
sdl? (
!sdl2? ( >=media-libs/libsdl-1.2.11[static-libs(+)] )
sdl2? ( media-libs/libsdl2[static-libs(+)] )
)
seccomp? ( >=sys-libs/libseccomp-2.1.0[static-libs(+)] )
snappy? ( app-arch/snappy[static-libs(+)] )
spice? ( >=app-emulation/spice-0.12.0[static-libs(+)] )
@ -123,7 +127,10 @@ CDEPEND="
opengl? ( virtual/opengl )
pulseaudio? ( media-sound/pulseaudio )
python? ( ${PYTHON_DEPS} )
sdl? ( media-libs/libsdl[X] )
sdl? (
!sdl2? ( media-libs/libsdl[X] )
sdl2? ( media-libs/libsdl2[X] )
)
smartcard? ( dev-libs/nss !app-emulation/libcacard )
spice? ( >=app-emulation/spice-protocol-0.12.3 )
systemtap? ( dev-util/systemtap )
@ -377,6 +384,7 @@ qemu_src_configure() {
--audio-drv-list="${audio_opts}"
)
use gtk && conf_opts+=( --with-gtkabi=$(usex gtk2 2.0 3.0) )
use sdl && conf_opts+=( --with-sdlabi=$(usex sdl2 2.0 1.2) )
;;
esac
@ -558,21 +566,6 @@ src_install() {
pkg_postinst() {
if qemu_support_kvm; then
readme.gentoo_print_elog
ewarn "Migration from qemu-kvm instances and loading qemu-kvm created"
ewarn "save states has been removed starting with the 1.6.2 release"
ewarn
ewarn "It is recommended that you migrate any VMs that may be running"
ewarn "on qemu-kvm to a host with a newer qemu and regenerate"
ewarn "any saved states with a newer qemu."
ewarn
ewarn "qemu-kvm was the primary qemu provider in Gentoo through 1.2.x"
if use x86 || use amd64; then
ewarn
ewarn "The /usr/bin/kvm and /usr/bin/qemu-kvm wrappers are no longer"
ewarn "installed. In order to use kvm acceleration, pass the flag"
ewarn "-enable-kvm when running your system target."
fi
fi
if [[ -n ${softmmu_targets} ]] && use kernel_linux; then
@ -591,7 +584,7 @@ pkg_info() {
echo " $(best_version app-emulation/spice-protocol)"
echo " $(best_version sys-firmware/ipxe)"
echo " $(best_version sys-firmware/seabios)"
if has_version sys-firmware/seabios[binary]; then
if has_version 'sys-firmware/seabios[binary]'; then
echo " USE=binary"
else
echo " USE=''"

@ -2,12 +2,13 @@ DIST ovmf-20131208.tar.bz2 32493270 SHA256 73363666b9e1b906905812347ec1d3bebec13
DIST seabios-1.6.3.2.tar.gz 422376 SHA256 888aafe37ef3d1f502a73518a5e4dd0e9373ce4cd41681c354771314f1e41dd7 SHA512 c54431d8e81d25b74427696da689e90d3ab68c7c1be1dec05c81658d28b650f53daa34dcee2da826c1cf5d5d39396b12b0b16ea20ed6fd89de8f732163c8cca5 WHIRLPOOL 826c0e034ca46291661faa363189ee6cf56098cabc39f8fc84d2c442cc2da2174c2fa027cc11e11a7c3fed619f2e524f2aee804d9836d256448cdad28631d69a
DIST seabios-1.7.3.1.tar.gz 463801 SHA256 e1f5845c3fa01a9280421d587dcd866273d5d6c0002b9fe70a6736e56ef5c36f SHA512 6b2c376f6c2644e1ecad687079fc8ec63eb064b82ec3ac2d24f4ec7b56432c7ed69d41539e7b212aa134368272198bdaf50fed23637a29fcf1e653db008b2009 WHIRLPOOL 8e37ef66722580b9db67c5b98282e23074847eadbdd2db5ed8b999d25c1ce7cbe9ab54fbbb15d2985f403e18e6b2fa2ea36d87ce46ec30b0e5bbbc0f69623007
DIST seabios-1.7.5.tar.gz 537566 SHA256 858d9eda4ad91efa1c45a5a401d560ef9ca8dd172f03b0a106f06661c252dc51 SHA512 ecf5fb9ac44dde6e4ac00baa6c920dde51b923f23dd74e62c5a02eceaf235e57b885975c5a8bd0927e268115c72bd1143a080fdfd4eff4e168ebeaa30436280e WHIRLPOOL 5e1e99b3bd82a8607c5986fde4592c7437bec4bd78abd5873710f6c431d075436725e8d0d32e9f0dd2921c9d84b8613108b21d31c5309a73e337ead7adf35e90
DIST xen-4.2.5-upstream-patches-6.tar.xz 19908 SHA256 29e0eb892f18fba8de51a7cfae9d7781e376f45adda7b57ab295b619832cbb95 SHA512 0f1a00b1a339e0d9fc0f0dbb440cc68b80bc8acc030898e7ad5de5b9c064ac0459b1a9228a4b7ef06fc46572fd921bd70121f407d8481ace9a5495607d94e7bd WHIRLPOOL 06e4eabbe9be3a2f94fa65e7658d3019155f802f7fff90c0b8250e5fd21435b08cde9ce4ddb9322f52a5c6e45a5f04dc2a2f7082402af736d34dbb37844f0f28
DIST xen-4.2.5-upstream-patches-7.tar.xz 22492 SHA256 d672bd1be49f9312eef7229d6ab199b21423df6d99ee99732d0386d8c5239dba SHA512 c7c917b8333073646680f66a5e5395a65f40d28bd1ceefaa327a391f4bf8b3569f763754db14beff1c0c975076f9393cb61869ff9d9bfa9d7942406d411b01d1 WHIRLPOOL 8ffd11a7fe4c6113a76fc06434a778da8375b741b9ffe4371c4ceb3ea50b07fe3e545752db5f4340f243432a6fd250590b08895975111d80f791e5daa76b590d
DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
DIST xen-4.4.2-upstream-patches-0.tar.xz 16468 SHA256 1a05c1555f9e868e0e9358cb94ed23afbde170c346977fe8f515dc090107fec9 SHA512 8ff91288d6852219061ca6961fd6e156b313af4e0ce8903eb08b1f4dc7312ac549843cccb5f8b6cba7172f55163de407a98925ed6254a52a29f7c275c180bec5 WHIRLPOOL 9b83edb137edcfd5b530a115afcf28e8b0a2a460291728646cb83ebca79c7280ffd4de45ac1523771b703dab0024dcc35044b40cb7249f13ef954d018b512216
DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94
DIST xen-4.5.0-upstream-patches-3.tar.xz 27560 SHA256 25bd1414f56b2279efc0ba6a915fd86cf5d3c2fdee26da5876a8a4e875aa0132 SHA512 73bfba732b344bc45bf484b586b004852207fed08d69263ba1354ad14a2941df131526c2669a93b8bc55f231ddfc13f1d30a3f4aefdbb7e609616ab555396f76 WHIRLPOOL 454f8d1b5e4b433bca7691323220867ab50467aca998ccdfeb4dc51a44e4315ac32d830560cdf29ea31f39fc3c41d03945aee2ec0bb4e8cb8c8912654ac34ff6
DIST xen-4.5.0-upstream-patches-4.tar.xz 48856 SHA256 91957fdc53a69e09deba5b307c9c9aa400793267eab2a7ad45d7fe8f69310f47 SHA512 15ae3df9cdaf76c8029a7c39fbc6a2614bf6ef5398518ee9624055a56b4b4293dcfc746f9fdbde11fdb57f5fa3a51d2d51ef30c14e0c5c37134ae9254a244c41 WHIRLPOOL 35a9a0919a466b4129d089ad6742ccf2ced91f249146c127c847a04cda413f8f7c94c89ad27f983d2d7c93a225185fd28054a422ac7879144ebbbe26b6e6103b
DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924
DIST xen-gentoo-patches-0.tar.xz 22240 SHA256 cfe809b2ca278a4ad6771a59ea5bf4848423e5eb5c72c2f3092163c772774e3c SHA512 05c3416859e24b6704e4cf3442fe20411e78a63689d20f97dfd228a15a7e5bb6cf0c4310278ef6cb15a37bc5e07933137ffa17ccb0a8b7096fc45f3a1c16ba90 WHIRLPOOL ea1c3a4679368bcc37f4638400e91f773126a43f6c180084cb8c8f737d9bdae476d67e310453ac3b10e3fe71a0e2c760906ad707234ee6933c0963d6f3c7f061
DIST xen-gentoo-patches-3.tar.xz 23364 SHA256 66e37bc63376ac9aa9c8c9b16d7a154d3fb8c9906f963bb32f3d7baec6c95c68 SHA512 20b6bcede882b454bd84d349b0b70bf7e7150afb25ff89718f2feb938b120bd051547b7c129e58656e5281b39263de29bc2ed0510070fcfc2297110f0a597b4d WHIRLPOOL 293b1db1061e5af0f4f6e5c4d102d2ea8203539ad17adec3545ef35184ffae7d5c3f7a99dc5c367b9ad84b39aa6fa9624598620bdeb308c08ccf03b56b379e90
DIST xen-gentoo-patches-1.tar.xz 23044 SHA256 dcff35bbc4b6946473c9b55ad595a5fea88e8dac1bd977cbe18a644b2cced2e0 SHA512 a4c66382d44112e7be09711e3ecf0f8ebd9a30b29e04d8aca536430172bdd111ab8bab7700433e0dc35165f876eb7e9cd2e554d74ce2a166fb2dfd4de482cb7a WHIRLPOOL d0443e1501ac813ac3226df32a6b050c03302c3d74e3b3bd1293ab4ad929b5c314cc0eac13505ce8a826ee357117e8eeaf0713fd8b9c55f40296966fda082c2e
DIST xen-gentoo-patches-4.tar.xz 23632 SHA256 5cdb0f93ee32d0a5fc4fc7282270ace73acfdc4df694f7b29c1135180d902049 SHA512 3006ce4cd67e80a9f79d9ba3814a64704b0d762159a439a140b1ec0a2699473cd5537950f0913b55f8f7e3d0fd2e9861f3199793120d8d2502aa3f8ef7816c8f WHIRLPOOL 4a921103df2825ccd8b0481708e7cd692fa45d5aadae286c1522c144a1576920e7d3567648565bb9af85bb6bb597ea9d0ec04ea6abd2115db4caf7e739717b1a
DIST xen-ovmf-patches-0.tar.xz 4356 SHA256 cd192a98114e534ce7454dc7ea45a42cea7ca83899d01fc8d695e2b110fdeaaf SHA512 03b844040ebad1a18d759418b0107d56feb9b8095291b7da1d36eb3409041764ad4bfd87679176b820221180e1038f6fad4314e8ad877096c052505de6339cf8 WHIRLPOOL e5c0aca3c786d905ad13f4d58a3b9b78260350df3dbe769ea6b66ac409e25ea0a368f9554c9da9b1a3f6f01ea1540038893b496fa5e637b18007076f8d305ee6
DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
DIST xen-security-patches-1.tar.xz 4228 SHA256 0a8bbc3eae72b908801b3445a4513d2fc976ec181c7f02d1a70f76026490dcfe SHA512 7a2271b4d0bd7dcdf2ebaf692157ed69c4c49b7251f7917100d5a22db780a9c7eb66e67dc52261d1d1438d290366f2a6d1cd72f56637cd5b130c22580f47b4d0 WHIRLPOOL 390c649e3ab9335518bbc492335e820f70c0d69bf75963485925b7671c936db5040a01e28f02dd67630ebd49735b2a228670f1db5817d83c578e7611e37c86f9

@ -75,6 +75,10 @@ _gx028=" xen-tools-4.4.1-tinfo.patch"
# Don't download ovmf, use pre-released
_gx029=" xen-tools-4-anti-ovmf-download.patch"
# fix build err while using gcc-4.5.x, c99
_gx033=" xen-tools-4.4.2-gcc99.patch"
_gx034=" xen-tools-4.5.0-gcc99.patch"
# xen-tools-4.2.5 patches set
_gpv_xen_tools_425_0="
${_gx001} ${_gx002} ${_gx003} ${_gx004} ${_gx005}
@ -100,6 +104,13 @@ ${_gx022} ${_gx017} ${_gx025}
${_gx026} ${_gx027} ${_gx019}
${_gx028} ${_gx029}
"
_gpv_xen_tools_442_1="
${_gx007} ${_gx008} ${_gx009}
${_gx024} ${_gx021} ${_gx014}
${_gx022} ${_gx017} ${_gx025}
${_gx026} ${_gx027} ${_gx019}
${_gx028} ${_gx029} ${_gx033}
"
# xen-tools-4.5.0 patches set
_gpv_xen_tools_450_0="
@ -108,3 +119,9 @@ ${_gx022} ${_gx017} ${_gx031}
${_gx027} ${_gx032}
${_gx028} ${_gx029}
"
_gpv_xen_tools_450_1="
${_gx008} ${_gx024} ${_gx021}
${_gx022} ${_gx017} ${_gx031}
${_gx027} ${_gx032}
${_gx028} ${_gx029} ${_gx034}
"

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5-r4.ebuild,v 1.4 2015/04/08 07:30:36 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.2.5-r5.ebuild,v 1.3 2015/05/14 08:54:45 ago Exp $
EAPI=5
@ -15,10 +15,10 @@ if [[ $PV == *9999 ]]; then
live_eclass="mercurial"
else
KEYWORDS="amd64 x86"
UPSTREAM_VER=6
SECURITY_VER=0
UPSTREAM_VER=7
SECURITY_VER=1
# xen-tools's gentoo patches tarball
GENTOO_VER=0
GENTOO_VER=1
# xen-tools's gentoo patches version which apply to this specific ebuild
GENTOO_GPV=0
SEABIOS_VER=1.6.3.2

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.2-r1.ebuild,v 1.2 2015/04/03 08:30:10 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.4.2-r2.ebuild,v 1.2 2015/05/14 08:54:10 ago Exp $
EAPI=5
@ -17,12 +17,12 @@ if [[ $PV == *9999 ]]; then
live_eclass="mercurial"
else
KEYWORDS="amd64 ~arm -x86"
UPSTREAM_VER=
SECURITY_VER=0
UPSTREAM_VER=0
SECURITY_VER=1
# xen-tools's gentoo patches tarball
GENTOO_VER=3
GENTOO_VER=4
# xen-tools's gentoo patches version which apply to this specific ebuild
GENTOO_GPV=0
GENTOO_GPV=1
# xen-tools ovmf's patches
OVMF_VER=0
@ -41,11 +41,11 @@ else
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
ovmf? ( http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
${OVMF_PATCHSET_URI} )
${UPSTREAM_PATCHSET_URI}
${SECURITY_PATCHSET_URI}
${GENTOO_PATCHSET_URI}
${OVMF_PATCHSET_URI}"
${GENTOO_PATCHSET_URI}"
S="${WORKDIR}/xen-${MY_PV}"
fi
@ -85,6 +85,7 @@ DEPEND="${COMMON_DEPEND}
api? ( dev-libs/libxml2
net-misc/curl )
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
arm? ( >=sys-apps/dtc-1.4.0 )
!arm? ( sys-devel/bin86
system-seabios? ( sys-firmware/seabios )
@ -175,6 +176,12 @@ src_prepare() {
epatch "${WORKDIR}/patches-security/${PV}"
fi
# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
pushd tools/firmware/ > /dev/null
ln -s seabios-dir-remote seabios-dir || die
popd > /dev/null
# Gentoo's patchset
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
einfo "Try to apply Gentoo specific patcheset"
@ -188,7 +195,7 @@ src_prepare() {
fi
# Ovmf's patchset
if [[ -n ${OVMF_VER} ]]; then
if [[ -n ${OVMF_VER} ]] && use ovmf; then
einfo "Try to apply Ovmf patcheset"
pushd "${WORKDIR}"/ovmf-*/ > /dev/null
EPATCH_SUFFIX="patch" \
@ -196,16 +203,11 @@ src_prepare() {
EPATCH_OPTS="-p1" \
epatch "${WORKDIR}"/patches-ovmf
popd > /dev/null
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
fi
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
pushd tools/firmware/ > /dev/null
ln -s seabios-dir-remote seabios-dir || die
popd > /dev/null
# Fix texi2html build error with new texi2html, qemu.doc.html
sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.5.0-r3.ebuild,v 1.1 2015/04/03 05:10:20 dlan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-tools/xen-tools-4.5.0-r4.ebuild,v 1.1 2015/05/14 05:11:49 dlan Exp $
EAPI=5
@ -17,12 +17,12 @@ if [[ $PV == *9999 ]]; then
live_eclass="mercurial"
else
KEYWORDS="~arm ~arm64 ~amd64 -x86"
UPSTREAM_VER=3
SECURITY_VER=0
UPSTREAM_VER=4
SECURITY_VER=1
# xen-tools's gentoo patches tarball
GENTOO_VER=3
GENTOO_VER=4
# xen-tools's gentoo patches version which apply to this specific ebuild
GENTOO_GPV=0
GENTOO_GPV=1
# xen-tools ovmf's patches
OVMF_VER=0
@ -41,11 +41,11 @@ else
SRC_URI="http://bits.xensource.com/oss-xen/release/${MY_PV}/xen-${MY_PV}.tar.gz
http://code.coreboot.org/p/seabios/downloads/get/seabios-${SEABIOS_VER}.tar.gz
http://dev.gentoo.org/~dlan/distfiles/seabios-${SEABIOS_VER}.tar.gz
http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
ovmf? ( http://dev.gentoo.org/~dlan/distfiles/ovmf-${OVMF_PV}.tar.bz2
${OVMF_PATCHSET_URI} )
${UPSTREAM_PATCHSET_URI}
${SECURITY_PATCHSET_URI}
${GENTOO_PATCHSET_URI}
${OVMF_PATCHSET_URI}"
${GENTOO_PATCHSET_URI}"
S="${WORKDIR}/xen-${MY_PV}"
fi
@ -85,6 +85,7 @@ DEPEND="${COMMON_DEPEND}
api? ( dev-libs/libxml2
net-misc/curl )
pygrub? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/ncurses} )
ovmf? ( ${PYTHON_DEPS//${PYTHON_REQ_USE}/sqlite} )
!amd64? ( >=sys-apps/dtc-1.4.0 )
amd64? ( sys-devel/bin86
system-seabios? ( sys-firmware/seabios )
@ -177,6 +178,12 @@ src_prepare() {
epatch "${WORKDIR}/patches-security/${PV}"
fi
# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
pushd tools/firmware/ > /dev/null
ln -s seabios-dir-remote seabios-dir || die
popd > /dev/null
# Gentoo's patchset
if [[ -n ${GENTOO_VER} && -n ${GENTOO_GPV} ]]; then
einfo "Try to apply Gentoo specific patcheset"
@ -190,7 +197,7 @@ src_prepare() {
fi
# Ovmf's patchset
if [[ -n ${OVMF_VER} ]]; then
if [[ -n ${OVMF_VER} ]] && use ovmf; then
einfo "Try to apply Ovmf patcheset"
pushd "${WORKDIR}"/ovmf-*/ > /dev/null
EPATCH_SUFFIX="patch" \
@ -198,16 +205,11 @@ src_prepare() {
EPATCH_OPTS="-p1" \
epatch "${WORKDIR}"/patches-ovmf
popd > /dev/null
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
fi
mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
mv ../ovmf-${OVMF_PV} tools/firmware/ovmf-dir-remote || die
pushd tools/firmware/ > /dev/null
ln -s seabios-dir-remote seabios-dir || die
popd > /dev/null
# Fix texi2html build error with new texi2html, qemu.doc.html
sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die

@ -1,6 +1,7 @@
DIST xen-4.2.5-upstream-patches-6.tar.xz 19908 SHA256 29e0eb892f18fba8de51a7cfae9d7781e376f45adda7b57ab295b619832cbb95 SHA512 0f1a00b1a339e0d9fc0f0dbb440cc68b80bc8acc030898e7ad5de5b9c064ac0459b1a9228a4b7ef06fc46572fd921bd70121f407d8481ace9a5495607d94e7bd WHIRLPOOL 06e4eabbe9be3a2f94fa65e7658d3019155f802f7fff90c0b8250e5fd21435b08cde9ce4ddb9322f52a5c6e45a5f04dc2a2f7082402af736d34dbb37844f0f28
DIST xen-4.2.5-upstream-patches-7.tar.xz 22492 SHA256 d672bd1be49f9312eef7229d6ab199b21423df6d99ee99732d0386d8c5239dba SHA512 c7c917b8333073646680f66a5e5395a65f40d28bd1ceefaa327a391f4bf8b3569f763754db14beff1c0c975076f9393cb61869ff9d9bfa9d7942406d411b01d1 WHIRLPOOL 8ffd11a7fe4c6113a76fc06434a778da8375b741b9ffe4371c4ceb3ea50b07fe3e545752db5f4340f243432a6fd250590b08895975111d80f791e5daa76b590d
DIST xen-4.2.5.tar.gz 15671925 SHA256 3cf440866315e8085050eb0586f0447b6b47a08dbed6a72226bf5ed5d89ec567 SHA512 42c0fc241952fc55fc44480fb6752b004b54ae40e946159ec047adf229b65cbfbd810271d01b064ad8fdbddb73c640dcdcb6bc19f91e8968829889c129920dac WHIRLPOOL 762a91c0111892b33e6bd3e7f7714709b04697ad7c2b0919fef6cc9570a343a77fd5a2b82833e75dac9d12d4e41acdcf0743b0d593595910ddd326f5cd721368
DIST xen-4.4.2-upstream-patches-0.tar.xz 16468 SHA256 1a05c1555f9e868e0e9358cb94ed23afbde170c346977fe8f515dc090107fec9 SHA512 8ff91288d6852219061ca6961fd6e156b313af4e0ce8903eb08b1f4dc7312ac549843cccb5f8b6cba7172f55163de407a98925ed6254a52a29f7c275c180bec5 WHIRLPOOL 9b83edb137edcfd5b530a115afcf28e8b0a2a460291728646cb83ebca79c7280ffd4de45ac1523771b703dab0024dcc35044b40cb7249f13ef954d018b512216
DIST xen-4.4.2.tar.gz 18137195 SHA256 cd53592e86669e5e8c4d4a731b0199e8af17d8eadbb8f26dbb69f1b751259204 SHA512 7dae2a1d601d5c65c350ea9fe9870551ec53dff47b6ebe56e99285fd1112aa1cba3a2594e294b871defcf43fb7fccace9f18910e69f02dfce162d7bf453eb07b WHIRLPOOL 2dfe3de5fd800d2172ad2c95117e0646c6b2045cfcb9fa5eccc46b695f1c58aa861bf2a591f78db5baf5a89894b3fa26dc1ba63cb0d57f87be4df5c445c82a94
DIST xen-4.5.0-upstream-patches-3.tar.xz 27560 SHA256 25bd1414f56b2279efc0ba6a915fd86cf5d3c2fdee26da5876a8a4e875aa0132 SHA512 73bfba732b344bc45bf484b586b004852207fed08d69263ba1354ad14a2941df131526c2669a93b8bc55f231ddfc13f1d30a3f4aefdbb7e609616ab555396f76 WHIRLPOOL 454f8d1b5e4b433bca7691323220867ab50467aca998ccdfeb4dc51a44e4315ac32d830560cdf29ea31f39fc3c41d03945aee2ec0bb4e8cb8c8912654ac34ff6
DIST xen-4.5.0-upstream-patches-4.tar.xz 48856 SHA256 91957fdc53a69e09deba5b307c9c9aa400793267eab2a7ad45d7fe8f69310f47 SHA512 15ae3df9cdaf76c8029a7c39fbc6a2614bf6ef5398518ee9624055a56b4b4293dcfc746f9fdbde11fdb57f5fa3a51d2d51ef30c14e0c5c37134ae9254a244c41 WHIRLPOOL 35a9a0919a466b4129d089ad6742ccf2ced91f249146c127c847a04cda413f8f7c94c89ad27f983d2d7c93a225185fd28054a422ac7879144ebbbe26b6e6103b
DIST xen-4.5.0.tar.gz 18404933 SHA256 5bdb40e2b28d2eeb541bd71a9777f40cbe2ae444b987521d33f099541a006f3b SHA512 31621fbaf621ad350125d03366ecff4dec5d810b0c1242ca0e28788f7556ac1443d7ee9247e1f76dec07e148e0b4ae16d08a7c10101bb78d6529375f3e40998e WHIRLPOOL 4a77588a4aa4846cfbf9493ab20bd2f293c55a941a5639fdd166a43f284cc0cc7218969def755a1acd89e640181bdd862fff0b566cfb8e628d73deeb6369c924
DIST xen-security-patches-0.tar.xz 5944 SHA256 c0456793064185f0781668264a09a2412a25e2ff8c4ce0d332204e37b94d7e96 SHA512 de812e66563e608548b220aa00c8fd71973af748a00cea79959f46a5b6893a38248d2ea455026af43f47e3f5e566d08b5a6f3d18f22e940d75d2a2ca76cec3d3 WHIRLPOOL 3e18d32798bdfe584ee8d102963090b569ec3660fd5723d8c608091e5c7d935c1edced5e258d92bf51fe06975455a3ae33dfedd01702c6076aedf97ea61f2d1b
DIST xen-security-patches-1.tar.xz 4228 SHA256 0a8bbc3eae72b908801b3445a4513d2fc976ec181c7f02d1a70f76026490dcfe SHA512 7a2271b4d0bd7dcdf2ebaf692157ed69c4c49b7251f7917100d5a22db780a9c7eb66e67dc52261d1d1438d290366f2a6d1cd72f56637cd5b130c22580f47b4d0 WHIRLPOOL 390c649e3ab9335518bbc492335e820f70c0d69bf75963485925b7671c936db5040a01e28f02dd67630ebd49735b2a228670f1db5817d83c578e7611e37c86f9

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r8.ebuild,v 1.4 2015/04/08 07:30:32 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.5-r9.ebuild,v 1.3 2015/05/14 08:54:41 ago Exp $
EAPI=5
@ -14,8 +14,8 @@ if [[ $PV == *9999 ]]; then
live_eclass="mercurial"
else
KEYWORDS="amd64 x86"
UPSTREAM_VER=6
SECURITY_VER=0
UPSTREAM_VER=7
SECURITY_VER=1
GENTOO_VER=
[[ -n ${UPSTREAM_VER} ]] && \

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2-r1.ebuild,v 1.2 2015/04/03 08:30:05 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.4.2-r2.ebuild,v 1.2 2015/05/14 08:54:05 ago Exp $
EAPI=5
@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
live_eclass="git-2"
else
KEYWORDS="amd64 ~arm -x86"
UPSTREAM_VER=
SECURITY_VER=0
UPSTREAM_VER=0
SECURITY_VER=1
GENTOO_VER=
[[ -n ${UPSTREAM_VER} ]] && \

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r5.ebuild,v 1.1 2015/04/03 05:01:16 dlan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.5.0-r6.ebuild,v 1.1 2015/05/14 05:16:20 dlan Exp $
EAPI=5
@ -15,8 +15,8 @@ if [[ $PV == *9999 ]]; then
live_eclass="git-2"
else
KEYWORDS="~arm ~arm64 ~amd64"
UPSTREAM_VER=3
SECURITY_VER=0
UPSTREAM_VER=4
SECURITY_VER=1
GENTOO_VER=
[[ -n ${UPSTREAM_VER} ]] && \

@ -1,40 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/gnomecatalog/gnomecatalog-0.3.4.2.ebuild,v 1.5 2014/08/10 18:04:58 slyfox Exp $
EAPI="3"
PYTHON_DEPEND="2:2.6"
PYTHON_USE_WITH="sqlite,xml"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="2.[45] 3.* *-jython"
inherit distutils eutils
DESCRIPTION="Cataloging software for CDs and DVDs"
HOMEPAGE="http://gnomecatalog.sf.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND="dev-python/gconf-python:2
dev-python/gnome-vfs-python:2
dev-python/kaa-metadata
dev-python/libgnome-python:2
dev-python/pygobject:2
>=dev-python/pygtk-2.4:2
dev-python/pyvorbis
>=gnome-base/libglade-2:2.0
>=x11-libs/gtk+-2.4:2"
DEPEND="${RDEPEND}"
src_prepare() {
# Fix importing from a single folder in /media
epatch "${FILESDIR}/${P}-dbus.patch"
# Use sqlite3 instead of pysqlite2, bug #452126.
sed -i -e 's:from pysqlite2 import dbapi2:import sqlite3:' \
gnomecatalog/storage.py || die
}

@ -1,28 +0,0 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-subfile/hachoir-subfile-0.5.3.ebuild,v 1.5 2010/12/26 14:33:44 arfrever Exp $
EAPI="3"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
inherit distutils
DESCRIPTION="Find subfile in any binary stream"
HOMEPAGE="http://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile http://pypi.python.org/pypi/hachoir-subfile"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE=""
RDEPEND=">=dev-python/hachoir-core-1.1
>=dev-python/hachoir-parser-1.1
>=dev-python/hachoir-regex-1.0.1"
DEPEND="${RDEPEND}
dev-python/setuptools"
RESTRICT_PYTHON_ABIS="3.*"
DISTUTILS_GLOBAL_OPTIONS=("--setuptools")
PYTHON_MODNAME="${PN/-/_}"

@ -1,29 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/hachoir-urwid/hachoir-urwid-1.1.ebuild,v 1.3 2012/02/26 08:32:38 patrick Exp $
EAPI="3"
PYTHON_DEPEND="2"
PYTHON_USE_WITH="ncurses"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
inherit distutils
DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
HOMEPAGE="http://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid http://pypi.python.org/pypi/hachoir-urwid"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
RDEPEND=">=dev-python/hachoir-core-1.2
>=dev-python/hachoir-parser-1.0
>=dev-python/urwid-0.9.4"
DEPEND="${RDEPEND}
dev-python/setuptools"
DISTUTILS_GLOBAL_OPTIONS=("--setuptools")
PYTHON_MODNAME="${PN/-/_}"

@ -1,3 +1,2 @@
DIST klavaro-1.9.7.tar.bz2 802138 SHA256 4ebe693639ae59e560e0bbc54077c804eae7c495f8a8436fb559cdbdf4e5c1c8 SHA512 1f27d2e1003e03644bc1ac765a56b9416314ce5a7088f8ece7e5abd450a3ac7c084caf7cdbdac4088edc5dedaf94540fc655781126050c1b14fe2939a78d503f WHIRLPOOL 9ef8d76ba8f4344313d3643a480f743c266dcff03e095b162143ce94aa212adb985cba8fa0330958a862adc22b4d9414b13df02f7652f90e56d8b480a54e3295
DIST klavaro-3.00.tar.bz2 1066189 SHA256 281a5360019b074f3eccff04cb6d63ac0612d7db459f519e9708b49e0364ef05 SHA512 7daa0169fb5f8e56914f626845706669d84a1574dedee43029d5abb408fdc98fbacd0be1d78dfb991ce0f71ccc3e401a89f07560fd68f065e543702b332de964 WHIRLPOOL a17059781fcb14fb21e6c65a5c045cdab3b502928983ed3090066320f412c5044cad76ec5a435f55fd1d0da7d3e7a9d9a7757d059b54c73f21a1462bcdd9df3a
DIST klavaro-3.01.tar.bz2 1140146 SHA256 ed71d522c29113d5d6517a65cbf95dafbe85ca4bb978139b804b98f128015e85 SHA512 5d58269867d2b39309e07ca9dd6c525d67acaca93dea0010332e39e8f3dd444070dbc75abad00ac4ca3fd4155f41cf871cb8ccee3dc332aa31f85c8b17d7c48b WHIRLPOOL 7c45bf861cdca5ee40bf525377ab679bc8d02b6fc3c6559ccd376896c53246bca32a569721e77f4003c19488cbcc88c6ec48a17ee54b1fb0a959c3c76b69d977

@ -1,16 +0,0 @@
src/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index b73ccc2..990f835 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -29,7 +29,7 @@ AM_LDFLAGS = -static
klavaro_LDADD = @GTK_LIBS@ \
-lgmodule-2.0 \
- $(top_srcdir)/gtkdatabox/libgtkdatabox.la
+ $(top_builddir)/gtkdatabox/libgtkdatabox.la
if IS_POSIX
AM_CFLAGS += -export-dynamic

@ -1,15 +0,0 @@
gtkdatabox/Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gtkdatabox/Makefile.am b/gtkdatabox/Makefile.am
index 503f753..d972de9 100644
--- a/gtkdatabox/Makefile.am
+++ b/gtkdatabox/Makefile.am
@@ -1,6 +1,6 @@
# $Id: Makefile.am 4 2008-06-22 09:19:11Z rbock $
-lib_LTLIBRARIES = libgtkdatabox.la
+noinst_LTLIBRARIES = libgtkdatabox.la
libgtkdatabox_la_SOURCES= \
gtkdatabox.c\
gtkdatabox_marshal.c\

@ -1,42 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-misc/klavaro/klavaro-3.0.0.ebuild,v 1.2 2014/01/29 15:02:17 kensington Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=yes
inherit autotools-utils versionator
MY_P="${PN}-$(delete_version_separator 2)"
DESCRIPTION="Another free touch typing tutor program"
HOMEPAGE="http://klavaro.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/${PN}/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="+static-libs"
RDEPEND="
net-misc/curl
x11-libs/cairo
x11-libs/gtk+:3
x11-libs/pango
"
# gtk+3 version needed
# x11-libs/gtkdatabox
DEPEND="${RDEPEND}
dev-util/intltool
>=sys-devel/gettext-0.18.3
dev-util/gtk-builder-convert
"
PATCHES=(
"${FILESDIR}"/${P}-out-of-source.patch
"${FILESDIR}"/${P}-static.patch
)
S="${WORKDIR}"/${MY_P}

@ -1,3 +1,2 @@
DIST ganyremote-6.0.1.tar.gz 280585 SHA256 14dda596fab59be899a3bcf815ba0c5938efdf83ba5f1d0d91b2f8bfc5ddb80c SHA512 04719a4c0e15bfe2aa670bd6b83ae300aee0a825733d0fb9f37ee98286520a7354f927fb4be4774acdd2a7251893e62d4ff3328f655567b87961a3f83542e7c0 WHIRLPOOL a8f23815d783a42b79f3a378c8bdeac10c368971a13365b7dc427e539fe558eb7b880f598484456ebd3a854cf715f7059c81b86bedcdfdb474cad86ec4408c7d
DIST ganyremote-6.2.tar.gz 282501 SHA256 cac48b5323cf5a20ece358846075e7c3dcfb1e5b318701db6b90e34e54bbd91d SHA512 5e02742f54f0d2e34b49c300effaac2afbab9be13ffb1ab17cb0a6d7a2ac33098ad5f41301fa660b84c22320422e5e50dd7afe93e93f54156c87c0f9381cbdce WHIRLPOOL 3ca32feeac20171fd792a5ce59e8b1e7e7a2618b9aa4ebfecedf876a6ce628f11e6627c64234e268c35652d017f764977fbcc8d03967c23bbf501171673a798c
DIST ganyremote-6.3.3.tar.gz 303612 SHA256 5033a261506b4c37ed5deed22428837d1c4b1e5cb0027234b2ec97f6e6d9b40d SHA512 cfb0d5896c3c4ee575f2d77d17b8f8e13624202100994415147f1ddb2b6c04c179ec4a4b31369830705ae1d0068e50fe0c3a5fd4acc2de6e02ec0a530a0a6182 WHIRLPOOL 0e8b8c3c6d9ffd8a77903fbf2a7e220d696eab4e609be5f684f7c2a9dab5a80f32d539d70203fd70d6a2a29e0f9ca9352d91442822830c9ccc4d230d79e56cae

@ -1,24 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-mobilephone/ganyremote/ganyremote-6.2.ebuild,v 1.1 2013/07/25 00:57:50 creffett Exp $
EAPI="5"
inherit base eutils
DESCRIPTION="Gnome frontend to Anyremote"
HOMEPAGE="http://anyremote.sourceforge.net/"
SRC_URI="mirror://sourceforge/anyremote/${P}.tar.gz"
LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="bluetooth"
DEPEND=">=app-mobilephone/anyremote-6.0[bluetooth=]
dev-python/pygtk
bluetooth? ( dev-python/pybluez )
"
RDEPEND="${DEPEND}"
DOCS=( AUTHORS ChangeLog NEWS README )

@ -1,2 +1 @@
DIST mdbtools-0.7.1.tar.gz 277257 SHA256 dcf310dc7b07e7ad2f9f6be16047dc81312cfe1ab1bd94d0fa739c8059af0b16 SHA512 bbad415c59a3f54c11bcd04971220b1370046c5dfd7300d1f23e597615a1df6af850c6f767e78033676d486d87a11c72dfdb141abbee8378337c3fda9a450b75 WHIRLPOOL 0e25f7d5a2108575bc3fdf2930ceedc21844412fb7947c504f2538b185f8f623712c31ca9102660446731dc19fb431217aa70c7ee658f07d951966921fc2fc7a
DIST mdbtools-cvs-20050624.tar.gz 306961 SHA256 471034a00f9441e34b3a236ce07bdb766fea0bd140fc69a3d8a9c7225bf573b3 SHA512 6b0dabbd2442a50b91ed058ae65c02b85c8622e3773e08f7f9249a6a5fe0b43a22d7343ef19c79b77277c215652091e19e46d1a3f7896a5a9b556a5d3f544d74 WHIRLPOOL 91268a6258198e1bfc8b83cb5681cd0f29582dbd711fc3ba6e7d950e38b933c8d9b91c0b6e53fdccdecfc75b6ffc22d7762e95a413ee1e6b04018dc4b0c322f4

@ -1,11 +0,0 @@
--- src/odbc/Makefile.am.orig 2006-07-26 14:05:55.000000000 +0200
+++ src/odbc/Makefile.am 2006-07-26 14:06:02.000000000 +0200
@@ -15,7 +15,7 @@
$(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %, $(MDBDIR)/%, \
$(patsubst %.c, %.lo, $(MDBSOURCES)))
-LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
+LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
## Need blank statement to avoid compiling odbc.c

@ -1,35 +0,0 @@
diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c mdbtools-0.6pre1/src/gmdb2/sql.c
--- mdbtools-0.6pre1-orig/src/gmdb2/sql.c 2004-02-13 13:49:52.000000000 -0500
+++ mdbtools-0.6pre1/src/gmdb2/sql.c 2005-10-18 08:00:19.088362686 -0400
@@ -38,6 +38,8 @@
void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
+void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
+void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
void
gmdb_sql_close_all()
diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/table_export.c mdbtools-0.6pre1/src/gmdb2/table_export.c
--- mdbtools-0.6pre1-orig/src/gmdb2/table_export.c 2003-01-14 12:37:44.000000000 -0500
+++ mdbtools-0.6pre1/src/gmdb2/table_export.c 2005-10-18 08:00:19.089362678 -0400
@@ -37,6 +37,8 @@
#define NEVER "Never"
#define AUTOMAT "Automatic (where necessary)"
+void gmdb_table_export_populate_dialog(GladeXML *xml);
+
void
gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, char *str)
{
diff -Naur mdbtools-0.6pre1-orig/src/odbc/odbc.c mdbtools-0.6pre1/src/odbc/odbc.c
--- mdbtools-0.6pre1-orig/src/odbc/odbc.c 2004-05-30 04:06:43.000000000 -0400
+++ mdbtools-0.6pre1/src/odbc/odbc.c 2005-10-18 08:00:19.090362669 -0400
@@ -46,6 +46,7 @@
static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
+static void bind_columns(struct _hstmt *stmt);
static void bind_columns (struct _hstmt*);

@ -1,13 +0,0 @@
diff -ur mdbtools-0.6pre1-orig/include/mdbtools.h mdbtools-0.6pre1/include/mdbtools.h
--- mdbtools-0.6pre1-orig/include/mdbtools.h 2006-05-28 18:01:32.000000000 -0400
+++ mdbtools-0.6pre1/include/mdbtools.h 2006-05-28 18:04:33.000000000 -0400
@@ -147,7 +147,7 @@
#define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
/* hash to store registered backends */
-extern GHashTable *mdb_backends;
+static GHashTable *mdb_backends;
/* forward declarations */
typedef struct mdbindex MdbIndex;

@ -1,10 +0,0 @@
--- src/extras/mdbsupport.c.orig 2007-05-13 11:55:43.000000000 +0200
+++ src/extras/mdbsupport.c 2007-05-13 11:55:57.000000000 +0200
@@ -1,6 +1,7 @@
/* support routines for code generated by the util programs */
#include <stdio.h>
+#include <string.h>
void dump_int (int i)
{

@ -1,11 +0,0 @@
--- src/odbc/Makefile.am.orig 2006-07-26 14:05:55.000000000 +0200
+++ src/odbc/Makefile.am 2006-07-26 14:06:02.000000000 +0200
@@ -15,7 +15,7 @@
$(patsubst %.c, %.lo, $(SQLSOURCES))) \
$(patsubst %, $(MDBDIR)/%, \
$(patsubst %.c, %.lo, $(MDBSOURCES)))
-LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
+LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) -lm
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
## Need blank statement to avoid compiling odbc.c

@ -1,35 +0,0 @@
diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/sql.c mdbtools-0.6pre1/src/gmdb2/sql.c
--- src/gmdb2/sql.c 2004-02-13 13:49:52.000000000 -0500
+++ src/gmdb2/sql.c 2005-10-18 08:00:19.088362686 -0400
@@ -38,6 +38,8 @@
static void gmdb_sql_tree_populate(MdbHandle *mdb, GladeXML *xml);
static void gmdb_sql_load_query(GladeXML *xml, gchar *file_path);
+void gmdb_sql_save_as_cb(GtkWidget *w, GladeXML *xml);
+void gmdb_sql_save_query(GladeXML *xml, gchar *file_path);
void
gmdb_sql_close_all()
diff -Naur mdbtools-0.6pre1-orig/src/gmdb2/table_export.c mdbtools-0.6pre1/src/gmdb2/table_export.c
--- src/gmdb2/table_export.c 2003-01-14 12:37:44.000000000 -0500
+++ src/gmdb2/table_export.c 2005-10-18 08:00:19.089362678 -0400
@@ -37,6 +37,8 @@
#define NEVER "Never"
#define AUTOMAT "Automatic (where necessary)"
+void gmdb_table_export_populate_dialog(GladeXML *xml);
+
void
gmdb_print_quote(FILE *outfile, int need_quote, char quotechar, char *colsep, char *str)
{
diff -Naur mdbtools-0.6pre1-orig/src/odbc/odbc.c mdbtools-0.6pre1/src/odbc/odbc.c
--- src/odbc/odbc.c 2004-05-30 04:06:43.000000000 -0400
+++ src/odbc/odbc.c 2005-10-18 08:00:19.090362669 -0400
@@ -46,6 +46,7 @@
static SQLRETURN SQL_API _SQLFreeConnect(SQLHDBC hdbc);
static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
+static void bind_columns(struct _hstmt *stmt);
static void bind_columns (struct _hstmt*);

@ -1,22 +0,0 @@
diff -u -r mdbtools/src/libmdb/file.c mdbtools.fix/src/libmdb/file.c
--- mdbtools/src/libmdb/file.c 2005-06-28 13:53:40.000000000 +0900
+++ mdbtools.fix/src/libmdb/file.c 2009-09-09 04:02:47.000000000 +0900
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include "config.h"
#include "mdbtools.h"
#ifdef DMALLOC
diff -u -r mdbtools/src/libmdb/iconv.c mdbtools.fix/src/libmdb/iconv.c
--- mdbtools/src/libmdb/iconv.c 2005-09-08 08:27:43.000000000 +0900
+++ mdbtools.fix/src/libmdb/iconv.c 2009-09-09 04:00:36.000000000 +0900
@@ -17,6 +17,7 @@
* Boston, MA 02111-1307, USA.
*/
+#include "config.h"
#include "mdbtools.h"
#include "errno.h"

@ -1,146 +0,0 @@
--- mdbtools-cvs-20050624/src/odbc/odbc.c.orig 2010-05-24 10:20:59.000000000 -0400
+++ mdbtools-cvs-20050624/src/odbc/odbc.c 2010-05-25 17:28:05.000000000 -0400
@@ -210,7 +210,7 @@
SQLHSTMT hstmt,
SQLUSMALLINT ipar,
SQLSMALLINT FAR *pfSqlType,
- SQLUINTEGER FAR *pcbParamDef,
+ SQLULEN FAR *pcbParamDef,
SQLSMALLINT FAR *pibScale,
SQLSMALLINT FAR *pfNullable)
{
@@ -221,8 +221,8 @@
SQLRETURN SQL_API SQLExtendedFetch(
SQLHSTMT hstmt,
SQLUSMALLINT fFetchType,
- SQLINTEGER irow,
- SQLUINTEGER FAR *pcrow,
+ SQLLEN irow,
+ SQLULEN FAR *pcrow,
SQLUSMALLINT FAR *rgfRowStatus)
{
struct _hstmt *stmt = (struct _hstmt *) hstmt;
@@ -297,8 +297,8 @@
SQLRETURN SQL_API SQLParamOptions(
SQLHSTMT hstmt,
- SQLUINTEGER crow,
- SQLUINTEGER FAR *pirow)
+ SQLULEN crow,
+ SQLULEN FAR *pirow)
{
TRACE("SQLParamOptions");
return SQL_SUCCESS;
@@ -347,7 +347,7 @@
SQLRETURN SQL_API SQLSetPos(
SQLHSTMT hstmt,
- SQLUSMALLINT irow,
+ SQLSETPOSIROW irow,
SQLUSMALLINT fOption,
SQLUSMALLINT fLock)
{
@@ -398,11 +398,11 @@
SQLSMALLINT fParamType,
SQLSMALLINT fCType,
SQLSMALLINT fSqlType,
- SQLUINTEGER cbColDef,
+ SQLULEN cbColDef,
SQLSMALLINT ibScale,
SQLPOINTER rgbValue,
- SQLINTEGER cbValueMax,
- SQLINTEGER FAR *pcbValue)
+ SQLLEN cbValueMax,
+ SQLLEN FAR *pcbValue)
{
struct _hstmt *stmt;
@@ -502,8 +502,8 @@
SQLUSMALLINT icol,
SQLSMALLINT fCType,
SQLPOINTER rgbValue,
- SQLINTEGER cbValueMax,
- SQLINTEGER FAR *pcbValue)
+ SQLLEN cbValueMax,
+ SQLLEN FAR *pcbValue)
{
struct _hstmt *stmt = (struct _hstmt *) hstmt;
struct _sql_bind_info *cur, *newitem;
@@ -594,7 +594,7 @@
SQLSMALLINT cbColNameMax,
SQLSMALLINT FAR *pcbColName,
SQLSMALLINT FAR *pfSqlType,
- SQLUINTEGER FAR *pcbColDef, /* precision */
+ SQLULEN FAR *pcbColDef, /* precision */
SQLSMALLINT FAR *pibScale,
SQLSMALLINT FAR *pfNullable)
{
@@ -649,7 +649,7 @@
SQLPOINTER rgbDesc,
SQLSMALLINT cbDescMax,
SQLSMALLINT FAR *pcbDesc,
- SQLINTEGER FAR *pfDesc)
+ SQLLEN FAR *pfDesc)
{
int namelen, i;
struct _hstmt *stmt;
@@ -969,7 +969,7 @@
SQLRETURN SQL_API SQLRowCount(
SQLHSTMT hstmt,
- SQLINTEGER FAR *pcrow)
+ SQLLEN FAR *pcrow)
{
struct _hstmt *stmt=(struct _hstmt *)hstmt;
@@ -1002,10 +1002,10 @@
SQLUSMALLINT ipar,
SQLSMALLINT fCType,
SQLSMALLINT fSqlType,
- SQLUINTEGER cbParamDef,
+ SQLULEN cbParamDef,
SQLSMALLINT ibScale,
SQLPOINTER rgbValue,
- SQLINTEGER FAR *pcbValue)
+ SQLLEN FAR *pcbValue)
{
TRACE("SQLSetParam");
return SQL_SUCCESS;
@@ -1125,8 +1125,8 @@
SQLUSMALLINT icol,
SQLSMALLINT fCType,
SQLPOINTER rgbValue,
- SQLINTEGER cbValueMax,
- SQLINTEGER FAR *pcbValue)
+ SQLLEN cbValueMax,
+ SQLLEN FAR *pcbValue)
{
struct _hstmt *stmt;
struct _hdbc *dbc;
@@ -1457,7 +1457,7 @@
SQLRETURN SQL_API SQLPutData(
SQLHSTMT hstmt,
SQLPOINTER rgbValue,
- SQLINTEGER cbValue)
+ SQLLEN cbValue)
{
TRACE("SQLPutData");
return SQL_SUCCESS;
@@ -1466,7 +1466,7 @@
SQLRETURN SQL_API SQLSetConnectOption(
SQLHDBC hdbc,
SQLUSMALLINT fOption,
- SQLUINTEGER vParam)
+ SQLULEN vParam)
{
TRACE("SQLSetConnectOption");
return SQL_SUCCESS;
@@ -1475,7 +1475,7 @@
SQLRETURN SQL_API SQLSetStmtOption(
SQLHSTMT hstmt,
SQLUSMALLINT fOption,
- SQLUINTEGER vParam)
+ SQLULEN vParam)
{
TRACE("SQLSetStmtOption");
return SQL_SUCCESS;

@ -1,18 +0,0 @@
--- mdbtools-cvs-20050624.orig/src/sql/Makefile.am 2005-01-15 06:02:06.000000000 +0100
+++ mdbtools-cvs-20050624/src/sql/Makefile.am 2010-01-12 13:04:01.000000000 +0100
@@ -1,5 +1,5 @@
lib_LTLIBRARIES = libmdbsql.la
-libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l
+libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l parser.h
libmdbsql_la_LDFLAGS = -version-info 1:0:0
DISTCLEANFILES = parser.c parser.h lexer.c
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
@@ -7,5 +7,8 @@
LDADD = ../libmdb/libmdb.la
YACC = @YACC@ -d
+parser.h: parser.lo
+lexer.lo: parser.h
+
dist-hook:
rm -f $(distdir)/parser.c $(distdir)/parser.h $(distdir)/lexer.c

@ -1,66 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-office/mdbtools/mdbtools-0.6_pre2-r2.ebuild,v 1.10 2012/05/03 20:00:39 jdhore Exp $
EAPI="2"
# Will fail with 1.10+ because of config.rpath
WANT_AUTOMAKE="1.9"
inherit eutils autotools
MY_P=${P/_/}
S="${WORKDIR}/${PN}-cvs-20050624"
DESCRIPTION="A set of libraries and utilities for reading Microsoft Access database (MDB) files"
HOMEPAGE="http://sourceforge.net/projects/mdbtools"
SRC_URI="mirror://gentoo/${PN}-cvs-20050624.tar.gz"
IUSE="gnome odbc static-libs"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
RDEPEND=">=dev-libs/glib-2
sys-libs/ncurses
sys-libs/readline
gnome? (
>=gnome-base/libglade-2
>=gnome-base/libgnomeui-2 )
odbc? ( >=dev-db/unixODBC-2.0 )"
DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/flex-2.5.0
>=sys-devel/bison-1.35"
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc34.patch
epatch "${FILESDIR}"/${P}-as-needed.patch
epatch "${FILESDIR}"/${P}-haveiconv-fix.patch
epatch "${FILESDIR}"/${P}-parallel-make.patch
epatch "${FILESDIR}"/${P}-odbc_definitions.patch
# This is necessary since the upstream tarball was created with a
# buggy libtool, and the .so suffix in library names is lost in
# some platforms (e.g. amd64). Starting with libtool 2.2.4 it is
# also necessary to remove the acinclude.m4 file since it contains
# an old libtool.m4 that is obsolete, #227257.
rm "${S}"/acinclude.m4
eautoreconf
}
src_configure() {
local myconf
use odbc && myconf="${myconf} --with-unixodbc=/usr"
econf ${myconf} \
$(use_enable static-libs static) || die "configure failed"
}
src_install() {
emake DESTDIR="${D}" install || die "Installation failed"
dodoc COPYING* NEWS README* TODO AUTHORS HACKING ChangeLog
# add a compat symlink (gmdb2 is not compiled if gnome USE flag is disabled)
use gnome && dosym gmdb2 /usr/bin/gmdb
}

@ -1,41 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/build-docbook-catalog/build-docbook-catalog-1.19.1-r1.ebuild,v 1.2 2014/01/18 11:46:00 vapier Exp $
EAPI=5
inherit eutils
DESCRIPTION="DocBook XML catalog auto-updater"
HOMEPAGE="http://sources.gentoo.org/gentoo-src/build-docbook-catalog/"
SRC_URI="mirror://gentoo/${P}.tar.xz
http://dev.gentoo.org/~floppym/distfiles/${P}.tar.xz
http://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="userland_BSD kernel_linux"
RDEPEND="kernel_linux? ( sys-apps/util-linux )
!kernel_linux? ( app-misc/getopt )
!<app-text/docbook-xsl-stylesheets-1.73.1
userland_BSD? ( sys-apps/flock )
dev-libs/libxml2"
DEPEND=""
src_prepare() {
if use prefix ; then
sed -i -e "/^\(ROOTCONFDIR\|DOCBOOKDIR\)=/s:=/:=${EPREFIX}/:" build-docbook-catalog || die
sed -i -e "/^\(SYSCONFDIR\|PREFIX\) = /s:= /:= ${EPREFIX}/:" Makefile || die
if use !kernel_linux ; then
sed -i -e '/opts=/s/getopt/getopt-long/' build-docbook-catalog || die
fi
epatch "${FILESDIR}"/${P}-no-flock.patch # obsoletes flock requirement
fi
}
pkg_postinst() {
# New version -> regen files
build-docbook-catalog
}

@ -1,2 +1 @@
DIST html-xml-utils-6.0.tar.gz 267172 SHA256 a3c5e562302c47030622f89a1893226f2fe3de4127c343618ba1e229a1b6e15a SHA512 4102b21881f391ce8ea0c9af76f0134b99ed8d8cb3f01576f29844a1c6026abadcb344eb3cd367feaed7a4f4f79074306e017d0e58667bcaf32acf3f168a714c WHIRLPOOL 8948e6fcaae000a3bc531919d3616f43fc2899f6d73e908849b8efab518d43fd67aab78ae4215b5228e90c4b416a9da49010b4a1e9953f15d97762512a0b675c
DIST html-xml-utils-6.8.tar.gz 310688 SHA256 f09b7de5e427ea930ed9ceaf0ee7e6a816cf51113149a040fa84a1664ddfa189 SHA512 f4e942636064727da08b32989353e7d260d981363346f7654d65aa561aa01a1e70c478fbc9257bc5d027d34dc62d896c29dc7bff8d50c67b382387d540395546 WHIRLPOOL e31796f24fcf173da2e29d9e0f2f45be54de468fc8a93b56380a7e0ad25d9e61b78cf9b643b77e62820ec6bfc4dfa78c14f13204df0c3210c69bde411a95e645

@ -1,14 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/html-xml-utils/html-xml-utils-6.0.ebuild,v 1.6 2014/08/10 18:23:58 slyfox Exp $
EAPI=4
DESCRIPTION="A number of simple utilities for manipulating HTML and XML files"
SRC_URI="http://www.w3.org/Tools/HTML-XML-utils/${P}.tar.gz"
HOMEPAGE="http://www.w3.org/Tools/HTML-XML-utils/"
LICENSE="W3C"
SLOT="0"
KEYWORDS="amd64 ppc x86 ~x86-linux ~ppc-macos ~x86-macos"
IUSE=""

@ -1,5 +1,4 @@
DIST QQWry.Dat.bz2 4114875 SHA256 3eda90ee8ea13ec88767336b078d2dfe2c971d6a31df60f409d526e3e29a4f83 SHA512 46fd677359a2144429eb9d16131ca6b19db1c086fa93e275aa3d702d3024a65d54064df931d1ed2ba5b0c1f7d9595a284f2a8995d9cd5aac96a45216422dc9ae WHIRLPOOL 456bab65658a8af76160f162fc66868c8a74653a88a1a115e2a20dd90ba9ae8a93b1aa1ee9856cc811d1b1229ca910868ea5db764a119ae9b31cbabf962cab5f
DIST WyabdcRealPeopleTTS.tar.bz2 84329208 SHA256 96a398eaef3e84f6f23e61683e6439913a4d44055e695dd4a1936f9340d64870 SHA512 1553e62c139ecb005bb04163147d94aa58e4ba7f9ee3172b760c6e4776587c12bf816c42e0131c82195b7c738ec9ee5082f39b974790f5cacd522367919beaa0 WHIRLPOOL 210c121c25c7726cee62c2f2beb3186f0799d68c5537442eda967694f176cbbbc6d09a8c3759de093226e283ae651348ed7173a9f93bbf776325fb656e19720c
DIST stardict-3.0.4.tar.bz2 8961622 SHA256 c38b9d953fe0b2380a8aed4c98cb121ad83aff91a32af3c665198d8268b1dce8 SHA512 a1cbf58202b5430b0869955bfb7df961debab12abf55022f7c07537246c81dc182c3be50fa66273c13c289471c15afba74d15933cb202ae292f4388aa2fb6fd5 WHIRLPOOL b0476e5f38862e4c2a747206a8f1d8c55dc889d1138961390aa9f415ec310cabce242e7a4f484a4c260a004e3a8a152726cf936f0ec030586ddcd91979912aa0
DIST stardict-3.0.5.tar.bz2 9353864 SHA256 1e71fefd8637d6ae797347f771fbb44ff5cb925ad1dd5fa17c6e988c4a0bcce8 SHA512 6b4244b697c3496c50bee1dc455ee31920665052f7c562c6d882701a3660c761b22e802e0a72fdf2a8912838a3f0379c2dccccfb490c30e5f4f8eaba6d3e9adf WHIRLPOOL a1a75ce6bb39e66f18c3841f1287d990ebb3a94eb532f77622ca9e5537bab962a8c89f0ad536a46a5d5d77a3d0bc5ff99541f43a8ae967c52a7c622ffa9366e1
DIST stardict-3.0.6.tar.bz2 9341740 SHA256 6a0a695a8977604e0509a3db1bc6a67e53599b14f29494ba942f21d2c26b82e7 SHA512 81d93324b6e8954af7c20ea6d2a3054bb564d786a21b1cb541c728da7a18a6e7ddb23e595055ccc77e6866bbb8c89fb4f17023e33664761dbe1ee8cd55768658 WHIRLPOOL 9502af310d5eba5ed23457fff9e9f00e2d8453873cece3c20e2c5daf861bd665fc7b9c8e292be5b1d886f9a9fd0d5ad9bd1d8fbd043d221e6637c1c8185f444f

@ -1,121 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-text/stardict/stardict-3.0.5.ebuild,v 1.3 2015/03/03 06:02:53 dlan Exp $
EAPI=5
# NOTE: Even though the *.dict.dz are the same as dictd/freedict's files,
# their indexes seem to be in a different format. So we'll keep them
# seperate for now.
# NOTE: Festival plugin crashes, bug 188684. Disable for now.
GNOME2_LA_PUNT=yes
GCONF_DEBUG=no
inherit eutils gnome2
DESCRIPTION="A international dictionary supporting fuzzy and glob style matching"
HOMEPAGE="http://stardict-4.sourceforge.net/"
SRC_URI="mirror://sourceforge/${PN}-4/${P}.tar.bz2
pronounce? ( http://${PN}-3.googlecode.com/files/WyabdcRealPeopleTTS.tar.bz2 )
qqwry? ( mirror://gentoo/QQWry.Dat.bz2 )"
LICENSE="CPL-1.0 GPL-3 LGPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="espeak gucharmap qqwry pronounce spell tools"
RESTRICT="test"
COMMON_DEPEND=">=dev-libs/glib-2.16:2=
dev-libs/libsigc++:2=
sys-libs/zlib:=
>=x11-libs/gtk+-2.20:2=
gucharmap? ( >=gnome-extra/gucharmap-2.22.1:0 )
spell? ( >=app-text/enchant-1.2 )
tools? (
dev-libs/libpcre:=
dev-libs/libxml2:=
virtual/mysql
)"
RDEPEND="${COMMON_DEPEND}
espeak? ( >=app-accessibility/espeak-1.29 )"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.3
app-text/gnome-doc-utils
dev-libs/libxslt
dev-util/intltool
sys-devel/gettext
virtual/pkgconfig"
src_configure() {
# Hint: EXTRA_ECONF="--enable-gnome-support" and manual install of
# libbonobo-2, libgnome-2, libgnomeui-2, gconf-2 and orbit-2 will
# give you GNOME 2.x support, that is otherwise considered deprecated
# because of the deep GNOME 2.x core library dependencies
gnome2_src_configure \
$(use_enable tools) \
--disable-scrollkeeper \
$(use_enable spell) \
$(use_enable gucharmap) \
--disable-festival \
$(use_enable espeak) \
$(use_enable qqwry) \
--disable-updateinfo \
--disable-gnome-support \
--disable-gpe-support \
--disable-schemas-install
}
src_install() {
gnome2_src_install
dodoc dict/doc/{Documentation,FAQ,HACKING,HowToCreateDictionary,Skins,StarDictFileFormat,Translation}
if use qqwry; then
insinto /usr/share/${PN}/data
doins ../QQWry.Dat
fi
if use pronounce; then
docinto WyabdcRealPeopleTTS
dodoc ../WyabdcRealPeopleTTS/{README,readme.txt}
rm -f ../WyabdcRealPeopleTTS/{README,readme.txt}
insinto /usr/share
doins -r ../WyabdcRealPeopleTTS
fi
# noinst_PROGRAMS with ${PN}_ prefix from tools/src/Makefile.am wrt #292773
if use tools; then
local app
local apps="${PN}-editor pydict2dic olddic2newdic oxford2dic directory2dic
dictd2dic wquick2dic ec50 directory2treedic treedict2dir jdictionary mova
xmlinout soothill kanjidic2 powerword kdic 21tech 21shiji buddhist
tabfile cedict edict duden ${PN}-dict-update degb2utf frgb2utf
jpgb2utf gmx2utf rucn kingsoft wikipedia wikipediaImage babylon
${PN}2txt ${PN}-verify fest2dict i2e2dict downloadwiki
ooo2dict myspell2dic exc2i2e dictbuilder tabfile2sql KangXi Unihan
xiaoxuetang-ja wubi ydp2dict wordnet lingvosound2resdb
resdatabase2dir dir2resdatabase ${PN}-index sd2foldoc ${PN}-text2bin
${PN}-bin2text ${PN}-repair"
for app in ${apps}; do
newbin tools/src/${app} ${PN}_${app}
done
fi
}
pkg_postinst() {
elog "Note: festival text to speech (TTS) plugin is not built. To use festival"
elog 'TTS plugin, please, emerge festival and enable "Use TTS program." at:'
elog '"Preferences -> Dictionary -> Sound" and fill in "Commandline" with:'
elog '"echo %s | festival --tts"'
elog
elog "You will now need to install ${PN} dictionary files. If"
elog "you have not, execute the below to get a list of dictionaries:"
elog
elog " emerge -s ${PN}-"
gnome2_pkg_postinst
}

@ -3,8 +3,6 @@ DIST gcc-ada-4.1.2.tar.bz2 4589609 SHA256 703125c4d033c666b52db2aeee0a05e3461467
DIST gcc-ada-4.2.3.tar.bz2 4740243 SHA256 08956727415fb1721c5c89ef33ebe94ab718459e88f7cd4589fc1c2b7e98cb4c
DIST gcc-ada-4.3.5.tar.bz2 5231691 SHA256 e3e4a0836820e8b1b7b4b00b529568a2d51ed9ec3933fbd44c7b1c04ad3076de SHA512 37619e5e925865f920debe6f2fe66c5e38c91ecd1e9e83c5f60ea31750164d947459e764f574c91f4e7c56c73a0b3e8f32fc1ec95af48177743b9dbaeaa5a458 WHIRLPOOL d0c10883c7b3b62433133d48d4bd0eb332d523bb958425fbcb93a26c398d8cfb3f3d0886914a706fbf4fcb040966203d6d504a1ce51583fb97546244642cc0a6
DIST gcc-ada-4.3.6.tar.bz2 5309618 SHA256 a2721a41965f361938bc9d86e3cc7ba12dc6b7efa24cbe5d9f9c84882b9caf31 SHA512 c9f253050bc355a5dca27fcef41f93772f41cfe2dfd41eecf390019318eded36c897f40812dbe32f14e3f7a4e0625f0fc87461bb03dba2f1385f396aa53e8f64 WHIRLPOOL 143ba164866e35c69dcbe9dfdb44b4473731ef11d0b36e281f29b357b2ccc6d3f826a938539c788afe31b648493fea394b8a28577913105e47740c582cad181f
DIST gcc-ada-4.4.3.tar.bz2 5470203 SHA256 67cec15254922d71790e80f150f24e13cdaac60804d46cb17bed9df7f874d290 SHA512 77c6b0407f9da7bf73116045169534bcc2660e416b83cca0b5f392702c44cf70038dcbb6db039126608afbaaac79d8c73a9cf2d56f0e56133316d4e449909adf WHIRLPOOL b27222cfe2a87c3ca4d6ae617c1a544a6dcc8b86c087c34303f0c94b69eb4f0493d34f37acd69c8810b6aaf400147208af8c203d49e6e958a409090d27d1c6bc
DIST gcc-ada-4.4.5.tar.bz2 5470412 SHA256 0fdfd6318faba7bd39dde6fdc78c8334636be1e9fdcf4bd84f39372882abd177 SHA512 fcb344b53f3cfeddfd5b504b0bc419ef28bd770c45c6731fa97ca70acb64a3e3d9b5c76fbe3e89142c90563bc480724aea0f70a0f157dafc6a3998894523abd8 WHIRLPOOL 9008cc7225ce6ea1658c18fe0d0fbbb801a31f597c57a55c99a0a4d63a83da53440fa3473644f680449a7186f4c46cfe833b5b758884d533ebf379bd00bff9ee
DIST gcc-ada-4.4.7.tar.bz2 5492474 SHA256 fb9f30b85d48838390554b948d137487f0db09ad5f8ba73ca4d7ca35765c6ed8 SHA512 4447dfb2353018108ffc88a0fdeccca224a5fc9e4cbb75d8ee136c38c2937a368a677ff6e4df1a1431338fc1adc26fcd1f0f9cf963e5e98e4e28bc22e7e72cb5 WHIRLPOOL 5f6d7356d74725c0658e79ba1022df187cc08588835dae49867dc29c62b9b61d11e265b1a4636fe3e152b45a0bc65bb45ae69cac4ed1cd0447cc7603398adf44
DIST gcc-ada-4.5.4.tar.bz2 5755385 SHA256 8abddae15be65572b4d639bd9818057019bb4a45da4decfc6451511c8d580c5e SHA512 9d160fba38e4482c01eb66735559086527ce9032ecd73a90fc0eea5e96f960cc11f7ed2dded1d8eb70a10a7706ea8f80b48b61db25fdda8724ba3a32f4d464fc WHIRLPOOL 8349c8be9e4805bf61d28db540469060ab851e2a3c6eada3ce3937805a59e8c8c3344c84b322d334e72e475988c12f4d30b63860514ab68af449d425d7b446c4
DIST gcc-ada-4.6.4.tar.bz2 6084085 SHA256 2a09bbf942b2557839722d4807e67559123037356f5cb1a3b12f44539968d0ad SHA512 889ae05b809413e40f765dcf56100601d4969b82631e7a842146ebbc27c3dde519793f8cee03f03fa4dee87fcbd6814f2a3b8ab79295a824282ee913cc7dc590 WHIRLPOOL 2434bca1a838fc874afe0d3c18ce4a3fad8e57853a5aa6bd1b87e2d063b75840ceda770eb3552b62dd83654ab02b807475161907e5791ab37a27670a6c06a1ca
@ -13,8 +11,6 @@ DIST gcc-core-4.1.2.tar.bz2 17485561 SHA256 7be9c5df8000ae35d0928f0a254bfb5e8478
DIST gcc-core-4.2.3.tar.bz2 19319213 SHA256 99ec052e13e8c2bc7d1db86d1c98fb651d45fd3e8ea90b0981c47f6e8826c813
DIST gcc-core-4.3.5.tar.bz2 24828441 SHA256 ca57b06732a9a4123d6685fe58f3550afadf063107016e3f15c2b32447612711 SHA512 f18d4f71b3be9784701b620ab67006231d330e2178ce91399051f8acf52d44478571a7c53af714c2a4207d81e49f7e94309fd963b16f982a428e834bfda7bd87 WHIRLPOOL 483220abd40c45c858a31ab8cf7aa0792e3230c49ab2c328ec59f412ea298dc02cd8002f27d8459a4c5b7cd9ce5551a0aaf8f613cf049bc4b6ce1b3080a7240b
DIST gcc-core-4.3.6.tar.bz2 24448503 SHA256 86af1703be5cc7f40270a66ac15ebcf6088706a789ae1bf18488dc070777f979 SHA512 6bc477282a72dca697db4b4bafb221a77f95945eb867cd109c9593f6ec7471152d9cabdb62ce84761d624d196a5da0ad5f3218e959ba1b86506ba54b095b62aa WHIRLPOOL a9a21920f3d860f9d1aace6c53dd9e5b6c29102bfb432ea7c2d1819a37fe77c29a92d652f4a4cd74adb850f79fa5e58e79a1c1c77d9c61df38f1af68c6015c5d
DIST gcc-core-4.4.3.tar.bz2 26336901 SHA256 92f311e6be22a2096c765bc8be72bd7fef56bba73f053b3de025b9c92d308356 SHA512 63e0ddcac1ede0e688b83370e67de5b50785d706a61d9dbe7842b38e23410d8ffd1c69af41163adcaa93d8dc6e1d0eab85cf0255e4c9c9e828a99f060d6bd4c3 WHIRLPOOL f4f91709646d7246f118e830fa832b0600ba50701d3ea7c3b31605328e0255c74c44b95a38d8d0362b64b603378b00fea53ed653229c3aec20c6602eafea6fa7
DIST gcc-core-4.4.5.tar.bz2 26356188 SHA256 dbf012d5616b51d072383a32f71d4217239e7f0096acb07bbf266529a347ab4b SHA512 4578855724443f5504750387a3eccc3491d2148456dfc4f0d21d84ce89f333abee59182bf485a5e9f59f87c5c425c989c6bd3fcfbf8dc97c12a2564f4117cd4f WHIRLPOOL ac6954df0a8469086e8be663bb3646d41860dc7bdf274e2261ca309bd39d11eb561dc70f34acb6163b7a3b856c743b28570d459eeebf7799887ee07e11cbaba3
DIST gcc-core-4.4.7.tar.bz2 25784094 SHA256 c4663b7023909a4a075d3c2b2e17f6e082a9625aebfd0ce7f1d7817e44bf5542 SHA512 318522e170a9e54d051311416dc221d8d727a85d6e24a97fdbd9125d9dea1530930efd04b846c06ddbe3c5acaeef8810e0d4e79b8e9af535f0b08f1f20e5b10b WHIRLPOOL c2964330c174236e734d78ad80462a050b27d23f6b96a66bd5a4c1fce0d5cd4d35c9fba759ffe94b542805fb405071cd05e0945a4806fd8551c285eae7247ffd
DIST gcc-core-4.5.4.tar.bz2 28265185 SHA256 894d90f72cbfc8707e330fa2b1847c443fa97cf9b7f26e86be554709510e624a SHA512 82f81a6860155e78cecac846038ceb5a5ec68e399f3ab058c5d569745e47460761f162e92f627d0275a37ff24cbc6582a018b5057d57fc01107f615e59192451 WHIRLPOOL 42324f6da6897e6fac4a4b3476fb1cf46b4461164b84c9f24e5a793e37c211246f9d9bed9f03ee170dc4dd7896579e0f1d1ba11e73e3ec0b92a2caa9191c82f8
DIST gcc-core-4.6.4.tar.bz2 30353380 SHA256 48b566f1288f099dff8fba868499a320f83586245ec69b8c82a9042566a5bf62 SHA512 93b1dfb945256ab08d4cadd43237da09b5b37ebc9d82b6ba4072df253f139ae0795860cd58d9fde83018b0b5ce6e23bc679dfb22ca76813a9a29c8129fd2854d WHIRLPOOL b810c19de92980d93cc374647c3f9b4b72b04ac2508168f798b51cfefcb54dc677f04c7d1583de123b2e01ee203ef975bda17d99acfeb87cc9687f021e63041f

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild,v 1.5 2013/08/03 04:58:50 george Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.3.6.ebuild,v 1.6 2015/05/13 21:08:11 pacho Exp $
inherit gnatbuild
@ -8,7 +8,7 @@ DESCRIPTION="GNAT Ada Compiler - gcc version"
HOMEPAGE="http://gcc.gnu.org/"
LICENSE="GMGPL"
IUSE=""
IUSE="doc lto" # doc and lto from gnatbuild.eclass
# SLOT is set in gnatbuild.eclass, depends only on PV (basically SLOT=GCCBRANCH)
# so the URI's are static.
@ -19,7 +19,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
ppc? ( http://dev.gentoo.org/~george/src/gnatboot-4.1-ppc.tar.bz2 )"
# sparc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-sparc.tar.bz2 )
KEYWORDS="~amd64 ~ppc ~x86"
KEYWORDS="amd64 ppc x86"
# starting with 4.3.0 gnat needs these libs
RDEPEND=">=dev-libs/mpfr-2.3.1

@ -1,72 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.4.3.ebuild,v 1.4 2014/08/05 11:42:10 armin76 Exp $
# Need to let configure know where to find stddef.h
#EXTRA_CONFGCC="${WORKDIR}/usr/lib/include/"
inherit gnatbuild
DESCRIPTION="GNAT Ada Compiler - gcc version"
HOMEPAGE="http://gcc.gnu.org/"
LICENSE="GMGPL"
IUSE=""
# using new bootstrap
BOOT_SLOT="4.3"
# SLOT is set in gnatbuild.eclass, depends only on PV (basically SLOT=GCCBRANCH)
# so the URI's are static.
SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-amd64.tar.bz2 )
sparc? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-sparc.tar.bz2 )
x86? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i686.tar.bz2 )"
# ppc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
KEYWORDS=" ~amd64 ~x86"
# starting with 4.3.0 gnat needs these libs
RDEPEND=">=dev-libs/mpfr-2.3.1
>=dev-libs/gmp-4.2.2
>=sys-libs/zlib-1.1.4
>=sys-libs/ncurses-5.2-r2"
DEPEND="${RDEPEND}
>=sys-devel/bison-1.875
>=sys-libs/glibc-2.8
>=sys-devel/binutils-2.15.94"
#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
# ${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
src_unpack() {
gnatbuild_src_unpack
#fixup some hardwired flags
cd "${S}"/gcc/ada
# universal gcc -> gnatgcc substitution occasionally produces lines too long
# and then build halts on the style check.
#
sed -i -e 's:and Nam is "gnatgcc":and Nam is "gcc":' osint.ads ||
die "reversing [gnat]gcc substitution in comments failed"
# gcc pretty much ignores --with-system-zlib. At least it still descends
# into zlib and does configure and build there (gcc bug@7125?). For whatever
# reason this conflicts with multilib in gcc-4.4..
sed -i -e "s:libgui zlib:libgui:" "${S}"/configure
# looks like wrapper has problems with all the quotation
sed -i -e "/-DREVISION/d" -e "/-DDEVPHASE/d" \
-e "s: -DDATESTAMP=\$(DATESTAMP_s)::" "${S}"/gcc/Makefile.in
sed -i -e "s: DATESTAMP DEVPHASE REVISION::" \
-e "s:PKGVERSION:\"\":" "${S}"/gcc/version.c
}
src_compile() {
# looks like gnatlib_and_tools and gnatlib_shared have become part of
# bootstrap
gnatbuild_src_compile configure make-tools bootstrap
}

@ -1,62 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.4.5.ebuild,v 1.6 2014/08/05 11:42:10 armin76 Exp $
inherit gnatbuild
DESCRIPTION="GNAT Ada Compiler - gcc version"
HOMEPAGE="http://gcc.gnu.org/"
LICENSE="GMGPL"
IUSE=""
BOOT_SLOT="4.3"
# SLOT is set in gnatbuild.eclass, depends only on PV (basically SLOT=GCCBRANCH)
# so the URI's are static.
SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-ada-${PV}.tar.bz2
amd64? ( http://dev.gentoo.org/~george/src/gnatboot-${SLOT}-amd64.tar.bz2 )
sparc? ( http://dev.gentoo.org/~george/src/gnatboot-${SLOT}-sparc.tar.bz2 )
x86? ( http://dev.gentoo.org/~george/src/gnatboot-${SLOT}-i686.tar.bz2 )"
# ppc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
KEYWORDS="~amd64 ~x86"
# starting with 4.3.0 gnat needs these libs
RDEPEND=">=dev-libs/mpfr-3.0.1
>=dev-libs/gmp-5.0
>=sys-libs/zlib-1.2
>=sys-libs/ncurses-5.7"
DEPEND="${RDEPEND}
>=sys-devel/bison-1.875
>=sys-libs/glibc-2.8
>=sys-devel/binutils-2.20"
#QA_EXECSTACK="${BINPATH:1}/gnatls ${BINPATH:1}/gnatbind ${BINPATH:1}/gnatmake
# ${LIBEXECPATH:1}/gnat1 ${LIBPATH:1}/adalib/libgnat-${SLOT}.so"
src_unpack() {
gnatbuild_src_unpack
#fixup some hardwired flags
cd "${S}"/gcc/ada
# universal gcc -> gnatgcc substitution occasionally produces lines too long
# and then build halts on the style check.
#
sed -i -e 's:and Nam is "gnatgcc":and Nam is "gcc":' osint.ads ||
die "reversing [gnat]gcc substitution in comments failed"
# gcc pretty much ignores --with-system-zlib. At least it still descends
# into zlib and does configure and build there (gcc bug@7125?). For whatever
# reason this conflicts with multilib in gcc-4.4..
sed -i -e "s:libgui zlib:libgui:" "${S}"/configure
}
src_compile() {
# looks like gnatlib_and_tools and gnatlib_shared have become part of
# bootstrap
gnatbuild_src_compile configure make-tools bootstrap
}

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.4.7.ebuild,v 1.3 2014/08/05 11:42:10 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.4.7.ebuild,v 1.4 2015/05/13 21:08:11 pacho Exp $
inherit gnatbuild
@ -21,7 +21,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
x86? ( http://dev.gentoo.org/~george/src/gnatboot-${SLOT}-i686.tar.bz2 )"
# ppc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
# starting with 4.3.0 gnat needs these libs
RDEPEND=">=dev-libs/mpfr-3.0.1

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild,v 1.4 2014/08/05 11:42:10 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.5.4.ebuild,v 1.5 2015/05/13 21:08:11 pacho Exp $
inherit gnatbuild
@ -21,7 +21,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
x86? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i686.tar.bz2 )"
# ppc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
KEYWORDS=" ~amd64 ~x86"
KEYWORDS="amd64 x86"
# starting with 4.3.0 gnat needs these libs
RDEPEND=">=dev-libs/mpfr-3.0.1

@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild,v 1.4 2014/08/05 11:42:10 armin76 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-lang/gnat-gcc/gnat-gcc-4.6.4.ebuild,v 1.5 2015/05/13 21:08:11 pacho Exp $
inherit gnatbuild
@ -21,7 +21,7 @@ SRC_URI="ftp://gcc.gnu.org/pub/gcc/releases/gcc-${PV}/gcc-core-${PV}.tar.bz2
x86? ( http://dev.gentoo.org/~george/src/gnatboot-${BOOT_SLOT}-i686.tar.bz2 )"
# ppc? ( mirror://gentoo/gnatboot-${BOOT_SLOT}-ppc.tar.bz2 )
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 x86"
# starting with 4.3.0 gnat needs these libs
RDEPEND=">=dev-libs/mpfr-3.1.2

@ -1,3 +1 @@
DIST antlr-3.4.tar.gz 7204514 SHA256 2ff38f5acba683137b4633a15e06ee1fe7f11e1cc4549bee3cdaea8a4ff2c980 SHA512 72efac7b4c0fc6de29e0939a543d20ee6ac813e2ac298fadbcb46ba113c1b547b1fb40304dace0527977e15ee8716e4d63d874dcb1580724d2c4953331f8faf2 WHIRLPOOL 49f75e51867a8e0870ebc4da1d03731414f2996e8067d4326c93673e7392643b881d75c65b8b1807b6cf60f4ff8f540f9c50e43c1192af7fdaf505aad18a51d7
DIST antlr-3.5.tar.gz 6791279 SHA256 6be17690f782c899cda68be812df5c40911aed057bf0192b0c37d2711cba8fc8 SHA512 a7014bc5d178add8a1f8e44a19ec60fed934f79f38fd702c7d7c3bb6a8c803492063911f86a445b696d10956f6f902144a5244046e83d70cffdc1717400c38a7 WHIRLPOOL c364d9ffac34de2e80a04233c73cab54b468eb958d924a305ccfc534587996edd4ee78a8fbb9416f2cad404dc43f44da9f9717e32e3f33da900c450c41a046ea
DIST libantlr3c-3.3_pre20110403.tar.gz 544321 SHA256 d9d4fad690e918960ba62dde8a80aa2955610e3a936d2f69d6b6f798c2c82ba7 SHA512 7b9f1454c866773c8a4862bd3d5cf874161a80de3b5086c1665874ac88c13c8c851c8c1bc73e0309f6fb088f94c17be2c791bc2d3707b319a76e74b46fedfdd1 WHIRLPOOL da34b9db64465a5535fdc28baead3af9a1edc99762538886c7ce996b0e9591595f400d28f50c6f80fe8c392344feac6344eb4615a94a3690f1c4eca92010d2c7

@ -1,68 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/antlr-c/antlr-c-3.3_pre20110403.ebuild,v 1.1 2011/06/10 07:02:40 qiaomuf Exp $
EAPI="4"
inherit eutils versionator autotools
MY_PN="libantlr3c"
MY_P="${MY_PN}-$(get_version_component_range 1-2)-SNAPSHOT"
DESCRIPTION="The ANTLR3 C Runtime"
HOMEPAGE="http://fisheye2.atlassian.com/browse/antlr/runtime/C/dist/"
SRC_URI="http://www.antlr.org/download/C/${MY_P}.tar.gz ->
${MY_PN}-${PV}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~x86 ~amd64"
IUSE="debug debugger doc static-libs"
DEPEND="doc? ( app-doc/doxygen )"
RDEPEND=""
S="${WORKDIR}/${MY_P}"
src_prepare() {
epatch "${FILESDIR}/${PN}-3.1.4-doxygen.patch"
epatch "${FILESDIR}/${PN}-3.3-cflags.patch"
mkdir m4
eautoreconf
}
src_configure() {
local myconf
if use amd64 || use ia64; then
myconf="${myconf} --enable-64bit"
else
myconf="${myconf} --disable-64bit"
fi
econf \
$(use_enable static-libs static) \
$(use_enable debug debuginfo ) \
$(use_enable debugger antlrdebug ) \
${myconf}
}
src_compile() {
emake
if use doc; then
einfo "Generating documentation API ..."
doxygen -u doxyfile
doxygen doxyfile || die "doxygen failed"
fi
}
src_install() {
emake DESTDIR="${D}" install
# remove useless .la files
find "${D}" -name '*.la' -delete
dodoc AUTHORS ChangeLog NEWS README
if use doc; then
dohtml api/*
fi
}

@ -1,66 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/antlr-c/antlr-c-3.4.ebuild,v 1.1 2013/03/28 05:04:43 pinkbyte Exp $
EAPI="5"
AUTOTOOLS_AUTORECONF=1
AUTOTOOLS_IN_SOURCE_BUILD=1
inherit autotools-utils eutils
MY_P="antlr-${PV}"
DESCRIPTION="The ANTLR3 C Runtime"
HOMEPAGE="https://github.com/antlr/antlr3/tree/master/runtime/C"
SRC_URI="https://github.com/antlr/antlr3/archive/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="debug debugger doc static-libs"
DEPEND="doc? ( app-doc/doxygen )"
RDEPEND=""
S="${WORKDIR}/antlr3-${MY_P}/runtime/C"
DOCS=( AUTHORS ChangeLog NEWS README )
PATCHES=( "${FILESDIR}/${PN}-3.3-cflags.patch" )
src_prepare() {
sed -i -e '/^QUIET/s/NO/YES/' doxyfile || die 'sed on doxyfile failed'
autotools-utils_src_prepare
}
src_configure() {
local myeconfargs=(
$(use_enable static-libs static)
$(use_enable debug debuginfo)
$(use_enable debugger antlrdebug)
)
if use amd64 || use ia64; then
myeconfargs+=( --enable-64bit )
else
myeconfargs+=( --disable-64bit )
fi
autotools-utils_src_configure
}
src_compile() {
autotools-utils_src_compile
if use doc; then
einfo "Generating documentation API ..."
doxygen -u doxyfile
doxygen doxyfile || die "doxygen failed"
fi
}
src_install() {
autotools-utils_src_install
if use doc; then
dohtml api/*
fi
}

@ -1,19 +0,0 @@
--- doxyfile
+++ doxyfile
@@ -30,7 +30,6 @@
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = YES
MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = YES
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 4
@@ -73,7 +72,7 @@
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
-QUIET = NO
+QUIET = YES
WARNINGS = YES
WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES

@ -1,87 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1-r1.ebuild,v 1.2 2013/02/20 23:03:01 zmedico Exp $
EAPI=5
PYTHON_DEPEND="python? 2"
inherit eutils multilib autotools java-pkg-opt-2 python
DESCRIPTION="general-purpose cryptography library"
HOMEPAGE="http://sourceforge.net/projects/beecrypt/"
SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
IUSE="java cxx python static-libs threads doc"
COMMONDEPEND="!<app-arch/rpm-4.2.1
cxx? ( >=dev-libs/icu-2.8:= )"
DEPEND="${COMMONDEPEND}
java? ( >=virtual/jdk-1.4 )
doc? ( app-doc/doxygen
virtual/latex-base
dev-texlive/texlive-fontsextra
)"
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.4 )"
DOCS="BUGS README BENCHMARKS NEWS"
REQUIRED_USE="cxx? ( threads )"
pkg_setup() {
if use python; then
python_set_active_version 2
python_pkg_setup
java-pkg-opt-2_pkg_setup
fi
}
src_prepare() {
java-pkg-opt-2_src_prepare
use python && python_convert_shebangs -r 2 .
epatch "${FILESDIR}"/${P}-build-system.patch
epatch "${FILESDIR}"/${P}-gcc-4.7.patch
eautoreconf
}
src_configure() {
# cpluscplus needs threads support
econf \
--disable-expert-mode \
$(use_enable static-libs static) \
$(use_enable threads) \
$(use_with python python "${EPREFIX}"/usr/bin/python2) \
$(use_with cxx cplusplus) \
$(use_with java)
}
src_compile() {
default
if use doc; then
cd include/beecrypt
doxygen || die "doxygen failed"
fi
}
src_test() {
export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}"
emake check
emake bench
}
src_install() {
default
rm -f "${ED}"/usr/$(get_libdir)/python*/site-packages/_bc.*a
use static-libs || find "${ED}" -name '*.la' -exec rm -f {} +
use doc && dohtml -r docs/html/.
}

@ -1,85 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/beecrypt/beecrypt-4.2.1-r2.ebuild,v 1.3 2015/03/06 10:34:52 monsieurp Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit eutils multilib autotools java-pkg-opt-2 python-single-r1
DESCRIPTION="general-purpose cryptography library"
HOMEPAGE="http://sourceforge.net/projects/beecrypt/"
SRC_URI="mirror://sourceforge/beecrypt/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos"
IUSE="java cxx python static-libs threads doc"
COMMONDEPEND="!<app-arch/rpm-4.2.1
cxx? ( >=dev-libs/icu-2.8:= )
python? ( ${PYTHON_DEPS} )"
DEPEND="${COMMONDEPEND}
java? ( >=virtual/jdk-1.4 )
doc? ( app-doc/doxygen
virtual/latex-base
dev-texlive/texlive-fontsextra
)"
RDEPEND="${COMMONDEPEND}
java? ( >=virtual/jre-1.4 )"
DOCS="BUGS README BENCHMARKS NEWS"
REQUIRED_USE="cxx? ( threads )
python? ( ${PYTHON_REQUIRED_USE} )"
pkg_setup() {
use python && python-single-r1_pkg_setup
use java && java-pkg-opt-2_pkg_setup
}
src_prepare() {
java-pkg-opt-2_src_prepare
epatch "${FILESDIR}"/${P}-build-system.patch
epatch "${FILESDIR}"/${P}-gcc-4.7.patch
eautoreconf
}
src_configure() {
# cpluscplus needs threads support
econf \
--disable-expert-mode \
$(use_enable static-libs static) \
$(use_enable threads) \
$(use_with python python "${PYTHON}") \
$(use_with cxx cplusplus) \
$(use_with java)
}
src_compile() {
default
if use doc; then
cd include/beecrypt || die
doxygen || die "doxygen failed"
fi
}
src_test() {
export BEECRYPT_CONF_FILE="${T}/beecrypt-test.conf"
echo "provider.1=${S}/c++/provider/.libs/base.so" > "${BEECRYPT_CONF_FILE}"
emake check
emake bench
}
src_install() {
default
use python && rm -f "${D%/}$(python_get_sitedir)"/_bc.*a
use static-libs || find "${ED}" -name '*.la' -delete
use doc && dohtml -r docs/html/.
}

@ -1,3 +1,2 @@
DIST cdk-5.0-20131107.tgz 495455 SHA256 2b3670b95d330cce34ddd929f985c423cf86b05ba8a33bf5f217c4702131f565 SHA512 93e0c78bfd12fb9c554b9b6996b9c93542201afb67ddd63ecea7330171ca079da73d81b3f3b2f27a28ecd3527ed6c7333203a9438ecd196a66d3bad78233f439 WHIRLPOOL bedf5a441175436fb0eb54b216a61acd296d97dbbb2be1eb817b024778f58383f0ea00f6159c67c05f116f21ad6e0030a2d979aa8db2798a4f103f36f3e3198b
DIST cdk-5.0-20140118.tgz 496939 SHA256 4a85981d1eabe3d7e5568db0018cee82967b09f26e7aaa3bcdb85e1777de23d6 SHA512 a38bff8c39ee1a25aba7b1ab864ee03f9d53f9594994ab26d6d8272b97c5896d19c4f0695db987b1fd347c2bdd5d0c17232fef72042260d1aff0c77e14caaca4 WHIRLPOOL 1cd745ca6b328272367706bf5d70636cc9ea3208d510068e73635384db87b24fe9dfd508aabb376dced394ba3fcb90fa02eeb3b0147db64b7c23fa2f3e15a578
DIST cdk-5.0-20141106.tgz 509310 SHA256 d7ce8d9698b4998fa49a63b6e19309d3eb61cc3a019bfc95101d845ef03c4803 SHA512 8a92363c8036acb61fe8dcfcf3690653f2573407123b8c684c0bf165d5b99b6a4c7e8bcded8773304ebc13108e90ae3488f0e74ed026f3bc69f6a5b007e651e4 WHIRLPOOL d497624acb49bec7a1f18afe13c1279f5e8c06b71d4f904b88b9f639e01fae0b4d959ae90df169c477292e0f56f787944e5cffddb4416d30d85784155bde2dee

@ -1,49 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/cdk/cdk-5.0.20140118.ebuild,v 1.1 2014/06/25 05:05:45 radhermit Exp $
EAPI=5
inherit eutils versionator
MY_P="${PN}-$(replace_version_separator 2 -)"
DESCRIPTION="A library of curses widgets"
HOMEPAGE="http://dickey.his.com/cdk/cdk.html"
SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz"
LICENSE="BSD"
SLOT="0/6" # subslot = soname version
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="examples static-libs unicode"
DEPEND=">=sys-libs/ncurses-5.2[unicode?]"
RDEPEND="${DEPEND}"
S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}"/${PN}-5.0.20120323-parallel-make.patch
}
src_configure() {
econf \
--with-libtool \
--with-shared \
--with-ncurses$(usex unicode "w" "")
}
src_install() {
# parallel make installs duplicate libs
emake -j1 \
DESTDIR="${ED}" \
DOCUMENT_DIR="${ED}/usr/share/doc/${PF}" install
if use examples ; then
for x in include c++ demos examples cli cli/utils cli/samples; do
docinto $x
find $x -maxdepth 1 -mindepth 1 -type f -print0 | xargs -0 dodoc
done
fi
use static-libs || find "${ED}" \( -name '*.a' -or -name '*.la' \) -delete
}

@ -1,11 +0,0 @@
--- cdk-5.0-20110517/Makefile.in.orig
+++ cdk-5.0-20110517/Makefile.in
@@ -402,7 +402,7 @@
installCDKHeaderFiles \
installCDKLibrary :: $(BIN_DIR) cdk-config
@echo "Installing script $(CFG_ROOTNAME)$(VERSION_MAJOR)-config"
- @$(INSTALL_DATA) cdk-config $(BIN_DIR)/$(CFG_ROOTNAME)$(VERSION_MAJOR)-config
+ @$(INSTALL_PROGRAM) cdk-config $(BIN_DIR)/$(CFG_ROOTNAME)$(VERSION_MAJOR)-config
uninstall \
uninstallCDKHeaderFiles \

@ -1,33 +0,0 @@
--- cdk-5.0-20120323/aclocal.m4
+++ cdk-5.0-20120323/aclocal.m4
@@ -2852,7 +2852,7 @@
AC_MSG_ERROR(Cannot find libtool)
fi
])dnl
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'
--- cdk-5.0-20120323/configure
+++ cdk-5.0-20120323/configure
@@ -5135,7 +5135,7 @@
echo "$as_me: error: Cannot find libtool" >&2;}
{ (exit 1); exit 1; }; }
fi
- LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+ LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LDFLAGS} ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
LIB_OBJECT='${OBJECTS:.o=.lo}'
LIB_SUFFIX=.la
LIB_CLEAN='${LIBTOOL} --mode=clean'
--- cdk-5.0-20120323/Makefile.in
+++ cdk-5.0-20120323/Makefile.in
@@ -277,7 +277,7 @@
all cdklib :: $(DEFAULT)
$(CDKLIB) :: $(OBJECTS)
- @echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT)
+ @echo creating $@; $(LIBTOOL_CREATE) $@ $(LIB_OBJECT) $(LIBS)
@$(RANLIB) $@
cdkshlib $(CDKSHLIB) :: $(CDKSHOBJS)

@ -1,45 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-c++/dbus-c++-0.9.0-r1.ebuild,v 1.3 2015/03/22 21:36:55 tetromino Exp $
EAPI="4"
inherit eutils
DESCRIPTION="Provides a C++ API for D-BUS"
HOMEPAGE="http://sourceforge.net/projects/dbus-cplusplus/ http://sourceforge.net/apps/mediawiki/dbus-cplusplus/index.php?title=Main_Page"
SRC_URI="mirror://sourceforge/dbus-cplusplus/lib${P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="doc ecore glib static-libs test"
RDEPEND="sys-apps/dbus
ecore? ( dev-libs/ecore )
glib? ( dev-libs/glib:2 )"
DEPEND="${RDEPEND}
doc? ( app-doc/doxygen )
dev-util/cppunit
virtual/pkgconfig"
S=${WORKDIR}/lib${P}
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc-4.7.patch #424707
}
src_configure() {
econf \
--disable-examples \
$(use_enable doc doxygen-docs) \
$(use_enable ecore) \
$(use_enable glib) \
$(use_enable static-libs static) \
$(use_enable test tests)
}
src_install() {
default
prune_libtool_files
}

@ -1,56 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/ffcall/ffcall-1.10-r3.ebuild,v 1.2 2012/08/20 03:32:11 ottxor Exp $
EAPI=3
inherit eutils flag-o-matic
# CLISP maintains ffcall now
CLISP_PACKAGE="clisp-2.41"
DESCRIPTION="foreign function call libraries"
HOMEPAGE="http://www.haible.de/bruno/packages-ffcall.html"
SRC_URI="mirror://sourceforge/clisp/${CLISP_PACKAGE}.tar.bz2"
# "Ffcall is under GNU GPL. As a special exception, if used in GNUstep
# or in derivate works of GNUstep, the included parts of ffcall are
# under GNU LGPL." -ffcall author
LICENSE="|| ( GPL-2 LGPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}/${CLISP_PACKAGE}/${PN}
DEPEND=""
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${PN}-make-jN.patch
}
src_configure() {
append-flags -fPIC
# Doc goes in datadir
econf \
--datadir="${EPREFIX}"/usr/share/doc/${PF} \
--enable-shared \
|| die "./configure failed"
}
src_compile() {
# Because CHOST is set to (for example)
# alphaev67-unknown-linux-gnu, CPU gets set to alphaev67 which
# doesn't work in the Makefile (29 Jan 2004 agriffis)
local cpu_setting
[[ "${ARCH}" == "alpha" ]] && cpu_setting='CPU=alpha'
emake ${cpu_setting} || die
}
src_install() {
dodoc NEWS README
dodir /usr/share/man
emake DESTDIR="${D}" install || die "Install failed"
}

@ -1,57 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/ffcall/ffcall-1.10-r4.ebuild,v 1.1 2014/02/08 13:42:20 pacho Exp $
EAPI=5
inherit eutils flag-o-matic
# CLISP maintains ffcall now
CLISP_PACKAGE="clisp-2.41"
DESCRIPTION="foreign function call libraries"
HOMEPAGE="http://www.haible.de/bruno/packages-ffcall.html"
SRC_URI="mirror://sourceforge/clisp/${CLISP_PACKAGE}.tar.bz2"
# "Ffcall is under GNU GPL. As a special exception, if used in GNUstep
# or in derivate works of GNUstep, the included parts of ffcall are
# under GNU LGPL." -ffcall author
LICENSE="|| ( GPL-2 LGPL-2 )"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE=""
S=${WORKDIR}/${CLISP_PACKAGE}/${PN}
DEPEND=""
RDEPEND=""
src_prepare() {
epatch "${FILESDIR}"/${PN}-make-jN.patch
}
src_configure() {
append-flags -fPIC
# Doc goes in datadir
econf \
--datadir="${EPREFIX}"/usr/share/doc/${PF} \
--enable-shared \
--disable-static
}
src_compile() {
# Because CHOST is set to (for example)
# alphaev67-unknown-linux-gnu, CPU gets set to alphaev67 which
# doesn't work in the Makefile (29 Jan 2004 agriffis)
local cpu_setting
[[ "${ARCH}" == "alpha" ]] && cpu_setting='CPU=alpha'
emake ${cpu_setting}
}
src_install() {
dodoc NEWS README
dodir /usr/share/man
default
prune_libtool_files
}

@ -1,49 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/fribidi/fribidi-0.19.5-r2.ebuild,v 1.3 2014/06/24 22:07:15 mgorny Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=1
inherit autotools eutils autotools-multilib
DESCRIPTION="A free implementation of the unicode bidirectional algorithm"
HOMEPAGE="http://fribidi.org/"
SRC_URI="http://fribidi.org/download/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="static-libs"
RESTRICT="test" #397347
RDEPEND=">=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}]
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r10
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
DOCS=( AUTHORS NEWS README ChangeLog THANKS TODO )
src_prepare() {
epatch \
"${FILESDIR}"/${PN}-0.19.2-nodoc.patch \
"${FILESDIR}"/${P}-signedwarning.patch
# Fix compability with dev-libs/glib >= 2.31
sed -i \
-e '/include/s:<glib/gstrfuncs.h>:<glib.h>:' \
-e '/include/s:<glib/gmem.h>:<glib.h>:' \
charset/fribidi-char-sets.c lib/mem.h || die
autotools-multilib_src_prepare
}
src_configure() {
# --with-glib=yes is required for #345621 to ensure "Requires: glib-2.0" is
# present in /usr/lib/pkgconfig/fribidi.pc
local myeconfargs=( --with-glib=yes )
autotools-multilib_src_configure
}

@ -1,2 +1 @@
DIST igraph-0.6.5.tar.gz 3209599 SHA256 7d1f8da9ebb6dd7acc648d9c7d6f4c490e998c5ca54ddf85db0017de3cc73fa2 SHA512 820ef71236942be21c393aede5913fe0d699cc901925ce3d989f4cc543eeac748d97e6e7c82f96c505a1c8580371447b27adf8369047b9d8f3d009eb9be6880d WHIRLPOOL cc9b2b084771b063455d0aa5353a6838e0684cd6a93d8c957973e2534333832e2680d6b975c7471cfabce55d00f88b9d4c6e1b120009f1cd2e17609a1c7d6f2d
DIST igraph-0.7.1.tar.gz 2967134 SHA256 d978030e27369bf698f3816ab70aa9141e9baf81c56cc4f55efbe5489b46b0df SHA512 ac7d7e3fbc6d27ae69079224881ca03db2c7e0b50d016706f3e167c614e2c9332c675d2fcd3cde12874e13a8fc402d42222308c6195afadee15152cec93f94dd WHIRLPOOL bb860c90796b8706ffed708bc5ba1a1a83ab73b57f9fd49aa0d05548c6f2758f8305a09386dc6da7d86bd568261df35b207231facffc7045527c7ab0b0ec89ea

@ -1,274 +0,0 @@
configure.ac | 32 ++++++++++++-------------------
examples/simple/igraph_arpack_rnsolve.out | 3 +++
examples/simple/igraph_layout_merge2.out | 20 +++++++++----------
examples/simple/igraph_sparsemat2.c | 2 +-
examples/simple/igraph_sparsemat3.c | 2 +-
examples/simple/igraph_sparsemat4.c | 2 +-
src/Makefile.am | 11 +++--------
src/sparsemat.c | 2 +-
tests/Makefile.am | 2 +-
tests/mt.at | 2 +-
tests/types.at | 2 +-
11 files changed, 35 insertions(+), 45 deletions(-)
diff --git a/configure.ac b/configure.ac
index c617aec..6d5d162 100644
--- a/configure.ac
+++ b/configure.ac
@@ -165,7 +165,8 @@ if test "x$enable_gmp" != "xno"; then
AC_CHECK_HEADER([gmp.h], [
AC_DEFINE([HAVE_GMP], [1], [Define to 1 if you have the GMP library])
gmp_support=yes
- LDFLAGS="${LDFLAGS} -lgmp"
+ GMP_LIBS="-lgmp"
+ AC_SUBST(GMP_LIBS)
])
])
fi
@@ -223,23 +224,15 @@ else
fi
if test "$internal_blas" = "no"; then
- AC_CHECK_LIB([blas], [daxpy_], [],
- AC_CHECK_LIB([blas], [daxpy], [],
- AC_CHECK_LIB([blas], [DAXPY_], [],
- AC_CHECK_LIB([blas], [DAXPY], [],
- [AC_MSG_RESULT(not found, trying to use -lblas anyway.)]))))
- LDFLAGS="${LDFLAGS} -lblas"
+ PKG_CHECK_MODULES([BLAS],[blas])
+ CPPFLAGS="${CPPFLAGS} ${BLAS_CFLAGS}"
else
AC_DEFINE([INTERNAL_BLAS], [1], [Define to 1 if you use the internal BLAS library])
fi
if test "$internal_lapack" = "no"; then
- AC_CHECK_LIB([lapack], [dlarnv_], [],
- AC_CHECK_LIB([lapack], [dlarnv], [],
- AC_CHECK_LIB([lapack], [DLARNV_], [],
- AC_CHECK_LIB([lapack], [DLARNV], [],
- [AC_MSG_RESULT(not found, trying to use -llapack anyway.)]))))
- LDFLAGS="${LDFLAGS} -llapack"
+ PKG_CHECK_MODULES([LAPACK],[lapack])
+ CPPFLAGS="${CPPFLAGS} ${LAPACK_CFLAGS}"
else
AC_DEFINE([INTERNAL_LAPACK], [1], [Define to 1 if you use the internal LAPACK library])
fi
@@ -248,16 +241,14 @@ if test "$internal_arpack" = "no"; then
if test "$tls_support" = "yes"; then
AC_MSG_ERROR([Thread-local storage only supported with internal ARPACK library])
fi
- AC_CHECK_LIB([arpack], [dsaupd_], [],
- AC_CHECK_LIB([arpack], [dsaupd], [],
- AC_CHECK_LIB([arpack], [DSAUPD_], [],
- AC_CHECK_LIB([arpack], [DSAUPD], [],
- [AC_MSG_RESULT(not found, trying to use -larpack anyway.)]))))
- LDFLAGS="${LDFLAGS} -larpack"
+ PKG_CHECK_MODULES([ARPACK],[arpack])
+ CPPFLAGS="${CPPFLAGS} ${ARPACK_CFLAGS}"
else
AC_DEFINE([INTERNAL_ARPACK], [1], [Define to 1 if you use the internal ARPACK library])
fi
+PKG_CHECK_MODULES([CS],[cxsparse])
+
glpk_support=no
if test "$internal_glpk" = "no"; then
AC_CHECK_LIB([glpk], [glp_read_mps], [
@@ -270,7 +261,8 @@ if test "$internal_glpk" = "no"; then
], [
AC_DEFINE([HAVE_GLPK], [1], [Define to 1 if you have the GLPK library])
glpk_support=yes
- LDFLAGS="${LDFLAGS} -lglpk"
+ GLPK_LIBS="-lglpk"
+ AC_SUBST(GLPK_LIBS)
])
])
])
diff --git a/examples/simple/igraph_arpack_rnsolve.out b/examples/simple/igraph_arpack_rnsolve.out
index ec38497..47b1a6b 100644
--- a/examples/simple/igraph_arpack_rnsolve.out
+++ b/examples/simple/igraph_arpack_rnsolve.out
@@ -17,6 +17,7 @@
22.0483 0
-21.3281 0
-3.00735 -19.2957
+-3.00735 19.2957
---
0.373224 0.226696 0.204213 0.0473383
-0.289145 -0.296079 -0.0479785 0.156365
@@ -32,6 +33,7 @@
-21.3281 0
-12.4527 0
-3.00735 -19.2957
+-3.00735 19.2957
---
-0.226696 0.695866 -0.204213 -0.0473383
0.296079 0.120213 0.0479785 -0.156365
@@ -47,6 +49,7 @@
-3.00735 19.2957
-3.00735 -19.2957
12.1099 6.27293
+12.1099 -6.27293
---
0.0768616 -0.195028 -0.152389 0.21912
0.147607 0.0704569 0.346547 0.125122
diff --git a/examples/simple/igraph_layout_merge2.out b/examples/simple/igraph_layout_merge2.out
index dfe2c22..9fe81bf 100644
--- a/examples/simple/igraph_layout_merge2.out
+++ b/examples/simple/igraph_layout_merge2.out
@@ -1,13 +1,13 @@
--2.73912 -2.95429
--0.479512 -4.00008
-1.96326 -3.51798
-3.65613 -1.69214
-3.95248 0.780051
-2.73912 2.95429
-0.479512 4.00008
--1.96326 3.51798
--3.65613 1.69214
--3.95248 -0.780051
+-2.55311 -3.13964
+-0.22007 -4.0407
+2.19703 -3.39835
+3.77493 -1.45795
+3.91094 1.03935
+2.55311 3.13964
+0.22007 4.0407
+-2.19703 3.39835
+-3.77493 1.45795
+-3.91094 -1.03935
-1.6061 6.30088
-4.92661 5.80435
-3.69637 8.92826
diff --git a/examples/simple/igraph_sparsemat2.c b/examples/simple/igraph_sparsemat2.c
index 296e52e..3abd0e3 100644
--- a/examples/simple/igraph_sparsemat2.c
+++ b/examples/simple/igraph_sparsemat2.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
#include <igraph_blas_internal.h>
diff --git a/examples/simple/igraph_sparsemat3.c b/examples/simple/igraph_sparsemat3.c
index 630bf1a..b23cbe1 100644
--- a/examples/simple/igraph_sparsemat3.c
+++ b/examples/simple/igraph_sparsemat3.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
diff --git a/examples/simple/igraph_sparsemat4.c b/examples/simple/igraph_sparsemat4.c
index 4d85bde..7497faf 100644
--- a/examples/simple/igraph_sparsemat4.c
+++ b/examples/simple/igraph_sparsemat4.c
@@ -21,7 +21,7 @@
*/
-#include <cs/cs.h>
+#include <cs.h>
#include <igraph.h>
#include <igraph_sparsemat.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index af7cae7..5db09eb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -9,9 +9,6 @@ AM_YFLAGS = -d
lib_LTLIBRARIES = libigraph.la
-include lapack/blas.inc
-include lapack/lapack.inc
-include lapack/arpack.inc
include plfit/plfit.inc
F2C = f2c/abort_.c f2c/dolio.c f2c/r_sin.c\
@@ -99,8 +96,6 @@ if INTERNAL_ARPACK
ARPACK_LIB = libarpack.la
endif
-include ../optional/glpk/glpk.inc
-
if INTERNAL_GLPK
libglpk_la_SOURCES = $(GLPK)
libglpk_la_CFLAGS = -I$(top_srcdir)/optional/glpk
@@ -247,7 +242,7 @@ libigraph_la_SOURCES = $(HEADERS_PRIVATE) \
drl_layout_3d.cpp drl_graph_3d.cpp \
DensityGrid_3d.cpp \
foreign-dl-parser.y foreign-dl-lexer.l \
- $(CS) sparsemat.c mixing.c bigint.c bignum.c \
+ sparsemat.c mixing.c bigint.c bignum.c \
version.c optimal_modularity.c \
igraph_fixed_vectorlist.c separators.c \
igraph_marked_queue.c igraph_estack.c st-cuts.c \
@@ -263,8 +258,8 @@ libigraph_la_SOURCES = $(HEADERS_PRIVATE) \
libigraph_la_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
libigraph_la_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include $(WARNING_CFLAGS)
libigraph_la_LDFLAGS = -no-undefined
-libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIB) \
- $(LAPACK_LIB) $(ARPACK_LIB) $(GLPK_LIB) $(PLFIT_LIB)
+libigraph_la_LIBADD = -lm $(XML2_LIBS) $(F2C_LIB) $(BLAS_LIBS) $(GMP_LIBS) \
+ $(LAPACK_LIBS) $(ARPACK_LIBS) $(GLPK_LIBS) $(PLFIT_LIB) $(CS_LIBS)
if INTERNAL_GLPK
libigraph_la_CFLAGS += -I$(top_srcdir)/optional/glpk
diff --git a/src/sparsemat.c b/src/sparsemat.c
index 2cbdab1..b78b88d 100644
--- a/src/sparsemat.c
+++ b/src/sparsemat.c
@@ -23,7 +23,7 @@
#include "config.h"
-#include "cs/cs.h"
+#include <cs.h>
#include "igraph_sparsemat.h"
#include "igraph_error.h"
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6d0ba59..af9bca9 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -13,7 +13,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \
} >$(srcdir)/package.m4
-EXTRA_DIST += package.m4
+#EXTRA_DIST += package.m4
TESTSUITE_AT = \
testsuite.at \
diff --git a/tests/mt.at b/tests/mt.at
index 050974a..e1496ac 100644
--- a/tests/mt.at
+++ b/tests/mt.at
@@ -29,5 +29,5 @@ AT_CLEANUP
AT_SETUP([Thread-safe ARPACK:])
AT_KEYWORDS([thread-safe ARPACK])
AT_COMPILE_CHECK([simple/tls2.c], [simple/tls2.out], [], [internal],
- [-lpthread])
+ [-lpthread $(${PKG_CONFIG} --libs arpack)])
AT_CLEANUP
diff --git a/tests/types.at b/tests/types.at
index f80a6a2..45087e8 100644
--- a/tests/types.at
+++ b/tests/types.at
@@ -133,7 +133,7 @@ AT_CLEANUP
AT_SETUP([Sparse matrix, multiplications (igraph_sparsemat_t): ])
AT_KEYWORDS([sparse matrix igraph_sparsemat_t])
AT_COMPILE_CHECK([simple/igraph_sparsemat2.c], [simple/igraph_sparsemat2.out],
- [], [INTERNAL], [-lblas])
+ [], [INTERNAL], [$(${PKG_CONFIG} --libs blas)])
AT_CLEANUP
AT_SETUP([Sparse matrix, indexing (igraph_sparsemat_t): ])

@ -1,52 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/igraph-0.6.5.ebuild,v 1.1 2014/04/18 20:58:32 mrueg Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=true
inherit autotools-utils toolchain-funcs
DESCRIPTION="Creating and manipulating undirected and directed graphs"
HOMEPAGE="http://igraph.sourceforge.net/index.html"
SRC_URI="mirror://sourceforge/project/${PN}/C%20library/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="debug gmp static-libs"
RDEPEND="
dev-libs/libxml2
>=sci-libs/arpack-3
virtual/blas
virtual/lapack
>=sci-libs/cxsparse-3
sci-mathematics/glpk
gmp? ( dev-libs/gmp )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
src_prepare() {
# rm -rf src/{cs,f2c,lapack,f2c.h} optional/glpk || die
# rm -rf src/cs optional/glpk || die
autotools-utils_src_prepare
}
src_configure() {
tc-export PKG_CONFIG
local myeconfargs=(
$(use_enable gmp)
$(use_enable debug)
--disable-tls
--with-external-arpack
--with-external-blas
--with-external-lapack
--with-external-f2c
--with-external-glpk
)
autotools-utils_src_configure
}

@ -1,52 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/igraph/igraph-0.7.1.ebuild,v 1.1 2014/06/26 14:04:57 mrueg Exp $
EAPI=5
AUTOTOOLS_AUTORECONF=true
inherit autotools-utils toolchain-funcs
DESCRIPTION="Creating and manipulating undirected and directed graphs"
HOMEPAGE="http://igraph.org"
SRC_URI="http://igraph.org/nightly/get/c/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64"
IUSE="debug gmp static-libs"
RDEPEND="
dev-libs/libxml2
>=sci-libs/arpack-3
virtual/blas
virtual/lapack
>=sci-libs/cxsparse-3
sci-mathematics/glpk
gmp? ( dev-libs/gmp )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
PATCHES=( "${FILESDIR}"/${P}-unbundle.patch )
src_prepare() {
# rm -rf src/{cs,f2c,lapack,f2c.h} optional/glpk || die
# rm -rf src/cs optional/glpk || die
autotools-utils_src_prepare
}
src_configure() {
tc-export PKG_CONFIG
local myeconfargs=(
$(use_enable gmp)
$(use_enable debug)
--disable-tls
--with-external-arpack
--with-external-blas
--with-external-lapack
--with-external-f2c
--with-external-glpk
)
autotools-utils_src_configure
}

@ -1,3 +1,2 @@
DIST libRocket-1.2.1.tar.gz 1796018 SHA256 05c92515031ebfa5b1e9421d88116a60f815818c97004947a16ce6b4c77563a7 SHA512 49210bf7f4867103d0149a789f020388a2ad533ee684b52d8d2ffdb38f41fe873ffc389b79a20a7020506b368394a0fde7a8ba5cb495576edc16f1b12f520e41 WHIRLPOOL f9b8f9d30c3f94028d623f22b8169a4a101fda5f52edd3a21d05b9a56c6410c94788e1226c4689361a7a8198973cf4c6819cd3733fe69d3d8a93edffad090e06
DIST libRocket-1.2.1_p20130110.tar.xz 845572 SHA256 5661f0d1b0a3e19b9f2856b9927ed7ec4ad6939e732230832cd701bf078a732b SHA512 1c474e0cad2e13ebe6102cd5d31c3fa61370d23062c31fd7703ec431f0da56f008c9711b49b73d8a9b32af0313e2cb3aa8c46888a36044fef05c15fe1cbc23b5 WHIRLPOOL 52ef88ebc35ac762c6b50fbaed8713b2568f80bc65390e696537f4935eaf1c4182a64b414fd6bfadb3e1a6cadb0589fcb20bc12c26e3ea87edaf342b5ff09bb6
DIST libRocket-1.3.0.0.tar.gz 1858846 SHA256 574e992ac0bb62c1aa782114986d440ade69f4408971d0fb4ddc5922df761b75 SHA512 579fb5b9ca48b44999ca9c64e5fde3f28b83b12487928d34cf6e2834e60c4fff06c845832d38387f4ba639e2bd906b96940da4ce5e4c73625c48c6658726d3bd WHIRLPOOL a72c72c38780bc4dba9fbdb14365b675579e0a4d251c88bcf780fa076c16728c09c9ba7dff733d8f54da8064184e585ea568e12275f8e7ab86d55333a6242b0f

@ -1,82 +0,0 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libRocket/libRocket-1.2.1.ebuild,v 1.6 2015/04/08 17:51:55 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python2_7 )
inherit cmake-utils eutils python-r1
DESCRIPTION="A HTML/CSS User Interface library"
HOMEPAGE="http://librocket.com/"
SRC_URI="https://github.com/lloydw/libRocket/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="python samples"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
RDEPEND="media-libs/freetype
python? (
${PYTHON_DEPS}
dev-libs/boost[python,${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}"
S=${WORKDIR}/${PN}-release-${PV}
python_BUILD_DIR=${WORKDIR}/${P}_build_python
CMAKE_USE_DIR="${S}"/Build
src_prepare() {
epatch "${FILESDIR}"/${P}-build.patch
}
src_configure() {
local mycmakeargs=(
-DBUILD_PYTHON_BINDINGS=OFF
$(cmake-utils_use_build samples SAMPLES)
-DSAMPLES_DIR=/usr/share/${PN}/samples
)
cmake-utils_src_configure
if use python ; then
cfgpybind() {
local mycmakeargs=(
-DBUILD_PYTHON_BINDINGS=ON
-DCMAKE_SKIP_RPATH=YES
)
BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_configure
}
einfo "configuring python binding"
python_foreach_impl cfgpybind
fi
}
src_compile() {
cmake-utils_src_compile
if use python ; then
buildpybind() {
cp "${WORKDIR}"/${P}_build/{libRocketCore*,libRocketControls*} "${python_BUILD_DIR}-${EPYTHON}"/ || die
BUILD_DIR="${python_BUILD_DIR}-${EPYTHON}" cmake-utils_src_make _rocketcontrols/fast _rocketcore/fast
}
einfo "compiling python binding"
python_foreach_impl buildpybind
fi
}
src_install() {
cmake-utils_src_install
if use python ; then
instpybind() {
python_domodule bin/rocket.py
exeinto "$(python_get_sitedir)"
doexe ${python_BUILD_DIR}-${EPYTHON}/_rocket{core,controls}.so
}
einfo "installing python binding"
python_foreach_impl instpybind
fi
}

@ -1,3 +1 @@
DIST libcgroup-0.38.tar.bz2 475657 SHA256 5d36d1a48b95f62fe9fcdf74a5a4089512e5e43e6011aa1504fd6f2a0909867f SHA512 763e52bee699b0461508eabb6fdf3a79f15d1d8cdbc6631fcae93127eb7648e6bab660cf3a31019b966095113f9a086d55b5351c7999f3654f8e6c95507725d5 WHIRLPOOL d6a6e9c629687608698817346e1eda1e1406554665ea6aea055844bd47b0a21b0f3301c4a3acb0c2492be0a6536d25c1b609ee3ade8c11376f25b3335859814b
DIST libcgroup-0.39.rc1.tar.bz2 497250 SHA256 9d27e4b16b92fb9917d0807934023b8cc691f3b5258c4ee581957645fa7ba143 SHA512 0aad3389cb52e6f4c6f130ba24a4e2f2348562254dee10f343607b78c2e28930753ece70b6b3f2cce57d72f3d0bc78352cfbf15a659b3ec75421d233ac50750f WHIRLPOOL 09e4f444a589e68373ce52f96707a4026175392bc26090a85bc50d7a35233ad5356638d250d1292511110e235aab1d77992f77e35d1be399a017b319354d235e
DIST libcgroup-0.41.tar.bz2 500120 SHA256 e4e38bdc7ef70645ce33740ddcca051248d56b53283c0dc6d404e17706f6fb51 SHA512 1aedb02cd2ce3bc2e2a328a247a92976ad0978ca4d3aee4eb671fbcc6bb270348efc78dcf84f27fc500f8bfb9bb57c7d6e4d429ef2bc69e4e5118b7cd895a6bd WHIRLPOOL 3941ec9362dd7da1c5d1b9eaf2b44303982a04d460ab92946201b1fe952c2f94e19950e9a08104c262eb982d8e64bcf290f1b95115aaba11d8b1457b715a3646

@ -1,97 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcgroup/libcgroup-0.38-r1.ebuild,v 1.4 2013/01/05 11:24:38 pinkbyte Exp $
EAPI="4"
inherit autotools eutils linux-info pam
DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
HOMEPAGE="http://libcg.sourceforge.net/"
SRC_URI="mirror://sourceforge/libcg/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~ppc x86"
IUSE="+daemon debug pam static-libs +tools"
RDEPEND="pam? ( virtual/pam )"
DEPEND="${RDEPEND}
sys-devel/bison
sys-devel/flex"
pkg_setup() {
if use daemon && ! use tools; then
eerror "The daemon USE flag requires tools USE flag."
die "Please enable tools or disable daemon."
fi
local CONFIG_CHECK="~CGROUPS"
if use daemon; then
CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
fi
linux-info_pkg_setup
}
src_prepare() {
# Change rules file location
sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \
-i src/libcgroup-internal.h || die "sed failed"
sed -e 's:\(pam_cgroup_la_LDFLAGS.*\):\1\ -avoid-version:' \
-i src/pam/Makefile.am || die "sed failed"
eautoreconf
}
src_configure() {
my_conf="--enable-shared
--libdir=/usr/$(get_libdir)
$(use_enable daemon)
$(use_enable debug)
$(use_enable pam)
$(use_enable static-libs static)
$(use_enable tools)"
if use pam; then
my_conf="${my_conf} --enable-pam-module-dir=$(getpam_mod_dir)"
fi
# bug #450302
econf ${my_conf} --disable-silent-rules
}
src_install() {
emake DESTDIR="${D}" install || die "Install failed"
find "${D}" -name "*.la" -delete || die "la removal failed"
insinto /etc/cgroup
doins samples/cgrules.conf || die
if use tools; then
doins samples/cgconfig.conf || die
newconfd "${FILESDIR}"/cgconfig.confd cgconfig || die
newinitd "${FILESDIR}"/cgconfig.initd cgconfig || die
fi
if use daemon; then
newconfd "${FILESDIR}"/cgred.confd cgred || die
newinitd "${FILESDIR}"/cgred.initd cgred || die
fi
}
pkg_postinst() {
elog "Read the kernel docs on cgroups, related schedulers, and the"
elog "block I/O controllers. The Redhat Resource Management Guide"
elog "is also helpful. DO NOT enable the cgroup namespace subsytem"
elog "if you want a custom config, rule processing, etc. This option"
elog "should only be enabled for a VM environment. The UID wildcard"
elog "rules seem to work only without a custom config (since wildcards"
elog "don't work in config blocks). Specific user-id configs *do*"
elog "work, but be careful about how the mem limits add up if using"
elog "the memory.limit_* directives. There should be a basic task"
elog "partitioning into the default group when running cgred with no"
elog "specific config blocks or rules (other than the mount directive)."
elog "See the docs for the pam module config, and as always, RTFM..."
}

@ -1,113 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libcgroup/libcgroup-0.39_rc1-r1.ebuild,v 1.6 2013/05/25 08:50:54 ago Exp $
EAPI="5"
AUTOTOOLS_AUTORECONF=1
inherit eutils linux-info pam autotools-utils versionator
MY_P="${PN}-$(replace_version_separator 2 .)"
DESCRIPTION="Tools and libraries to configure and manage kernel control groups"
HOMEPAGE="http://libcg.sourceforge.net/"
SRC_URI="mirror://sourceforge/project/libcg/${PN}/v0.39.rc/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ppc ~ppc64 x86"
IUSE="+daemon debug pam static-libs +tools debug"
RDEPEND="pam? ( virtual/pam )"
DEPEND="
${RDEPEND}
sys-devel/bison
sys-devel/flex
"
REQUIRED_USE="daemon? ( tools )"
S="${WORKDIR}/${MY_P}"
DOCS=(README_daemon README README_systemd INSTALL)
pkg_setup() {
local CONFIG_CHECK="~CGROUPS"
if use daemon; then
CONFIG_CHECK="${CONFIG_CHECK} ~CONNECTOR ~PROC_EVENTS"
fi
linux-info_pkg_setup
}
src_prepare() {
# Change rules file location
sed -e 's:/etc/cgrules.conf:/etc/cgroup/cgrules.conf:' \
-i src/libcgroup-internal.h || die "sed failed"
sed -e 's:\(pam_cgroup_la_LDFLAGS.*\):\1\ -avoid-version:' \
-i src/pam/Makefile.am || die "sed failed"
sed -e 's#/var/run#/run#g' -i configure.in || die "sed failed"
autotools-utils_src_prepare
}
src_configure() {
local my_conf
if use pam; then
my_conf=" --enable-pam-module-dir=$(getpam_mod_dir) "
fi
#if use daemon; then
# my_conf+=" --enable-cgred-socket=/run/cgred.socket "
#fi
local myeconfargs=(
$(use_enable daemon)
$(use_enable debug)
$(use_enable pam)
$(use_enable tools)
${my_conf}
)
autotools-utils_src_configure
}
src_test() {
# Use mount cgroup to build directory
# sandbox restricted to trivial build,
# possible kill Diego tanderbox ;)
true
}
src_install() {
autotools-utils_src_install
prune_libtool_files --all
insinto /etc/cgroup
doins samples/*.conf || die
if use tools; then
newconfd "${FILESDIR}"/cgconfig.confd cgconfig || die
newinitd "${FILESDIR}"/cgconfig.initd cgconfig || die
fi
if use daemon; then
newconfd "${FILESDIR}"/cgred.confd cgred || die
newinitd "${FILESDIR}"/cgred.initd cgred || die
fi
}
pkg_postinst() {
elog "Read the kernel docs on cgroups, related schedulers, and the"
elog "block I/O controllers. The Redhat Resource Management Guide"
elog "is also helpful. DO NOT enable the cgroup namespace subsytem"
elog "if you want a custom config, rule processing, etc. This option"
elog "should only be enabled for a VM environment. The UID wildcard"
elog "rules seem to work only without a custom config (since wildcards"
elog "don't work in config blocks). Specific user-id configs *do*"
elog "work, but be careful about how the mem limits add up if using"
elog "the memory.limit_* directives. There should be a basic task"
elog "partitioning into the default group when running cgred with no"
elog "specific config blocks or rules (other than the mount directive)."
elog "See the docs for the pam module config, and as always, RTFM..."
}

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

Loading…
Cancel
Save