root
10 years ago
parent
2985a3d41b
commit
0356e09718
@ -1,2 +1,2 @@
|
||||
DIST xz-5.0.5.tar.gz 1305685 SHA512 dc36f305bc2abf97da8c86e44b661d9ac2d5ed58e89e83f007f49e0d7cf4871d7b6defa51b9348d3f725793517f7ac47de572f6d23212e074c32032dd8357772 WHIRLPOOL 7e95d6d064239ebe6f1231ec8a5a1390e3c5d71863d7e8d1339bed5f20255d750e3f9df953ed7e95ae2b43607aab93747a5a2d948e4bb6745d3adcf7ea25c455
|
||||
DIST xz-5.0.5.tar.gz 1305685 SHA256 5dcffe6a3726d23d1711a65288de2e215b4960da5092248ce63c99d50093b93a SHA512 dc36f305bc2abf97da8c86e44b661d9ac2d5ed58e89e83f007f49e0d7cf4871d7b6defa51b9348d3f725793517f7ac47de572f6d23212e074c32032dd8357772 WHIRLPOOL 7e95d6d064239ebe6f1231ec8a5a1390e3c5d71863d7e8d1339bed5f20255d750e3f9df953ed7e95ae2b43607aab93747a5a2d948e4bb6745d3adcf7ea25c455
|
||||
DIST xz-5.1.3alpha.tar.gz 1262328 SHA256 9f94506e301d5b6863921bba861a99ba00de384dafb4e5f409679a93e41613d4 SHA512 839c999e1eee273a3120e76d5096f8a523c157a2dacd83f6d554e3f2a4f790f3f7360cfbc7749c1c42cb213d0a55eb74216ed2236a6568f49027e119a3184687 WHIRLPOOL 3c1227c899dcab955b2db10ed94432fff6a5025d0da957dfab14b8129d25cc8478b372bcae6b9b089769b732d19d570ad42c187fa568e257ad5fd5bf15eb8743
|
||||
|
||||
@ -0,0 +1,17 @@
|
||||
Fixed man-page creation with pod2man from >=perl-5.18
|
||||
|
||||
https://bugs.gentoo.org/490486
|
||||
|
||||
Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
|
||||
|
||||
--- rsnapshot-1.3.1/rsnapshot-program.pl
|
||||
+++ rsnapshot-1.3.1/rsnapshot-program.pl
|
||||
@@ -6716,6 +6716,8 @@
|
||||
|
||||
=back
|
||||
|
||||
+=back
|
||||
+
|
||||
=head1 USAGE
|
||||
|
||||
B<rsnapshot> can be used by any user, but for system-wide backups
|
||||
@ -0,0 +1,184 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/docker/docker-0.7.6.ebuild,v 1.1 2014/01/16 21:35:21 gregkh Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
DESCRIPTION="Docker complements LXC with a high-level API which operates at the process level."
|
||||
HOMEPAGE="http://www.docker.io/"
|
||||
|
||||
GITHUB_URI="github.com/dotcloud/docker"
|
||||
|
||||
if [[ ${PV} == *9999 ]]; then
|
||||
SRC_URI=""
|
||||
EGIT_REPO_URI="git://${GITHUB_URI}.git"
|
||||
inherit git-2
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="https://${GITHUB_URI}/archive/v${PV}.zip -> ${P}.zip"
|
||||
DOCKER_GITCOMMIT="bc3b2ec"
|
||||
KEYWORDS="~amd64"
|
||||
[ "$DOCKER_GITCOMMIT" ] || die "DOCKER_GITCOMMIT must be added manually for each bump!"
|
||||
fi
|
||||
|
||||
inherit bash-completion-r1 linux-info systemd udev user
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="aufs +device-mapper doc vim-syntax zsh-completion"
|
||||
|
||||
# TODO work with upstream to allow us to build without lvm2 installed if we have -device-mapper
|
||||
CDEPEND="
|
||||
>=dev-db/sqlite-3.7.9:3
|
||||
sys-fs/lvm2[thin]
|
||||
"
|
||||
DEPEND="
|
||||
${CDEPEND}
|
||||
>=dev-lang/go-1.2
|
||||
dev-vcs/git
|
||||
dev-vcs/mercurial
|
||||
doc? (
|
||||
dev-python/sphinx
|
||||
dev-python/sphinxcontrib-httpdomain
|
||||
)
|
||||
"
|
||||
RDEPEND="
|
||||
${CDEPEND}
|
||||
!app-emulation/docker-bin
|
||||
>=app-arch/tar-1.26
|
||||
>=sys-apps/iproute2-3.5
|
||||
>=net-firewall/iptables-1.4
|
||||
>=app-emulation/lxc-0.8
|
||||
>=dev-vcs/git-1.7
|
||||
>=app-arch/xz-utils-4.9
|
||||
aufs? (
|
||||
|| (
|
||||
sys-fs/aufs3
|
||||
sys-kernel/aufs-sources
|
||||
)
|
||||
)
|
||||
"
|
||||
|
||||
RESTRICT="strip"
|
||||
|
||||
pkg_setup() {
|
||||
CONFIG_CHECK+="
|
||||
~BRIDGE
|
||||
~IP_NF_TARGET_MASQUERADE
|
||||
~MEMCG_SWAP
|
||||
~NETFILTER_XT_MATCH_ADDRTYPE
|
||||
~NF_NAT
|
||||
~NF_NAT_NEEDED
|
||||
"
|
||||
ERROR_MEMCG_SWAP="MEMCG_SWAP is required if you wish to limit swap usage of containers"
|
||||
|
||||
if use aufs; then
|
||||
CONFIG_CHECK+="
|
||||
~AUFS_FS
|
||||
"
|
||||
ERROR_AUFS_FS="AUFS_FS is required to be set if and only if aufs-sources are used"
|
||||
fi
|
||||
|
||||
if use device-mapper; then
|
||||
CONFIG_CHECK+="
|
||||
~BLK_DEV_DM
|
||||
~DM_THIN_PROVISIONING
|
||||
~EXT4_FS
|
||||
"
|
||||
fi
|
||||
|
||||
check_extra_config
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# eventually, perhaps Gentoo will include a "go" eclass to do some of this
|
||||
|
||||
export GOPATH="${WORKDIR}/gopath"
|
||||
mkdir -p "$GOPATH" || die
|
||||
|
||||
# make sure docker itself is in our shiny new GOPATH
|
||||
mkdir -p "${GOPATH}/src/$(dirname "$GITHUB_URI")" || die
|
||||
ln -sf "$(pwd -P)" "${GOPATH}/src/${GITHUB_URI}" || die
|
||||
|
||||
# we need our vendored deps, too
|
||||
export GOPATH="$GOPATH:$(pwd -P)/vendor"
|
||||
|
||||
# setup CFLAGS and LDFLAGS for separate build target
|
||||
# see https://github.com/tianon/docker-overlay/pull/10
|
||||
export CGO_CFLAGS="-I${ROOT}/usr/include"
|
||||
export CGO_LDFLAGS="-L${ROOT}/usr/lib"
|
||||
|
||||
# if we're building from a zip, we need the GITCOMMIT value
|
||||
[ "$DOCKER_GITCOMMIT" ] && export DOCKER_GITCOMMIT
|
||||
|
||||
# time to build!
|
||||
./hack/make.sh dynbinary || die
|
||||
|
||||
if use doc; then
|
||||
emake -C docs docs man || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
VERSION=$(cat VERSION)
|
||||
newbin bundles/$VERSION/dynbinary/docker-$VERSION docker
|
||||
exeinto /usr/libexec/docker
|
||||
newexe bundles/$VERSION/dynbinary/dockerinit-$VERSION dockerinit
|
||||
|
||||
newinitd contrib/init/openrc/docker.initd docker
|
||||
newconfd contrib/init/openrc/docker.confd docker
|
||||
|
||||
systemd_dounit contrib/init/systemd/docker.service
|
||||
|
||||
udev_dorules contrib/udev/*.rules
|
||||
|
||||
dodoc AUTHORS CONTRIBUTING.md CHANGELOG.md NOTICE README.md
|
||||
if use doc; then
|
||||
dohtml -r docs/_build/html/*
|
||||
doman docs/_build/man/*
|
||||
fi
|
||||
|
||||
dobashcomp contrib/completion/bash/*
|
||||
|
||||
if use zsh-completion; then
|
||||
insinto /usr/share/zsh/site-functions
|
||||
doins contrib/completion/zsh/*
|
||||
fi
|
||||
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles
|
||||
doins -r contrib/syntax/vim/ftdetect
|
||||
doins -r contrib/syntax/vim/syntax
|
||||
fi
|
||||
|
||||
insinto /usr/share/${P}/contrib
|
||||
doins contrib/README
|
||||
cp -R "${S}/contrib"/* "${D}/usr/share/${P}/contrib/"
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
udev_reload
|
||||
|
||||
elog ""
|
||||
elog "To use docker, the docker daemon must be running as root. To automatically"
|
||||
elog "start the docker daemon at boot, add docker to the default runlevel:"
|
||||
elog " rc-update add docker default"
|
||||
elog "Similarly for systemd:"
|
||||
elog " systemctl enable docker.service"
|
||||
elog ""
|
||||
|
||||
# create docker group if the code checking for it in /etc/group exists
|
||||
enewgroup docker
|
||||
|
||||
elog "To use docker as a non-root user, add yourself to the docker group."
|
||||
elog ""
|
||||
|
||||
ewarn ""
|
||||
ewarn "If you want your containers to have access to the public internet or even"
|
||||
ewarn "the existing private network, IP Forwarding must be enabled:"
|
||||
ewarn " sysctl -w net.ipv4.ip_forward=1"
|
||||
ewarn "or more permanently:"
|
||||
ewarn " echo net.ipv4.ip_forward = 1 > /etc/sysctl.d/${PN}.conf"
|
||||
ewarn "Please be mindful of the security implications of enabling IP Forwarding."
|
||||
ewarn ""
|
||||
}
|
||||
@ -0,0 +1,41 @@
|
||||
x86: restrict XEN_DOMCTL_getmemlist
|
||||
|
||||
Coverity ID 1055652
|
||||
|
||||
(See the code comment.)
|
||||
|
||||
This is CVE-2013-4553 / XSA-74.
|
||||
|
||||
Signed-off-by: Jan Beulich <jbeulich@suse.com>
|
||||
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
|
||||
Reviewed-by: Tim Deegan <tim@xen.org>
|
||||
|
||||
--- a/xen/arch/x86/domctl.c
|
||||
+++ b/xen/arch/x86/domctl.c
|
||||
@@ -385,6 +385,26 @@ long arch_do_domctl(
|
||||
break;
|
||||
}
|
||||
|
||||
+ /*
|
||||
+ * XSA-74: This sub-hypercall is broken in several ways:
|
||||
+ * - lock order inversion (p2m locks inside page_alloc_lock)
|
||||
+ * - no preemption on huge max_pfns input
|
||||
+ * - not (re-)checking d->is_dying with page_alloc_lock held
|
||||
+ * - not honoring start_pfn input (which libxc also doesn't set)
|
||||
+ * Additionally it is rather useless, as the result is stale by
|
||||
+ * the time the caller gets to look at it.
|
||||
+ * As it only has a single, non-production consumer (xen-mceinj),
|
||||
+ * rather than trying to fix it we restrict it for the time being.
|
||||
+ */
|
||||
+ if ( /* No nested locks inside copy_to_guest_offset(). */
|
||||
+ paging_mode_external(current->domain) ||
|
||||
+ /* Arbitrary limit capping processing time. */
|
||||
+ max_pfns > GB(4) / PAGE_SIZE )
|
||||
+ {
|
||||
+ ret = -EOPNOTSUPP;
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
spin_lock(&d->page_alloc_lock);
|
||||
|
||||
if ( unlikely(d->is_dying) ) {
|
||||
@ -0,0 +1,142 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen/xen-4.2.2-r2.ebuild,v 1.1 2014/01/17 02:44:09 dlan Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
if [[ $PV == *9999 ]]; then
|
||||
KEYWORDS=""
|
||||
REPO="xen-unstable.hg"
|
||||
EHG_REPO_URI="http://xenbits.xensource.com/${REPO}"
|
||||
S="${WORKDIR}/${REPO}"
|
||||
live_eclass="mercurial"
|
||||
else
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
SRC_URI="http://bits.xensource.com/oss-xen/release/${PV}/xen-${PV}.tar.gz"
|
||||
fi
|
||||
|
||||
inherit mount-boot flag-o-matic python-any-r1 toolchain-funcs eutils ${live_eclass}
|
||||
|
||||
DESCRIPTION="The Xen virtual machine monitor"
|
||||
HOMEPAGE="http://xen.org/"
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
IUSE="custom-cflags debug efi flask pae xsm"
|
||||
|
||||
DEPEND="${PYTHON_DEPS}
|
||||
efi? ( >=sys-devel/binutils-2.22[multitarget] )
|
||||
!efi? ( >=sys-devel/binutils-2.22[-multitarget] )"
|
||||
RDEPEND=""
|
||||
PDEPEND="~app-emulation/xen-tools-${PV}"
|
||||
|
||||
RESTRICT="test"
|
||||
|
||||
# Approved by QA team in bug #144032
|
||||
QA_WX_LOAD="boot/xen-syms-${PV}"
|
||||
|
||||
REQUIRED_USE="
|
||||
flask? ( xsm )
|
||||
"
|
||||
|
||||
#Security patches
|
||||
XSA_PATCHES=(
|
||||
"${FILESDIR}"/${PN}-4-CVE-2013-1918-XSA-45_[1-7].patch
|
||||
"${FILESDIR}"/${PN}-4.2-2013-2076-XSA-52to54.patch
|
||||
"${FILESDIR}"/${PN}-4.2-CVE-2013-1432-XSA-58.patch
|
||||
"${FILESDIR}"/${PN}-4.2-CVE-2013-4553-XSA-74.patch
|
||||
"${FILESDIR}"/${PN}-CVE-2013-4554-XSA-76.patch
|
||||
"${FILESDIR}"/${PN}-CVE-2013-6400-XSA-80.patch
|
||||
)
|
||||
|
||||
pkg_setup() {
|
||||
python-any-r1_pkg_setup
|
||||
if [[ -z ${XEN_TARGET_ARCH} ]]; then
|
||||
if use x86 && use amd64; then
|
||||
die "Confusion! Both x86 and amd64 are set in your use flags!"
|
||||
elif use x86; then
|
||||
export XEN_TARGET_ARCH="x86_32"
|
||||
elif use amd64; then
|
||||
export XEN_TARGET_ARCH="x86_64"
|
||||
else
|
||||
die "Unsupported architecture!"
|
||||
fi
|
||||
fi
|
||||
|
||||
if use flask ; then
|
||||
export "XSM_ENABLE=y"
|
||||
export "FLASK_ENABLE=y"
|
||||
elif use xsm ; then
|
||||
export "XSM_ENABLE=y"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# Drop .config and fix gcc-4.6
|
||||
epatch "${FILESDIR}"/${PN/-pvgrub/}-4-fix_dotconfig-gcc.patch
|
||||
|
||||
if use efi; then
|
||||
epatch "${FILESDIR}"/${PN}-4.2-efi.patch
|
||||
export EFI_VENDOR="gentoo"
|
||||
export EFI_MOUNTPOINT="boot"
|
||||
fi
|
||||
|
||||
# if the user *really* wants to use their own custom-cflags, let them
|
||||
if use custom-cflags; then
|
||||
einfo "User wants their own CFLAGS - removing defaults"
|
||||
# try and remove all the default custom-cflags
|
||||
find "${S}" -name Makefile -o -name Rules.mk -o -name Config.mk -exec sed \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O3\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-march=i686\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-fomit-frame-pointer\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-g3*\s\(.*\)/CFLAGS\1=\2 \3/' \
|
||||
-e 's/CFLAGS\(.*\)=\(.*\)-O2\(.*\)/CFLAGS\1=\2\3/' \
|
||||
-i {} \; || die "failed to re-set custom-cflags"
|
||||
fi
|
||||
|
||||
# not strictly necessary to fix this
|
||||
sed -i 's/, "-Werror"//' "${S}/tools/python/setup.py" || die "failed to re-set setup.py"
|
||||
|
||||
[[ ${XSA_PATCHES[@]} ]] && epatch "${XSA_PATCHES[@]}"
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
if use custom-cflags; then
|
||||
filter-flags -fPIE -fstack-protector
|
||||
replace-flags -O3 -O2
|
||||
else
|
||||
unset CFLAGS
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Send raw LDFLAGS so that --as-needed works
|
||||
emake CC="$(tc-getCC)" LDFLAGS="$(raw-ldflags)" LD="$(tc-getLD)" -C xen ${myopt}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local myopt
|
||||
use debug && myopt="${myopt} debug=y"
|
||||
use pae && myopt="${myopt} pae=y"
|
||||
|
||||
# The 'make install' doesn't 'mkdir -p' the subdirs
|
||||
if use efi; then
|
||||
mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
|
||||
fi
|
||||
|
||||
emake LDFLAGS="$(raw-ldflags)" DESTDIR="${D}" -C xen ${myopt} install
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Official Xen Guide and the unoffical wiki page:"
|
||||
elog " http://www.gentoo.org/doc/en/xen-guide.xml"
|
||||
elog " http://en.gentoo-wiki.com/wiki/Xen/"
|
||||
|
||||
use pae && ewarn "This is a PAE build of Xen. It will *only* boot PAE kernels!"
|
||||
use efi && einfo "The efi executable is installed in boot/efi/gentoo"
|
||||
}
|
||||
@ -1,24 +1,12 @@
|
||||
DIST amd64-debug-libreoffice-4.1.3.2-r2.tar.xz 29522704 SHA256 04f26c06e3d907a5874561b590cc94f6f7254ddc073fbc0da692425d60699366 SHA512 de66b91fef5506ab8231db6d01fb39e4be45b8af7c5f110e54ca49eee65538ec718416f8b8d3455b5e8375ea0a64141c6f98305827e5998d65b69730d55aee89 WHIRLPOOL c48367509662660de1bfe9ed63c1cd03374464a0dfd6d2aa5e4f45f9080cf1bf83cf261df2aa4e9ef1b7bb7bb9eab70481bbdda04bf1bce83e26c976ba80db95
|
||||
DIST amd64-debug-libreoffice-4.1.3.2-r3.tar.xz 953429084 SHA256 1848b0171040b8c1f41d0dbf7a601dafa1cc17368e2d1dc8a3250ea93b6ccd82 SHA512 febc024ed3a8998f1e42ff2d12787c3c23612c7716f4d83884eb4b3e39ec380700e2f4f5e25313993c1d7bae2999c656fd3c67982ba7d7291fc790d9fde0ac23 WHIRLPOOL 8bc4e005c76ef33507b54802d46e96248ad137328c52c0411b65bf1f2895c7ff3c23cf71b16bff6483988734d6958b31fec018eff8e91685630c312020691502
|
||||
DIST amd64-debug-libreoffice-gnome-4.1.3.2-r2.xd3 5770968 SHA256 3ef3707b5a9f044e897f26cd68b2c66a8835eb164c0bc34087bd9a6ce5801e3d SHA512 d68295ba9b4d976d9cb0b40dfaba4a0fa861f52b54c6e1f0a95eb61ff3c90dde5d3e2e9ee25a240c881dcde2fcc347cbdb9bd560ac1cf6c49afe7b049f20a96a WHIRLPOOL cf29026465271273574da5b5c4223bb73362dfebb8d17a0260e24735a31fd6a178cc86f909c14fc9892a346ea40018d918bd91b05e1146736d8a5f3115d490bf
|
||||
DIST amd64-debug-libreoffice-gnome-4.1.3.2-r3.xd3 245058778 SHA256 bc1b7570b9a2b640a618999de88bf1dee49a055dfa666badd71de9eeea051fac SHA512 c1c180abeaf9221b20fe642be94c6446001511463ce12d5457886c1cdc8914864e76294d21e6ad7c9a6e0ef54e8fbf9627f71b160a083a36dbf4b51581d429a4 WHIRLPOOL 80c6d23bf8f268f2082dab243a7746d4ce0fb6018d59b34072461e45df51b8086fdaa3d16149cfb6a8d4ebe4075012b8b1e0a5ff52dae08fd75b789ba83bb31b
|
||||
DIST amd64-debug-libreoffice-gnome-java-4.1.3.2-r2.xd3 11236622 SHA256 77b45ee5b8bacc2b1b803db1894345c97d2035ad22f14cd407f443567d46e517 SHA512 de8c1ccf371029d2a075b7e5df305d2114a4bd91ab78beb25bb7d4c8dd2b25b3eae689b15cbce57b4c298ddbd9647f2dfa92430578f2eeafa6a7de810ddc691a WHIRLPOOL 7734b43203c31571692a51bf4936e7038ed2fec1eb316d2b526d07baec465724622d2c495163ab21e28577a6211e799571bf6a41e83a7f56160f6c2c974f9ff0
|
||||
DIST amd64-debug-libreoffice-gnome-java-4.1.3.2-r3.xd3 641166772 SHA256 175e9392a5e24478aa083c4148783680740289a95b352b7624748721c36b0a62 SHA512 99c7537414a4e7e56aec3249c62df30d630a660fc9ea8654a1c28824fd3e50585011d51002dfd6211ecad2422a9cd0a42e7a9978252e4d4992bbaa6c283f0633 WHIRLPOOL 564e48c48438158d22efea1ded6d5044e3e75af0e4b4ea40eab186b47c7d48f4f0b3939cea4117bb7242300683c3fd5ecca17d6e31338af6c9e7842489c0dcd7
|
||||
DIST amd64-debug-libreoffice-java-4.1.3.2-r2.xd3 11030982 SHA256 ea7637f496e425858f54bcb16e741df43225465cfcb74a2475fdb352307b22bb SHA512 1ed773d911f0243308ae33476212e4c33c9f1fa5a0f820914903f2765c07393dda76c227dcce55f102a40fd38d40222496b5eca061432a3e6ed8c87e3cc37549 WHIRLPOOL 02bc5ff5c8ae43e6d84ebf1d1fd7f330f4f0b04a3f3da4ee62dae1a879646b59813cdda49ce43f6bbf71de432e346a3b031c5f9e129d182d51c9881c93724d86
|
||||
DIST amd64-debug-libreoffice-java-4.1.3.2-r3.xd3 638572430 SHA256 ccaf6f26275f0e707b1adc3c7539d2a60f64e8ce23a35fc25ef48b3351a39e6a SHA512 2a22a034436d25f993617bbf01109c98ef8853ab76ab3516335bd2163c7120e0a3f22386f0a6cbf5a3709e19844cabdaade24a2e75f09cd57c311d5d4087ed5f WHIRLPOOL dc9b78a40b779f9b2e5f69db3442369a8fe4452d27e9650a99022c0e5b505c9a066ee3df448bc9558a2a1fd9287363ef44bdd1376fa894cd63ceff9a9b463aeb
|
||||
DIST amd64-debug-libreoffice-kde-4.1.3.2-r2.xd3 5762060 SHA256 05e2fb888bbfbbf2f74ec1b3479736ee8f840894a9b6c2cebff04b7da40e143f SHA512 53ba2413708a83d7fb054153403b0f7c7fa1a1022cc00b2e9278528f2845159a3f000a008b64e6727b3ddfc3dbe8988fc0789bdc55b601c810aefdcfead7bb5f WHIRLPOOL 6fbadc3c6362f0bebb17c66ec482c2f957b74e2d37cb69c19f0713c9d09679058878c464c49f21f4429f4cb784e6ccc90daf9ca58fffe88bf350ad29a0380886
|
||||
DIST amd64-debug-libreoffice-kde-4.1.3.2-r3.xd3 259442335 SHA256 bdb00cbd7ff302ecc46370386064d20a8a3e1a35bdd6c81b82539396c7572701 SHA512 f5f1c80930fde50b11cce49237c365fafc64bd20312601ae8249d5c29460b2e910bf8061f16f6116844c202470909e28f01c25d6c8fde3777e53df815f56852f WHIRLPOOL 17b0720bc946cdf6ddf4baf853edca81532d8562c01e09eb8c3df9509ad757d20181036a27a26352e04e60e5bd4060faadb2c443055f12db6e42c76e9effef95
|
||||
DIST amd64-debug-libreoffice-kde-java-4.1.3.2-r2.xd3 11068246 SHA256 734693daa3cb7a07a0db3bdd3757b404b2b881e93303ba4becfa6803b87334e1 SHA512 b7f8b4bda9c6112b231d875cc864e5ae0c75598800c3d6fc88ee7dddf4e8f6bcb6abc653c04e2aeac7a6113ab88619c67675164b89988816041add9b2cd9eb25 WHIRLPOOL 41efa765195f9208f9c265e23fc5b6f7c0a708b0bea1fa828156f041a20e0ba5e92ae454f18968396d322041527ef2ca0fd060a5ddb9f778be8330f2f5f199ac
|
||||
DIST amd64-debug-libreoffice-kde-java-4.1.3.2-r3.xd3 640100567 SHA256 113aed13332baf4d40f181b8554eebaccabc950e506c4a786397aed6ffdf4f02 SHA512 d946b810064771f153c87e1d32f5c747560897322a79c8eca0879986bff214bf0b95884ab31523b84e1c15f11a431c1eba4177bcf5a198773ffbac60c400c3be WHIRLPOOL 00947ebf8b8978bba5598b0d43a556a7e522ad20f28d383e91ba17b21942e3b170437487cd591d8bffe5f58e1a6e25fd2dfb3f7f1bfd44c9d1f329b01251008e
|
||||
DIST x86-debug-libreoffice-4.1.3.2-r2.tar.xz 29134156 SHA256 839bae6e958ac802a00bfe62e62079b0adc3f778350e778bc5520c766ea1a029 SHA512 282c5234b766ab5c4c35cf80cd0289b66f773b7b1acdec3d537990b7e4b77bf729ca965578d90920a12f6ca46b53b998a51c009fd455abc27bd7ee7f6782189a WHIRLPOOL 729d2c7591412f6ef61e1da04cc5ad93cca74c757e63bb5b619a8648a2cb3e8d6190733060527d50d361ea9f45360f531e6ad03700281f35f4da582f4da1e30a
|
||||
DIST x86-debug-libreoffice-4.1.3.2-r3.tar.xz 887536136 SHA256 21f95ca96134bc35c7cbd52c232f3c916fdc0405ee4661077fdf75c31bab3fa8 SHA512 b0407a61c0a48cbe9b51f1d86139fbbaaafacd08847393fefe817163cd94786df27865e9ac0b9c472e36f5b0368948d3dd04b1342172231cf651e49bff6e18b1 WHIRLPOOL 1de3a1837f12f95b0a0024cd78bba82f3494cf6793dd01a67833eb2fd1f1551276d5452fd65e12de7cf427f0ee603be05a611284e387b946d986c62e768f1a30
|
||||
DIST x86-debug-libreoffice-gnome-4.1.3.2-r2.xd3 5668929 SHA256 5808d46b56cedd4b662fabc49165b70595f37f4391a283afffcee9bcc94cc3da SHA512 e74f83ef41fa02dfef5aebf023afa5752c45ed15e90a42b043bcb0bc658bcf3bf6a11346f9b69c6ce465860fe2689c28410cf80604852c44472901d2c630a247 WHIRLPOOL faeb2ec928c2530b6aefc65880a12eba4d69421e02e2a72846ae6ff700892246d62812c087c2840a9a66d38eaf088d0c5cc6611a8d6c5e0f93d2244ebb5cce9d
|
||||
DIST x86-debug-libreoffice-gnome-4.1.3.2-r3.xd3 224807453 SHA256 d9f2f7633d6d050e1fcdbfe7ebd6f196956a96aa4fd69d584496c2af564a5e1b SHA512 ec791f59d36c3e56b05274cf88684baeeb4cbbd9faf812b05bba173a09059fb47a813cc120bf7243cc3d18694887f9fbefb7db49eee248fbbfe95504bdac68d8 WHIRLPOOL 3a7a727f47097135ac6bf0395b6716710967fce2ae68f2967de9658ca218dfc35ece519e47afa72e3dddaae9e9729867f9fbec8957bb2b7070fea72fd6ee75c4
|
||||
DIST x86-debug-libreoffice-gnome-java-4.1.3.2-r2.xd3 11135522 SHA256 e8d68990177d885ee14ee8b93951db09f217f51dbe1d01eafb3bafd975da9ee7 SHA512 40fb5fe88c7fb3d7171a2d310383cb5e26c5e7734cf1af92983c0c30f8fa7823fcbf783c52f8a0e4b5bd8730637d04e5294b355e4cbe6a066a323ba1ce1a0506 WHIRLPOOL 894c53b71270c4112b8cc04cee24925bbb4178a6a62c9285e7941ff6865ce706e5510d908e5e5d9ede182d34564b5bc742b17d1f609916860f633ab75703f788
|
||||
DIST x86-debug-libreoffice-gnome-java-4.1.3.2-r3.xd3 585798915 SHA256 77be104c39859ab002a87315761af0a7702b7c73f0c7c2a94fd4961f35b6772e SHA512 e88738ce1df96ac1bcf3c5ae5ee2d6ee7ee8cdecc253a99da451a4c3a5fa7b60d76b7006a9489391d214469dfbcfd068a562014817c80a4e10187e254b5cdd49 WHIRLPOOL 42de2cd3862f73ee96e4ed38022ca7d268d5d39b0c44cfe5db4db3a671467a8a40fea3f576f9aa46bea54f3e86d0af44d27948886858c6631efc44383001c3bc
|
||||
DIST x86-debug-libreoffice-java-4.1.3.2-r2.xd3 10945503 SHA256 572b4a42ee67506f1a3ae401a5e3a71e43b711988cf9a5564ee9ac0346ebaaa4 SHA512 ac8dd0b23bf8eea6d6c00e683a537278a7512a9252d002237da2b22c0210afb6ecb1051c578c3aa38bc04991dade245cea5ff6e10f7de2709095a70dd6f19cd8 WHIRLPOOL ac08a170303b8b76e38018ea5e8e74cba5af6f716028d1e14fd2be117c7b1fc891b286a90a212e77b196b56077ba4c9324573e9e5ff9dde2b101cd461a84cda0
|
||||
DIST x86-debug-libreoffice-java-4.1.3.2-r3.xd3 583349643 SHA256 cee849cda0ea495090986653594d3a641e4ac1bec528806957685613618254fc SHA512 bd5eeb0720fbd66691b77ab86ca1f6e66f45add9eaa714527187d281103b39ca018bea45b7d3db6e7a9027cc7bac2675e0999b53da0b0868b46c58e65c84e4e0 WHIRLPOOL cfea1cc49e9d5c852c9ea044a965fb31175db4f1899f2660981b887cff360064cb8fbe8fe855bbe5916295aa16a7945a815bb3b53662d68f57c21fe8d0949b0a
|
||||
DIST x86-debug-libreoffice-kde-4.1.3.2-r2.xd3 5543445 SHA256 7c4f3e723e1fa72d001d4cf558ad7d9ae50892d132fd2b1574d0001e8cc200c6 SHA512 6a459dec2e78776bcf29c792e3272b6a4d4cc47ee2ed2eac912432416f861a7e50d43fef04a21348ef5560fb070cc6035344b9b26235245be309bb2118aac554 WHIRLPOOL 9808ec5de088edb205c9eddf6eddec1144002e55eb2af03f47c5828ad84c5f8e61c4948154964da0b1d4047f4b579410c7169aa69fe9f8edcb3644d5a0ffb814
|
||||
DIST x86-debug-libreoffice-kde-4.1.3.2-r3.xd3 237064920 SHA256 5e9ba3d118fe3b613dbf88a15b49c4dc0dac0b293a7bc9c0af1b77f7449de4e5 SHA512 54d27657c9846121450a56c9da2c8703b4a5aa5672a604150e3072baea95ddcc2cbbc4c177484c37ec350495fad43cf422f7d0ab9f2b637d2d1a7063cdc0a59c WHIRLPOOL a28b25873bfe775755600db5cb8cb2884df0157c265f992eb3a0f177d8a8c3c6784b2f0889825efd4f169b82514eb376d8d0fd2284bf5393424eac54c19fdb2d
|
||||
DIST x86-debug-libreoffice-kde-java-4.1.3.2-r2.xd3 10990786 SHA256 bdbfdfbbacc9c1eeb188f175851a5b6211466bc830e9553eabeadfd4a547c5b5 SHA512 7d1bc6b7d88a4f87c1d2bcc8e7f189a3466cf6c6cb3946b9fa1df5cfda300795a97dd1c3367f9dd1bcb20c907b641277f607a1638cda0da68cb5afabc33de7b9 WHIRLPOOL 3602c39977e15cb7f14630c1dc80f00033d225597210cf8f4a576097154af2307ecc53b12ddd486e1ef0859b728843eb46e217fc5f01c2ab9090bcf15c9e88e2
|
||||
DIST x86-debug-libreoffice-kde-java-4.1.3.2-r3.xd3 584815082 SHA256 97a2124866165bf72a41e5758bf1b428bb1dab75c79ea0075a3201f74cb9eb3c SHA512 f1a7f024a3e6fc508fb9205a54709c41b15bc3f0a28db14f620d2e19c8f2d75d607c46284f0fef323a7de3355a95d7897426047d58925ca27bbe8e8f2696907d WHIRLPOOL 06ffe98340d260a2008261f8152c457be42d4795870c254a19f21e8857eebff53bd10c2fe9e84b687958b99243c12f8efdaed1b914d05e70ae94d371128fbe52
|
||||
|
||||
@ -1,86 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin-debug/libreoffice-bin-debug-4.1.3.2-r2.ebuild,v 1.3 2013/12/17 17:21:43 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
BASE_PACKAGENAME="debug"
|
||||
BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
|
||||
BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package, debug info."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI_AMD64="
|
||||
${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
SRC_URI_X86="
|
||||
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_URI_AMD64} )
|
||||
x86? ( ${SRC_URI_X86} )
|
||||
"
|
||||
|
||||
IUSE="gnome java kde"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
|
||||
RDEPEND="=app-office/${PN/-debug}-${PVR}[gnome=,java=,kde=]"
|
||||
|
||||
DEPEND="dev-util/xdelta:3"
|
||||
|
||||
RESTRICT="test strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
src_unpack() {
|
||||
elog "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
|
||||
xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
|
||||
local patchname
|
||||
use kde && patchname="-kde"
|
||||
use gnome && patchname="-gnome"
|
||||
use java && patchname="${patchname}-java"
|
||||
|
||||
if [ -n "${patchname}" ]; then
|
||||
elog "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
|
||||
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
|
||||
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
fi
|
||||
|
||||
elog "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr
|
||||
cp -aR "${S}"/usr/* "${ED}"/usr/ || die
|
||||
}
|
||||
@ -1,24 +1,12 @@
|
||||
DIST amd64-bin-libreoffice-4.1.3.2-r2.tar.xz 77846360 SHA256 b8f6bfa2b7140cbfe6057f60608f59b73358c7056cbdd5a2f1ab5ef8c8848829 SHA512 b6d54df0ef8c4d9b1d10cd21aa738eba1283b4ce4ddba0d5e923296ef410a769134c7e7eff516507ca54aa5405e803064f52325fb2a239b903288a0839b6054e WHIRLPOOL 14ccdb557bd2f9b068672b58ab294655002411d9043d0603c133df0ede2cabc9c19446dbff2b3f80398bdccc43ab0fdd65e39f82e859ddd79083c4909a04bf57
|
||||
DIST amd64-bin-libreoffice-4.1.3.2-r3.tar.xz 77845428 SHA256 68d944f540099d3a9863608799c0316d38010966c4d3b8a1b04b60263ff45fe9 SHA512 eddd1478636b29e1f303657e07a0b898ced3c69617faa016966170e8f2622de247de43a09127380002d9877f4671dfd2be35128b8f881195beea63a0fa25f5fe WHIRLPOOL 43c4584cad95b1fdcb262be533eba4c38cef5fcf62a5aa2d65e6752e24cd04ad803340c09a8916fd254dcbb6c3aef1011ee0cfe1901729d0a44c5c26a84a8264
|
||||
DIST amd64-bin-libreoffice-gnome-4.1.3.2-r2.xd3 7109238 SHA256 72eab9b7676be11d01830b9d7f7af6ca6b9d035e614ce4d991b62eb6cbf62420 SHA512 0c32ba4516a09466eb2245f3c09ad6e1d03f667c6cd9c25eb2240becdff9843778031decd0a548b2a692c9131e153cb22d4432b77e109902a0f41ade1e6d3d07 WHIRLPOOL 6a63d73d4e25a29d5cf3bd22612e5a4bfc5f5e1f4341f613d684358b19016a927b10368dbe66ebd3c1bb6b1df4524165876606ef617d65e7254796b64cc779b5
|
||||
DIST amd64-bin-libreoffice-gnome-4.1.3.2-r3.xd3 6619284 SHA256 95d9a6dcee8cc0cb9d7387fe5a4a47c9aa51ef065d44706ffba928a93defa9e2 SHA512 7c6be5d0432c16dc0daa4b93b32b4575acc4096825e4d73ccf7c4fc7fd7a95a668c0141c8f5345e885dbbeebcfb7552bedc1d3bb917eb48493419cd1d9080d4d WHIRLPOOL 263a9ed49d8d89ad94b43bd15f5d9b19c66a795c87fb7040e6594789630de501e29b52436c32a3f8b5c645fb17d3a919a01052e907a2e0b213b3c43d1d16ca6b
|
||||
DIST amd64-bin-libreoffice-gnome-java-4.1.3.2-r2.xd3 22714162 SHA256 385db7fed7ff804eb1e2acce5409b1ad7d389e4bac75f5d0907012e3691e87f9 SHA512 d0666cff33996abd891be88c045055b69b502979c888aa8e9a3b0ffdb1efe50cc4b8d58213be567087a95ecab4334c87b2b9f45b64d3eccb912cac8bd07c17a0 WHIRLPOOL bc2d97cd79cb6821b74de7da612406dd701633b1c1af754037af33413e7cbedd4dcfb56bea480f954571b55a2533c90c35d1ee8dbde2732f49c8a1e1dd776f08
|
||||
DIST amd64-bin-libreoffice-gnome-java-4.1.3.2-r3.xd3 22712874 SHA256 3993e0a70ce005ebe130fcd810c38b73a246345d393563351436d05db1b8e3b5 SHA512 4f6de9f45f299862eed2238ca097b33fcf9c1c3cb174fb3a0093ff01d3170c1694454a8331612448efde3c514f41c1cc2b2a1dc286a6e6fa4abb55dfd6a6eaad WHIRLPOOL 831cee1e55db1303cd41f7e1acb9acc78d1ba7cd71bd445bb4d8e3c1c2fd9c05fe9069043b349374dcee9037dda64ae3e2d885d6ab7ef2e5ee97834cd09d97c8
|
||||
DIST amd64-bin-libreoffice-java-4.1.3.2-r2.xd3 22408504 SHA256 784f2581c69a20cef5ea7ca2eed97969d394b1b52eb3b738627e8e2653a1368b SHA512 664c2804f8c1f3cdf504d480b4f331d77e80f4093911055855394d351e15c67927629a200ae3931a73271472e99569845cd74ca6344b8db9b99538f9abea2c77 WHIRLPOOL 25d2d12d58776aa255a9fdd3161b981ac77d1adcc1f3455a7e5a48ec8a872bfca158a0ca45b320c008a7d361e07b25d1a5b1be9d536414195af90e8f3573ba8f
|
||||
DIST amd64-bin-libreoffice-java-4.1.3.2-r3.xd3 22416990 SHA256 63a1e7fa3d8150ec4ad8b5c559393865a87eacea853453ddb10273993a9f2231 SHA512 a363e14474c220abae03ad33933c9adf076b08d0bb1dd7ff46bc4e1196c480c72843dce8b45b784c5283ebfd5b6345bdb103fd53bb7c64e17a60c1e3309f5aa0 WHIRLPOOL db586356bb0e1c10ba55c52fa10ecae4b6d4eebe5372c9a4efb8dca8f7c68d6f4e8df031ddd64f89bf7ff5a1f991cfc155007c469537277f30a948bd6a43a843
|
||||
DIST amd64-bin-libreoffice-kde-4.1.3.2-r2.xd3 7031827 SHA256 7a43811a33264dce4f4e8c6649f01d0ae2310b06e65121e7019b341e7745286b SHA512 18b400d29d13cde0f30fc387dfe732da1eaaa3ba5a201ed535f186971b6a71e66d313fda10599fc686ab4809ec30204b8ea686f282138bfe3839f4810c5a87e3 WHIRLPOOL 3f58cbb419eecdecc1de3dd39548541a21d8cfb7179096cd58379d76d61e479a464cda784e32a2bcfb0d0f614d40868ecb01241f223f6755ec4c4a306fc215d1
|
||||
DIST amd64-bin-libreoffice-kde-4.1.3.2-r3.xd3 7033674 SHA256 f7930b8b31f130e123910706030950bce12eb40d0ab4d7268aaa0554ff359fe0 SHA512 dab1a6735a12b58d9700dbef7a8f2f02aa98f96da9233cf9beb4fffc0351ea2fa8fce7a9dfa74793a41b9b62e394faaf9fe7d89affb429fe826017dc635fe572 WHIRLPOOL 635d11652c609c20a15f8c4a27926f7ed38324ea0f740945c9b47274f0413efc7b09fa24b8b844833744090e9830dd49129d4bbe8b95e68b2f394957aa345b90
|
||||
DIST amd64-bin-libreoffice-kde-java-4.1.3.2-r2.xd3 22442689 SHA256 0652491e9ed1aca3bea50ff88486fd027051eb41105754f222d2632d45c4ae78 SHA512 1560ac4b141a66cf3f406cd343c671e9a79b06a2a8fdee527e60553f9b73e4bc6568870e6e118b886fa00af602e7612c7d3ba0750488af9c49123748c5f44915 WHIRLPOOL 046a642cb20ca1d6013d84221834e3aa83a49f03dae513ce906ca83c404404c207113c4ade4256b8654247d0689001569f1a0fce0d89d0c880c5ebece4bcf56e
|
||||
DIST amd64-bin-libreoffice-kde-java-4.1.3.2-r3.xd3 22450325 SHA256 5867ca408f1065a0ff01423a44ea53be8d186305b21e44b2382b994634be1fee SHA512 ef4f956139cdf203fdf4b3adf6691eae5b2076ec2b194eb90ff8769a0b5a65cf0dd6635e55fc07a1b362b369e498458c1706bd7d5a2ad884f5150d1c81c8a4e0 WHIRLPOOL 6504dcf7cf04ea8e807aba6de6dec1b1a78cac53545d1226d8e1b0759bae977018cbfcfb9f090fab100d7a1d93d7a8974866834d0f228fed1d5ec25d9013df55
|
||||
DIST x86-bin-libreoffice-4.1.3.2-r2.tar.xz 77238496 SHA256 590ccf7825b96589f0cb1594efea80d31b77289b88b9f8d80b463dd0fad25c5c SHA512 123fc87571eacd6f15d11dddf60c8c453ece2225609eaa466d537f7a803766f785e6295d9aefda4ef118e7b602e8f9ccfba080c3f131c2ecb5c96acf149b53c6 WHIRLPOOL 0250f8998d44bb9921f3ba773e8af9d1f3f0ee2d42d2a4a053be6f0218c5c6907a92f8a07864069e116bf92d0f706c8f8ccb0e3bfb3ed8e0c893d3c706374c12
|
||||
DIST x86-bin-libreoffice-4.1.3.2-r3.tar.xz 77226156 SHA256 70916ad7eb33cc37651f826f363f655129c6e03855df297f000a308cfa539bd5 SHA512 92f500ce240beafdf093cd82bc06f32dd8c97ea7b96fe7bdf127a8f68d28ab03886707927598ee4a8cf7856775fe108dd08cc145367f4d5673e390e6e4ae39e0 WHIRLPOOL c3645ecc423ede019181c4fb6ee62e27596000431065916a608ade571bbc63609df03434e5d6ef29827206e89ca344b955dab41839a2b76882859c37571f3774
|
||||
DIST x86-bin-libreoffice-gnome-4.1.3.2-r2.xd3 5829555 SHA256 1cba7775811135e258b4d6b59b0a2c9eb83680987cd1f6afc98e241389443d1b SHA512 2abb5b4222e7df08ce01c1a97288ee29639bd125c4cd839cfa6a0031cfc645310663201492af6a8869a38db881d628adc744d3d465c2743197bbe4c9cc1becca WHIRLPOOL 2d23b5ff617f37fc8ac1d6197f0ca780675ae40c3bff52ac17c98b7d6ba2dd83b83fe8b06c3f5a22278b0e8e1f9e24385f80453fa3fe7a12e9a2c259aa9d8f0a
|
||||
DIST x86-bin-libreoffice-gnome-4.1.3.2-r3.xd3 5916008 SHA256 f2d703a532985e4050d7d53701902ea4a5177fad24eac72827d71412e50d7060 SHA512 4324ecdc4ce90838602575de657d9f5054e61762dc54333c9d7658b63b139f4aefeff77fbdff25ae5e1d1ee2cf7edbdd06c8605f1d12578578c7bb88861b090e WHIRLPOOL 625d7287d93f4e739794e7a51d3467d27d21f38d9bb055ce7dd15abf2753f3d615696fcd322cf5aaddd427b4644e9679d75f4b697e06b6f2090cb32eb676c9a6
|
||||
DIST x86-bin-libreoffice-gnome-java-4.1.3.2-r2.xd3 20383887 SHA256 5b79dec34dc98e9e4e76c77a02801ecaa128473af41b598ba54025cd7465f262 SHA512 71e08f4c268c56ffa601ade23e43d3f1c0dd3600cd70739d419e96981ee7fe99237b749e084b25032808ab39e1e2f01635d939d49750dca7bf622e61966f2da8 WHIRLPOOL 959c8d57bfe6251704b71468d0e08855dafe6f25023994dca806df1d5c60b31cc97199d17a281a99958cacc3dfc29e4528b6ed2bd94c09a4f8f70b79ac0f68d8
|
||||
DIST x86-bin-libreoffice-gnome-java-4.1.3.2-r3.xd3 20352526 SHA256 3de5a21f735377c418e1736ce13a31f64396efe27c7753e13bb4b0380971fe80 SHA512 579c51cb330cb3b4c76bd1a6bee3e1debb3640ec5e24481b29e97da71cf1697086ce0a24603ff127d81ada70e2a4f0cf927b0a08835b4e12fd6ab8149a05f604 WHIRLPOOL f81ef3b9b3bb5d2adfc0128839145096300b08668a5cf68bd147c21b2c190fe1deb88f6ef2440fbaa29aa62d8dbd428854471e7d13812cc4fea273d18d224641
|
||||
DIST x86-bin-libreoffice-java-4.1.3.2-r2.xd3 20043251 SHA256 9242b5e5acfe7f557a320217e45021f9304514eaab9167e45a898219f0e6020a SHA512 6c06719fab39bd6fcaa783cfe55eace65a8082512e1aa9ea9aac18d5de9ebc5bda3317b085ab409e6bdf801d4e5fd41d251966399b48bf34910f80903b955b4b WHIRLPOOL 45a12bbce04192150e5d98e5f9f4f1b2d741005a99643046cd54c414ab1f5f218a04bda086715982188027faad61e72a5536fb8355f6adfed0fcee8ac0cd8e83
|
||||
DIST x86-bin-libreoffice-java-4.1.3.2-r3.xd3 19999133 SHA256 5d49c2e669d93ee76e80f930a904ad5008f9f6e949a0cf18c35d26b5ed4430ff SHA512 be17f39cf7938af5ff461319e8d5fe866d82aa06fe0dc3268fac39d84c8ae7f1479ca027b5b67ff37101e0de4db7b55b072a836c412a2cdc4fd989aaa7dd55c4 WHIRLPOOL 30d060bb2379293a5d1f92a3b29558734571807fd9b9702b8bac5570fd31121c1b7e8070a78c50e12b525caf812d782c530d0a980eef688c3e219fb905351eab
|
||||
DIST x86-bin-libreoffice-kde-4.1.3.2-r2.xd3 7607643 SHA256 6b65048cd42f4886a785df22ca54ad89783fe71d3b068a882d49462739840505 SHA512 d70d8fed2b23bfeeb12544cea3f1651deac8121d3d4b85ef030cf2622019ddb1feae3bdc286c410e8b20088b8ba2c33ba19765c9cbec4e2879e5d1846aa2857e WHIRLPOOL bfe651a5c75c502d45f27b7465ab2866162b40de3d6ff4121f15bf71963e09c5112f9c56c32cda98cd0c57ff0d6d6b7e44bf57283743ca4dec01ef8abcc13d20
|
||||
DIST x86-bin-libreoffice-kde-4.1.3.2-r3.xd3 8366422 SHA256 3e9b909e0b69e160ae8f9ea0c7bf98aa2d44c8ab9afd79f9963e3e0e0db274e9 SHA512 aab140f89d11208e2d558703c43ae26fa3aeac66ba0a9a6fc602679606a03c9f04c2f634f763d3e31c8ef74204fa9dbf5ce0c4da99f2acb612988bcc1a1e977b WHIRLPOOL 873b1181dbf6664a43b9f222584e4c901f7d35c878d3d29b8bd1598f82825d80fd12bf93d8063fb32508710e47c0e0413d97b53cf392182228d7d53581ca8c21
|
||||
DIST x86-bin-libreoffice-kde-java-4.1.3.2-r2.xd3 20683448 SHA256 52b4bc8bf54b550a07d4741691b22e3ccfc38c16eafb17bd27f49c8b334373e9 SHA512 0d26776c279adc32874f1384c6ad32d4a83a82dbc7511f3100c23a52f1774f954c572d3333c853e4974624ec9dddc1cd2a9b9660ad16705867277679c35b50f8 WHIRLPOOL bafe83529ed9ac0e7ac9f598256c604cef59cc4fdec5fba6576b27399f41e28da776a9e7fdba485b60688e88e7d53ce07c98fce94f42352e8637f8a91d60fa14
|
||||
DIST x86-bin-libreoffice-kde-java-4.1.3.2-r3.xd3 20638259 SHA256 2bd19d857b9f35ec3d3fd9d44491c495f05564567e481f7ed73747344f9c06b3 SHA512 a40f6ba7f3f193439fadcbd875f4d68d9c42b197e638b135d169b9d2107eb5c26ea04b15a90e6c2ff34f18378eeefc349303134d82a1e4e984df90182e0ec554 WHIRLPOOL 708cee429c128ae4033153dd9031ecf9c3687775f9341da33915d2900ea17610bb1ec25cbf8abad7eb38bc5d32bb6d660bd2d66473a24e491b9fce402794cd95
|
||||
|
||||
@ -1,224 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-office/libreoffice-bin/libreoffice-bin-4.1.3.2-r2.ebuild,v 1.3 2013/12/17 17:18:58 dilfridge Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
KDE_REQUIRED="optional"
|
||||
CMAKE_REQUIRED="never"
|
||||
|
||||
BASE_PACKAGENAME="bin"
|
||||
BASE_AMD64_URI="http://packages.gentooexperimental.org/packages/amd64-libreoffice/amd64-${BASE_PACKAGENAME}-"
|
||||
BASE_X86_URI="http://packages.gentooexperimental.org/packages/x86-libreoffice/x86-${BASE_PACKAGENAME}-"
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_3 )
|
||||
PYTHON_REQ_USE="threads,xml"
|
||||
|
||||
inherit kde4-base java-pkg-opt-2 python-single-r1 pax-utils prefix versionator
|
||||
|
||||
DESCRIPTION="LibreOffice, a full office productivity suite. Binary package."
|
||||
HOMEPAGE="http://www.libreoffice.org"
|
||||
SRC_URI_AMD64="
|
||||
${BASE_AMD64_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_AMD64_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_AMD64_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
SRC_URI_X86="
|
||||
${BASE_X86_URI}libreoffice-${PVR}.tar.xz
|
||||
kde? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-kde-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-kde-java-${PVR}.xd3 )
|
||||
)
|
||||
gnome? (
|
||||
!java? ( ${BASE_X86_URI}libreoffice-gnome-${PVR}.xd3 )
|
||||
java? ( ${BASE_X86_URI}libreoffice-gnome-java-${PVR}.xd3 )
|
||||
)
|
||||
!kde? ( !gnome? (
|
||||
java? ( ${BASE_X86_URI}libreoffice-java-${PVR}.xd3 )
|
||||
) )
|
||||
"
|
||||
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_URI_AMD64} )
|
||||
x86? ( ${SRC_URI_X86} )
|
||||
"
|
||||
|
||||
IUSE="gnome java kde"
|
||||
LICENSE="LGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="-* amd64 x86"
|
||||
|
||||
BIN_COMMON_DEPEND="
|
||||
=app-text/libexttextcat-3.4*
|
||||
app-text/poppler:0/43
|
||||
dev-libs/boost:0/1.52
|
||||
dev-libs/icu:0/51.2
|
||||
=media-gfx/graphite2-1.2*
|
||||
=media-libs/harfbuzz-0.9.23[icu]
|
||||
=media-libs/libpng-1.5*
|
||||
>=sys-libs/glibc-2.16.0
|
||||
kde? ( >=kde-base/kdelibs-4.11.2-r1:4 >=dev-qt/qtcore-4.8.5:4 )
|
||||
|| ( <media-libs/libjpeg-turbo-1.3.0-r2 =media-libs/jpeg-8* )
|
||||
"
|
||||
|
||||
# PLEASE place any restrictions that are specific to the binary builds
|
||||
# into the BIN_COMMON_DEPEND block above.
|
||||
# All dependencies below this point should remain identical to those in
|
||||
# the source ebuilds.
|
||||
|
||||
COMMON_DEPEND="
|
||||
${BIN_COMMON_DEPEND}
|
||||
${PYTHON_DEPS}
|
||||
app-arch/zip
|
||||
app-arch/unzip
|
||||
>=app-text/hunspell-1.3.2-r3
|
||||
app-text/mythes
|
||||
>=app-text/libexttextcat-3.2
|
||||
app-text/liblangtag
|
||||
app-text/libmspub
|
||||
>=app-text/libmwaw-0.1.7
|
||||
app-text/libodfgen
|
||||
app-text/libwpd:0.9[tools]
|
||||
app-text/libwpg:0.2
|
||||
>=app-text/libwps-0.2.2
|
||||
>=app-text/poppler-0.16:=[xpdf-headers(+),cxx]
|
||||
>=dev-cpp/clucene-2.3.3.4-r2
|
||||
>=dev-cpp/libcmis-0.3.1:0.3
|
||||
dev-db/unixODBC
|
||||
>=dev-libs/boost-1.46:=
|
||||
dev-libs/expat
|
||||
>=dev-libs/hyphen-2.7.1
|
||||
>=dev-libs/icu-4.8.1.1:=
|
||||
>=dev-libs/liborcus-0.5.1:=
|
||||
>=dev-libs/nspr-4.8.8
|
||||
>=dev-libs/nss-3.12.9
|
||||
>=dev-lang/perl-5.0
|
||||
>=dev-libs/openssl-1.0.0d
|
||||
>=dev-libs/redland-1.0.16[ssl]
|
||||
media-gfx/graphite2
|
||||
>=media-libs/fontconfig-2.8.0
|
||||
media-libs/freetype:2
|
||||
>=media-libs/harfbuzz-0.9.10:=[icu(+)]
|
||||
media-libs/lcms:2
|
||||
>=media-libs/libpng-1.4
|
||||
>=media-libs/libcdr-0.0.5
|
||||
media-libs/libvisio
|
||||
>=net-misc/curl-7.21.4
|
||||
net-nds/openldap
|
||||
sci-mathematics/lpsolve
|
||||
virtual/jpeg
|
||||
>=x11-libs/cairo-1.10.0[X]
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXrender
|
||||
net-print/cups
|
||||
>=dev-libs/dbus-glib-0.92
|
||||
gnome? ( gnome-extra/evolution-data-server )
|
||||
gnome? ( gnome-base/gconf:2 )
|
||||
x11-libs/gdk-pixbuf[X]
|
||||
>=x11-libs/gtk+-2.24:2
|
||||
media-libs/gstreamer:1.0
|
||||
media-libs/gst-plugins-base:1.0
|
||||
virtual/glu
|
||||
virtual/opengl
|
||||
net-libs/neon
|
||||
"
|
||||
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!app-office/libreoffice
|
||||
!<app-office/openoffice-bin-3.4.0-r1
|
||||
!app-office/openoffice
|
||||
media-fonts/libertine-ttf
|
||||
media-fonts/liberation-fonts
|
||||
media-fonts/urw-fonts
|
||||
java? ( >=virtual/jre-1.6 )
|
||||
"
|
||||
|
||||
PDEPEND="
|
||||
=app-office/libreoffice-l10n-${PV}*
|
||||
"
|
||||
|
||||
DEPEND="dev-util/xdelta:3"
|
||||
|
||||
# only one flavor at a time
|
||||
REQUIRED_USE="kde? ( !gnome ) gnome? ( !kde )"
|
||||
|
||||
RESTRICT="test strip"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
PYTHON_UPDATER_IGNORE="1"
|
||||
|
||||
pkg_pretend() {
|
||||
[[ $(gcc-major-version) -lt 4 ]] || \
|
||||
( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -le 4 ]] ) \
|
||||
&& die "Sorry, but gcc-4.4 and earlier won't work for libreoffice-bin package (see bug #387515)."
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
kde4-base_pkg_setup
|
||||
}
|
||||
|
||||
src_unpack() {
|
||||
elog "Uncompressing distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz"
|
||||
xz -cd "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar.xz" > "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
|
||||
local patchname
|
||||
use kde && patchname="-kde"
|
||||
use gnome && patchname="-gnome"
|
||||
use java && patchname="${patchname}-java"
|
||||
|
||||
if [ -n "${patchname}" ]; then
|
||||
elog "Patching distfile ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar using ${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3"
|
||||
xdelta3 -d -s "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" "${DISTDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice${patchname}-${PVR}.xd3" "${WORKDIR}/tmpdist.tar" || die
|
||||
mv "${WORKDIR}/tmpdist.tar" "${WORKDIR}/${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar" || die
|
||||
fi
|
||||
|
||||
elog "Unpacking new ${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
unpack "./${ARCH}-${BASE_PACKAGENAME}-libreoffice-${PVR}.tar"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
cp "${FILESDIR}"/50-${PN} "${T}"
|
||||
eprefixify "${T}"/50-${PN}
|
||||
}
|
||||
|
||||
src_configure() { :; }
|
||||
|
||||
src_compile() { :; }
|
||||
|
||||
src_install() {
|
||||
dodir /usr
|
||||
cp -aR "${S}"/usr/* "${ED}"/usr/
|
||||
|
||||
# prevent revdep-rebuild from attempting to rebuild all the time
|
||||
insinto /etc/revdep-rebuild && doins "${T}/50-${PN}"
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# Cache updates - all handled by kde eclass for all environments
|
||||
kde4-base_pkg_preinst
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
kde4-base_pkg_postinst
|
||||
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/soffice.bin
|
||||
pax-mark -m "${EPREFIX}"/usr/$(get_libdir)/libreoffice/program/unopkg.bin
|
||||
|
||||
use java || \
|
||||
ewarn 'If you plan to use lbase application you should enable java or you will get various crashes.'
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
kde4-base_pkg_postrm
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
DIST highlight-3.12.tar.bz2 679786 SHA256 32f22fc63243c48ee7499c7834af50de4ed0ec84b12bd9acfaf7649e36083000 SHA512 850f59ebab9da6f38b0e42bdcdee1dd182cac31fcb8523ef88d0600cc44b682230e365918d3b97fd06ad167fcaaf69fbc0315bc848d485bcb071ff8009b10bf5 WHIRLPOOL 8fdb8eaa64ec16cc51d41dded86f0da833b7e07d92b697c0b6580f89a1cefbb9b102fe113e1f45b1289b09ad422d41f4282e4f2b3a241e7041d409456fa81353
|
||||
DIST highlight-3.16.tar.bz2 613356 SHA256 994e8da0b86549fb16c4590769731315d01db68e973c44d43931fcc628e79d77 SHA512 b637107f589ff475bda22e14a7a55a5af5adbae67a5c1b9081bd312646dc712ee8b9e04d3f760e485d4c311b0ef69ef71a5121ab7d70e0f55d3990a5c6134443 WHIRLPOOL 09af3cc7f77e409d3bdeec3979f390e30b9ffc47484274fc326de9011b55e7b10e825586a9bc2be5aa1e73dc1ab8b3623caa408766e2f7b9efff07fff470e4fc
|
||||
DIST highlight-3.17.tar.bz2 617834 SHA256 87ca5907943da25c756407d35ea0df8eb7762f3e32544201da27555c8eadb301 SHA512 27d5391339e80b616146489e97f63bca336f18b26c2ff5b94ae5bf183d3d1cdbfba202ab36d8eac86dee98ff49c6cc6c41dcf31860f0277f0327688e622d954e WHIRLPOOL 53ee5a4c58021f2a395d1d2e29090a43b06f3ad4ccad4461843f5a1eedebabe5ff33d2ac0c97c9d1ea496023c3acfe9eb30ff4d9d119a0eae4173ea1f9352cc3
|
||||
DIST highlight-3.3.tar.bz2 740651 SHA256 96c415d62488c6522e9933ecdfce447eb8eecd3b88a1064f42908c936ea02d87 SHA512 10530f485e57aa8068edddca3b0f75fcdd1c756d45740e7dd4eeaeb8b87cebd022f6283ecd37a057ef18f30e8cb56eeb412e8ba0c0542320a751b8b9c3dbf1c9 WHIRLPOOL 8b0ccfa97d5343b0edb2cf11d92116df4ebdac5d7157569d758c8eb2a113dd07612438ef9eeeda9138a7aa9d64c027ba5dab31054700acbc6823b6868ff4a77c
|
||||
DIST highlight-3.9.tar.bz2 683718 SHA256 4ae69795e3ca4ffef47355a7b6dc371e2d781735efd44fa12ff3a1ffc990daef SHA512 4f75232eae5f18f37666e04467993eab8ba983ec86ba6fbef4fbd6fea1e4b2a388beff75a72cfb00c1a90a6fa6dcab9cd68d40cde940f6aaff5174304102cada WHIRLPOOL 1d0ab7fa034fa16cf07318a1140d261942ad98b73108b1b83c578e98f836c9d933ad731320b8aa183f958572e10f3970f64b822954fe5065f8ec6692290f6e9a
|
||||
|
||||
@ -0,0 +1,66 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/highlight/highlight-3.17.ebuild,v 1.1 2014/01/16 21:59:47 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit toolchain-funcs qt4-r2 flag-o-matic
|
||||
|
||||
DESCRIPTION="converts source code to formatted text ((X)HTML, RTF, (La)TeX, XSL-FO, XML) with syntax highlight"
|
||||
HOMEPAGE="http://www.andre-simon.de/"
|
||||
SRC_URI="http://www.andre-simon.de/zip/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
|
||||
IUSE="examples qt4"
|
||||
|
||||
RDEPEND="dev-lang/lua
|
||||
qt4? (
|
||||
dev-qt/qtgui:4
|
||||
dev-qt/qtcore:4
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-libs/boost
|
||||
virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
sed -i "/LSB_DOC_DIR/s:doc/${PN}:doc/${PF}:" \
|
||||
src/core/datadir.cpp || die
|
||||
|
||||
if has_version '<dev-lang/lua-5.2' ; then
|
||||
sed -i 's/-DUSE_LUA52//' src/makefile || die
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
myhlopts=(
|
||||
"CXX=$(tc-getCXX)"
|
||||
"AR=$(tc-getAR)"
|
||||
"LDFLAGS=${LDFLAGS}"
|
||||
"CFLAGS=${CXXFLAGS}"
|
||||
"DESTDIR=${D}"
|
||||
"PREFIX=${EPREFIX}/usr"
|
||||
"HL_CONFIG_DIR=${EPREFIX}/etc/highlight/"
|
||||
"HL_DATA_DIR=${EPREFIX}/usr/share/highlight/"
|
||||
"doc_dir=${EPREFIX}/usr/share/doc/${PF}/"
|
||||
"conf_dir=${EPREFIX}/etc/highlight/"
|
||||
)
|
||||
emake -f makefile "${myhlopts[@]}"
|
||||
if use qt4 ; then
|
||||
cd src/gui-qt
|
||||
eqmake4 'DEFINES+=DATA_DIR=\\\"'"${EPREFIX}"'/usr/share/${PN}/\\\" CONFIG_DIR=\\\"'"${EPREFIX}"'/etc/${PN}/\\\" DOC_DIR=\\\"'"${EPREFIX}"'/usr/share/doc/${PF}/\\\"'
|
||||
emake
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake -f makefile "${myhlopts[@]}" install
|
||||
use qt4 && emake -f makefile "${myhlopts[@]}" install-gui
|
||||
|
||||
if use examples ; then
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
else
|
||||
rm -rf "${ED}"/usr/share/doc/${PF}/examples
|
||||
fi
|
||||
}
|
||||
@ -1,2 +1 @@
|
||||
DIST poppler-0.24.3.tar.xz 1506152 SHA256 d2cd02509e458117df7534b60703171d567f26865ab9b7f9c84c53727b35374e SHA512 561ee068e156e743e46388b093468ba50c2bab8d2e319524abeaddd195d388a370265c53fef2787974ee18de2af229cbd303b1a9ddd08a2a1d885f895deb263b WHIRLPOOL a47a2a6657479c9d82f5f8f2579e702a0f9cd98ff451140dd6ed80fd7ac1ba33a7b9251e8f4d8ea46e91e8054ba49ca960b5904c2cab191eab264b78aea6d42a
|
||||
DIST poppler-0.24.5.tar.xz 1512476 SHA256 a2654910100c923c44e366242495e226db2798254f2fa2781138867348759f84 SHA512 dfb40f7d864614f4ad7e8729334931c4b40c48c0dc3d7a8c33b14134cf13c61f8a562cc790a08bee4a43c2c29e587a9d26330437858d465e18ceafd69521250c WHIRLPOOL 066924beb46e58c2906a3b278e617438bd966e2b7bd884e110949f0d149d2cca0bf6326f2fa8c99e3a2c0f2d3cb3f145c8eeee4f060d17e3dded501ef8ec7f33
|
||||
|
||||
@ -1,95 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/poppler/poppler-0.24.3.ebuild,v 1.11 2013/12/17 15:02:28 ago Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit cmake-utils toolchain-funcs
|
||||
|
||||
DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base"
|
||||
HOMEPAGE="http://poppler.freedesktop.org/"
|
||||
SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
SLOT="0/43"
|
||||
IUSE="cairo cjk curl cxx debug doc +introspection +jpeg jpeg2k +lcms png qt4 tiff +utils"
|
||||
|
||||
# No test data provided
|
||||
RESTRICT="test"
|
||||
|
||||
COMMON_DEPEND="
|
||||
>=media-libs/fontconfig-2.6.0
|
||||
>=media-libs/freetype-2.3.9
|
||||
sys-libs/zlib
|
||||
cairo? (
|
||||
dev-libs/glib:2
|
||||
>=x11-libs/cairo-1.10.0
|
||||
introspection? ( >=dev-libs/gobject-introspection-1.32.1 )
|
||||
)
|
||||
curl? ( net-misc/curl )
|
||||
jpeg? ( virtual/jpeg:0 )
|
||||
jpeg2k? ( media-libs/openjpeg:0 )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
png? ( media-libs/libpng:0= )
|
||||
qt4? (
|
||||
dev-qt/qtcore:4
|
||||
dev-qt/qtgui:4
|
||||
)
|
||||
tiff? ( media-libs/tiff:0 )
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
virtual/pkgconfig
|
||||
"
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
cjk? ( >=app-text/poppler-data-0.4.4 )
|
||||
"
|
||||
|
||||
DOCS=(AUTHORS NEWS README README-XPDF TODO)
|
||||
|
||||
src_configure() {
|
||||
# this is needed for multilib, see bug 459394
|
||||
local ft_libdir ft_includedir
|
||||
ft_libdir="$($(tc-getPKG_CONFIG) freetype2 --variable=libdir)"
|
||||
ft_includedir="$($(tc-getPKG_CONFIG) freetype2 --variable=includedir)"
|
||||
export FREETYPE_DIR="${ft_libdir}:${ft_includedir%/include}"
|
||||
einfo "Detected FreeType at ${FREETYPE_DIR}"
|
||||
|
||||
mycmakeargs=(
|
||||
-DBUILD_GTK_TESTS=OFF
|
||||
-DBUILD_QT4_TESTS=OFF
|
||||
-DBUILD_QT5_TESTS=OFF
|
||||
-DBUILD_CPP_TESTS=OFF
|
||||
-DENABLE_SPLASH=ON
|
||||
-DENABLE_ZLIB=ON
|
||||
-DENABLE_XPDF_HEADERS=ON
|
||||
$(cmake-utils_use_enable curl LIBCURL)
|
||||
$(cmake-utils_use_enable cxx CPP)
|
||||
$(cmake-utils_use_enable jpeg2k LIBOPENJPEG)
|
||||
$(cmake-utils_use_enable utils)
|
||||
$(cmake-utils_use_with cairo)
|
||||
$(cmake-utils_use_with introspection GObjectIntrospection)
|
||||
$(cmake-utils_use_with jpeg)
|
||||
$(cmake-utils_use_with png)
|
||||
$(cmake-utils_use_with qt4)
|
||||
-DCMAKE_DISABLE_FIND_PACKAGE_Qt5Core=ON
|
||||
$(cmake-utils_use_with tiff)
|
||||
)
|
||||
if use lcms; then
|
||||
mycmakeargs+=(-DENABLE_CMS=lcms2)
|
||||
else
|
||||
mycmakeargs+=(-DENABLE_CMS=)
|
||||
fi
|
||||
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
if use cairo && use doc; then
|
||||
# For now install gtk-doc there
|
||||
insinto /usr/share/gtk-doc/html/poppler
|
||||
doins -r "${S}"/glib/reference/html/*
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/qpdf/qpdf-5.1.1.ebuild,v 1.1 2014/01/17 04:29:19 radhermit Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="A command-line program that does structural, content-preserving transformations on PDF files"
|
||||
HOMEPAGE="http://qpdf.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
|
||||
|
||||
LICENSE="Artistic-2"
|
||||
SLOT="0/13" # subslot = libqpdf soname version
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-fbsd ~x86-linux ~m68k-mint ~sparc-solaris"
|
||||
IUSE="doc examples static-libs test"
|
||||
|
||||
RDEPEND="dev-libs/libpcre
|
||||
sys-libs/zlib
|
||||
>=dev-lang/perl-5.8"
|
||||
DEPEND="${RDEPEND}
|
||||
test? (
|
||||
sys-apps/diffutils
|
||||
media-libs/tiff
|
||||
app-text/ghostscript-gpl
|
||||
)"
|
||||
|
||||
DOCS=( ChangeLog README TODO )
|
||||
|
||||
src_prepare() {
|
||||
# manually install docs
|
||||
sed -i "/docdir/d" make/libtool.mk || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable test test-compare-images)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
|
||||
if use doc ; then
|
||||
dodoc doc/qpdf-manual.pdf
|
||||
dohtml doc/*
|
||||
fi
|
||||
|
||||
if use examples ; then
|
||||
dobin examples/build/.libs/*
|
||||
fi
|
||||
|
||||
prune_libtool_files
|
||||
}
|
||||
@ -1,18 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/FreezeThaw/FreezeThaw-0.500.100.ebuild,v 1.1 2011/01/14 12:13:05 tove Exp $
|
||||
|
||||
EAPI=2
|
||||
|
||||
MODULE_AUTHOR=ILYAZ
|
||||
MODULE_SECTION=modules
|
||||
MODULE_VERSION=0.5001
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="converting Perl structures to strings and back"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 hppa ia64 ppc s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris"
|
||||
IUSE=""
|
||||
|
||||
SRC_TEST=do
|
||||
@ -1,2 +1 @@
|
||||
DIST cvxopt-1.1.5.tar.gz 3436288 SHA256 f1c0bd46321db941a46bb3544f4a23c6b15a90cbe5a485d735659abf110993d8 SHA512 8318e51589c7001f253e190082d550becbabcffa761cdb867c74593a7be9b764770fefc879057a389edccd64dcc34434b665f7df8bca460a036275dbcaa259a8 WHIRLPOOL 6dd81538813e033f028fae528d6d97d4477f57087479686017b249a054d46cc34d32e7dc61414bcf2628791cb43821545c576872b9332da953f9417e58ffa40c
|
||||
DIST cvxopt-1.1.6.tar.gz 3352996 SHA256 7b4ccf3ed896dde6624623431c0b1f5e32d874384329ed716f51babcbf416227 SHA512 b9f5fd7870412423b60068d205efb99d3630012509cb659fb67a10d6175906768846d7c906cf2fcac4be29afd558619b71e2dca730041329195a2365dd1d722c WHIRLPOOL d43cf090ee0396a77851fb71e6e34c980152bccdd5fdb3ecc53d0a464a505ac87a1e7198d313ec669443970bcf8a2d616f03c2f861b7df2f620bd583a97ea140
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/cvxopt/cvxopt-1.1.5-r2.ebuild,v 1.1 2013/02/26 20:33:17 jlec Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
|
||||
inherit distutils-r1 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Python package for convex optimization"
|
||||
HOMEPAGE="http://abel.ee.ucla.edu/cvxopt"
|
||||
SRC_URI="http://abel.ee.ucla.edu/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc +dsdp examples fftw +glpk gsl"
|
||||
|
||||
RDEPEND="
|
||||
virtual/blas
|
||||
virtual/cblas
|
||||
virtual/lapack
|
||||
sci-libs/cholmod
|
||||
sci-libs/umfpack
|
||||
dsdp? ( sci-libs/dsdp )
|
||||
fftw? ( sci-libs/fftw:3.0 )
|
||||
glpk? ( sci-mathematics/glpk )
|
||||
gsl? ( sci-libs/gsl )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
doc? ( dev-python/sphinx )"
|
||||
|
||||
S="${WORKDIR}/${P}/src"
|
||||
|
||||
python_prepare_all(){
|
||||
local PATCHES=( "${FILESDIR}"/${P}-setup.patch )
|
||||
rm -rf src/C/SuiteSparse*/
|
||||
rm -rf ../doc/build # 413905
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
|
||||
pkg_lib() {
|
||||
local pylib=\'$($(tc-getPKG_CONFIG) --libs-only-l ${1} | sed \
|
||||
-e 's/^-l//' \
|
||||
-e "s/ -l/\',\'/g" \
|
||||
-e 's/.,.pthread//g' \
|
||||
-e "s:[[:space:]]::g")\'
|
||||
sed -i -e "/_LIB = /s:\(.*\)'${1}'\(.*\):\1${pylib}\2:" setup.py || die
|
||||
}
|
||||
|
||||
use_cvx() {
|
||||
if use ${1}; then
|
||||
sed -i \
|
||||
-e "s/\(BUILD_${1^^} =\) 0/\1 1/" \
|
||||
setup.py || die
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_lib blas
|
||||
pkg_lib lapack
|
||||
use_cvx gsl
|
||||
use_cvx fftw
|
||||
use_cvx glpk
|
||||
use_cvx dsdp
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
use doc && emake -C "${WORKDIR}"/${P}/doc -B html
|
||||
}
|
||||
|
||||
python_test() {
|
||||
cd "${WORKDIR}"/${P}/examples/doc/chap8
|
||||
"${PYTHON}" lp.py || die
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && HTML_DOCS=( "${WORKDIR}"/${P}/doc/build/html/. )
|
||||
insinto /usr/share/doc/${PF}
|
||||
use examples && doins -r "${WORKDIR}"/${P}/examples
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
@ -1,171 +0,0 @@
|
||||
--- setup.py.orig 2012-04-04 17:18:51.000000000 +0100
|
||||
+++ setup.py 2012-04-19 00:02:14.000000000 +0100
|
||||
@@ -2,7 +2,7 @@
|
||||
from glob import glob
|
||||
|
||||
# Modifiy this if BLAS and LAPACK libraries are not in /usr/lib.
|
||||
-BLAS_LIB_DIR = '/usr/lib'
|
||||
+BLAS_LIB_DIR = ''
|
||||
|
||||
# Default names of BLAS and LAPACK libraries
|
||||
BLAS_LIB = ['blas']
|
||||
@@ -18,37 +18,37 @@
|
||||
BUILD_GSL = 0
|
||||
|
||||
# Directory containing libgsl (used only when BUILD_GSL = 1).
|
||||
-GSL_LIB_DIR = '/usr/lib'
|
||||
+GSL_LIB_DIR = ''
|
||||
|
||||
# Directory containing the GSL header files (used only when BUILD_GSL = 1).
|
||||
-GSL_INC_DIR = '/usr/include/gsl'
|
||||
+GSL_INC_DIR = ''
|
||||
|
||||
# Set to 1 if you are installing the fftw module.
|
||||
BUILD_FFTW = 0
|
||||
|
||||
# Directory containing libfftw3 (used only when BUILD_FFTW = 1).
|
||||
-FFTW_LIB_DIR = '/usr/lib'
|
||||
+FFTW_LIB_DIR = ''
|
||||
|
||||
# Directory containing fftw.h (used only when BUILD_FFTW = 1).
|
||||
-FFTW_INC_DIR = '/usr/include'
|
||||
+FFTW_INC_DIR = ''
|
||||
|
||||
# Set to 1 if you are installing the glpk module.
|
||||
BUILD_GLPK = 0
|
||||
|
||||
# Directory containing libglpk (used only when BUILD_GLPK = 1).
|
||||
-GLPK_LIB_DIR = '/usr/lib'
|
||||
+GLPK_LIB_DIR = ''
|
||||
|
||||
# Directory containing glpk.h (used only when BUILD_GLPK = 1).
|
||||
-GLPK_INC_DIR = '/usr/include'
|
||||
+GLPK_INC_DIR = ''
|
||||
|
||||
# Set to 1 if you are installing the DSDP module.
|
||||
BUILD_DSDP = 0
|
||||
|
||||
# Directory containing libdsdp (used only when BUILD_DSDP = 1).
|
||||
-DSDP_LIB_DIR = '/usr/lib'
|
||||
+DSDP_LIB_DIR = ''
|
||||
|
||||
# Directory containing dsdp5.h (used only when BUILD_DSDP = 1).
|
||||
-DSDP_INC_DIR = '/usr/include/dsdp'
|
||||
+DSDP_INC_DIR = ''
|
||||
|
||||
# No modifications should be needed below this line.
|
||||
|
||||
@@ -61,39 +61,32 @@
|
||||
# optional modules
|
||||
|
||||
if BUILD_GSL:
|
||||
- gsl = Extension('gsl', libraries = ['m', 'gsl'] + BLAS_LIB,
|
||||
- include_dirs = [ GSL_INC_DIR ],
|
||||
- library_dirs = [ GSL_LIB_DIR, BLAS_LIB_DIR ],
|
||||
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
+ gsl = Extension('gsl', libraries = ['gsl'],
|
||||
+ library_dirs = [ GSL_LIB_DIR ],
|
||||
sources = ['C/gsl.c'] )
|
||||
extmods += [gsl];
|
||||
|
||||
if BUILD_FFTW:
|
||||
- fftw = Extension('fftw', libraries = ['fftw3'] + BLAS_LIB,
|
||||
- include_dirs = [ FFTW_INC_DIR ],
|
||||
- library_dirs = [ FFTW_LIB_DIR, BLAS_LIB_DIR ],
|
||||
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
+ fftw = Extension('fftw', libraries = ['fftw3'],
|
||||
+ library_dirs = [ FFTW_LIB_DIR ],
|
||||
sources = ['C/fftw.c'] )
|
||||
extmods += [fftw];
|
||||
|
||||
if BUILD_GLPK:
|
||||
glpk = Extension('glpk', libraries = ['glpk'],
|
||||
- include_dirs = [ GLPK_INC_DIR ],
|
||||
library_dirs = [ GLPK_LIB_DIR ],
|
||||
sources = ['C/glpk.c'] )
|
||||
extmods += [glpk];
|
||||
|
||||
if BUILD_DSDP:
|
||||
- dsdp = Extension('dsdp', libraries = ['dsdp'] + LAPACK_LIB + BLAS_LIB,
|
||||
- include_dirs = [ DSDP_INC_DIR ],
|
||||
- library_dirs = [ DSDP_LIB_DIR, BLAS_LIB_DIR ],
|
||||
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
+ dsdp = Extension('dsdp', libraries = ['dsdp'],
|
||||
+ library_dirs = [ DSDP_LIB_DIR ],
|
||||
sources = ['C/dsdp.c'] )
|
||||
extmods += [dsdp];
|
||||
|
||||
# Required modules
|
||||
|
||||
-base = Extension('base', libraries = ['m'] + LAPACK_LIB + BLAS_LIB,
|
||||
+base = Extension('base', libraries = LAPACK_LIB,
|
||||
library_dirs = [ BLAS_LIB_DIR ],
|
||||
define_macros = MACROS,
|
||||
extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
@@ -105,55 +98,36 @@
|
||||
extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
sources = ['C/blas.c'] )
|
||||
|
||||
-lapack = Extension('lapack', libraries = LAPACK_LIB + BLAS_LIB,
|
||||
+lapack = Extension('lapack', libraries = LAPACK_LIB ,
|
||||
library_dirs = [ BLAS_LIB_DIR ],
|
||||
define_macros = MACROS,
|
||||
extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
sources = ['C/lapack.c'] )
|
||||
|
||||
umfpack = Extension('umfpack',
|
||||
- include_dirs = [ 'C/SuiteSparse/UMFPACK/Include',
|
||||
- 'C/SuiteSparse/AMD/Include', 'C/SuiteSparse/AMD/Source',
|
||||
- 'C/SuiteSparse/UFconfig' ],
|
||||
library_dirs = [ BLAS_LIB_DIR ],
|
||||
define_macros = MACROS,
|
||||
- libraries = LAPACK_LIB + BLAS_LIB,
|
||||
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
- sources = [ 'C/umfpack.c',
|
||||
- 'C/SuiteSparse/UMFPACK/Source/umfpack_global.c',
|
||||
- 'C/SuiteSparse/UMFPACK/Source/umfpack_tictoc.c' ] +
|
||||
- glob('C/SuiteSparse_cvxopt_extra/umfpack/*'))
|
||||
+ libraries = [ 'umfpack' ],
|
||||
+ sources = [ 'C/umfpack.c' ])
|
||||
+
|
||||
|
||||
# Build for int or long?
|
||||
import sys
|
||||
if sys.maxsize > 2**31: MACROS += [('DLONG','')]
|
||||
|
||||
cholmod = Extension('cholmod',
|
||||
- library_dirs = [ BLAS_LIB_DIR ],
|
||||
- libraries = LAPACK_LIB + BLAS_LIB,
|
||||
- include_dirs = [ 'C/SuiteSparse/CHOLMOD/Include',
|
||||
- 'C/SuiteSparse/COLAMD', 'C/SuiteSparse/AMD/Include',
|
||||
- 'C/SuiteSparse/UFconfig', 'C/SuiteSparse/COLAMD/Include' ],
|
||||
- define_macros = MACROS + [('NPARTITION', '1')],
|
||||
- extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
- sources = [ 'C/cholmod.c' ] +
|
||||
- ['C/SuiteSparse/AMD/Source/' + s for s in ['amd_global.c',
|
||||
- 'amd_postorder.c', 'amd_post_tree.c', 'amd_2.c']] +
|
||||
- ['C/SuiteSparse/COLAMD/Source/' + s for s in ['colamd.c',
|
||||
- 'colamd_global.c']] +
|
||||
- glob('C/SuiteSparse/CHOLMOD/Core/c*.c') +
|
||||
- glob('C/SuiteSparse/CHOLMOD/Cholesky/c*.c') +
|
||||
- ['C/SuiteSparse/CHOLMOD/Check/cholmod_check.c'] +
|
||||
- glob('C/SuiteSparse/CHOLMOD/Supernodal/c*.c') )
|
||||
+ libraries = ['cholmod'] + BLAS_LIB,
|
||||
+ define_macros = MACROS + [('NPARTITION', '1')],
|
||||
+ sources = [ 'C/cholmod.c' ])
|
||||
+
|
||||
|
||||
amd = Extension('amd',
|
||||
- include_dirs = [ 'C/SuiteSparse/AMD/Include',
|
||||
- 'C/SuiteSparse/UFconfig' ],
|
||||
define_macros = MACROS,
|
||||
- sources = [ 'C/amd.c' ] + glob('C/SuiteSparse/AMD/Source/*.c') )
|
||||
+ libraries = ['amd'],
|
||||
+ sources = [ 'C/amd.c' ])
|
||||
|
||||
misc_solvers = Extension('misc_solvers',
|
||||
- libraries = LAPACK_LIB + BLAS_LIB,
|
||||
+ libraries = LAPACK_LIB,
|
||||
library_dirs = [ BLAS_LIB_DIR ],
|
||||
define_macros = MACROS,
|
||||
extra_link_args = BLAS_EXTRA_LINK_ARGS,
|
||||
@ -0,0 +1,889 @@
|
||||
--- src/C/glpk.c.orig 2013-07-31 12:05:27.089955661 -0600
|
||||
+++ src/C/glpk.c 2013-07-31 12:13:40.702115730 -0600
|
||||
@@ -22,6 +22,8 @@
|
||||
#include "cvxopt.h"
|
||||
#include "misc.h"
|
||||
#include "glpk.h"
|
||||
+#include <float.h>
|
||||
+#include <limits.h>
|
||||
|
||||
PyDoc_STRVAR(glpk__doc__,
|
||||
"Interface to the simplex and mixed integer LP algorithms in GLPK.\n\n"
|
||||
@@ -36,62 +38,15 @@ PyDoc_STRVAR(glpk__doc__,
|
||||
|
||||
static PyObject *glpk_module;
|
||||
|
||||
-typedef struct {
|
||||
- char name[20];
|
||||
- int idx;
|
||||
- char type;
|
||||
-} param_tuple;
|
||||
-
|
||||
-static const param_tuple GLPK_PARAM_LIST[] = {
|
||||
- {"LPX_K_MSGLEV", LPX_K_MSGLEV, 'i'},
|
||||
- {"LPX_K_SCALE", LPX_K_SCALE, 'i'},
|
||||
- {"LPX_K_DUAL", LPX_K_DUAL, 'i'},
|
||||
- {"LPX_K_PRICE", LPX_K_PRICE, 'i'},
|
||||
- {"LPX_K_RELAX", LPX_K_RELAX, 'f'},
|
||||
- {"LPX_K_TOLBND", LPX_K_TOLBND, 'f'},
|
||||
- {"LPX_K_TOLDJ", LPX_K_TOLDJ, 'f'},
|
||||
- {"LPX_K_TOLPIV", LPX_K_TOLPIV, 'f'},
|
||||
- {"LPX_K_ROUND", LPX_K_ROUND, 'i'},
|
||||
- {"LPX_K_OBJLL", LPX_K_OBJLL, 'f'},
|
||||
- {"LPX_K_OBJUL", LPX_K_OBJUL, 'f'},
|
||||
- {"LPX_K_ITLIM", LPX_K_ITLIM, 'i'},
|
||||
- {"LPX_K_ITCNT", LPX_K_ITCNT, 'i'},
|
||||
- {"LPX_K_TMLIM", LPX_K_TMLIM, 'f'},
|
||||
- {"LPX_K_OUTFRQ", LPX_K_OUTFRQ, 'i'},
|
||||
- {"LPX_K_OUTDLY", LPX_K_OUTDLY, 'f'},
|
||||
- {"LPX_K_BRANCH", LPX_K_BRANCH, 'i'},
|
||||
- {"LPX_K_BTRACK", LPX_K_BTRACK, 'i'},
|
||||
- {"LPX_K_TOLINT", LPX_K_TOLINT, 'f'},
|
||||
- {"LPX_K_TOLOBJ", LPX_K_TOLOBJ, 'f'},
|
||||
- {"LPX_K_MPSINFO", LPX_K_MPSINFO, 'i'},
|
||||
- {"LPX_K_MPSOBJ", LPX_K_MPSOBJ, 'i'},
|
||||
- {"LPX_K_MPSORIG", LPX_K_MPSORIG, 'i'},
|
||||
- {"LPX_K_MPSWIDE", LPX_K_MPSWIDE, 'i'},
|
||||
- {"LPX_K_MPSFREE", LPX_K_MPSFREE, 'i'},
|
||||
- {"LPX_K_MPSSKIP", LPX_K_MPSSKIP, 'i'},
|
||||
- {"LPX_K_LPTORIG", LPX_K_LPTORIG, 'i'},
|
||||
- {"LPX_K_PRESOL", LPX_K_PRESOL, 'i'},
|
||||
-}; /* 28 paramaters */
|
||||
-
|
||||
-
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
-static int get_param_idx(const char *str, int *idx, char *type)
|
||||
+#define PYINT_CHECK(value) PyLong_Check(value)
|
||||
+#define PYINT_AS_LONG(value) PyLong_AS_LONG(value)
|
||||
+#define PYSTRING_FROMSTRING(str) PyUnicode_FromString(str)
|
||||
#else
|
||||
-static int get_param_idx(char *str, int *idx, char *type)
|
||||
+#define PYINT_CHECK(value) PyInt_Check(value)
|
||||
+#define PYINT_AS_LONG(value) PyInt_AS_LONG(value)
|
||||
+#define PYSTRING_FROMSTRING(str) PyString_FromString(str)
|
||||
#endif
|
||||
-{
|
||||
- int i;
|
||||
-
|
||||
- for (i=0; i<28; i++) {
|
||||
- if (!strcmp(GLPK_PARAM_LIST[i].name, str)) {
|
||||
- *idx = GLPK_PARAM_LIST[i].idx;
|
||||
- *type = GLPK_PARAM_LIST[i].type;
|
||||
- return 1;
|
||||
- }
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
|
||||
static char doc_simplex[] =
|
||||
"Solves a linear program using GLPK.\n\n"
|
||||
@@ -127,11 +82,12 @@ static PyObject *simplex(PyObject *self,
|
||||
{
|
||||
matrix *c, *h, *b=NULL, *x=NULL, *z=NULL, *y=NULL;
|
||||
PyObject *G, *A=NULL, *t=NULL, *param, *key, *value;
|
||||
- LPX *lp;
|
||||
- int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
|
||||
+ glp_prob *lp;
|
||||
+ glp_smcp smcp;
|
||||
+ int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL;
|
||||
int_t pos=0;
|
||||
double *a=NULL, val;
|
||||
- char param_type, err_str[100];
|
||||
+ char err_str[100];
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
const char *keystr;
|
||||
#else
|
||||
@@ -183,18 +139,18 @@ static PyObject *simplex(PyObject *self,
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- lp = lpx_create_prob();
|
||||
- lpx_add_rows(lp, m+p);
|
||||
- lpx_add_cols(lp, n);
|
||||
+ lp = glp_create_prob();
|
||||
+ glp_add_rows(lp, m+p);
|
||||
+ glp_add_cols(lp, n);
|
||||
|
||||
for (i=0; i<n; i++){
|
||||
- lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
|
||||
- lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
|
||||
+ glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
|
||||
+ glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
|
||||
}
|
||||
for (i=0; i<m; i++)
|
||||
- lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
|
||||
+ glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
|
||||
for (i=0; i<p; i++)
|
||||
- lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
|
||||
+ glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
|
||||
MAT_BUFD(b)[i]);
|
||||
|
||||
nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
|
||||
@@ -203,7 +159,7 @@ static PyObject *simplex(PyObject *self,
|
||||
rn = (int *) calloc(nnzmax+1, sizeof(int));
|
||||
cn = (int *) calloc(nnzmax+1, sizeof(int));
|
||||
if (!a || !rn || !cn){
|
||||
- free(a); free(rn); free(cn); lpx_delete_prob(lp);
|
||||
+ free(a); free(rn); free(cn); glp_delete_prob(lp);
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
|
||||
@@ -242,84 +198,155 @@ static PyObject *simplex(PyObject *self,
|
||||
nnz++;
|
||||
}
|
||||
|
||||
- lpx_load_matrix(lp, nnz, rn, cn, a);
|
||||
+ glp_load_matrix(lp, nnz, rn, cn, a);
|
||||
free(rn); free(cn); free(a);
|
||||
|
||||
if (!(t = PyTuple_New(A ? 4 : 3))){
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
|
||||
if (!(param = PyObject_GetAttrString(glpk_module, "options"))
|
||||
|| !PyDict_Check(param)){
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
PyErr_SetString(PyExc_AttributeError,
|
||||
"missing glpk.options dictionary");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- while (PyDict_Next(param, &pos, &key, &value))
|
||||
+ glp_init_smcp(&smcp);
|
||||
+ while (PyDict_Next(param, &pos, &key, &value)){
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
- if ((PyUnicode_Check(key)) &&
|
||||
- get_param_idx(_PyUnicode_AsString(key), ¶m_id,
|
||||
- ¶m_type)){
|
||||
+ if (PyUnicode_Check(key)){
|
||||
keystr = _PyUnicode_AsString(key);
|
||||
#else
|
||||
- if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
|
||||
- ¶m_id, ¶m_type)){
|
||||
-#endif
|
||||
- if (param_type == 'i'){
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- if (!PyLong_Check(value)){
|
||||
-#else
|
||||
- if (!PyInt_Check(value)){
|
||||
-#endif
|
||||
- sprintf(err_str, "invalid value for integer "
|
||||
- "GLPK parameter: %-.20s", keystr);
|
||||
- PyErr_SetString(PyExc_ValueError, err_str);
|
||||
- lpx_delete_prob(lp);
|
||||
- Py_DECREF(param);
|
||||
- return NULL;
|
||||
- }
|
||||
- if (!strcmp("LPX_K_PRESOL", keystr) &&
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyLong_AS_LONG(value) != 1){
|
||||
-#else
|
||||
- PyInt_AS_LONG(value) != 1){
|
||||
+ if ((keystr = PyString_AsString(key))){
|
||||
#endif
|
||||
+ if (!strcmp("LPX_K_MSGLEV", keystr)){
|
||||
+ switch (PYINT_AS_LONG(value)){
|
||||
+ case 0: smcp.msg_lev = GLP_MSG_OFF; break;
|
||||
+ case 1: smcp.msg_lev = GLP_MSG_ERR; break;
|
||||
+ case 2: smcp.msg_lev = GLP_MSG_ON; break;
|
||||
+ case 3: smcp.msg_lev = GLP_MSG_ALL; break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_SCALE", keystr)){
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 0: glp_unscale_prob(lp); break;
|
||||
+ case 1: glp_scale_prob(lp, GLP_SF_EQ); break;
|
||||
+ case 2: glp_scale_prob(lp, GLP_SF_GM); break;
|
||||
+ case 3: glp_scale_prob(lp, GLP_SF_GM | GLP_SF_EQ); break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_DUAL", keystr)){
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 0: smcp.meth = GLP_PRIMAL; break;
|
||||
+ case 1: smcp.meth = GLP_DUAL; break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_PRICE", keystr)){
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 0: smcp.pricing = GLP_PT_STD; break;
|
||||
+ case 1: smcp.pricing = GLP_PT_PSE; break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_RELAX", keystr)){
|
||||
+ double relax = PyFloat_AsDouble(value);
|
||||
+ if (relax < 0.0 || relax > 1.0)
|
||||
+ goto error;
|
||||
+ smcp.r_test = (relax == 0.0) ? GLP_RT_STD : GLP_RT_HAR;
|
||||
+ } else if (!strcmp("LPX_K_TOLBND", keystr)){
|
||||
+ smcp.tol_bnd = PyFloat_AsDouble(value);
|
||||
+ if (smcp.tol_bnd < DBL_EPSILON || smcp.tol_bnd > 0.001)
|
||||
+ goto error;
|
||||
+ } else if (!strcmp("LPX_K_TOLDJ", keystr)){
|
||||
+ smcp.tol_dj = PyFloat_AsDouble(value);
|
||||
+ if (smcp.tol_dj < DBL_EPSILON || smcp.tol_dj > 0.001)
|
||||
+ goto error;
|
||||
+ } else if (!strcmp("LPX_K_TOLPIV", keystr)){
|
||||
+ smcp.tol_piv = PyFloat_AsDouble(value);
|
||||
+ if (smcp.tol_piv < DBL_EPSILON || smcp.tol_piv > 0.001)
|
||||
+ goto error;
|
||||
+ } else if (!strcmp("LPX_K_ROUND", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_OBJLL", keystr)){
|
||||
+ smcp.obj_ll = PyFloat_AsDouble(value);
|
||||
+ } else if (!strcmp("LPX_K_OBJUL", keystr)){
|
||||
+ smcp.obj_ul = PyFloat_AsDouble(value);
|
||||
+ } else if (!strcmp("LPX_K_ITLIM", keystr)){
|
||||
+ smcp.it_lim = PYINT_AS_LONG(value);
|
||||
+ if (smcp.it_lim < 0)
|
||||
+ smcp.it_lim = INT_MAX;
|
||||
+ } else if (!strcmp("LPX_K_ITCNT", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_TMLIM", keystr)){
|
||||
+ smcp.tm_lim = (int)(PyFloat_AsDouble(value) * 1000.0);
|
||||
+ if (smcp.tm_lim < 0)
|
||||
+ smcp.tm_lim = INT_MAX;
|
||||
+ } else if (!strcmp("LPX_K_OUTFRQ", keystr)){
|
||||
+ smcp.out_frq = PYINT_AS_LONG(value);
|
||||
+ if (smcp.out_frq <= 0)
|
||||
+ goto error;
|
||||
+ } else if (!strcmp("LPX_K_OUTDLY", keystr)){
|
||||
+ smcp.out_dly = (int)(PyFloat_AsDouble(value) * 1000.0);
|
||||
+ } else if (!strcmp("LPX_K_BRANCH", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_BTRACK", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_TOLINT", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_TOLOBJ", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSINFO", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSOBJ", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSORIG", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSWIDE", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSFREE", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSSKIP", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_LPTORIG", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_PRESOL", keystr)){
|
||||
+ if (PYINT_AS_LONG(value) != 1)
|
||||
PyErr_Warn(PyExc_UserWarning, "ignoring value of "
|
||||
"GLPK parameter 'LPX_K_PRESOL'");
|
||||
+ } else if (!strcmp("LPX_K_BINARIZE", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_USECUTS", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_BFTYPE", keystr)){
|
||||
+ glp_bfcp bfcp;
|
||||
+
|
||||
+ glp_get_bfcp(lp, &bfcp);
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 1: bfcp.type = GLP_BF_FT; break;
|
||||
+ case 2: bfcp.type = GLP_BF_BG; break;
|
||||
+ case 3: bfcp.type = GLP_BF_GR; break;
|
||||
+ default: goto error;
|
||||
}
|
||||
- else lpx_set_int_parm(lp, param_id,
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyLong_AS_LONG(value));
|
||||
-#else
|
||||
- PyInt_AS_LONG(value));
|
||||
-#endif
|
||||
- }
|
||||
- else {
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- if (!PyLong_Check(value) && !PyFloat_Check(value)){
|
||||
-#else
|
||||
- if (!PyInt_Check(value) && !PyFloat_Check(value)){
|
||||
-#endif
|
||||
- sprintf(err_str, "invalid value for floating point "
|
||||
- "GLPK parameter: %-.20s", keystr);
|
||||
- PyErr_SetString(PyExc_ValueError, err_str);
|
||||
- lpx_delete_prob(lp);
|
||||
- Py_DECREF(param);
|
||||
- return NULL;
|
||||
- }
|
||||
- lpx_set_real_parm(lp, param_id,
|
||||
- PyFloat_AsDouble(value));
|
||||
+ glp_set_bfcp(lp, &bfcp);
|
||||
+ } else if (!strcmp("LPX_K_MIPGAP", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else {
|
||||
+ sprintf(err_str, "unknown GLPK parameter: %-.20s", keystr);
|
||||
+ PyErr_SetString(PyExc_ValueError, err_str);
|
||||
+ glp_delete_prob(lp);
|
||||
+ Py_DECREF(param);
|
||||
+ return NULL;
|
||||
}
|
||||
+ }
|
||||
}
|
||||
- lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
|
||||
+ smcp.presolve = GLP_ON;
|
||||
Py_DECREF(param);
|
||||
|
||||
- switch (lpx_simplex(lp)){
|
||||
+ switch (glp_simplex(lp, &smcp)){
|
||||
|
||||
- case LPX_E_OK:
|
||||
+ case 0:
|
||||
|
||||
x = (matrix *) Matrix_New(n,1,DOUBLE);
|
||||
z = (matrix *) Matrix_New(m,1,DOUBLE);
|
||||
@@ -329,71 +356,61 @@ static PyObject *simplex(PyObject *self,
|
||||
Py_XDECREF(z);
|
||||
Py_XDECREF(y);
|
||||
Py_XDECREF(t);
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
|
||||
- PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("optimal"));
|
||||
-#else
|
||||
- PyString_FromString("optimal"));
|
||||
-#endif
|
||||
+ PyTuple_SET_ITEM(t, 0, (PyObject *)PYSTRING_FROMSTRING("optimal"));
|
||||
|
||||
for (i=0; i<n; i++)
|
||||
- MAT_BUFD(x)[i] = lpx_get_col_prim(lp, i+1);
|
||||
+ MAT_BUFD(x)[i] = glp_get_col_prim(lp, i+1);
|
||||
PyTuple_SET_ITEM(t, 1, (PyObject *) x);
|
||||
|
||||
for (i=0; i<m; i++)
|
||||
- MAT_BUFD(z)[i] = -lpx_get_row_dual(lp, i+1);
|
||||
+ MAT_BUFD(z)[i] = -glp_get_row_dual(lp, i+1);
|
||||
PyTuple_SET_ITEM(t, 2, (PyObject *) z);
|
||||
|
||||
if (A){
|
||||
for (i=0; i<p; i++)
|
||||
- MAT_BUFD(y)[i] = -lpx_get_row_dual(lp, m+i+1);
|
||||
+ MAT_BUFD(y)[i] = -glp_get_row_dual(lp, m+i+1);
|
||||
PyTuple_SET_ITEM(t, 3, (PyObject *) y);
|
||||
}
|
||||
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return (PyObject *) t;
|
||||
|
||||
- case LPX_E_NOPFS:
|
||||
+ case GLP_ENOPFS:
|
||||
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("primal infeasible"));
|
||||
-#else
|
||||
- PyString_FromString("primal infeasible"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("primal infeasible"));
|
||||
break;
|
||||
|
||||
- case LPX_E_NODFS:
|
||||
+ case GLP_ENODFS:
|
||||
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("dual infeasible"));
|
||||
-#else
|
||||
- PyString_FromString("dual infeasible"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("dual infeasible"));
|
||||
break;
|
||||
|
||||
default:
|
||||
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("unknown"));
|
||||
-#else
|
||||
- PyString_FromString("unknown"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("unknown"));
|
||||
}
|
||||
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
|
||||
PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
|
||||
PyTuple_SET_ITEM(t, 2, Py_BuildValue(""));
|
||||
if (A) PyTuple_SET_ITEM(t, 3, Py_BuildValue(""));
|
||||
|
||||
return (PyObject *) t;
|
||||
+
|
||||
+error:
|
||||
+ sprintf(err_str, "invalid value for GLPK parameter: %-.20s", keystr);
|
||||
+ PyErr_SetString(PyExc_ValueError, err_str);
|
||||
+ glp_delete_prob(lp);
|
||||
+ Py_DECREF(param);
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
|
||||
@@ -428,11 +445,12 @@ static PyObject *integer(PyObject *self,
|
||||
matrix *c, *h, *b=NULL, *x=NULL;
|
||||
PyObject *G, *A=NULL, *IntSet=NULL, *BinSet = NULL;
|
||||
PyObject *t=NULL, *param, *key, *value;
|
||||
- LPX *lp;
|
||||
- int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL, param_id;
|
||||
+ glp_prob *lp;
|
||||
+ glp_iocp iocp;
|
||||
+ int m, n, p, i, j, k, nnz, nnzmax, *rn=NULL, *cn=NULL;
|
||||
int_t pos=0;
|
||||
double *a=NULL, val;
|
||||
- char param_type, err_str[100];
|
||||
+ char err_str[100];
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
const char *keystr;
|
||||
#else
|
||||
@@ -490,18 +508,18 @@ static PyObject *integer(PyObject *self,
|
||||
if ((BinSet) && (!PyAnySet_Check(BinSet)))
|
||||
PY_ERR_TYPE("invalid binary index set");
|
||||
|
||||
- lp = lpx_create_prob();
|
||||
- lpx_add_rows(lp, m+p);
|
||||
- lpx_add_cols(lp, n);
|
||||
+ lp = glp_create_prob();
|
||||
+ glp_add_rows(lp, m+p);
|
||||
+ glp_add_cols(lp, n);
|
||||
|
||||
for (i=0; i<n; i++){
|
||||
- lpx_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
|
||||
- lpx_set_col_bnds(lp, i+1, LPX_FR, 0.0, 0.0);
|
||||
+ glp_set_obj_coef(lp, i+1, MAT_BUFD(c)[i]);
|
||||
+ glp_set_col_bnds(lp, i+1, GLP_FR, 0.0, 0.0);
|
||||
}
|
||||
for (i=0; i<m; i++)
|
||||
- lpx_set_row_bnds(lp, i+1, LPX_UP, 0.0, MAT_BUFD(h)[i]);
|
||||
+ glp_set_row_bnds(lp, i+1, GLP_UP, 0.0, MAT_BUFD(h)[i]);
|
||||
for (i=0; i<p; i++)
|
||||
- lpx_set_row_bnds(lp, i+m+1, LPX_FX, MAT_BUFD(b)[i],
|
||||
+ glp_set_row_bnds(lp, i+m+1, GLP_FX, MAT_BUFD(b)[i],
|
||||
MAT_BUFD(b)[i]);
|
||||
|
||||
nnzmax = (SpMatrix_Check(G) ? SP_NNZ(G) : m*n ) +
|
||||
@@ -510,7 +528,7 @@ static PyObject *integer(PyObject *self,
|
||||
rn = (int *) calloc(nnzmax+1, sizeof(int));
|
||||
cn = (int *) calloc(nnzmax+1, sizeof(int));
|
||||
if (!a || !rn || !cn){
|
||||
- free(a); free(rn); free(cn); lpx_delete_prob(lp);
|
||||
+ free(a); free(rn); free(cn); glp_delete_prob(lp);
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
|
||||
@@ -549,77 +567,152 @@ static PyObject *integer(PyObject *self,
|
||||
nnz++;
|
||||
}
|
||||
|
||||
- lpx_load_matrix(lp, nnz, rn, cn, a);
|
||||
+ glp_load_matrix(lp, nnz, rn, cn, a);
|
||||
free(rn); free(cn); free(a);
|
||||
|
||||
if (!(t = PyTuple_New(2))) {
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
|
||||
if (!(param = PyObject_GetAttrString(glpk_module, "options"))
|
||||
|| !PyDict_Check(param)){
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
PyErr_SetString(PyExc_AttributeError,
|
||||
"missing glpk.options dictionary");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- while (PyDict_Next(param, &pos, &key, &value))
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- if ((PyUnicode_Check(key)) && (keystr = PyUnicode_AS_DATA(key))
|
||||
- && get_param_idx(keystr, ¶m_id, ¶m_type)){
|
||||
-#else
|
||||
- if ((keystr = PyString_AsString(key)) && get_param_idx(keystr,
|
||||
- ¶m_id, ¶m_type)){
|
||||
-#endif
|
||||
- if (param_type == 'i'){
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- if (!PyLong_Check(value)){
|
||||
-#else
|
||||
- if (!PyInt_Check(value)){
|
||||
-#endif
|
||||
- sprintf(err_str, "invalid value for integer "
|
||||
- "GLPK parameter: %-.20s", keystr);
|
||||
- PyErr_SetString(PyExc_ValueError, err_str);
|
||||
- lpx_delete_prob(lp);
|
||||
- Py_DECREF(param);
|
||||
- return NULL;
|
||||
- }
|
||||
- if (!strcmp("LPX_K_PRESOL", keystr) &&
|
||||
+ glp_init_iocp(&iocp);
|
||||
+ while (PyDict_Next(param, &pos, &key, &value)) {
|
||||
#if PY_MAJOR_VERSION >= 3
|
||||
- PyLong_AS_LONG(value) != 1){
|
||||
+ if ((PyUnicode_Check(key)) && (keystr = PyUnicode_AS_DATA(key))){
|
||||
#else
|
||||
- PyInt_AS_LONG(value) != 1){
|
||||
+ if ((keystr = PyString_AsString(key))){
|
||||
#endif
|
||||
+ if (!strcmp("LPX_K_MSGLEV", keystr)){
|
||||
+ switch (PYINT_AS_LONG(value)){
|
||||
+ case 0: iocp.msg_lev = GLP_MSG_OFF; break;
|
||||
+ case 1: iocp.msg_lev = GLP_MSG_ERR; break;
|
||||
+ case 2: iocp.msg_lev = GLP_MSG_ON; break;
|
||||
+ case 3: iocp.msg_lev = GLP_MSG_ALL; break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_SCALE", keystr)){
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 0: glp_unscale_prob(lp); break;
|
||||
+ case 1: glp_scale_prob(lp, GLP_SF_EQ); break;
|
||||
+ case 2: glp_scale_prob(lp, GLP_SF_GM); break;
|
||||
+ case 3: glp_scale_prob(lp, GLP_SF_GM | GLP_SF_EQ); break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_DUAL", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_PRICE", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_RELAX", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_TOLBND", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_TOLDJ", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_TOLPIV", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_ROUND", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_OBJLL", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_OBJUL", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_ITLIM", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_ITCNT", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_TMLIM", keystr)){
|
||||
+ iocp.tm_lim = (int)(PyFloat_AsDouble(value) * 1000.0);
|
||||
+ if (iocp.tm_lim < 0)
|
||||
+ iocp.tm_lim = INT_MAX;
|
||||
+ } else if (!strcmp("LPX_K_OUTFRQ", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_OUTDLY", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_BRANCH", keystr)){
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 0: iocp.br_tech = GLP_BR_FFV; break;
|
||||
+ case 1: iocp.br_tech = GLP_BR_LFV; break;
|
||||
+ case 2: iocp.br_tech = GLP_BR_DTH; break;
|
||||
+ case 3: iocp.br_tech = GLP_BR_MFV; break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_BTRACK", keystr)){
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 0: iocp.bt_tech = GLP_BT_DFS; break;
|
||||
+ case 1: iocp.bt_tech = GLP_BT_BFS; break;
|
||||
+ case 2: iocp.bt_tech = GLP_BT_BPH; break;
|
||||
+ case 3: iocp.bt_tech = GLP_BT_BLB; break;
|
||||
+ default: goto error;
|
||||
+ }
|
||||
+ } else if (!strcmp("LPX_K_TOLINT", keystr)){
|
||||
+ iocp.tol_int = PyFloat_AsDouble(value);
|
||||
+ if (iocp.tol_int < DBL_EPSILON || iocp.tol_int > 0.001)
|
||||
+ goto error;
|
||||
+ } else if (!strcmp("LPX_K_TOLOBJ", keystr)){
|
||||
+ iocp.tol_obj = PyFloat_AsDouble(value);
|
||||
+ if (iocp.tol_obj < DBL_EPSILON || iocp.tol_obj > 0.001)
|
||||
+ goto error;
|
||||
+ } else if (!strcmp("LPX_K_MPSINFO", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSOBJ", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSORIG", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSWIDE", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSFREE", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_MPSSKIP", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_LPTORIG", keystr)){
|
||||
+ /* Ignored */
|
||||
+ } else if (!strcmp("LPX_K_PRESOL", keystr)){
|
||||
+ if (PYINT_AS_LONG(value) != 1)
|
||||
PyErr_Warn(PyExc_UserWarning, "ignoring value of "
|
||||
"GLPK parameter 'LPX_K_PRESOL'");
|
||||
+ } else if (!strcmp("LPX_K_BINARIZE", keystr)){
|
||||
+ iocp.binarize = (PYINT_AS_LONG(value) == 0) ? GLP_OFF : GLP_ON;
|
||||
+ } else if (!strcmp("LPX_K_USECUTS", keystr)){
|
||||
+ int cuts = PYINT_AS_LONG(value);
|
||||
+ if (cuts & ~0xFF)
|
||||
+ goto error;
|
||||
+ iocp.cov_cuts = (cuts & 1) ? GLP_ON : GLP_OFF;
|
||||
+ iocp.clq_cuts = (cuts & 2) ? GLP_ON : GLP_OFF;
|
||||
+ iocp.gmi_cuts = (cuts & 4) ? GLP_ON : GLP_OFF;
|
||||
+ iocp.mir_cuts = (cuts & 8) ? GLP_ON : GLP_OFF;
|
||||
+ } else if (!strcmp("LPX_K_BFTYPE", keystr)){
|
||||
+ glp_bfcp bfcp;
|
||||
+
|
||||
+ glp_get_bfcp(lp, &bfcp);
|
||||
+ switch(PYINT_AS_LONG(value)){
|
||||
+ case 1: bfcp.type = GLP_BF_FT; break;
|
||||
+ case 2: bfcp.type = GLP_BF_BG; break;
|
||||
+ case 3: bfcp.type = GLP_BF_GR; break;
|
||||
+ default: goto error;
|
||||
}
|
||||
- else
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- lpx_set_int_parm(lp, param_id, PyLong_AS_LONG(value));
|
||||
-#else
|
||||
- lpx_set_int_parm(lp, param_id, PyInt_AS_LONG(value));
|
||||
-#endif
|
||||
- }
|
||||
- else {
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- if (!PyLong_Check(value) && !PyFloat_Check(value)){
|
||||
-#else
|
||||
- if (!PyInt_Check(value) && !PyFloat_Check(value)){
|
||||
-#endif
|
||||
- sprintf(err_str, "invalid value for floating point "
|
||||
- "GLPK parameter: %-.20s", keystr);
|
||||
- PyErr_SetString(PyExc_ValueError, err_str);
|
||||
- lpx_delete_prob(lp);
|
||||
- Py_DECREF(param);
|
||||
- return NULL;
|
||||
- }
|
||||
- lpx_set_real_parm(lp, param_id,
|
||||
- PyFloat_AsDouble(value));
|
||||
+ glp_set_bfcp(lp, &bfcp);
|
||||
+ } else if (!strcmp("LPX_K_MIPGAP", keystr)){
|
||||
+ iocp.mip_gap = PyFloat_AsDouble(value);
|
||||
+ if (iocp.mip_gap < 0.0)
|
||||
+ goto error;
|
||||
+ } else {
|
||||
+ sprintf(err_str, "unknown GLPK parameter: %-.20s", keystr);
|
||||
+ PyErr_SetString(PyExc_ValueError, err_str);
|
||||
+ glp_delete_prob(lp);
|
||||
+ Py_DECREF(param);
|
||||
+ return NULL;
|
||||
}
|
||||
+ }
|
||||
}
|
||||
- lpx_set_int_parm(lp, LPX_K_PRESOL, 1);
|
||||
+ iocp.presolve = GLP_ON;
|
||||
Py_DECREF(param);
|
||||
|
||||
if (IntSet) {
|
||||
@@ -628,22 +721,14 @@ static PyObject *integer(PyObject *self,
|
||||
for (i=0; i<PySet_GET_SIZE(IntSet); i++) {
|
||||
|
||||
PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- if (!PyLong_Check(tmp)) {
|
||||
-#else
|
||||
- if (!PyInt_Check(tmp)) {
|
||||
-#endif
|
||||
- lpx_delete_prob(lp);
|
||||
+ if (!PYINT_CHECK(tmp)) {
|
||||
+ glp_delete_prob(lp);
|
||||
Py_DECREF(iter);
|
||||
PY_ERR_TYPE("non-integer element in I");
|
||||
}
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- int k = PyLong_AS_LONG(tmp);
|
||||
-#else
|
||||
- int k = PyInt_AS_LONG(tmp);
|
||||
-#endif
|
||||
+ int k = PYINT_AS_LONG(tmp);
|
||||
if ((k < 0) || (k >= n)) {
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
Py_DECREF(iter);
|
||||
PY_ERR(PyExc_IndexError, "index element out of range in I");
|
||||
}
|
||||
@@ -659,22 +744,14 @@ static PyObject *integer(PyObject *self,
|
||||
for (i=0; i<PySet_GET_SIZE(BinSet); i++) {
|
||||
|
||||
PyObject *tmp = PySequence_Fast_GET_ITEM(iter, i);
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- if (!PyLong_Check(tmp)) {
|
||||
-#else
|
||||
- if (!PyInt_Check(tmp)) {
|
||||
-#endif
|
||||
- lpx_delete_prob(lp);
|
||||
+ if (!PYINT_CHECK(tmp)) {
|
||||
+ glp_delete_prob(lp);
|
||||
Py_DECREF(iter);
|
||||
PY_ERR_TYPE("non-binary element in I");
|
||||
}
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- int k = PyLong_AS_LONG(tmp);
|
||||
-#else
|
||||
- int k = PyInt_AS_LONG(tmp);
|
||||
-#endif
|
||||
+ int k = PYINT_AS_LONG(tmp);
|
||||
if ((k < 0) || (k >= n)) {
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
Py_DECREF(iter);
|
||||
PY_ERR(PyExc_IndexError, "index element out of range in B");
|
||||
}
|
||||
@@ -686,117 +763,92 @@ static PyObject *integer(PyObject *self,
|
||||
}
|
||||
|
||||
|
||||
+ switch (glp_intopt(lp, &iocp)){
|
||||
|
||||
- switch (lpx_intopt(lp)){
|
||||
-
|
||||
- case LPX_E_OK:
|
||||
+ case 0:
|
||||
|
||||
x = (matrix *) Matrix_New(n,1,DOUBLE);
|
||||
if (!x) {
|
||||
Py_XDECREF(t);
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
- PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("optimal"));
|
||||
-#else
|
||||
- PyString_FromString("optimal"));
|
||||
-#endif
|
||||
+ PyTuple_SET_ITEM(t, 0, (PyObject *)PYSTRING_FROMSTRING("optimal"));
|
||||
|
||||
for (i=0; i<n; i++)
|
||||
- MAT_BUFD(x)[i] = lpx_mip_col_val(lp, i+1);
|
||||
+ MAT_BUFD(x)[i] = glp_mip_col_val(lp, i+1);
|
||||
PyTuple_SET_ITEM(t, 1, (PyObject *) x);
|
||||
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return (PyObject *) t;
|
||||
|
||||
- case LPX_E_TMLIM:
|
||||
+ case GLP_ETMLIM:
|
||||
|
||||
x = (matrix *) Matrix_New(n,1,DOUBLE);
|
||||
if (!x) {
|
||||
Py_XDECREF(t);
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return PyErr_NoMemory();
|
||||
}
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("time limit exceeded"));
|
||||
-#else
|
||||
- PyString_FromString("time limit exceeded"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("time limit exceeded"));
|
||||
|
||||
for (i=0; i<n; i++)
|
||||
- MAT_BUFD(x)[i] = lpx_mip_col_val(lp, i+1);
|
||||
+ MAT_BUFD(x)[i] = glp_mip_col_val(lp, i+1);
|
||||
PyTuple_SET_ITEM(t, 1, (PyObject *) x);
|
||||
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
return (PyObject *) t;
|
||||
|
||||
|
||||
- case LPX_E_FAULT:
|
||||
+ case GLP_EBADB:
|
||||
+ case GLP_ECOND:
|
||||
+ case GLP_EBOUND:
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("invalid MIP formulation"));
|
||||
-#else
|
||||
- PyString_FromString("invalid MIP formulation"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("invalid MIP formulation"));
|
||||
break;
|
||||
|
||||
- case LPX_E_NOPFS:
|
||||
+ case GLP_ENOPFS:
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("primal infeasible"));
|
||||
-#else
|
||||
- PyString_FromString("primal infeasible"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("primal infeasible"));
|
||||
break;
|
||||
|
||||
- case LPX_E_NODFS:
|
||||
+ case GLP_ENODFS:
|
||||
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("dual infeasible"));
|
||||
-#else
|
||||
- PyString_FromString("dual infeasible"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("dual infeasible"));
|
||||
break;
|
||||
|
||||
- case LPX_E_ITLIM:
|
||||
+ case GLP_EITLIM:
|
||||
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("maxiters exceeded"));
|
||||
-#else
|
||||
- PyString_FromString("maxiters exceeded"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("maxiters exceeded"));
|
||||
break;
|
||||
|
||||
- case LPX_E_SING:
|
||||
+ case GLP_ESING:
|
||||
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("singular or ill-conditioned basis"));
|
||||
-#else
|
||||
- PyString_FromString("singular or ill-conditioned basis"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("singular or ill-conditioned basis"));
|
||||
break;
|
||||
|
||||
|
||||
default:
|
||||
|
||||
PyTuple_SET_ITEM(t, 0, (PyObject *)
|
||||
-#if PY_MAJOR_VERSION >= 3
|
||||
- PyUnicode_FromString("unknown"));
|
||||
-#else
|
||||
- PyString_FromString("unknown"));
|
||||
-#endif
|
||||
+ PYSTRING_FROMSTRING("unknown"));
|
||||
}
|
||||
|
||||
- lpx_delete_prob(lp);
|
||||
+ glp_delete_prob(lp);
|
||||
|
||||
PyTuple_SET_ITEM(t, 1, Py_BuildValue(""));
|
||||
return (PyObject *) t;
|
||||
+
|
||||
+error:
|
||||
+ sprintf(err_str, "invalid value for GLPK parameter: %-.20s", keystr);
|
||||
+ PyErr_SetString(PyExc_ValueError, err_str);
|
||||
+ glp_delete_prob(lp);
|
||||
+ Py_DECREF(param);
|
||||
+ return NULL;
|
||||
}
|
||||
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<herd>sci-mathematics</herd>
|
||||
<longdescription lang="en">
|
||||
<herd>sci-mathematics</herd>
|
||||
<longdescription lang="en">
|
||||
CVXOPT is a software for convex optimization based on
|
||||
the Python programming language. Its main purpose is to make the
|
||||
development of software for convex optimization applications
|
||||
straightforward.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="glpk">Use GNU Linear Programming Kit
|
||||
<pkg>sci-mathematics/glpk</pkg></flag>
|
||||
<flag name="dsdp">Use interior point library
|
||||
<use>
|
||||
<flag name="dsdp">Use interior point library
|
||||
<pkg>sci-libs/dsdp</pkg></flag>
|
||||
</use>
|
||||
<flag name="glpk">Use GNU Linear Programming Kit
|
||||
<pkg>sci-mathematics/glpk</pkg></flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -0,0 +1,21 @@
|
||||
From 320283cd70ae31ce46b03e0c5da55412089ce953 Mon Sep 17 00:00:00 2001
|
||||
From: Akira TAGOH <akira@tagoh.org>
|
||||
Date: Thu, 16 Jan 2014 10:30:35 +0000
|
||||
Subject: Bug 73686 - confdir is not set correctly in fontconfig.pc
|
||||
|
||||
---
|
||||
diff --git a/fontconfig.pc.in b/fontconfig.pc.in
|
||||
index 6e112bb..fa00a72 100644
|
||||
--- a/fontconfig.pc.in
|
||||
+++ b/fontconfig.pc.in
|
||||
@@ -5,7 +5,7 @@ includedir=@includedir@
|
||||
sysconfdir=@sysconfdir@
|
||||
localstatedir=@localstatedir@
|
||||
PACKAGE=@PACKAGE@
|
||||
-confdir=@baseconfigdir@
|
||||
+confdir=@BASECONFIGDIR@
|
||||
cachedir=@fc_cachedir@
|
||||
|
||||
Name: Fontconfig
|
||||
--
|
||||
cgit v0.9.0.2-2-gbebe
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue