root
12 years ago
parent
47a78ef01b
commit
c5db843999
@ -0,0 +1,16 @@
|
||||
From: Slawomir Nizio <slawomir.nizio@sabayon.org>
|
||||
Date: Tue May 29 11:52:00 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
fix underlinking wrt https://bugs.gentoo.org/show_bug.cgi?id=418121
|
||||
|
||||
--- CMakeLists.txt
|
||||
+++ CMakeLists.txt
|
||||
@@ -171,6 +171,7 @@
|
||||
${GTK_LIBRARIES}
|
||||
${LIBSOUP_LIBRARIES}
|
||||
hardinfo-shell
|
||||
+ m
|
||||
)
|
||||
target_link_libraries(hardinfo-shell
|
||||
hardinfo-help-viewer
|
||||
@ -1,4 +1,2 @@
|
||||
DIST syslog-ng_3.2.4.tar.gz 1435115 RMD160 2927ba4d9b8a913f7117a659806c1721fe3d244e SHA1 ff732f7223bd2bd0424d4b9028b523cf62133af1 SHA256 e7bbd53121b57ba49089a0f95bf10a393e62b27a575c83d08e668c9dc1fe2f15
|
||||
DIST syslog-ng_3.2.5.tar.gz 1448844 RMD160 dcaf5bc623d163f36a8b7d76cfbaa09142a5a834 SHA1 5541cd6711b7a9d983601d8047b9a27d98ecbe9b SHA256 ffc9f3a0ebea836c1c737b1ff49efe731d885af1d8aacf9eca79d9144eeefa89
|
||||
DIST syslog-ng_3.3.4.tar.gz 2475254 RMD160 234a94e89a47f0520236c8a9a3d586d609a50476 SHA1 3437a50af027f281747087ab47a45aa5fbabbf14 SHA256 a7045694cd079a8efcfd73ca45cb7576f005ba26e6c83ccdfaf3cf81fa4e58aa
|
||||
DIST syslog-ng_3.3.5.tar.gz 2495235 RMD160 6b9debaf2c765b9ba8fc9ae580a74811699b6a90 SHA1 0c8b85079b60c68c4279bcd4124b1e3c6358407b SHA256 dcca69869ab3cf2afda6db0dad549b6be717f6cf6aa6d7f27ca10f9c4c6aaa75
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
--- ./lib/scratch-buffers.c.orig 2012-01-20 17:44:43.871103296 -0500
|
||||
+++ ./lib/scratch-buffers.c 2012-01-20 17:44:56.313552034 -0500
|
||||
@@ -24,6 +24,7 @@
|
||||
|
||||
#include "tls-support.h"
|
||||
#include "scratch-buffers.h"
|
||||
+#include "misc.h"
|
||||
|
||||
TLS_BLOCK_START
|
||||
{
|
||||
@ -1,13 +0,0 @@
|
||||
diff --git a/lib/logwriter.c b/lib/logwriter.c
|
||||
index 1c4f1c7..4411826 100644
|
||||
--- a/lib/logwriter.c
|
||||
+++ b/lib/logwriter.c
|
||||
@@ -1016,7 +1016,7 @@ struct _LogWriter
|
||||
{
|
||||
/* push back to the queue */
|
||||
log_queue_push_head(self->queue, lm, &path_options);
|
||||
-
|
||||
+ log_msg_unref(lm);
|
||||
msg_set_context(NULL);
|
||||
log_msg_refcache_stop();
|
||||
break;
|
||||
@ -1,112 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.2.4.ebuild,v 1.10 2012/05/03 18:02:22 jdhore Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit autotools fixheadtails eutils multilib
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
|
||||
SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${PV}/source/syslog-ng_${PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
|
||||
IUSE="caps hardened ipv6 +pcre selinux spoof-source sql ssl static tcpd"
|
||||
RESTRICT="test"
|
||||
|
||||
LIBS_DEPEND="
|
||||
spoof-source? ( net-libs/libnet )
|
||||
ssl? ( dev-libs/openssl )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
!static? ( >=dev-libs/eventlog-0.2.12 )
|
||||
>=dev-libs/glib-2.10.1:2
|
||||
caps? ( sys-libs/libcap )
|
||||
sql? ( >=dev-db/libdbi-0.8.3 )"
|
||||
RDEPEND="
|
||||
!static? (
|
||||
pcre? ( dev-libs/libpcre )
|
||||
${LIBS_DEPEND}
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
${LIBS_DEPEND}
|
||||
static? ( >=dev-libs/eventlog-0.2.12[static-libs] )
|
||||
virtual/pkgconfig
|
||||
sys-devel/flex"
|
||||
|
||||
src_prepare() {
|
||||
ht_fix_file configure.in
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
if use static ; then
|
||||
myconf="${myconf} --enable-static-linking"
|
||||
if use pcre ; then
|
||||
ewarn "USE=pcre is incompatible with static linking"
|
||||
myconf="${myconf} --disable-pcre"
|
||||
fi
|
||||
else
|
||||
myconf="${myconf} --enable-dynamic-linking"
|
||||
fi
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
--sysconfdir=/etc/syslog-ng \
|
||||
--localstatedir=/var/lib/misc \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
|
||||
$(use_enable caps linux-caps) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable pcre) \
|
||||
$(use_enable spoof-source) \
|
||||
$(use_enable sql) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable tcpd tcp-wrapper) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS README \
|
||||
doc/examples/{syslog-ng.conf.sample,syslog-ng.conf.solaris} \
|
||||
contrib/syslog-ng.conf* \
|
||||
contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/syslog-ng
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
|
||||
elif use userland_BSD ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
# Install snippet for logrotate, which may or may not be installed
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}/syslog-ng.rc6.${PV%%.*}" syslog-ng || die
|
||||
newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
|
||||
keepdir /etc/syslog-ng/patterndb.d
|
||||
find "${D}" -type f -name '*.la' -exec rm {} + || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
echo
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,125 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-admin/syslog-ng/syslog-ng-3.3.4.ebuild,v 1.5 2012/05/03 18:02:22 jdhore Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit autotools eutils multilib
|
||||
|
||||
MY_PV=${PV/_/}
|
||||
DESCRIPTION="syslog replacement with advanced filtering features"
|
||||
HOMEPAGE="http://www.balabit.com/products/syslog_ng/"
|
||||
SRC_URI="http://www.balabit.com/downloads/files/syslog-ng/sources/${MY_PV}/source/syslog-ng_${MY_PV}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
|
||||
IUSE="caps hardened ipv6 json mongodb +pcre selinux spoof-source sql ssl static tcpd"
|
||||
RESTRICT="test"
|
||||
|
||||
LIBS_DEPEND="
|
||||
spoof-source? ( net-libs/libnet )
|
||||
ssl? ( dev-libs/openssl )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
!static? (
|
||||
>=dev-libs/eventlog-0.2.12
|
||||
>=dev-libs/glib-2.10.1:2 )
|
||||
json? ( >=dev-libs/json-glib-0.12 )
|
||||
caps? ( sys-libs/libcap )
|
||||
sql? ( >=dev-db/libdbi-0.8.3 )"
|
||||
RDEPEND="
|
||||
!static? (
|
||||
pcre? ( dev-libs/libpcre )
|
||||
${LIBS_DEPEND}
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
${LIBS_DEPEND}
|
||||
static? (
|
||||
>=dev-libs/eventlog-0.2.12[static-libs]
|
||||
>=dev-libs/glib-2.10.1:2[static-libs] )
|
||||
virtual/pkgconfig
|
||||
sys-devel/flex"
|
||||
|
||||
S=${WORKDIR}/${PN}-${MY_PV}
|
||||
|
||||
src_prepare() {
|
||||
epatch \
|
||||
"${FILESDIR}"/${P}-compile.patch \
|
||||
"${FILESDIR}"/${P}-memleak.patch
|
||||
sed -i -e '/libsyslog_ng_crypto_la_LIBADD/s/$/ -lssl -lcrypto/' lib/Makefile.am || die
|
||||
eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf
|
||||
|
||||
if use static ; then
|
||||
myconf="${myconf} --enable-static-linking"
|
||||
else
|
||||
myconf="${myconf} --enable-dynamic-linking"
|
||||
fi
|
||||
econf \
|
||||
--disable-dependency-tracking \
|
||||
--disable-systemd \
|
||||
--with-ivykis=internal \
|
||||
--sysconfdir=/etc/syslog-ng \
|
||||
--localstatedir=/var/lib/misc \
|
||||
--with-pidfile-dir=/var/run \
|
||||
--with-module-dir=/usr/$(get_libdir)/syslog-ng \
|
||||
$(use_enable caps linux-caps) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable json) \
|
||||
$(use_with json json-glib) \
|
||||
$(use_enable mongodb) \
|
||||
$(use_enable pcre) \
|
||||
$(use_enable spoof-source) \
|
||||
$(use_enable sql) \
|
||||
$(use_enable ssl) \
|
||||
$(use_enable tcpd tcp-wrapper) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
dodoc AUTHORS ChangeLog NEWS \
|
||||
contrib/syslog-ng.conf* \
|
||||
contrib/syslog2ng "${FILESDIR}/syslog-ng.conf."*
|
||||
|
||||
# Install default configuration
|
||||
insinto /etc/syslog-ng
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.hardened.${PV%.*}" syslog-ng.conf || die
|
||||
elif use userland_BSD ; then
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.fbsd.${PV%.*}" syslog-ng.conf || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.conf.gentoo.${PV%.*}" syslog-ng.conf || die
|
||||
fi
|
||||
|
||||
insinto /etc/logrotate.d
|
||||
# Install snippet for logrotate, which may or may not be installed
|
||||
if use hardened || use selinux ; then
|
||||
newins "${FILESDIR}/syslog-ng.logrotate.hardened" syslog-ng || die
|
||||
else
|
||||
newins "${FILESDIR}/syslog-ng.logrotate" syslog-ng || die
|
||||
fi
|
||||
|
||||
newinitd "${FILESDIR}/syslog-ng.rc6.${PV%.*}" syslog-ng || die
|
||||
newconfd "${FILESDIR}/syslog-ng.confd" syslog-ng || die
|
||||
keepdir /etc/syslog-ng/patterndb.d
|
||||
find "${D}" -type f -name '*.la' -exec rm {} + || die
|
||||
rmdir "${D}"/usr/libexec
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "For detailed documentation please see the upstream website:"
|
||||
elog "http://www.balabit.com/sites/default/files/documents/syslog-ng-ose-3.3-guides/syslog-ng-ose-v3.3-guide-admin-en.html/index.html"
|
||||
|
||||
# bug #355257
|
||||
if ! has_version app-admin/logrotate ; then
|
||||
echo
|
||||
elog "It is highly recommended that app-admin/logrotate be emerged to"
|
||||
elog "manage the log files. ${PN} installs a file in /etc/logrotate.d"
|
||||
elog "for logrotate to use."
|
||||
echo
|
||||
fi
|
||||
}
|
||||
@ -1,6 +1,3 @@
|
||||
DIST bacula-5.0.2.tar.gz 4189272 RMD160 cb2e767476baf0d0bc3573a39882870e41dda6db SHA1 fe5b8d682fe73d2458f0b2965ea88386ba40f0d5 SHA256 c465d00dd968832d129ba68eea59714357605a461d745cef7e802978c453c3fb
|
||||
DIST bacula-5.0.3.tar.gz 3800556 RMD160 0ae8f303b379daffdf09e4eab9b35182759add41 SHA1 4ced1c4f8984a063a1134b59968d163243017611 SHA256 9905598e18bbe94fa871ddcb3f13ef8b754dcb301331b67b5b92a65eb834fdb4
|
||||
DIST bacula-5.2.3.tar.gz 4011303 RMD160 f28525fbd8db5b8dd4505a956d012b20bcbb88ae SHA1 1aa6399192b2c778ccd2de994542b8d0ea1bca5b SHA256 6224f7139ceafa26f104f0140fdddac981c41c9940ae2a779e64bb4ae1ae492d
|
||||
DIST bacula-5.2.4.tar.gz 4031629 RMD160 4fd5e54d03b2ce1a762b8e374ab13d96fd07797e SHA1 99c17094ea86651fec316e00cc63247d661bd163 SHA256 7d3019326a4b732d9cac1000abf880a71c4047e9fd912a146b85ef9dc7b911c6
|
||||
DIST bacula-5.2.5.tar.gz 4030327 RMD160 8de3f53bc5f053e66aff05721c5e246762ce260c SHA1 67e984128d15744118c70697641693f487310b64 SHA256 d731884b882178c597d8b7ef3f50c5622c87b1760d87133c24524faf43937f6d
|
||||
DIST bacula-5.2.6.tar.gz 4035050 RMD160 2494d9e1c9b8029c4ad699255023cab16c434903 SHA1 471cf224d5566e65a3a6cebd59d13c25f0825a8a SHA256 7cc60df4eccae0c71c26d2cdb4b1a2524f95e880913264cf4f4fcc7a5d949927
|
||||
|
||||
@ -1,478 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.0.2-r1.ebuild,v 1.11 2012/05/24 04:36:18 vapier Exp $
|
||||
|
||||
EAPI="2"
|
||||
inherit eutils multilib user
|
||||
|
||||
IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd X"
|
||||
# bacula-web bimagemgr brestore bweb
|
||||
KEYWORDS="amd64 hppa ~ppc sparc x86"
|
||||
|
||||
DESCRIPTION="Featureful client/server network backup suite"
|
||||
HOMEPAGE="http://www.bacula.org/"
|
||||
|
||||
MY_PV=${PV/_beta/-b}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
S=${WORKDIR}/${MY_P}
|
||||
#DOC_VER="${MY_PV}"
|
||||
#DOC_SRC_URI="mirror://sourceforge/bacula/${PN}-docs-${DOC_VER}.tar.bz2"
|
||||
#GUI_VER="${PV}"
|
||||
#GUI_SRC_URI="mirror://sourceforge/bacula/${PN}-gui-${GUI_VER}.tar.gz"
|
||||
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
|
||||
# doc? ( ${DOC_SRC_URI} )
|
||||
# bacula-web? ( ${GUI_SRC_URI} )
|
||||
# bimagemgr? ( ${GUI_SRC_URI} )
|
||||
# brestore? ( ${GUI_SRC_URI} )
|
||||
# bweb? ( ${GUI_SRC_URI} )
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
|
||||
DEPEND="
|
||||
>=sys-libs/zlib-1.1.4
|
||||
dev-libs/gmp
|
||||
!bacula-clientonly? (
|
||||
postgres? ( dev-db/postgresql-server )
|
||||
mysql? ( virtual/mysql )
|
||||
sqlite3? ( dev-db/sqlite:3 )
|
||||
!bacula-nodir? ( virtual/mta )
|
||||
)
|
||||
qt4? (
|
||||
x11-libs/qt-svg:4
|
||||
x11-libs/qwt:5
|
||||
)
|
||||
ssl? ( dev-libs/openssl )
|
||||
logwatch? ( sys-apps/logwatch )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
sys-libs/ncurses
|
||||
python? ( dev-lang/python[threads] )"
|
||||
# doc? (
|
||||
# app-text/ghostscript-gpl
|
||||
# dev-tex/latex2html[png]
|
||||
# app-text/dvipdfm
|
||||
# )
|
||||
RDEPEND="${DEPEND}
|
||||
!bacula-clientonly? (
|
||||
!bacula-nosd? (
|
||||
sys-block/mtx
|
||||
app-arch/mt-st
|
||||
)
|
||||
)"
|
||||
|
||||
pkg_setup() {
|
||||
local -i dbnum=0
|
||||
if ! use bacula-clientonly; then
|
||||
if use mysql; then
|
||||
export mydbtype=mysql
|
||||
let dbnum++
|
||||
fi
|
||||
if use postgres; then
|
||||
export mydbtype=postgresql
|
||||
let dbnum++
|
||||
fi
|
||||
if use sqlite3; then
|
||||
export mydbtype=sqlite3
|
||||
let dbnum++
|
||||
fi
|
||||
if [[ "${dbnum}" -lt 1 ]]; then
|
||||
eerror
|
||||
eerror "To use ${P} it is required to set a database in the USE flags."
|
||||
eerror "Supported databases are mysql, postgresql, sqlite3"
|
||||
eerror
|
||||
die "No database type selected."
|
||||
elif [[ "${dbnum}" -gt 1 ]]; then
|
||||
eerror
|
||||
eerror "You have set ${P} to use multiple database types."
|
||||
eerror "I don't know which to set as the default!"
|
||||
eerror "You can use /etc/portage/package.use to set per-package USE flags"
|
||||
eerror "Set it so only one database type, mysql, postgres, sqlite3"
|
||||
eerror
|
||||
die "Multiple database types selected."
|
||||
fi
|
||||
fi
|
||||
|
||||
# create the daemon group and user
|
||||
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
|
||||
enewgroup bacula
|
||||
einfo
|
||||
einfo "The group 'bacula' has been created. Any users you add to this"
|
||||
einfo "group have access to files created by the daemons."
|
||||
einfo
|
||||
fi
|
||||
if ! use bacula-clientonly; then
|
||||
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
|
||||
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
|
||||
einfo
|
||||
einfo "The user 'bacula' has been created. Please see the bacula manual"
|
||||
einfo "for information about running bacula as a non-root user."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# adjusts default configuration files for several binaries
|
||||
# to /etc/bacula/<config> instead of ./<config>
|
||||
pushd src >&/dev/null || die
|
||||
for f in console/console.c dird/dird.c filed/filed.c \
|
||||
stored/bcopy.c stored/bextract.c stored/bls.c \
|
||||
stored/bscan.c stored/btape.c stored/stored.c \
|
||||
qt-console/main.cpp; do
|
||||
sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
|
||||
|| die "sed on ${f} failed"
|
||||
done
|
||||
popd >&/dev/null || die
|
||||
|
||||
# bug #310087
|
||||
epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
|
||||
|
||||
# bug #311161
|
||||
epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch
|
||||
|
||||
epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=''
|
||||
|
||||
if use bacula-clientonly; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable bacula-clientonly client-only) \
|
||||
$(use_enable static static-fd)"
|
||||
else
|
||||
myconf="${myconf} \
|
||||
$(use_enable qt4 bat) \
|
||||
$(use_enable static static-tools) \
|
||||
$(use_enable static static-fd) \
|
||||
$(use_enable !bacula-nodir build-dird) \
|
||||
$(use_enable !bacula-nosd build-stored)"
|
||||
# bug #311099
|
||||
# database support needed by dir-only *and* sd-only
|
||||
# build as well (for building bscan, btape, etc.)
|
||||
myconf="${myconf} \
|
||||
--with-${mydbtype} \
|
||||
--enable-batch-insert"
|
||||
if ! use bacula-nodir; then
|
||||
myconf="${myconf} $(use_enable static static-dir)"
|
||||
fi
|
||||
if ! use bacula-nosd; then
|
||||
myconf="${myconf} $(use_enable static static-sd)"
|
||||
fi
|
||||
fi
|
||||
|
||||
myconf="${myconf} \
|
||||
--disable-tray-monitor \
|
||||
$(use_with X x) \
|
||||
$(use_enable static static-cons)
|
||||
$(use_with python) \
|
||||
$(use_enable !readline conio) \
|
||||
$(use_enable readline) \
|
||||
$(use_with readline readline /usr) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_with tcpd tcp-wrappers)"
|
||||
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--htmldir=/usr/share/doc/${PF}/html \
|
||||
--with-pid-dir=/var/run \
|
||||
--sysconfdir=/etc/bacula \
|
||||
--with-subsys-dir=/var/lock/subsys \
|
||||
--with-working-dir=/var/lib/bacula \
|
||||
--with-scriptdir=/usr/libexec/bacula \
|
||||
--with-dir-user=bacula \
|
||||
--with-dir-group=bacula \
|
||||
--with-sd-user=root \
|
||||
--with-sd-group=bacula \
|
||||
--with-fd-user=root \
|
||||
--with-fd-group=bacula \
|
||||
--enable-smartalloc \
|
||||
--host=${CHOST} \
|
||||
${myconf} \
|
||||
|| die "econf failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake || die "emake failed"
|
||||
|
||||
# build various GUIs from bacula-gui tarball
|
||||
# if use bacula-web || use bimagemgr || use brestore || use bweb; then
|
||||
# pushd "${WORKDIR}/${PN}-gui-${GUI_VER}"
|
||||
# local myconf_gui=''
|
||||
# if use bimagemgr; then
|
||||
# ## TODO FIXME: webapp-config? !apache?
|
||||
# myconf_gui="${myconf_gui} \
|
||||
# --with-bimagemgr-cgidir=/var/www/localhost/cgi-bin \
|
||||
# --with-bimagemgr-docdir=/var/www/localhost/htdocs \
|
||||
# --with-bimagemgr-binowner=root \
|
||||
# --with-bimagemgr-bingroup=root \
|
||||
# --with-bimagemgr-dataowner=apache \
|
||||
# --with-bimagemgr-datagroup=apache \
|
||||
# "
|
||||
# fi
|
||||
# ./configure \
|
||||
# --with-bacula="${S}" \
|
||||
# ${myconf} \
|
||||
# || die "configure for bacula-gui failed"
|
||||
# ## TODO FIXME: install files (see bacula-gui.spec)
|
||||
# if use bacula-web; then
|
||||
# : install
|
||||
# fi
|
||||
# if use bimagemgr; then
|
||||
# : install
|
||||
# fi
|
||||
# if use brestore; then
|
||||
# : install
|
||||
# fi
|
||||
# if use bweb; then
|
||||
# : install
|
||||
# fi
|
||||
# popd
|
||||
# fi
|
||||
|
||||
# build docs from bacula-docs tarball
|
||||
# if use doc; then
|
||||
# pushd "${WORKDIR}/${PN}-docs-${DOC_VER}"
|
||||
# ./configure \
|
||||
# --with-bacula="${S}" \
|
||||
# || die "configure for bacula-docs failed"
|
||||
# emake -j1 || die "emake for bacula-docs failed"
|
||||
# popd
|
||||
# fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "emake install failed"
|
||||
|
||||
# remove some scripts we don't need at all
|
||||
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
|
||||
|
||||
# rename statically linked apps
|
||||
if use static; then
|
||||
pushd "${D}"/usr/sbin || die
|
||||
mv static-bacula-fd bacula-fd || die
|
||||
mv static-bconsole bconsole || die
|
||||
if ! use bacula-clientonly; then
|
||||
mv static-bacula-dir bacula-dir || die
|
||||
mv static-bacula-sd bacula-sd || die
|
||||
fi
|
||||
if use qt4; then
|
||||
mv static-bat bat || die
|
||||
fi
|
||||
popd || die
|
||||
fi
|
||||
|
||||
# extra files which 'make install' doesn't cover
|
||||
if ! use bacula-clientonly; then
|
||||
# install bat when enabled (for some reason ./configure doesn't pick this up)
|
||||
if use qt4; then
|
||||
dosbin "${S}"/src/qt-console/.libs/bat || die
|
||||
fi
|
||||
# the database update scripts
|
||||
diropts -m0750
|
||||
insinto /usr/libexec/bacula/updatedb
|
||||
insopts -m0754
|
||||
doins "${S}"/updatedb/* || die
|
||||
fperms 0640 /usr/libexec/bacula/updatedb/README || die
|
||||
|
||||
# the logrotate configuration
|
||||
# (now unconditional wrt bug #258187)
|
||||
diropts -m0755
|
||||
insinto /etc/logrotate.d
|
||||
insopts -m0644
|
||||
newins "${S}"/scripts/logrotate bacula || die
|
||||
|
||||
# the logwatch scripts
|
||||
if use logwatch; then
|
||||
diropts -m0750
|
||||
dodir /etc/log.d/scripts/services
|
||||
dodir /etc/log.d/scripts/shared
|
||||
dodir /etc/log.d/conf/logfiles
|
||||
dodir /etc/log.d/conf/services
|
||||
pushd "${S}"/scripts/logwatch >&/dev/null || die
|
||||
emake DESTDIR="${D}" install || die "Failed to install logwatch scripts"
|
||||
popd >&/dev/null || die
|
||||
fi
|
||||
fi
|
||||
|
||||
# remove unwanted files
|
||||
if use bacula-clientonly; then
|
||||
rm -vf "${D}"/etc/bacula/bconsole.conf
|
||||
rm -vf "${D}"/usr/sbin/bconsole
|
||||
rm -vf "${D}"/usr/libexec/bacula/bconsole
|
||||
fi
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
|
||||
if use bacula-clientonly || ! use qt4; then
|
||||
rm -vf "${D}"/usr/share/man/man1/bat.1*
|
||||
fi
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
|
||||
if use bacula-clientonly || use bacula-nodir; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
|
||||
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
|
||||
rm -vf "${D}"/usr/libexec/bacula/create_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
|
||||
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
|
||||
fi
|
||||
if use bacula-clientonly || use bacula-nosd; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bextract.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bls.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bscan.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/btape.8*
|
||||
rm -vf "${D}"/usr/libexec/bacula/disk-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
|
||||
fi
|
||||
|
||||
# documentation
|
||||
ecompress "${D}"/usr/share/doc/${PF}/*
|
||||
# if use doc; then
|
||||
# for i in catalog concepts console developers install problems utility; do
|
||||
# dodoc "${WORKDIR}/${PN}-docs-${DOC_VER}"/manuals/en/${i}/${i}.pdf || die
|
||||
# done
|
||||
# fi
|
||||
|
||||
# setup init scripts
|
||||
myscripts="bacula-fd"
|
||||
if ! use bacula-clientonly; then
|
||||
if ! use bacula-nodir; then
|
||||
myscripts="${myscripts} bacula-dir"
|
||||
fi
|
||||
if ! use bacula-nosd; then
|
||||
myscripts="${myscripts} bacula-sd"
|
||||
fi
|
||||
fi
|
||||
for script in ${myscripts}; do
|
||||
# copy over init script and config to a temporary location
|
||||
# so we can modify them as needed
|
||||
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
|
||||
cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
|
||||
# set database dependancy for the director init script
|
||||
case "${script}" in
|
||||
bacula-dir)
|
||||
case "${mydbtype}" in
|
||||
sqlite3)
|
||||
# sqlite3 databases don't have a daemon
|
||||
sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
|
||||
;;
|
||||
*)
|
||||
# all other databases have daemons
|
||||
sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
# install init script and config
|
||||
newinitd "${T}/${script}".initd "${script}" || die
|
||||
newconfd "${T}/${script}".confd "${script}" || die
|
||||
done
|
||||
|
||||
# make sure the working directory exists
|
||||
diropts -m0750
|
||||
keepdir /var/lib/bacula
|
||||
|
||||
# make sure bacula group can execute bacula libexec scripts
|
||||
fowners -R root:bacula /usr/libexec/bacula
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use bacula-clientonly; then
|
||||
fowners root:bacula /var/lib/bacula
|
||||
else
|
||||
fowners bacula:bacula /var/lib/bacula
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly && ! use bacula-nodir; then
|
||||
einfo
|
||||
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
|
||||
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
|
||||
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
|
||||
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
|
||||
einfo
|
||||
echo
|
||||
|
||||
ewarn
|
||||
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
|
||||
ewarn
|
||||
ewarn "If you're upgrading from a major release, you must upgrade your bacula catalog database."
|
||||
ewarn "Please read the manual chapter for how to upgrade your database."
|
||||
ewarn "You can find database upgrade scripts in /usr/libexec/bacula/updatedb/."
|
||||
ewarn
|
||||
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
|
||||
ewarn
|
||||
ebeep 5
|
||||
epause 10
|
||||
echo
|
||||
|
||||
ewarn
|
||||
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
|
||||
ewarn
|
||||
ewarn "The bundled catalog backup script (/usr/libexec/bacula/make_catalog_backup)"
|
||||
ewarn "is INSECURE. The script needs to be called with the database access password"
|
||||
ewarn "as a command line parameter, thus, the password can be seen from any other"
|
||||
ewarn "user on the system (if not using some non-default hardened/patched kernel"
|
||||
ewarn "with /proc restrictions)!"
|
||||
ewarn
|
||||
ewarn "Our advice is to NOT USE the bundled script at all, but instead use something"
|
||||
ewarn "like this in your catalog backup job definition (example using MySQL as the"
|
||||
ewarn "catalog database):"
|
||||
ewarn
|
||||
ewarn "RunBeforeJob = \"mysqldump --defaults-file=/etc/bacula/my.cnf --opt -f -r /var/lib/bacula/bacula.sql bacula\""
|
||||
ewarn "RunAfterJob = \"rm -f /var/lib/bacula/bacula.sql\""
|
||||
ewarn
|
||||
ewarn "This requires you to put all database access parameters (like user, host and"
|
||||
ewarn "password) into a dedicated file (/etc/bacula/my.cnf in this example) which"
|
||||
ewarn "can (and should!) be secured by simple filesystem access permissions."
|
||||
ewarn
|
||||
ewarn "See also:"
|
||||
ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Bacula_Security_Issues.html"
|
||||
ewarn "http://www.bacula.org/5.0.x-manuals/en/main/main/Catalog_Maintenance.html#SECTION0043140000000000000000"
|
||||
ewarn
|
||||
ewarn "NOTICE:"
|
||||
ewarn "Since version 5.0.0 Bacula bundles an alternative catalog backup script"
|
||||
ewarn "installed as /usr/libexec/bacula/make_catalog_backup.pl that is not"
|
||||
ewarn "subject to this issue as it parses the director daemon config to extract"
|
||||
ewarn "the configured database connection parameters (including the password)."
|
||||
ewarn
|
||||
ewarn "*** ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ATTENTION! IMPORTANT! ***"
|
||||
ewarn
|
||||
ebeep 10
|
||||
epause 20
|
||||
echo
|
||||
|
||||
ewarn
|
||||
ewarn "Please note that SQLite v2 support as well as wxwindows (bwx-console)"
|
||||
ewarn "and gnome (gnome-console) support have been dropped from this release."
|
||||
ewarn
|
||||
ebeep 3
|
||||
epause 5
|
||||
echo
|
||||
fi
|
||||
|
||||
ewarn
|
||||
ewarn "*** NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! ***"
|
||||
ewarn
|
||||
ewarn "Support for the bacula all-in-one init script has been removed from"
|
||||
ewarn "a prior release -- if you were previously using the all-in-one init"
|
||||
ewarn "script, please switch to using the individual init scripts now:"
|
||||
ewarn
|
||||
ewarn "- bacula-dir: bacula director (for the central bacula server)"
|
||||
ewarn "- bacula-fd: bacula file daemon (for hosts to be backed up)"
|
||||
ewarn "- bacula-sd: bacula storage daemon (for hosts storing the backup data)"
|
||||
ewarn
|
||||
ewarn "*** NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! NOTICE! ***"
|
||||
ewarn
|
||||
ebeep 5
|
||||
epause 10
|
||||
}
|
||||
@ -1,347 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.3-r1.ebuild,v 1.2 2012/05/24 04:36:18 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
PYTHON_DEPEND="python? 2"
|
||||
PYTHON_USE_WITH="threads"
|
||||
PYTHON_USE_WITH_OPT="python"
|
||||
|
||||
inherit eutils multilib python user
|
||||
|
||||
MY_PV=${PV/_beta/-b}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Featureful client/server network backup suite"
|
||||
HOMEPAGE="http://www.bacula.org/"
|
||||
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
|
||||
IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
|
||||
|
||||
DEPEND="
|
||||
>=sys-libs/zlib-1.1.4
|
||||
dev-libs/gmp
|
||||
!bacula-clientonly? (
|
||||
postgres? ( dev-db/postgresql-base[threads] )
|
||||
mysql? ( virtual/mysql )
|
||||
sqlite3? ( dev-db/sqlite:3 )
|
||||
!bacula-nodir? ( virtual/mta )
|
||||
)
|
||||
qt4? (
|
||||
x11-libs/qt-svg:4
|
||||
x11-libs/qwt:5
|
||||
)
|
||||
ssl? ( dev-libs/openssl )
|
||||
logwatch? ( sys-apps/logwatch )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
dev-libs/lzo
|
||||
sys-libs/ncurses"
|
||||
RDEPEND="${DEPEND}
|
||||
!bacula-clientonly? (
|
||||
!bacula-nosd? (
|
||||
sys-block/mtx
|
||||
app-arch/mt-st
|
||||
)
|
||||
)
|
||||
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
|
||||
|
||||
REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
# create the daemon group and user
|
||||
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
|
||||
enewgroup bacula
|
||||
einfo
|
||||
einfo "The group 'bacula' has been created. Any users you add to this"
|
||||
einfo "group have access to files created by the daemons."
|
||||
einfo
|
||||
fi
|
||||
|
||||
if use bacula-clientonly && use static && use qt4; then
|
||||
ewarn
|
||||
ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly; then
|
||||
# USE=static only supported for bacula-clientonly
|
||||
if use static; then
|
||||
ewarn
|
||||
ewarn "USE=static only supported together with USE=bacula-clientonly."
|
||||
ewarn "Ignoring 'static' useflag."
|
||||
ewarn
|
||||
fi
|
||||
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
|
||||
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
|
||||
einfo
|
||||
einfo "The user 'bacula' has been created. Please see the bacula manual"
|
||||
einfo "for information about running bacula as a non-root user."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# adjusts default configuration files for several binaries
|
||||
# to /etc/bacula/<config> instead of ./<config>
|
||||
pushd src >&/dev/null || die
|
||||
for f in console/console.c dird/dird.c filed/filed.c \
|
||||
stored/bcopy.c stored/bextract.c stored/bls.c \
|
||||
stored/bscan.c stored/btape.c stored/stored.c \
|
||||
qt-console/main.cpp; do
|
||||
sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
|
||||
|| die "sed on ${f} failed"
|
||||
done
|
||||
popd >&/dev/null || die
|
||||
|
||||
# drop automatic install of unneeded documentation (for bug 356499)
|
||||
epatch "${FILESDIR}"/${PV}/${P}-doc.patch
|
||||
|
||||
# bug #310087
|
||||
epatch "${FILESDIR}"/${PV}/${P}-as-needed.patch
|
||||
|
||||
# bug #311161
|
||||
epatch "${FILESDIR}"/${PV}/${P}-lib-search-path.patch
|
||||
|
||||
# stop build for errors in subdirs
|
||||
epatch "${FILESDIR}"/${PV}/${P}-Makefile.patch
|
||||
|
||||
# bat needs to respect LDFLAGS
|
||||
epatch "${FILESDIR}"/${PV}/${P}-ldflags.patch
|
||||
|
||||
# bug #328701
|
||||
epatch "${FILESDIR}"/${PV}/${P}-openssl-1.patch
|
||||
|
||||
epatch "${FILESDIR}"/${PV}/${P}-fix-static.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=''
|
||||
|
||||
if use bacula-clientonly; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable bacula-clientonly client-only) \
|
||||
$(use_enable !static libtool) \
|
||||
$(use_enable static static-cons) \
|
||||
$(use_enable static static-fd)"
|
||||
else
|
||||
myconf="${myconf} \
|
||||
$(use_enable !bacula-nodir build-dird) \
|
||||
$(use_enable !bacula-nosd build-stored)"
|
||||
# bug #311099
|
||||
# database support needed by dir-only *and* sd-only
|
||||
# build as well (for building bscan, btape, etc.)
|
||||
myconf="${myconf} \
|
||||
$(use_with mysql) \
|
||||
$(use_with sqlite3) \
|
||||
$(use_with postgres postgresql) \
|
||||
--enable-batch-insert"
|
||||
fi
|
||||
|
||||
# do not build bat if 'static' clientonly
|
||||
if ! use bacula-clientonly || ! use static; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable qt4 bat)"
|
||||
fi
|
||||
|
||||
myconf="${myconf} \
|
||||
--disable-tray-monitor \
|
||||
$(use_with X x) \
|
||||
$(use_with python) \
|
||||
$(use_enable !readline conio) \
|
||||
$(use_enable readline) \
|
||||
$(use_with readline readline /usr) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_with tcpd tcp-wrappers)"
|
||||
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--htmldir=/usr/share/doc/${PF}/html \
|
||||
--with-pid-dir=/var/run \
|
||||
--sysconfdir=/etc/bacula \
|
||||
--with-subsys-dir=/var/lock/subsys \
|
||||
--with-working-dir=/var/lib/bacula \
|
||||
--with-scriptdir=/usr/libexec/bacula \
|
||||
--with-dir-user=bacula \
|
||||
--with-dir-group=bacula \
|
||||
--with-sd-user=root \
|
||||
--with-sd-group=bacula \
|
||||
--with-fd-user=root \
|
||||
--with-fd-group=bacula \
|
||||
--enable-smartalloc \
|
||||
--host=${CHOST} \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
insinto /usr/share/pixmaps
|
||||
doins scripts/bacula.png
|
||||
|
||||
# install bat icon and desktop file when enabled
|
||||
# (for some reason ./configure doesn't pick this up)
|
||||
if use qt4 && ! use static ; then
|
||||
insinto /usr/share/pixmaps
|
||||
doins src/qt-console/images/bat_icon.png
|
||||
insinto /usr/share/applications
|
||||
doins scripts/bat.desktop
|
||||
fi
|
||||
|
||||
# remove some scripts we don't need at all
|
||||
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
|
||||
|
||||
# rename statically linked apps
|
||||
if use bacula-clientonly && use static ; then
|
||||
pushd "${D}"/usr/sbin || die
|
||||
mv static-bacula-fd bacula-fd || die
|
||||
mv static-bconsole bconsole || die
|
||||
popd || die
|
||||
fi
|
||||
|
||||
# extra files which 'make install' doesn't cover
|
||||
if ! use bacula-clientonly; then
|
||||
# the database update scripts
|
||||
diropts -m0750
|
||||
insinto /usr/libexec/bacula/updatedb
|
||||
insopts -m0754
|
||||
doins "${S}"/updatedb/*
|
||||
fperms 0640 /usr/libexec/bacula/updatedb/README
|
||||
|
||||
# the logrotate configuration
|
||||
# (now unconditional wrt bug #258187)
|
||||
diropts -m0755
|
||||
insinto /etc/logrotate.d
|
||||
insopts -m0644
|
||||
newins "${S}"/scripts/logrotate bacula
|
||||
|
||||
# the logwatch scripts
|
||||
if use logwatch; then
|
||||
diropts -m0750
|
||||
dodir /etc/log.d/scripts/services
|
||||
dodir /etc/log.d/scripts/shared
|
||||
dodir /etc/log.d/conf/logfiles
|
||||
dodir /etc/log.d/conf/services
|
||||
pushd "${S}"/scripts/logwatch >&/dev/null || die
|
||||
emake DESTDIR="${D}" install
|
||||
popd >&/dev/null || die
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
|
||||
if ! use qt4; then
|
||||
rm -vf "${D}"/usr/share/man/man1/bat.1*
|
||||
fi
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
|
||||
if use bacula-clientonly || use bacula-nodir; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
|
||||
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
|
||||
rm -vf "${D}"/usr/libexec/bacula/create_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
|
||||
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
|
||||
fi
|
||||
if use bacula-clientonly || use bacula-nosd; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bextract.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bls.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bscan.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/btape.8*
|
||||
rm -vf "${D}"/usr/libexec/bacula/disk-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
|
||||
fi
|
||||
|
||||
# documentation
|
||||
dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
|
||||
|
||||
# vim-files
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins scripts/bacula.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
newins scripts/filetype.vim bacula_ft.vim
|
||||
fi
|
||||
|
||||
# setup init scripts
|
||||
myscripts="bacula-fd"
|
||||
if ! use bacula-clientonly; then
|
||||
if ! use bacula-nodir; then
|
||||
myscripts="${myscripts} bacula-dir"
|
||||
fi
|
||||
if ! use bacula-nosd; then
|
||||
myscripts="${myscripts} bacula-sd"
|
||||
fi
|
||||
fi
|
||||
for script in ${myscripts}; do
|
||||
# copy over init script and config to a temporary location
|
||||
# so we can modify them as needed
|
||||
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
|
||||
cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
|
||||
# set database dependancy for the director init script
|
||||
case "${script}" in
|
||||
bacula-dir)
|
||||
case "${mydbtype}" in
|
||||
sqlite3)
|
||||
# sqlite3 databases don't have a daemon
|
||||
sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
|
||||
;;
|
||||
*)
|
||||
# all other databases have daemons
|
||||
sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
# install init script and config
|
||||
newinitd "${T}/${script}".initd "${script}"
|
||||
newconfd "${T}/${script}".confd "${script}"
|
||||
done
|
||||
|
||||
# make sure the working directory exists
|
||||
diropts -m0750
|
||||
keepdir /var/lib/bacula
|
||||
|
||||
# make sure bacula group can execute bacula libexec scripts
|
||||
fowners -R root:bacula /usr/libexec/bacula
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use bacula-clientonly; then
|
||||
fowners root:bacula /var/lib/bacula
|
||||
else
|
||||
fowners bacula:bacula /var/lib/bacula
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly && ! use bacula-nodir; then
|
||||
einfo
|
||||
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
|
||||
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
|
||||
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
|
||||
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
|
||||
einfo
|
||||
fi
|
||||
|
||||
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
|
||||
einfo "you have to enable 'USE=qt4'."
|
||||
einfo
|
||||
}
|
||||
@ -1,347 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-5.2.4.ebuild,v 1.2 2012/05/24 04:36:18 vapier Exp $
|
||||
|
||||
EAPI="4"
|
||||
PYTHON_DEPEND="python? 2"
|
||||
PYTHON_USE_WITH="threads"
|
||||
PYTHON_USE_WITH_OPT="python"
|
||||
|
||||
inherit eutils multilib python user
|
||||
|
||||
MY_PV=${PV/_beta/-b}
|
||||
MY_P=${PN}-${MY_PV}
|
||||
|
||||
DESCRIPTION="Featureful client/server network backup suite"
|
||||
HOMEPAGE="http://www.bacula.org/"
|
||||
SRC_URI="mirror://sourceforge/bacula/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="AGPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86"
|
||||
IUSE="bacula-clientonly bacula-nodir bacula-nosd ipv6 logwatch mysql postgres python qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
|
||||
|
||||
DEPEND="
|
||||
>=sys-libs/zlib-1.1.4
|
||||
dev-libs/gmp
|
||||
!bacula-clientonly? (
|
||||
postgres? ( dev-db/postgresql-base[threads] )
|
||||
mysql? ( virtual/mysql )
|
||||
sqlite3? ( dev-db/sqlite:3 )
|
||||
!bacula-nodir? ( virtual/mta )
|
||||
)
|
||||
qt4? (
|
||||
x11-libs/qt-svg:4
|
||||
x11-libs/qwt:5
|
||||
)
|
||||
ssl? ( dev-libs/openssl )
|
||||
logwatch? ( sys-apps/logwatch )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
dev-libs/lzo
|
||||
sys-libs/ncurses"
|
||||
RDEPEND="${DEPEND}
|
||||
!bacula-clientonly? (
|
||||
!bacula-nosd? (
|
||||
sys-block/mtx
|
||||
app-arch/mt-st
|
||||
)
|
||||
)
|
||||
vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
|
||||
|
||||
REQUIRED_USE="|| ( ^^ ( mysql postgres sqlite3 ) bacula-clientonly )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
# create the daemon group and user
|
||||
if [ -z "$(egetent group bacula 2>/dev/null)" ]; then
|
||||
enewgroup bacula
|
||||
einfo
|
||||
einfo "The group 'bacula' has been created. Any users you add to this"
|
||||
einfo "group have access to files created by the daemons."
|
||||
einfo
|
||||
fi
|
||||
|
||||
if use bacula-clientonly && use static && use qt4; then
|
||||
ewarn
|
||||
ewarn "Building statically linked 'bat' is not supported. Ignorig 'qt4' useflag."
|
||||
ewarn
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly; then
|
||||
# USE=static only supported for bacula-clientonly
|
||||
if use static; then
|
||||
ewarn
|
||||
ewarn "USE=static only supported together with USE=bacula-clientonly."
|
||||
ewarn "Ignoring 'static' useflag."
|
||||
ewarn
|
||||
fi
|
||||
if [ -z "$(egetent passwd bacula 2>/dev/null)" ]; then
|
||||
enewuser bacula -1 -1 /var/lib/bacula bacula,disk,tape,cdrom,cdrw
|
||||
einfo
|
||||
einfo "The user 'bacula' has been created. Please see the bacula manual"
|
||||
einfo "for information about running bacula as a non-root user."
|
||||
einfo
|
||||
fi
|
||||
fi
|
||||
|
||||
if use python; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# adjusts default configuration files for several binaries
|
||||
# to /etc/bacula/<config> instead of ./<config>
|
||||
pushd src >&/dev/null || die
|
||||
for f in console/console.c dird/dird.c filed/filed.c \
|
||||
stored/bcopy.c stored/bextract.c stored/bls.c \
|
||||
stored/bscan.c stored/btape.c stored/stored.c \
|
||||
qt-console/main.cpp; do
|
||||
sed -i -e 's|^\(#define CONFIG_FILE "\)|\1/etc/bacula/|g' "${f}" \
|
||||
|| die "sed on ${f} failed"
|
||||
done
|
||||
popd >&/dev/null || die
|
||||
|
||||
# drop automatic install of unneeded documentation (for bug 356499)
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-doc.patch
|
||||
|
||||
# bug #310087
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-as-needed.patch
|
||||
|
||||
# bug #311161
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-lib-search-path.patch
|
||||
|
||||
# stop build for errors in subdirs
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-Makefile.patch
|
||||
|
||||
# bat needs to respect LDFLAGS
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-ldflags.patch
|
||||
|
||||
# bug #328701
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-openssl-1.patch
|
||||
|
||||
epatch "${FILESDIR}"/5.2.3/${PN}-5.2.3-fix-static.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myconf=''
|
||||
|
||||
if use bacula-clientonly; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable bacula-clientonly client-only) \
|
||||
$(use_enable !static libtool) \
|
||||
$(use_enable static static-cons) \
|
||||
$(use_enable static static-fd)"
|
||||
else
|
||||
myconf="${myconf} \
|
||||
$(use_enable !bacula-nodir build-dird) \
|
||||
$(use_enable !bacula-nosd build-stored)"
|
||||
# bug #311099
|
||||
# database support needed by dir-only *and* sd-only
|
||||
# build as well (for building bscan, btape, etc.)
|
||||
myconf="${myconf} \
|
||||
$(use_with mysql) \
|
||||
$(use_with sqlite3) \
|
||||
$(use_with postgres postgresql) \
|
||||
--enable-batch-insert"
|
||||
fi
|
||||
|
||||
# do not build bat if 'static' clientonly
|
||||
if ! use bacula-clientonly || ! use static; then
|
||||
myconf="${myconf} \
|
||||
$(use_enable qt4 bat)"
|
||||
fi
|
||||
|
||||
myconf="${myconf} \
|
||||
--disable-tray-monitor \
|
||||
$(use_with X x) \
|
||||
$(use_with python) \
|
||||
$(use_enable !readline conio) \
|
||||
$(use_enable readline) \
|
||||
$(use_with readline readline /usr) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_with tcpd tcp-wrappers)"
|
||||
|
||||
econf \
|
||||
--libdir=/usr/$(get_libdir) \
|
||||
--docdir=/usr/share/doc/${PF} \
|
||||
--htmldir=/usr/share/doc/${PF}/html \
|
||||
--with-pid-dir=/var/run \
|
||||
--sysconfdir=/etc/bacula \
|
||||
--with-subsys-dir=/var/lock/subsys \
|
||||
--with-working-dir=/var/lib/bacula \
|
||||
--with-scriptdir=/usr/libexec/bacula \
|
||||
--with-dir-user=bacula \
|
||||
--with-dir-group=bacula \
|
||||
--with-sd-user=root \
|
||||
--with-sd-group=bacula \
|
||||
--with-fd-user=root \
|
||||
--with-fd-group=bacula \
|
||||
--enable-smartalloc \
|
||||
--host=${CHOST} \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
insinto /usr/share/pixmaps
|
||||
doins scripts/bacula.png
|
||||
|
||||
# install bat icon and desktop file when enabled
|
||||
# (for some reason ./configure doesn't pick this up)
|
||||
if use qt4 && ! use static ; then
|
||||
insinto /usr/share/pixmaps
|
||||
doins src/qt-console/images/bat_icon.png
|
||||
insinto /usr/share/applications
|
||||
doins scripts/bat.desktop
|
||||
fi
|
||||
|
||||
# remove some scripts we don't need at all
|
||||
rm -f "${D}"/usr/libexec/bacula/{bacula,bacula-ctl-dir,bacula-ctl-fd,bacula-ctl-sd,startmysql,stopmysql}
|
||||
|
||||
# rename statically linked apps
|
||||
if use bacula-clientonly && use static ; then
|
||||
pushd "${D}"/usr/sbin || die
|
||||
mv static-bacula-fd bacula-fd || die
|
||||
mv static-bconsole bconsole || die
|
||||
popd || die
|
||||
fi
|
||||
|
||||
# extra files which 'make install' doesn't cover
|
||||
if ! use bacula-clientonly; then
|
||||
# the database update scripts
|
||||
diropts -m0750
|
||||
insinto /usr/libexec/bacula/updatedb
|
||||
insopts -m0754
|
||||
doins "${S}"/updatedb/*
|
||||
fperms 0640 /usr/libexec/bacula/updatedb/README
|
||||
|
||||
# the logrotate configuration
|
||||
# (now unconditional wrt bug #258187)
|
||||
diropts -m0755
|
||||
insinto /etc/logrotate.d
|
||||
insopts -m0644
|
||||
newins "${S}"/scripts/logrotate bacula
|
||||
|
||||
# the logwatch scripts
|
||||
if use logwatch; then
|
||||
diropts -m0750
|
||||
dodir /etc/log.d/scripts/services
|
||||
dodir /etc/log.d/scripts/shared
|
||||
dodir /etc/log.d/conf/logfiles
|
||||
dodir /etc/log.d/conf/services
|
||||
pushd "${S}"/scripts/logwatch >&/dev/null || die
|
||||
emake DESTDIR="${D}" install
|
||||
popd >&/dev/null || die
|
||||
fi
|
||||
fi
|
||||
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-bwxconsole.1*
|
||||
if ! use qt4; then
|
||||
rm -vf "${D}"/usr/share/man/man1/bat.1*
|
||||
fi
|
||||
rm -vf "${D}"/usr/share/man/man1/bacula-tray-monitor.1*
|
||||
if use bacula-clientonly || use bacula-nodir; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-dir.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/dbcheck.8*
|
||||
rm -vf "${D}"/usr/share/man/man1/bsmtp.1*
|
||||
rm -vf "${D}"/usr/libexec/bacula/create_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_database
|
||||
rm -vf "${D}"/usr/libexec/bacula/make_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/update_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/drop_*_tables
|
||||
rm -vf "${D}"/usr/libexec/bacula/grant_*_privileges
|
||||
rm -vf "${D}"/usr/libexec/bacula/*_catalog_backup
|
||||
fi
|
||||
if use bacula-clientonly || use bacula-nosd; then
|
||||
rm -vf "${D}"/usr/share/man/man8/bacula-sd.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bcopy.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bextract.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bls.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/bscan.8*
|
||||
rm -vf "${D}"/usr/share/man/man8/btape.8*
|
||||
rm -vf "${D}"/usr/libexec/bacula/disk-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/mtx-changer
|
||||
rm -vf "${D}"/usr/libexec/bacula/dvd-handler
|
||||
fi
|
||||
|
||||
# documentation
|
||||
dodoc ChangeLog LICENSE ReleaseNotes SUPPORT technotes
|
||||
|
||||
# vim-files
|
||||
if use vim-syntax; then
|
||||
insinto /usr/share/vim/vimfiles/syntax
|
||||
doins scripts/bacula.vim
|
||||
insinto /usr/share/vim/vimfiles/ftdetect
|
||||
newins scripts/filetype.vim bacula_ft.vim
|
||||
fi
|
||||
|
||||
# setup init scripts
|
||||
myscripts="bacula-fd"
|
||||
if ! use bacula-clientonly; then
|
||||
if ! use bacula-nodir; then
|
||||
myscripts="${myscripts} bacula-dir"
|
||||
fi
|
||||
if ! use bacula-nosd; then
|
||||
myscripts="${myscripts} bacula-sd"
|
||||
fi
|
||||
fi
|
||||
for script in ${myscripts}; do
|
||||
# copy over init script and config to a temporary location
|
||||
# so we can modify them as needed
|
||||
cp "${FILESDIR}/${script}".confd "${T}/${script}".confd || die "failed to copy ${script}.confd"
|
||||
cp "${FILESDIR}/${script}".initd "${T}/${script}".initd || die "failed to copy ${script}.initd"
|
||||
# set database dependancy for the director init script
|
||||
case "${script}" in
|
||||
bacula-dir)
|
||||
case "${mydbtype}" in
|
||||
sqlite3)
|
||||
# sqlite3 databases don't have a daemon
|
||||
sed -i -e 's/need "%database%"/:/g' "${T}/${script}".initd || die
|
||||
;;
|
||||
*)
|
||||
# all other databases have daemons
|
||||
sed -i -e "s:%database%:${mydbtype}:" "${T}/${script}".initd || die
|
||||
;;
|
||||
esac
|
||||
;;
|
||||
*)
|
||||
;;
|
||||
esac
|
||||
# install init script and config
|
||||
newinitd "${T}/${script}".initd "${script}"
|
||||
newconfd "${T}/${script}".confd "${script}"
|
||||
done
|
||||
|
||||
# make sure the working directory exists
|
||||
diropts -m0750
|
||||
keepdir /var/lib/bacula
|
||||
|
||||
# make sure bacula group can execute bacula libexec scripts
|
||||
fowners -R root:bacula /usr/libexec/bacula
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if use bacula-clientonly; then
|
||||
fowners root:bacula /var/lib/bacula
|
||||
else
|
||||
fowners bacula:bacula /var/lib/bacula
|
||||
fi
|
||||
|
||||
if ! use bacula-clientonly && ! use bacula-nodir; then
|
||||
einfo
|
||||
einfo "If this is a new install, you must create the ${mydbtype} databases with:"
|
||||
einfo " /usr/libexec/bacula/create_${mydbtype}_database"
|
||||
einfo " /usr/libexec/bacula/make_${mydbtype}_tables"
|
||||
einfo " /usr/libexec/bacula/grant_${mydbtype}_privileges"
|
||||
einfo
|
||||
fi
|
||||
|
||||
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
|
||||
einfo "you have to enable 'USE=qt4'."
|
||||
einfo
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
--- Makefile.in.orig 2010-07-20 16:53:44.000000000 +0000
|
||||
+++ Makefile.in 2010-07-20 16:55:50.000000000 +0000
|
||||
@@ -44,9 +44,8 @@
|
||||
|
||||
all: Makefile
|
||||
@for I in ${all_subdirs}; \
|
||||
- do (cd $$I; echo "==>Entering directory `pwd`"; \
|
||||
- $(MAKE) DESTDIR=$(DESTDIR) $@ || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
|
||||
- echo ""; echo ""; exit 1;)); \
|
||||
+ do \
|
||||
+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I $@ || exit 1; \
|
||||
done
|
||||
|
||||
depend:
|
||||
@@ -55,9 +54,8 @@
|
||||
|
||||
bacula-fd: Makefile
|
||||
@for I in ${fd_subdirs}; \
|
||||
- do (cd $$I; echo "==>Entering directory `pwd`"; \
|
||||
- $(MAKE) DESTDIR=$(DESTDIR) all || (echo ""; echo ""; echo " ====== Error in `pwd` ======"; \
|
||||
- echo ""; echo ""; exit 1;)); \
|
||||
+ do \
|
||||
+ $(MAKE) DESTDIR=$(DESTDIR) -C $$I all || exit 1; \
|
||||
done
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
@ -1,33 +0,0 @@
|
||||
diff -urN bacula-5.0.1.orig/src/findlib/Makefile.in bacula-5.0.1/src/findlib/Makefile.in
|
||||
--- bacula-5.0.1.orig/src/findlib/Makefile.in 2010-02-24 16:33:48.000000000 +0100
|
||||
+++ bacula-5.0.1/src/findlib/Makefile.in 2010-03-22 17:37:43.772805754 +0100
|
||||
@@ -59,7 +59,7 @@
|
||||
|
||||
libbacfind.la: Makefile $(LIBBACFIND_LOBJS)
|
||||
@echo "Making $@ ..."
|
||||
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE)
|
||||
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACFIND_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACFIND_LT_CURRENT).$(LIBBACFIND_LT_REVISION).$(LIBBACFIND_LT_AGE) -L../lib -lbac $(LIBS) $(OPENSSL_LIBS)
|
||||
|
||||
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
|
||||
cd $(topdir) \
|
||||
diff -urN bacula-5.0.1.orig/src/lib/Makefile.in bacula-5.0.1/src/lib/Makefile.in
|
||||
--- bacula-5.0.1.orig/src/lib/Makefile.in 2010-02-24 16:33:48.000000000 +0100
|
||||
+++ bacula-5.0.1/src/lib/Makefile.in 2010-03-22 17:37:05.352226188 +0100
|
||||
@@ -126,7 +126,7 @@
|
||||
|
||||
libbac.la: Makefile $(LIBBAC_LOBJS)
|
||||
@echo "Making $@ ..."
|
||||
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS)
|
||||
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAC_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAC_LT_CURRENT).$(LIBBAC_LT_REVISION).$(LIBBAC_LT_AGE) $(WRAPLIBS) $(CAP_LIBS) $(LIBS) $(OPENSSL_LIBS)
|
||||
|
||||
libbaccfg.a: $(LIBBACCFG_OBJS)
|
||||
@echo "Making $@ ..."
|
||||
@@ -135,7 +135,7 @@
|
||||
|
||||
libbaccfg.la: Makefile $(LIBBACCFG_LOBJS)
|
||||
@echo "Making $@ ..."
|
||||
- $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE)
|
||||
+ $(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBACCFG_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBACCFG_LT_CURRENT).$(LIBBACCFG_LT_REVISION).$(LIBBACCFG_LT_AGE) $(LIBS) $(OPENSSL_LIBS)
|
||||
|
||||
libbacpy.a: $(LIBBACPY_OBJS)
|
||||
@echo "Making $@ ..."
|
||||
@ -1,10 +0,0 @@
|
||||
--- src/qt-console/bat.pro.in.orig 2010-07-20 18:28:50.000000000 +0000
|
||||
+++ src/qt-console/bat.pro.in 2010-07-20 18:29:25.000000000 +0000
|
||||
@@ -26,6 +26,7 @@
|
||||
QMAKE_LINK = $${LIBTOOL_LINK} $(CXX)
|
||||
QMAKE_INSTALL_PROGRAM = $${LIBTOOL_INSTALL} install -m @SBINPERM@ -p
|
||||
QMAKE_CLEAN += .libs/* bat
|
||||
+QMAKE_LFLAGS += @LDFLAGS@
|
||||
|
||||
qwt {
|
||||
INCLUDEPATH += @QWT_INC@
|
||||
@ -1,12 +0,0 @@
|
||||
# If upgrading the old libraries gets linked first. So fix order of lib search path.
|
||||
--- src/console/Makefile.in.orig 2010-03-29 11:35:00.000000000 +0000
|
||||
+++ src/console/Makefile.in 2010-03-29 11:45:14.000000000 +0000
|
||||
@@ -47,7 +47,7 @@
|
||||
|
||||
|
||||
bconsole: Makefile $(CONSOBJS) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE)
|
||||
- $(LIBTOOL_LINK) $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
|
||||
+ $(LIBTOOL_LINK) $(CXX) -L../lib -L../cats $(LDFLAGS) $(CONS_LDFLAGS) -o $@ $(CONSOBJS) \
|
||||
$(DLIB) $(CONS_LIBS) -lbaccfg -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
|
||||
$(OPENSSL_LIBS)
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
http://bugs.gentoo.org/328701
|
||||
http://cvs.fedoraproject.org/viewvc/rpms/bacula/devel/bacula-5.0.2-openssl.patch?revision=1.3&view=markup
|
||||
|
||||
--- src/lib/crypto.c
|
||||
+++ src/lib/crypto.c
|
||||
@@ -51,7 +51,7 @@
|
||||
* For OpenSSL version 1.x, EVP_PKEY_encrypt no longer
|
||||
* exists. It was not an official API.
|
||||
*/
|
||||
-#ifdef HAVE_OPENSSLv1
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
|
||||
#define EVP_PKEY_encrypt EVP_PKEY_encrypt_old
|
||||
#define EVP_PKEY_decrypt EVP_PKEY_decrypt_old
|
||||
#endif
|
||||
--- src/lib/tls.c
|
||||
+++ src/lib/tls.c
|
||||
@@ -315,7 +315,7 @@ bool tls_postconnect_verify_host(JCR *jc
|
||||
extname = OBJ_nid2sn(OBJ_obj2nid(X509_EXTENSION_get_object(ext)));
|
||||
|
||||
if (strcmp(extname, "subjectAltName") == 0) {
|
||||
-#ifdef HAVE_OPENSSLv1
|
||||
+#if (OPENSSL_VERSION_NUMBER >= 0x10000000L)
|
||||
const X509V3_EXT_METHOD *method;
|
||||
#else
|
||||
X509V3_EXT_METHOD *method;
|
||||
@ -0,0 +1,81 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/bootchart2/bootchart2-0.14.2-r3.ebuild,v 1.1 2012/05/29 18:00:34 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
PYTHON_DEPEND="2"
|
||||
SUPPORT_PYTHON_ABIS="1"
|
||||
|
||||
inherit linux-info python systemd toolchain-funcs
|
||||
|
||||
DESCRIPTION="Performance analysis and visualization of the system boot process"
|
||||
HOMEPAGE="https://github.com/mmeeks/bootchart/"
|
||||
SRC_URI="mirror://github/mmeeks/bootchart/${P}.tar.bz2"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="GPL-2"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="svg"
|
||||
|
||||
RDEPEND="
|
||||
!app-benchmarks/bootchart
|
||||
dev-python/pycairo[svg?]
|
||||
dev-python/pygtk
|
||||
sys-apps/lsb-release"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
CONFIG_CHECK="~PROC_EVENTS ~TASKSTATS ~TASK_DELAY_ACCT ~TMPFS"
|
||||
|
||||
src_prepare() {
|
||||
tc-export CC
|
||||
sed \
|
||||
-e "/^install/s:py-install-compile::g" \
|
||||
-e "/^VER/s:0.14.1:0.14.2:g" \
|
||||
-e "/^SYSTEMD_UNIT_DIR/s:=.*:= $(systemd_get_unitdir):g" \
|
||||
-i Makefile || die
|
||||
sed \
|
||||
-e '/^EXIT_PROC/s:^.*$:EXIT_PROC="agetty mgetty mingetty":g' \
|
||||
-i bootchartd.conf bootchartd.in || die
|
||||
}
|
||||
|
||||
src_test() {
|
||||
testing() {
|
||||
emake test
|
||||
}
|
||||
python_execute_function testing
|
||||
}
|
||||
|
||||
src_install() {
|
||||
export NO_PYTHON_COMPILE=0
|
||||
export DOCDIR=/usr/share/doc/${PF}
|
||||
default
|
||||
|
||||
# Note: LIBDIR is hardcoded as /lib in collector/common.h, so we shouldn't
|
||||
# just change it. Since no libraries are installed, /lib is fine.
|
||||
keepdir /lib/bootchart/tmpfs
|
||||
|
||||
installation() {
|
||||
emake \
|
||||
DESTDIR="${D}" \
|
||||
PY_SITEDIR=$(python_get_sitedir) \
|
||||
py-install-compile
|
||||
}
|
||||
python_execute_function installation
|
||||
|
||||
# does not like python3 as active interpreter
|
||||
python_convert_shebangs 2 "${ED}"/usr/bin/pybootchartgui
|
||||
|
||||
newinitd "${FILESDIR}"/${PN}.init ${PN}
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "Please add the init script to your default runlevel"
|
||||
elog "rc-update add bootchart2 default"
|
||||
echo
|
||||
python_mod_optimize pybootchartgui
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
python_mod_cleanup pybootchartgui
|
||||
}
|
||||
@ -0,0 +1,234 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-doc/doxygen/doxygen-1.8.1.ebuild,v 1.1 2012/05/29 20:17:08 xarthisius Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils fdo-mime flag-o-matic python qt4-r2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Documentation system for most programming languages"
|
||||
HOMEPAGE="http://www.doxygen.org/"
|
||||
SRC_URI="http://ftp.stack.nl/pub/users/dimitri/${P}.src.tar.gz
|
||||
http://dev.gentoo.org/~xarthisius/distfiles/doxywizard.png"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
|
||||
IUSE="debug doc dot qt4 latex elibc_FreeBSD userland_GNU"
|
||||
|
||||
#missing SerbianCyrilic, JapaneseEn, KoreanEn, Chinesetraditional
|
||||
|
||||
LANGS=(hy ar pt_BR ca zh cs de da eo es fa fi fr el hr hu id it ja ko lt mk
|
||||
nl nb pl pt ro ru sl sk sr sv tr uk vi af)
|
||||
for X in "${LANGS[@]}" ; do
|
||||
IUSE="${IUSE} linguas_${X}"
|
||||
done
|
||||
|
||||
RDEPEND="qt4? ( x11-libs/qt-gui:4 )
|
||||
latex? ( app-text/texlive[extra] )
|
||||
dev-lang/perl
|
||||
virtual/libiconv
|
||||
media-libs/libpng
|
||||
app-text/ghostscript-gpl
|
||||
dot? (
|
||||
media-gfx/graphviz
|
||||
media-libs/freetype
|
||||
)"
|
||||
|
||||
DEPEND="sys-apps/sed
|
||||
sys-devel/flex
|
||||
sys-devel/bison
|
||||
doc? ( =dev-lang/python-2* )
|
||||
${RDEPEND}"
|
||||
|
||||
RESTRICT="mirror"
|
||||
EPATCH_SUFFIX="patch"
|
||||
|
||||
get_langs() {
|
||||
# using only user set linguas also fixes #263641
|
||||
my_linguas=()
|
||||
for lingua in ${LINGUAS}; do
|
||||
if has ${lingua} "${LANGS[@]}"; then
|
||||
case ${lingua} in
|
||||
hy) lingua=am ;;
|
||||
pt_BR) lingua=br ;;
|
||||
zh*) lingua=cn ;;
|
||||
cs) lingua=cz ;;
|
||||
da) lingua=dk ;;
|
||||
el*) lingua=gr ;;
|
||||
ja*) lingua=jp ;;
|
||||
ko) lingua=kr ;;
|
||||
nb) lingua=no ;;
|
||||
sl) lingua=si ;;
|
||||
tr*) lingua=tr ;;
|
||||
uk) lingua=ua ;;
|
||||
af) lingua=za ;;
|
||||
esac
|
||||
has ${lingua} "${my_linguas[@]}" ||
|
||||
my_linguas+=(${lingua})
|
||||
fi
|
||||
done
|
||||
f_langs="${my_linguas[@]}"
|
||||
echo ${f_langs// /,}
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
tc-export CC CXX
|
||||
if use doc; then
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# use CFLAGS, CXXFLAGS, LDFLAGS
|
||||
export ECFLAGS="${CFLAGS}" ECXXFLAGS="${CXXFLAGS}" ELDFLAGS="${LDFLAGS}"
|
||||
|
||||
sed -i.orig -e 's:^\(TMAKE_CFLAGS_RELEASE\t*\)= .*$:\1= $(ECFLAGS):' \
|
||||
-e 's:^\(TMAKE_CXXFLAGS_RELEASE\t*\)= .*$:\1= $(ECXXFLAGS):' \
|
||||
-e 's:^\(TMAKE_LFLAGS_RELEASE\s*\)=.*$:\1= $(ELDFLAGS):' \
|
||||
-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCXX):" \
|
||||
-e "s:^\(TMAKE_LINK\s*\)=.*$:\1= $(tc-getCXX):" \
|
||||
-e "s:^\(TMAKE_LINK_SHLIB\s*\)=.*$:\1= $(tc-getCXX):" \
|
||||
-e "s:^\(TMAKE_CXX\s*\)=.*$:\1= $(tc-getCC):" \
|
||||
tmake/lib/{{linux,gnu,freebsd,netbsd,openbsd,solaris}-g++,macosx-c++,linux-64}/tmake.conf \
|
||||
|| die
|
||||
|
||||
# Ensure we link to -liconv
|
||||
if use elibc_FreeBSD; then
|
||||
for pro in */*.pro.in */*/*.pro.in; do
|
||||
echo "unix:LIBS += -liconv" >> "${pro}"
|
||||
done
|
||||
fi
|
||||
|
||||
# Call dot with -Teps instead of -Tps for EPS generation - bug #282150
|
||||
sed -i -e '/addJob("ps"/ s/"ps"/"eps"/g' src/dot.cpp || die
|
||||
|
||||
# prefix search tools patch, plus OSX fixes
|
||||
epatch "${FILESDIR}"/${P}-prefix-misc-alt.patch
|
||||
|
||||
# fix final DESTDIR issue
|
||||
sed -i.orig -e "s:\$(INSTALL):\$(DESTDIR)/\$(INSTALL):g" \
|
||||
-e "s/all: Makefile.doxywizard/all:/g" \
|
||||
addon/doxywizard/Makefile.in || die
|
||||
|
||||
# fix pdf doc
|
||||
sed -i.orig -e "s:g_kowal:g kowal:" \
|
||||
doc/maintainers.txt || die
|
||||
|
||||
if is-flagq "-O3" ; then
|
||||
echo
|
||||
ewarn "Compiling with -O3 is known to produce incorrectly"
|
||||
ewarn "optimized code which breaks doxygen."
|
||||
echo
|
||||
elog "Continuing with -O2 instead ..."
|
||||
echo
|
||||
replace-flags "-O3" "-O2"
|
||||
fi
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# set ./configure options (prefix, Qt based wizard, docdir)
|
||||
|
||||
local my_conf="--shared --enable-langs $(get_langs)"
|
||||
|
||||
if use debug ; then
|
||||
my_conf="${my_conf} --debug"
|
||||
else
|
||||
my_conf="${my_conf} --release "
|
||||
fi
|
||||
|
||||
use ppc64 && my_conf="${my_conf} --english-only" #263641
|
||||
|
||||
use qt4 && my_conf="${my_conf} --with-doxywizard"
|
||||
|
||||
# On non GNU userland (e.g. BSD), configure script picks up make and bails
|
||||
# out because it is not GNU make, so we force the right value.
|
||||
use userland_GNU || my_conf="${my_conf} --make ${MAKE} --install install"
|
||||
|
||||
export LINK="${QMAKE_LINK}"
|
||||
export LINK_SHLIB="${QMAKE_CXX}"
|
||||
|
||||
if use qt4 ; then
|
||||
pushd addon/doxywizard &> /dev/null
|
||||
eqmake4 doxywizard.pro -o Makefile.doxywizard
|
||||
popd &> /dev/null
|
||||
fi
|
||||
|
||||
./configure --prefix "${EPREFIX}/usr" ${my_conf} \
|
||||
|| die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
|
||||
emake CFLAGS+="${ECFLAGS}" CXXFLAGS+="${ECXXFLAGS}" \
|
||||
LFLAGS+="${ELDFLAGS}" all
|
||||
|
||||
# generate html and pdf (if tetex in use) documents.
|
||||
# errors here are not considered fatal, hence the ewarn message
|
||||
# TeX's font caching in /var/cache/fonts causes sandbox warnings,
|
||||
# so we allow it.
|
||||
if use doc; then
|
||||
if ! use dot; then
|
||||
sed -i -e "s/HAVE_DOT = YES/HAVE_DOT = NO/" \
|
||||
{Doxyfile,doc/Doxyfile} \
|
||||
|| ewarn "disabling dot failed"
|
||||
fi
|
||||
if use latex; then
|
||||
addwrite /var/cache/fonts
|
||||
addwrite /var/cache/fontconfig
|
||||
addwrite /usr/share/texmf/fonts/pk
|
||||
addwrite /usr/share/texmf/ls-R
|
||||
make pdf || ewarn '"make pdf docs" failed.'
|
||||
else
|
||||
cp doc/Doxyfile doc/Doxyfile.orig
|
||||
cp doc/Makefile doc/Makefile.orig
|
||||
sed -i.orig -e "s/GENERATE_LATEX = YES/GENERATE_LATEX = NO/" \
|
||||
doc/Doxyfile
|
||||
sed -i.orig -e "s/@epstopdf/# @epstopdf/" \
|
||||
-e "s/@cp Makefile.latex/# @cp Makefile.latex/" \
|
||||
-e "s/@sed/# @sed/" doc/Makefile
|
||||
make docs || ewarn '"make docs" failed.'
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" MAN1DIR=share/man/man1 install
|
||||
|
||||
if use qt4; then
|
||||
doicon "${DISTDIR}/doxywizard.png"
|
||||
make_desktop_entry doxywizard "DoxyWizard ${PV}" \
|
||||
"/usr/share/pixmaps/doxywizard.png" \
|
||||
"Application;Development"
|
||||
fi
|
||||
|
||||
dodoc INSTALL LANGUAGE.HOWTO README
|
||||
|
||||
# pdf and html manuals
|
||||
if use doc; then
|
||||
dohtml -r html/*
|
||||
use latex && dodoc latex/doxygen_manual.pdf
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
fdo-mime_desktop_database_update
|
||||
|
||||
elog
|
||||
elog "The USE flags qt4, doc, and latex will enable doxywizard, or"
|
||||
elog "the html and pdf documentation, respectively. For examples"
|
||||
elog "and other goodies, see the source tarball. For some example"
|
||||
elog "output, run doxygen on the doxygen source using the Doxyfile"
|
||||
elog "provided in the top-level source dir."
|
||||
elog
|
||||
elog "Disabling the dot USE flag will remove the GraphViz dependency,"
|
||||
elog "along with Doxygen's ability to generate diagrams in the docs."
|
||||
elog "See the Doxygen homepage for additional helper tools to parse"
|
||||
elog "more languages."
|
||||
elog
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
fdo-mime_desktop_database_update
|
||||
}
|
||||
@ -0,0 +1,82 @@
|
||||
* make sure we always look for tools in the path, no "do it yourself paths"
|
||||
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -170,27 +170,15 @@
|
||||
;;
|
||||
Darwin:*)
|
||||
f_platform=macosx-c++
|
||||
- if test "$f_insttool" = NO; then
|
||||
- f_insttool=/usr/bin/install
|
||||
- fi
|
||||
;;
|
||||
FreeBSD:*)
|
||||
f_platform=freebsd-g++
|
||||
- if test "$f_insttool" = NO; then
|
||||
- f_insttool=/usr/bin/install
|
||||
- fi
|
||||
;;
|
||||
NetBSD:*)
|
||||
f_platform=netbsd-g++
|
||||
- if test "$f_insttool" = NO; then
|
||||
- f_insttool=/usr/bin/install
|
||||
- fi
|
||||
;;
|
||||
HP-UX:*)
|
||||
f_platform=hpux-g++
|
||||
- if test "$f_insttool" = NO; then
|
||||
- f_insttool=/usr/bin/install
|
||||
- fi
|
||||
;;
|
||||
IRIX64:*)
|
||||
f_platform=irix-64
|
||||
@@ -221,9 +209,6 @@
|
||||
;;
|
||||
SunOS:5*)
|
||||
f_platform=solaris-g++
|
||||
- if test "$f_insttool" = NO; then
|
||||
- f_insttool=/usr/bin/install
|
||||
- fi
|
||||
;;
|
||||
ULTRIX:*)
|
||||
f_platform=ultrix-g++
|
||||
@@ -323,8 +308,8 @@
|
||||
|
||||
echo -n " Checking for GNU install tool... "
|
||||
if test "$f_insttool" = NO; then
|
||||
- install_names="ginstall install"
|
||||
- install_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin /usr/ucb"
|
||||
+ install_names="install"
|
||||
+ install_dirs="$bin_dirs"
|
||||
install_prog=NO
|
||||
install_found=NO
|
||||
for i in $install_names; do
|
||||
@@ -360,7 +345,7 @@
|
||||
|
||||
echo -n " Checking for dot (part of GraphViz)... "
|
||||
if test "$f_dot" = NO; then
|
||||
- dot_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
|
||||
+ dot_dirs="$bin_dirs"
|
||||
dot_prog=NO
|
||||
for j in $dot_dirs; do
|
||||
if test -x "$j/dot"; then
|
||||
@@ -382,7 +367,7 @@
|
||||
echo -n " Checking for perl... "
|
||||
if test "$f_perl" = NO; then
|
||||
perl_names="perl perl5"
|
||||
- perl_dirs="$bin_dirs /usr/bin /usr/local/bin /bin /sbin"
|
||||
+ perl_dirs="$bin_dirs"
|
||||
perl_prog=NO
|
||||
perl_found=NO
|
||||
for i in $perl_names; do
|
||||
@@ -546,10 +531,6 @@
|
||||
cat >> .tmakeconfig <<EOF
|
||||
TMAKE_LFLAGS += -non_shared
|
||||
EOF
|
||||
- elif test "$f_platform" = "solaris-cc"; then
|
||||
- cat >> .tmakeconfig <<EOF
|
||||
- TMAKE_LFLAGS += -Bstatic
|
||||
-EOF
|
||||
elif test "$f_platform" = "hpux-cc"; then
|
||||
cat >> .tmakeconfig <<EOF
|
||||
TMAKE_LFLAGS += -noshared
|
||||
@ -1,5 +1,4 @@
|
||||
DIST jasspa-mehtml-20091011.tar.gz 628008 RMD160 1b622f7448cc205ca610a35266d0e6b3ffa4ee91 SHA1 fdc75f5d50fb3532ef0fa97d03d9ac19bf4bf3fa SHA256 c106af1a7a1bd5862883ae237ae8a27dccfa30f300944211995658bcfb8621d0
|
||||
DIST jasspa-memacros-20091011.tar.gz 1105320 RMD160 7b96c454a89da60fd9c4d6f32628a6457b3a5059 SHA1 a9c28d52573d9edfc6797d4cc035ec74482b22c9 SHA256 a010d51c7a7e8efd19b7f837566569f446dfbda8fe9eda96e45b1951e2f5ddec
|
||||
DIST jasspa-memacros-20091017.tar.gz 1105437 RMD160 c9fb40e1a39da3a2c7332dc9653bf4b872eea5d1 SHA1 a467e5f518c48e375d51c25e9309dceb02343151 SHA256 aa23d2bb4d5d5b87eb8aa5a28439ff1bcdd2162c5c14a186b84366c06691aa2d
|
||||
DIST jasspa-mesrc-20091011.tar.gz 810128 RMD160 b65816f7704af7b3587ac32f31f7e45cdc66638e SHA1 d252c9d34cdb802a9e890a378462b12a58a2a3c7 SHA256 44109a9118da34a1d026450ec85a3f85d983c4015c97db2b9abbad69e8d90889
|
||||
DIST meicons-extra.tar.gz 43345 RMD160 6fab9d24f82bbdce9d043d1c5b483eee42f1e780 SHA1 5a196c1bcd3a6a3afaa619b719848f775a3a910b SHA256 d56864a6abccda2b6f79b8b86c545ae4b2abb40b8761cd97bda986aed454e8ef
|
||||
|
||||
@ -1,82 +0,0 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-editors/jasspa-microemacs/jasspa-microemacs-20091011-r1.ebuild,v 1.6 2011/08/18 21:26:25 ulm Exp $
|
||||
|
||||
EAPI=3
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Jasspa Microemacs"
|
||||
HOMEPAGE="http://www.jasspa.com/"
|
||||
SRC_URI="http://www.jasspa.com/release_20090909/jasspa-mesrc-${PV}.tar.gz
|
||||
!nanoemacs? (
|
||||
http://www.jasspa.com/release_20090909/jasspa-memacros-${PV}.tar.gz
|
||||
http://www.jasspa.com/release_20090909/jasspa-mehtml-${PV}.tar.gz
|
||||
http://www.jasspa.com/release_20060909/meicons-extra.tar.gz )"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
|
||||
IUSE="nanoemacs X xpm"
|
||||
|
||||
RDEPEND="sys-libs/ncurses
|
||||
X? ( x11-libs/libX11
|
||||
xpm? ( x11-libs/libXpm ) )
|
||||
nanoemacs? ( !app-editors/ne )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-libs/libXt
|
||||
x11-proto/xproto )"
|
||||
|
||||
S="${WORKDIR}/me${PV:2}/src"
|
||||
|
||||
src_unpack() {
|
||||
unpack jasspa-mesrc-${PV}.tar.gz
|
||||
if ! use nanoemacs; then
|
||||
mkdir "${WORKDIR}/jasspa"
|
||||
cd "${WORKDIR}/jasspa"
|
||||
# everything except jasspa-mesrc
|
||||
unpack ${A/jasspa-mesrc-${PV}.tar.gz/}
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PV}-ncurses.patch"
|
||||
epatch "${FILESDIR}/${PV}-linux3.patch"
|
||||
|
||||
# allow for some variables to be passed to make
|
||||
sed -i '/make/s/\$OPTIONS/& CC="$CC" COPTIMISE="$CFLAGS" LDFLAGS="$LDFLAGS" STRIP=true/' \
|
||||
build || die "sed failed"
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
local pkgdatadir="${EPREFIX}/usr/share/jasspa"
|
||||
local me="" type=c
|
||||
use nanoemacs && me="-ne"
|
||||
use X && type=cw
|
||||
use xpm || export XPM_INCLUDE=. # prevent Xpm autodetection
|
||||
|
||||
CC="$(tc-getCC)" ./build ${me} \
|
||||
-t ${type} \
|
||||
-p "~/.jasspa:${pkgdatadir}/site:${pkgdatadir}" \
|
||||
|| die "build failed"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
local me=me type=c
|
||||
use nanoemacs && me=ne
|
||||
use X && type=cw
|
||||
newbin ${me}${type} ${me} || die "newbin failed"
|
||||
|
||||
if ! use nanoemacs; then
|
||||
keepdir /usr/share/jasspa/site
|
||||
insinto /usr/share
|
||||
doins -r "${WORKDIR}/jasspa"
|
||||
if use X; then
|
||||
insinto /usr/share/applications
|
||||
doins "${FILESDIR}/${PN}.desktop"
|
||||
fi
|
||||
fi
|
||||
|
||||
dodoc ../faq.txt ../readme.txt ../change.log || die "dodoc failed"
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
DIST free42-1.4.74.tgz 3995276 RMD160 696feb9ff441602cb9975bf7502365623d4ed805 SHA1 f31d9857b6540b257ef054ae6e08995eacd32697 SHA256 b0449d723bbf4d81cdd9435c84ae4fc3f4d93e521e5a7ee104e3e6ac15d61795
|
||||
@ -0,0 +1,39 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/free42/free42-1.4.74.ebuild,v 1.1 2012/05/29 17:28:57 nimiux Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="An HP-42S Calculator Simulator"
|
||||
HOMEPAGE="http://thomasokken.com/free42/"
|
||||
SRC_URI="mirror://gentoo/${P}.tgz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND="dev-libs/atk
|
||||
x11-libs/cairo
|
||||
x11-libs/gdk-pixbuf
|
||||
x11-libs/gtk+
|
||||
x11-libs/pango"
|
||||
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
src_prepare() {
|
||||
sed -i -e 's/hash-style=both/hash-style=gnu/' "${S}/gtk/Makefile" || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
make CXX="$(tc-getCXX)" -C "${S}/gtk" || die
|
||||
}
|
||||
|
||||
src_install() {
|
||||
dodoc CREDITS HISTORY README TODO
|
||||
dobin gtk/free42bin
|
||||
}
|
||||
@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>nimiux@gentoo.org</email>
|
||||
<name>Chema Alonso</name>
|
||||
</maintainer>
|
||||
<longdescription lang="en">
|
||||
An HP-42S Calculator Simulator
|
||||
</longdescription>
|
||||
<longdescription lang="es">
|
||||
Un simulador de la calculadora HP-42S
|
||||
</longdescription>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,7 @@
|
||||
diff --git a/VERSION b/VERSION
|
||||
index b70c292..7dea76e 100644
|
||||
--- a/VERSION
|
||||
+++ b/VERSION
|
||||
@@ -1 +1 @@
|
||||
-1.0,1
|
||||
+1.0.1
|
||||
@ -0,0 +1,371 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/qemu-kvm/qemu-kvm-1.0.1-r1.ebuild,v 1.1 2012/05/29 20:10:01 cardoe Exp $
|
||||
|
||||
#BACKPORTS=1
|
||||
|
||||
EAPI="4"
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
EGIT_REPO_URI="git://git.kernel.org/pub/scm/virt/kvm/qemu-kvm.git"
|
||||
GIT_ECLASS="git-2"
|
||||
fi
|
||||
|
||||
inherit eutils flag-o-matic ${GIT_ECLASS} linux-info toolchain-funcs multilib python
|
||||
|
||||
if [[ ${PV} = *9999* ]]; then
|
||||
SRC_URI=""
|
||||
KEYWORDS=""
|
||||
else
|
||||
SRC_URI="mirror://sourceforge/kvm/${PN}/${P}.tar.gz
|
||||
${BACKPORTS:+
|
||||
http://dev.gentoo.org/~flameeyes/${PN}/${P}-backports-${BACKPORTS}.tar.bz2
|
||||
http://dev.gentoo.org/~cardoe/distfiles/${P}-backports-${BACKPORTS}.tar.bz2}"
|
||||
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
|
||||
fi
|
||||
|
||||
DESCRIPTION="QEMU + Kernel-based Virtual Machine userland tools"
|
||||
HOMEPAGE="http://www.linux-kvm.org"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
# xen is disabled until the deps are fixed
|
||||
IUSE="+aio alsa bluetooth brltty +curl debug fdt ncurses \
|
||||
opengl pulseaudio qemu-ifup rbd sasl sdl smartcard spice static test
|
||||
+threads tls usbredir vde +vhost-net xattr xen"
|
||||
|
||||
COMMON_TARGETS="i386 x86_64 arm cris m68k microblaze mips mipsel ppc ppc64 sh4 sh4eb sparc sparc64"
|
||||
IUSE_SOFTMMU_TARGETS="${COMMON_TARGETS} mips64 mips64el ppcemb"
|
||||
IUSE_USER_TARGETS="${COMMON_TARGETS} alpha armeb ppc64abi32 sparc32plus"
|
||||
|
||||
# Setup the default SoftMMU targets, while using the loops
|
||||
# below to setup the other targets. x86_64 should be the only
|
||||
# defaults on for qemu-kvm
|
||||
IUSE="${IUSE} +qemu_softmmu_targets_x86_64"
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS}; do
|
||||
if [ "x${target}" = "xx86_64" ]; then
|
||||
continue
|
||||
fi
|
||||
IUSE="${IUSE} qemu_softmmu_targets_${target}"
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS}; do
|
||||
IUSE="${IUSE} qemu_user_targets_${target}"
|
||||
done
|
||||
|
||||
RDEPEND="
|
||||
!app-emulation/kqemu
|
||||
!app-emulation/qemu
|
||||
!app-emulation/qemu-user
|
||||
>=dev-libs/glib-2.0
|
||||
media-libs/libpng
|
||||
sys-apps/pciutils
|
||||
>=sys-apps/util-linux-2.16.0
|
||||
virtual/jpeg
|
||||
amd64? ( sys-apps/seabios
|
||||
sys-apps/vgabios )
|
||||
x86? ( sys-apps/seabios
|
||||
sys-apps/vgabios )
|
||||
aio? ( dev-libs/libaio )
|
||||
alsa? ( >=media-libs/alsa-lib-1.0.13 )
|
||||
bluetooth? ( net-wireless/bluez )
|
||||
brltty? ( app-accessibility/brltty )
|
||||
curl? ( >=net-misc/curl-7.15.4 )
|
||||
fdt? ( >=sys-apps/dtc-1.2.0 )
|
||||
ncurses? ( sys-libs/ncurses )
|
||||
opengl? ( virtual/opengl )
|
||||
pulseaudio? ( media-sound/pulseaudio )
|
||||
qemu-ifup? ( sys-apps/iproute2 net-misc/bridge-utils )
|
||||
rbd? ( sys-cluster/ceph )
|
||||
sasl? ( dev-libs/cyrus-sasl )
|
||||
sdl? ( static? ( >=media-libs/libsdl-1.2.11[static-libs,X] )
|
||||
!static? ( >=media-libs/libsdl-1.2.11[X] ) )
|
||||
static? ( sys-libs/zlib[static-libs(+)] )
|
||||
!static? ( sys-libs/zlib )
|
||||
smartcard? ( dev-libs/nss )
|
||||
spice? ( >=app-emulation/spice-0.9.0
|
||||
>=app-emulation/spice-protocol-0.8.1 )
|
||||
tls? ( net-libs/gnutls )
|
||||
usbredir? ( sys-apps/usbredir )
|
||||
vde? ( net-misc/vde )
|
||||
xattr? ( sys-apps/attr )
|
||||
xen? ( app-emulation/xen-tools )
|
||||
"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
app-text/texi2html
|
||||
virtual/pkgconfig
|
||||
>=sys-kernel/linux-headers-2.6.35
|
||||
test? ( dev-libs/check )"
|
||||
|
||||
STRIP_MASK="/usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_PRESTRIPPED="
|
||||
usr/share/qemu/openbios-ppc
|
||||
usr/share/qemu/openbios-sparc64
|
||||
usr/share/qemu/openbios-sparc32
|
||||
usr/share/qemu/palcode-clipper"
|
||||
|
||||
QA_WX_LOAD="${QA_PRESTRIPPED}
|
||||
usr/bin/qemu-i386
|
||||
usr/bin/qemu-x86_64
|
||||
usr/bin/qemu-alpha
|
||||
usr/bin/qemu-arm
|
||||
usr/bin/qemu-cris
|
||||
usr/bin/qemu-m68k
|
||||
usr/bin/qemu-microblaze
|
||||
usr/bin/qemu-mips
|
||||
usr/bin/qemu-mipsel
|
||||
usr/bin/qemu-ppc
|
||||
usr/bin/qemu-ppc64
|
||||
usr/bin/qemu-ppc64abi32
|
||||
usr/bin/qemu-sh4
|
||||
usr/bin/qemu-sh4eb
|
||||
usr/bin/qemu-sparc
|
||||
usr/bin/qemu-sparc64
|
||||
usr/bin/qemu-armeb
|
||||
usr/bin/qemu-sparc32plus"
|
||||
|
||||
pkg_pretend() {
|
||||
if ! use qemu_softmmu_targets_x86_64 && use amd64 ; then
|
||||
eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
|
||||
fi
|
||||
|
||||
if ! use qemu_softmmu_targets_x86_64 && use x86 ; then
|
||||
eerror "You disabled default target QEMU_SOFTMMU_TARGETS=x86_64"
|
||||
fi
|
||||
|
||||
if kernel_is lt 2 6 25; then
|
||||
eerror "This version of KVM requres a host kernel of 2.6.25 or higher."
|
||||
eerror "Either upgrade your kernel"
|
||||
else
|
||||
if ! linux_config_exists; then
|
||||
eerror "Unable to check your kernel for KVM support"
|
||||
else
|
||||
CONFIG_CHECK="~KVM ~TUN ~BRIDGE"
|
||||
ERROR_KVM="You must enable KVM in your kernel to continue"
|
||||
ERROR_KVM_AMD="If you have an AMD CPU, you must enable KVM_AMD in"
|
||||
ERROR_KVM_AMD+=" your kernel configuration."
|
||||
ERROR_KVM_INTEL="If you have an Intel CPU, you must enable"
|
||||
ERROR_KVM_INTEL+=" KVM_INTEL in your kernel configuration."
|
||||
ERROR_TUN="You will need the Universal TUN/TAP driver compiled"
|
||||
ERROR_TUN+=" into your kernel or loaded as a module to use the"
|
||||
ERROR_TUN+=" virtual network device if using -net tap."
|
||||
ERROR_BRIDGE="You will also need support for 802.1d"
|
||||
ERROR_BRIDGE+=" Ethernet Bridging for some network configurations."
|
||||
use vhost-net && CHECK_CHECK+=" ~VHOST_NET"
|
||||
ERROR_VHOST_NET="You must enable VHOST_NET to have vhost-net"
|
||||
ERROR_VHOST_NET+=" support"
|
||||
|
||||
if use amd64 || use x86 || use amd64-linux || use x86-linux; then
|
||||
CONFIG_CHECK+=" ~KVM_AMD ~KVM_INTEL"
|
||||
fi
|
||||
|
||||
# Now do the actual checks setup above
|
||||
check_extra_config
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_setup() {
|
||||
python_set_active_version 2
|
||||
|
||||
enewgroup kvm 78
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
# prevent docs to get automatically installed
|
||||
sed -i '/$(DESTDIR)$(docdir)/d' Makefile || die
|
||||
# Alter target makefiles to accept CFLAGS set via flag-o
|
||||
sed -i 's/^\(C\|OP_C\|HELPER_C\)FLAGS=/\1FLAGS+=/' \
|
||||
Makefile Makefile.target || die
|
||||
# append CFLAGS while linking
|
||||
sed -i 's/$(LDFLAGS)/$(QEMU_CFLAGS) $(CFLAGS) $(LDFLAGS)/' rules.mak || die
|
||||
|
||||
# remove part to make udev happy
|
||||
sed -e 's~NAME="%k", ~~' -i kvm/scripts/65-kvm.rules || die
|
||||
|
||||
# ${PN}-guest-hang-on-usb-add.patch was sent by Timothy Jones
|
||||
# to the qemu-devel ml - bug 337988
|
||||
epatch "${FILESDIR}/qemu-0.11.0-mips64-user-fix.patch"
|
||||
|
||||
# Fix compilation of the qemu-system-ppc component
|
||||
epatch "${FILESDIR}"/${PN}-1.0-fix-qemu-system-ppc.patch
|
||||
|
||||
# drop '-g' by default as it tends to eat
|
||||
# A LOT (~2GB) of ram for each job #355861
|
||||
sed -e 's/CFLAGS="-g $CFLAGS"/CFLAGS="$CFLAGS"/g' \
|
||||
-i configure || die
|
||||
|
||||
# Quick fix for the bad version number
|
||||
epatch "${FILESDIR}"/${P}-VERSION.patch
|
||||
|
||||
[[ -n ${BACKPORTS} ]] && \
|
||||
EPATCH_FORCE=yes EPATCH_SUFFIX="patch" EPATCH_SOURCE="${S}/patches" \
|
||||
epatch
|
||||
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local conf_opts audio_opts user_targets
|
||||
|
||||
for target in ${IUSE_SOFTMMU_TARGETS} ; do
|
||||
use "qemu_softmmu_targets_${target}" && \
|
||||
softmmu_targets="${softmmu_targets} ${target}-softmmu"
|
||||
done
|
||||
|
||||
for target in ${IUSE_USER_TARGETS} ; do
|
||||
use "qemu_user_targets_${target}" && \
|
||||
user_targets="${user_targets} ${target}-linux-user"
|
||||
done
|
||||
|
||||
if [[ -z ${softmmu_targets} ]]; then
|
||||
eerror "All SoftMMU targets are disabled. This is invalid for qemu-kvm"
|
||||
die "At least 1 SoftMMU target must be enabled"
|
||||
else
|
||||
einfo "Building the following softmmu targets: ${softmmu_targets}"
|
||||
fi
|
||||
|
||||
if [[ -n ${user_targets} ]]; then
|
||||
einfo "Building the following user targets: ${user_targets}"
|
||||
conf_opts="${conf_opts} --enable-linux-user"
|
||||
else
|
||||
conf_opts="${conf_opts} --disable-linux-user"
|
||||
fi
|
||||
|
||||
# Fix QA issues. QEMU needs executable heaps and we need to mark it as such
|
||||
conf_opts="${conf_opts} --extra-ldflags=-Wl,-z,execheap"
|
||||
|
||||
# Add support for static builds
|
||||
use static && conf_opts="${conf_opts} --static"
|
||||
|
||||
# Support debug USE flag
|
||||
use debug && conf_opts="${conf_opts} --enable-debug"
|
||||
|
||||
# audio options
|
||||
audio_opts="oss"
|
||||
use alsa && audio_opts="alsa ${audio_opts}"
|
||||
use pulseaudio && audio_opts="pa ${audio_opts}"
|
||||
use sdl && audio_opts="sdl ${audio_opts}"
|
||||
|
||||
./configure --prefix=/usr \
|
||||
--sysconfdir=/etc \
|
||||
--disable-darwin-user \
|
||||
--disable-bsd-user \
|
||||
--disable-libiscsi \
|
||||
--disable-strip \
|
||||
--disable-werror \
|
||||
--enable-kvm \
|
||||
--enable-kvm-device-assignment \
|
||||
--enable-kvm-pit \
|
||||
--enable-pie \
|
||||
--enable-nptl \
|
||||
--enable-tcg-interpreter \
|
||||
--enable-uuid \
|
||||
--enable-vnc-jpeg \
|
||||
--enable-vnc-png \
|
||||
--python=python2 \
|
||||
$(use_enable aio linux-aio) \
|
||||
$(use_enable bluetooth bluez) \
|
||||
$(use_enable brltty brlapi) \
|
||||
$(use_enable curl) \
|
||||
$(use_enable fdt) \
|
||||
$(use_enable ncurses curses) \
|
||||
$(use_enable opengl) \
|
||||
$(use_enable rbd) \
|
||||
$(use_enable sasl vnc-sasl) \
|
||||
$(use_enable sdl) \
|
||||
$(use_enable smartcard smartcard) \
|
||||
$(use_enable smartcard smartcard-nss) \
|
||||
$(use_enable spice) \
|
||||
$(use_enable test check-utests) \
|
||||
$(use_enable tls vnc-tls) \
|
||||
$(use_enable threads vnc-thread) \
|
||||
$(use_enable usbredir usb-redir) \
|
||||
$(use_enable vde) \
|
||||
$(use_enable vhost-net) \
|
||||
$(use_enable xen) \
|
||||
$(use_enable xattr attr) \
|
||||
--audio-drv-list="${audio_opts}" \
|
||||
--target-list="${softmmu_targets} ${user_targets}" \
|
||||
--cc="$(tc-getCC)" \
|
||||
--host-cc="$(tc-getBUILD_CC)" \
|
||||
|| die "configure failed"
|
||||
|
||||
# this is for qemu upstream's threaded support which is
|
||||
# in development and broken
|
||||
# the kvm project has its own support for threaded IO
|
||||
# which is always on and works
|
||||
# --enable-io-thread \
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${ED}" install || die "make install failed"
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
insinto /lib/udev/rules.d/
|
||||
doins kvm/scripts/65-kvm.rules || die
|
||||
|
||||
if use qemu-ifup; then
|
||||
insinto /etc/qemu/
|
||||
insopts -m0755
|
||||
doins kvm/scripts/qemu-ifup || die
|
||||
fi
|
||||
|
||||
if use qemu_softmmu_targets_x86_64 ; then
|
||||
dobin "${FILESDIR}"/qemu-kvm
|
||||
ewarn "The depreciated '/usr/bin/kvm' symlink is no longer installed"
|
||||
ewarn "You should use '/usr/bin/qemu-kvm', you may need to edit"
|
||||
ewarn "your libvirt configs or other wrappers for ${PN}"
|
||||
else
|
||||
elog "You disabled QEMU_SOFTMMU_TARGETS=x86_64, this disables install"
|
||||
elog "of /usr/bin/qemu-kvm and /usr/bin/kvm"
|
||||
fi
|
||||
fi
|
||||
|
||||
dodoc Changelog MAINTAINERS TODO pci-ids.txt || die
|
||||
newdoc pc-bios/README README.pc-bios || die
|
||||
dohtml qemu-doc.html qemu-tech.html || die
|
||||
|
||||
# FIXME: Need to come up with a solution for non-x86 based systems
|
||||
if use x86 || use amd64; then
|
||||
# Remove SeaBIOS since we're using the SeaBIOS packaged one
|
||||
rm "${ED}/usr/share/qemu/bios.bin"
|
||||
dosym ../seabios/bios.bin /usr/share/qemu/bios.bin
|
||||
|
||||
# Remove vgabios since we're using the vgabios packaged one
|
||||
rm "${ED}/usr/share/qemu/vgabios.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-cirrus.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-qxl.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-stdvga.bin"
|
||||
rm "${ED}/usr/share/qemu/vgabios-vmware.bin"
|
||||
dosym ../vgabios/vgabios.bin /usr/share/qemu/vgabios.bin
|
||||
dosym ../vgabios/vgabios-cirrus.bin /usr/share/qemu/vgabios-cirrus.bin
|
||||
dosym ../vgabios/vgabios-qxl.bin /usr/share/qemu/vgabios-qxl.bin
|
||||
dosym ../vgabios/vgabios-stdvga.bin /usr/share/qemu/vgabios-stdvga.bin
|
||||
dosym ../vgabios/vgabios-vmware.bin /usr/share/qemu/vgabios-vmware.bin
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
|
||||
if [[ -n ${softmmu_targets} ]]; then
|
||||
elog "If you don't have kvm compiled into the kernel, make sure you have"
|
||||
elog "the kernel module loaded before running kvm. The easiest way to"
|
||||
elog "ensure that the kernel module is loaded is to load it on boot."
|
||||
elog "For AMD CPUs the module is called 'kvm-amd'"
|
||||
elog "For Intel CPUs the module is called 'kvm-intel'"
|
||||
elog "Please review /etc/conf.d/modules for how to load these"
|
||||
elog
|
||||
elog "Make sure your user is in the 'kvm' group"
|
||||
elog "Just run 'gpasswd -a <USER> kvm', then have <USER> re-login."
|
||||
elog
|
||||
elog "The ssl USE flag was renamed to tls, so adjust your USE flags."
|
||||
elog "The nss USE flag was renamed to smartcard, so adjust your USE flags."
|
||||
fi
|
||||
|
||||
use qemu-ifup && \
|
||||
ewarn "qemu-ifup is deprecated, be prepared for it to disappear next release"
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST virt-viewer-0.4.2.tar.gz 442244 RMD160 f1094a374b0d808af77ba992fd12ba38c25a0623 SHA1 3b1d253c3c5f9cc89786e601e40a6ac72e52d4ee SHA256 32057e115ee53d9894af05ac4659893dc7e6ff9efba8d74999147b1bfda1439c
|
||||
DIST virt-viewer-0.5.2.tar.gz 583436 RMD160 4371ca8e6d95c38c223299c2a8175c2f5d135fc0 SHA1 634667d56945307046ff378843975bbd5290c4d1 SHA256 e7f09b5de988fd3c81568d05d2b5db97c620b547ec8f92eab8e6a88604a18009
|
||||
DIST virt-viewer-0.5.3.tar.gz 638327 RMD160 156713d668f482b169d2d2abc2f99ed7df97743c SHA1 dea38f9b31c3e374886d7c006b99a39c4094185b SHA256 944a53ab4079940d502e4e8572177fdf73357342f723e36538932556b6c2d996
|
||||
|
||||
@ -0,0 +1,57 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/virt-viewer/virt-viewer-0.5.3.ebuild,v 1.1 2012/05/29 20:29:09 dev-zero Exp $
|
||||
|
||||
EAPI=4
|
||||
inherit eutils gnome2 toolchain-funcs
|
||||
|
||||
DESCRIPTION="Graphical console client for connecting to virtual machines"
|
||||
HOMEPAGE="http://virt-manager.org/"
|
||||
SRC_URI="http://virt-manager.org/download/sources/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="gtk3 nsplugin sasl +spice +vnc"
|
||||
|
||||
RDEPEND=">=app-emulation/libvirt-0.9.7
|
||||
>=dev-libs/libxml2-2.6
|
||||
gtk3? ( x11-libs/gtk+:3 )
|
||||
!gtk3? (
|
||||
>=x11-libs/gtk+-2.18:2
|
||||
>=gnome-base/libglade-2.6
|
||||
)
|
||||
nsplugin? (
|
||||
>=dev-libs/nspr-4
|
||||
>=x11-libs/gtk+-2.18:2
|
||||
>=gnome-base/libglade-2.6
|
||||
)
|
||||
spice? ( >=net-misc/spice-gtk-0.12[sasl?,gtk3=] )
|
||||
vnc? ( >=net-libs/gtk-vnc-0.4.3 )"
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
nsplugin? ( >=net-misc/npapi-sdk-0.27 )"
|
||||
|
||||
REQUIRED_USE="|| ( spice vnc )
|
||||
nsplugin? ( !gtk3 )
|
||||
gtk3? ( !nsplugin )"
|
||||
|
||||
pkg_setup() {
|
||||
G2CONF="$(use_enable nsplugin plugin) $(use_with spice spice-gtk)"
|
||||
G2CONF="${G2CONF} $(use_with vnc gtk-vnc)"
|
||||
use gtk3 && G2CONF="${G2CONF} --with-gtk=3.0"
|
||||
use gtk3 || G2CONF="${G2CONF} --with-gtk=2.0"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-0.5.x-npapi-sdk.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
if use nsplugin; then
|
||||
export MOZILLA_PLUGIN_CFLAGS="$($(tc-getPKG_CONFIG) --cflags npapi-sdk nspr)"
|
||||
export MOZILLA_PLUGIN_LIBS="$($(tc-getPKG_CONFIG) --libs npapi-sdk nspr)"
|
||||
fi
|
||||
|
||||
gnome2_src_configure
|
||||
}
|
||||
@ -1,183 +0,0 @@
|
||||
http://bugzilla.gnome.org/show_bug.cgi?id=566355
|
||||
|
||||
diff -NrU5 tasque-0.1.8.orig/configure.ac tasque-0.1.8/configure.ac
|
||||
--- tasque-0.1.8.orig/configure.ac 2009-01-09 18:44:30.000000000 +0100
|
||||
+++ tasque-0.1.8/configure.ac 2009-01-09 19:19:06.000000000 +0100
|
||||
@@ -53,39 +53,12 @@
|
||||
AC_SUBST(NOTIFY_SHARP_LIBS)
|
||||
|
||||
AC_ARG_ENABLE(debug,
|
||||
AC_HELP_STRING([--enable-debug],
|
||||
[Use 'Debug' Configuration [default=yes]]),
|
||||
- enable_debug=$enableval, enable_debug=no)
|
||||
+ enable_debug=$enableval, enable_debug=yes)
|
||||
AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" = "xyes")
|
||||
-if test "x$enable_debug" = "xyes" ; then
|
||||
-# DEBUG_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
|
||||
-# DEBUG_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
|
||||
-# AC_SUBST(DEBUG_CONFIG_LIBRARIES)
|
||||
-# AC_SUBST(DEBUG_CONFIG_LIBS)
|
||||
- CONFIG_REQUESTED="yes"
|
||||
-fi
|
||||
-AC_ARG_ENABLE(release,
|
||||
- AC_HELP_STRING([--enable-release],
|
||||
- [Use 'Release' Configuration [default=no]]),
|
||||
- enable_release=$enableval, enable_release=no)
|
||||
-AM_CONDITIONAL(ENABLE_RELEASE, test "x$enable_release" = "xyes")
|
||||
-if test "x$enable_release" = "xyes" ; then
|
||||
-# RELEASE_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
|
||||
-# RELEASE_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
|
||||
-# AC_SUBST(RELEASE_CONFIG_LIBRARIES)
|
||||
-# AC_SUBST(RELEASE_CONFIG_LIBS)
|
||||
- CONFIG_REQUESTED="yes"
|
||||
-fi
|
||||
-if test -z "$CONFIG_REQUESTED" ; then
|
||||
-# DEBUG_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
|
||||
-# DEBUG_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
|
||||
-# AC_SUBST(DEBUG_CONFIG_LIBRARIES)
|
||||
-# AC_SUBST(DEBUG_CONFIG_LIBS)
|
||||
- AM_CONDITIONAL(ENABLE_DEBUG, true)
|
||||
-fi
|
||||
-
|
||||
|
||||
#
|
||||
# DEFINES uses for #if statements
|
||||
#
|
||||
AC_ARG_WITH(dbus_service_dir, [ --with-dbus-service-dir=DIR Where to install Tasque's DBus service file.])
|
||||
@@ -225,11 +198,10 @@
|
||||
echo "
|
||||
Configuration:
|
||||
|
||||
Prefix: ${prefix}
|
||||
Debug build: ${enable_debug}
|
||||
- Release build: ${enable_release}
|
||||
Notification: ${enable_notify_sharp}
|
||||
Dummy Backend: ${enable_backend_dummy}
|
||||
Evolution Backend: ${enable_backend_eds}
|
||||
ICECore Backend: ${enable_backend_icecore}
|
||||
RTM Backend: ${enable_backend_rtm}
|
||||
diff -NrU5 tasque-0.1.8.orig/RtmNet/Makefile.am tasque-0.1.8/RtmNet/Makefile.am
|
||||
--- tasque-0.1.8.orig/RtmNet/Makefile.am 2009-01-09 18:44:30.000000000 +0100
|
||||
+++ tasque-0.1.8/RtmNet/Makefile.am 2009-01-09 19:26:42.000000000 +0100
|
||||
@@ -1,16 +1,18 @@
|
||||
CSC = $(GMCS)
|
||||
|
||||
TARGET = RtmNet.dll
|
||||
|
||||
+CSFLAGS = -t:library -noconfig -codepage:utf8
|
||||
+
|
||||
if ENABLE_DEBUG
|
||||
-CSFLAGS = -t:library -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
|
||||
-endif
|
||||
-if ENABLE_RELEASE
|
||||
-CSFLAGS = -t:library -noconfig -codepage:utf8 -warn:4
|
||||
+CSFLAGS += -warn:4 -debug -d:DEBUG
|
||||
+TARGET_DEBUG_FILE = $(TARGET).mdb
|
||||
+$(TARGET).mdb: $(TARGET)
|
||||
endif
|
||||
|
||||
+
|
||||
CSFILES = \
|
||||
$(srcdir)/ApiKeyRequiredException.cs \
|
||||
$(srcdir)/AssemblyInfo.cs \
|
||||
$(srcdir)/Auth.cs \
|
||||
$(srcdir)/AuthenticationRequiredException.cs \
|
||||
@@ -45,20 +47,20 @@
|
||||
|
||||
$(TARGET): $(CSFILES)
|
||||
$(CSC) -unsafe -out:$@ $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
|
||||
|
||||
tasquelibdir = $(prefix)/lib/tasque
|
||||
-tasquelib_DATA = $(TARGET)
|
||||
+tasquelib_DATA = $(TARGET) $(TARGET_DEBUG_FILE)
|
||||
|
||||
bin_SCRIPTS = $(WRAPPER)
|
||||
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(CSFILES)
|
||||
|
||||
CLEANFILES = \
|
||||
- $(TARGET) \
|
||||
- $(TARGET).mdb
|
||||
+ $(TARGET_DEBUG_FILE) \
|
||||
+ $(TARGET)
|
||||
|
||||
DISTCLEANFILES = \
|
||||
- $(TARGET) \
|
||||
- $(TARGET).mdb
|
||||
+ $(TARGET_DEBUG_FILE) \
|
||||
+ $(TARGET)
|
||||
diff -NrU5 tasque-0.1.8.orig/src/Makefile.am tasque-0.1.8/src/Makefile.am
|
||||
--- tasque-0.1.8.orig/src/Makefile.am 2009-01-09 18:44:30.000000000 +0100
|
||||
+++ tasque-0.1.8/src/Makefile.am 2009-01-09 19:15:58.000000000 +0100
|
||||
@@ -2,20 +2,21 @@
|
||||
|
||||
CSC = $(GMCS)
|
||||
|
||||
TARGET = Tasque.exe
|
||||
WRAPPER = tasque
|
||||
+CSFLAGS = -noconfig -codepage:utf8
|
||||
|
||||
if GTK_2_12
|
||||
GTK_2_12_CSFLAGS = -define:GTK_2_12
|
||||
+CSFLAGS += $(GTK_2_12_CSFLAGS)
|
||||
endif
|
||||
|
||||
if ENABLE_DEBUG
|
||||
-CSFLAGS = -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG $(GTK_2_12_CSFLAGS)
|
||||
-endif
|
||||
-if ENABLE_RELEASE
|
||||
-CSFLAGS = -noconfig -codepage:utf8 -warn:4 $(GTK_2_12_CSFLAGS)
|
||||
+CSFLAGS += -warn:4 -debug -d:DEBUG
|
||||
+TARGET_DEBUG_FILE = $(TARGET).mdb
|
||||
+$(TARGET).mdb: $(TARGET)
|
||||
endif
|
||||
|
||||
if ENABLE_NOTIFY_SHARP
|
||||
NOTIFY_SHARP_CSFLAGS = -define:ENABLE_NOTIFY_SHARP
|
||||
endif
|
||||
@@ -138,11 +139,11 @@
|
||||
|
||||
$(TARGET): $(CSFILES) Defines.cs
|
||||
$(CSC) -unsafe -out:$@ $(CSFLAGS) $(NOTIFY_SHARP_CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
|
||||
|
||||
tasquelibdir = $(libdir)/tasque
|
||||
-tasquelib_DATA = $(TARGET) $(TARGET).config $(TARGET).mdb
|
||||
+tasquelib_DATA = $(TARGET) $(TARGET).config $(TARGET_DEBUG_FILE)
|
||||
|
||||
bin_SCRIPTS = $(WRAPPER)
|
||||
|
||||
$(WRAPPER): $(srcdir)/$(WRAPPER).in Makefile
|
||||
sed -e "s|\@prefix\@|$(prefix)|g" \
|
||||
@@ -154,12 +155,10 @@
|
||||
-e "s|\@wrapper\@|$(WRAPPER)|g" \
|
||||
-e "s|\@srcdir\@|$(PWD)|g" \
|
||||
< $< > $@
|
||||
chmod +x $(WRAPPER)
|
||||
|
||||
-$(TARGET).mdb: $(TARGET)
|
||||
-
|
||||
$(TARGET).config: $(srcdir)/$(TARGET).config.in Makefile
|
||||
sed -e "s|\@pkglibdir\@|$(pkglibdir)|" \
|
||||
< $< > $@
|
||||
|
||||
Defines.cs: $(srcdir)/Defines.cs.in Makefile
|
||||
@@ -187,15 +186,15 @@
|
||||
pkgconfig_DATA = tasque.pc
|
||||
|
||||
CLEANFILES = \
|
||||
$(TARGET) \
|
||||
$(TARGET).config \
|
||||
- $(TARGET).mdb \
|
||||
+ $(TARGET_DEBUG_FILE) \
|
||||
$(WRAPPER) \
|
||||
Defines.cs
|
||||
|
||||
DISTCLEANFILES = \
|
||||
$(WRAPPER) \
|
||||
$(TARGET) \
|
||||
$(TARGET).config \
|
||||
- $(TARGET).mdb \
|
||||
+ $(TARGET_DEBUG_FILE) \
|
||||
Defines.cs
|
||||
@ -0,0 +1,244 @@
|
||||
diff --git a/src/Backends/Sqlite/SqliteBackend.cs b/src/Backends/Sqlite/SqliteBackend.cs
|
||||
index 4e7ec7a..417f6b2 100644
|
||||
--- a/src/Backends/Sqlite/SqliteBackend.cs
|
||||
+++ b/src/Backends/Sqlite/SqliteBackend.cs
|
||||
@@ -243,10 +243,10 @@ namespace Tasque.Backends.Sqlite
|
||||
bool hasValues = false;
|
||||
|
||||
string command = "SELECT id FROM Categories";
|
||||
- SqliteCommand cmd = db.Connection.CreateCommand();
|
||||
- cmd.CommandText = command;
|
||||
- SqliteDataReader dataReader = cmd.ExecuteReader();
|
||||
- while(dataReader.Read()) {
|
||||
+ SqliteCommand cmd = db.Connection.CreateCommand();
|
||||
+ cmd.CommandText = command;
|
||||
+ SqliteDataReader dataReader = cmd.ExecuteReader();
|
||||
+ while(dataReader.Read()) {
|
||||
int id = dataReader.GetInt32(0);
|
||||
hasValues = true;
|
||||
|
||||
@@ -255,10 +255,10 @@ namespace Tasque.Backends.Sqlite
|
||||
defaultCategory = newCategory;
|
||||
iter = categoryListStore.Append ();
|
||||
categoryListStore.SetValue (iter, 0, newCategory);
|
||||
- }
|
||||
-
|
||||
- dataReader.Close();
|
||||
- cmd.Dispose();
|
||||
+ }
|
||||
+
|
||||
+ dataReader.Close();
|
||||
+ cmd.Dispose();
|
||||
|
||||
if(!hasValues)
|
||||
{
|
||||
@@ -286,23 +286,32 @@ namespace Tasque.Backends.Sqlite
|
||||
Gtk.TreeIter iter;
|
||||
SqliteTask newTask;
|
||||
bool hasValues = false;
|
||||
-
|
||||
- string command = "SELECT id FROM Tasks";
|
||||
- SqliteCommand cmd = db.Connection.CreateCommand();
|
||||
- cmd.CommandText = command;
|
||||
- SqliteDataReader dataReader = cmd.ExecuteReader();
|
||||
- while(dataReader.Read()) {
|
||||
- int id = dataReader.GetInt32(0);
|
||||
+
|
||||
+ string command = "SELECT id,Category,Name,DueDate,CompletionDate,Priority, State FROM Tasks";
|
||||
+ SqliteCommand cmd = db.Connection.CreateCommand();
|
||||
+ cmd.CommandText = command;
|
||||
+ SqliteDataReader dataReader = cmd.ExecuteReader();
|
||||
+ while(dataReader.Read()) {
|
||||
+ int id = dataReader.GetInt32(0);
|
||||
+ int category = dataReader.GetInt32(1);
|
||||
+ string name = dataReader.GetString(2);
|
||||
+ int dueDate = dataReader.GetInt32(3);
|
||||
+ int completionDate = dataReader.GetInt32(4);
|
||||
+ int priority = dataReader.GetInt32(5);
|
||||
+ int state = dataReader.GetInt32(6);
|
||||
+
|
||||
hasValues = true;
|
||||
-
|
||||
- newTask = new SqliteTask(this, id);
|
||||
+
|
||||
+ newTask = new SqliteTask(this, id, category,
|
||||
+ name, dueDate, completionDate,
|
||||
+ priority, state);
|
||||
iter = taskStore.AppendNode();
|
||||
taskStore.SetValue (iter, 0, newTask);
|
||||
taskIters [newTask.SqliteId] = iter;
|
||||
- }
|
||||
+ }
|
||||
|
||||
- dataReader.Close();
|
||||
- cmd.Dispose();
|
||||
+ dataReader.Close();
|
||||
+ cmd.Dispose();
|
||||
|
||||
if(!hasValues)
|
||||
{
|
||||
diff --git a/src/Backends/Sqlite/SqliteTask.cs b/src/Backends/Sqlite/SqliteTask.cs
|
||||
index a9f5d42..9ede1b1 100644
|
||||
--- a/src/Backends/Sqlite/SqliteTask.cs
|
||||
+++ b/src/Backends/Sqlite/SqliteTask.cs
|
||||
@@ -12,22 +12,41 @@ namespace Tasque.Backends.Sqlite
|
||||
{
|
||||
private SqliteBackend backend;
|
||||
private int id;
|
||||
+ private int category;
|
||||
+ private string name;
|
||||
+ private long dueDate;
|
||||
+ private long completionDate;
|
||||
+ private int priority;
|
||||
+ private int state;
|
||||
|
||||
public SqliteTask(SqliteBackend backend, string name)
|
||||
{
|
||||
this.backend = backend;
|
||||
Logger.Debug("Creating New Task Object : {0} (id={1})", name, id);
|
||||
name = backend.SanitizeText (name);
|
||||
+ this.name = name;
|
||||
+ this.dueDate = Database.FromDateTime(DateTime.MinValue);
|
||||
+ this.completionDate = Database.FromDateTime(DateTime.MinValue);
|
||||
+ this.category = 0;
|
||||
+ this.priority = (int)(TaskPriority.None);
|
||||
+ this.state = (int)TaskState.Active;
|
||||
string command = String.Format("INSERT INTO Tasks (Name, DueDate, CompletionDate, Priority, State, Category, ExternalID) values ('{0}','{1}', '{2}','{3}', '{4}', '{5}', '{6}'); SELECT last_insert_rowid();",
|
||||
- name, Database.FromDateTime(DateTime.MinValue), Database.FromDateTime(DateTime.MinValue),
|
||||
- ((int)(TaskPriority.None)), ((int)TaskState.Active), 0, string.Empty );
|
||||
+ name, dueDate, completionDate,
|
||||
+ priority, state, category, string.Empty);
|
||||
this.id = Convert.ToInt32 (backend.Database.ExecuteScalar (command));
|
||||
}
|
||||
-
|
||||
- public SqliteTask (SqliteBackend backend, int id)
|
||||
+
|
||||
+ public SqliteTask (SqliteBackend backend, int id, int category, string name,
|
||||
+ long dueDate, long completionDate, int priority, int state)
|
||||
{
|
||||
this.backend = backend;
|
||||
this.id = id;
|
||||
+ this.category = category;
|
||||
+ this.name = name;
|
||||
+ this.dueDate = dueDate;
|
||||
+ this.completionDate = completionDate;
|
||||
+ this.priority = priority;
|
||||
+ this.state = state;
|
||||
}
|
||||
|
||||
#region Public Properties
|
||||
@@ -44,12 +63,10 @@ namespace Tasque.Backends.Sqlite
|
||||
|
||||
public override string Name
|
||||
{
|
||||
- get {
|
||||
- string command = String.Format("SELECT Name FROM Tasks where ID='{0}'", id);
|
||||
- return backend.Database.GetSingleString(command);
|
||||
- }
|
||||
+ get { return this.name; }
|
||||
set {
|
||||
string name = backend.SanitizeText (value);
|
||||
+ this.name = name;
|
||||
string command = String.Format("UPDATE Tasks set Name='{0}' where ID='{1}'", name, id);
|
||||
backend.Database.ExecuteScalar(command);
|
||||
backend.UpdateTask(this);
|
||||
@@ -58,12 +75,10 @@ namespace Tasque.Backends.Sqlite
|
||||
|
||||
public override DateTime DueDate
|
||||
{
|
||||
- get {
|
||||
- string command = String.Format("SELECT DueDate FROM Tasks where ID='{0}'", id);
|
||||
- return backend.Database.GetDateTime(command);
|
||||
- }
|
||||
+ get { return Database.ToDateTime(this.dueDate); }
|
||||
set {
|
||||
- string command = String.Format("UPDATE Tasks set DueDate='{0}' where ID='{1}'", Database.FromDateTime(value), id);
|
||||
+ this.dueDate = Database.FromDateTime(value);
|
||||
+ string command = String.Format("UPDATE Tasks set DueDate='{0}' where ID='{1}'", this.dueDate, id);
|
||||
backend.Database.ExecuteScalar(command);
|
||||
backend.UpdateTask(this);
|
||||
}
|
||||
@@ -72,14 +87,12 @@ namespace Tasque.Backends.Sqlite
|
||||
|
||||
public override DateTime CompletionDate
|
||||
{
|
||||
- get {
|
||||
- string command = String.Format("SELECT CompletionDate FROM Tasks where ID='{0}'", id);
|
||||
- return backend.Database.GetDateTime(command);
|
||||
- }
|
||||
+ get { return Database.ToDateTime(this.completionDate); }
|
||||
set {
|
||||
- string command = String.Format("UPDATE Tasks set CompletionDate='{0}' where ID='{1}'", Database.FromDateTime(value), id);
|
||||
+ this.completionDate = Database.FromDateTime(value);
|
||||
+ string command = String.Format("UPDATE Tasks set CompletionDate='{0}' where ID='{1}'", this.completionDate, id);
|
||||
backend.Database.ExecuteScalar(command);
|
||||
- backend.UpdateTask(this);
|
||||
+ backend.UpdateTask(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -96,14 +109,12 @@ namespace Tasque.Backends.Sqlite
|
||||
|
||||
public override TaskPriority Priority
|
||||
{
|
||||
- get {
|
||||
- string command = String.Format("SELECT Priority FROM Tasks where ID='{0}'", id);
|
||||
- return (TaskPriority)backend.Database.GetSingleInt(command);
|
||||
- }
|
||||
+ get { return (TaskPriority) this.priority; }
|
||||
set {
|
||||
- string command = String.Format("UPDATE Tasks set Priority='{0}' where ID='{1}'", ((int)value), id);
|
||||
+ this.priority = (int) value;
|
||||
+ string command = String.Format("UPDATE Tasks set Priority='{0}' where ID='{1}'", this.priority, id);
|
||||
backend.Database.ExecuteScalar(command);
|
||||
- backend.UpdateTask(this);
|
||||
+ backend.UpdateTask(this);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,27 +138,21 @@ namespace Tasque.Backends.Sqlite
|
||||
|
||||
public TaskState LocalState
|
||||
{
|
||||
- get {
|
||||
- string command = String.Format("SELECT State FROM Tasks where ID='{0}'", id);
|
||||
- return (TaskState)backend.Database.GetSingleInt(command);
|
||||
- }
|
||||
+ get { return (TaskState) this.state; }
|
||||
set {
|
||||
- string command = String.Format("UPDATE Tasks set State='{0}' where ID='{1}'", ((int)value), id);
|
||||
+ this.state = (int) value;
|
||||
+ string command = String.Format("UPDATE Tasks set State='{0}' where ID='{1}'", this.state, id);
|
||||
backend.Database.ExecuteScalar(command);
|
||||
- backend.UpdateTask(this);
|
||||
+ backend.UpdateTask(this);
|
||||
}
|
||||
}
|
||||
|
||||
public override ICategory Category
|
||||
{
|
||||
- get {
|
||||
- string command = String.Format("SELECT Category FROM Tasks where ID='{0}'", id);
|
||||
- int catID = backend.Database.GetSingleInt(command);
|
||||
- SqliteCategory sqCat = new SqliteCategory(backend, catID);
|
||||
- return sqCat;
|
||||
- }
|
||||
+ get { return new SqliteCategory(backend, this.category); }
|
||||
set {
|
||||
- string command = String.Format("UPDATE Tasks set Category='{0}' where ID='{1}'", ((int)(value as SqliteCategory).ID), id);
|
||||
+ this.category = (int)(value as SqliteCategory).ID;
|
||||
+ string command = String.Format("UPDATE Tasks set Category='{0}' where ID='{1}'", category, id);
|
||||
backend.Database.ExecuteScalar(command);
|
||||
backend.UpdateTask(this);
|
||||
}
|
||||
@@ -166,7 +171,7 @@ namespace Tasque.Backends.Sqlite
|
||||
int taskId = dataReader.GetInt32(0);
|
||||
string text = dataReader.GetString(1);
|
||||
notes.Add (new SqliteNote (taskId, text));
|
||||
- }
|
||||
+ }
|
||||
|
||||
return notes;
|
||||
}
|
||||
--
|
||||
cgit v0.9.0.2
|
||||
@ -1,2 +1,3 @@
|
||||
DIST kyotocabinet-1.2.74.tar.gz 930521 RMD160 143e8272927a703292d128ba149bf7692201b316 SHA1 345358259ec4e58b5986b5d6fa8f82dfe2816c37 SHA256 0ab711731584c3703920947f231b7b6455c3901ae66ce2548b2df9c08a305f23
|
||||
DIST kyotocabinet-1.2.75.tar.gz 949259 RMD160 b04a07cfa070727d91b8568b5ece46bb37c38981 SHA1 ab4d59ca575455328f2b63628cc33c70d666570c SHA256 66c2d8c2b3ba269b4c33114974226de114047121d67cc4f749307e210e89597b
|
||||
DIST kyotocabinet-1.2.76.tar.gz 951930 RMD160 3bc2feb6e01310764c422cc93d9a98ced1da2cfb SHA1 a4ec70d08ca6c8f510dbc329d5c27b55030d3521 SHA256 812a2d3f29c351db4c6f1ff29d94d7135f9e601d7cc1872ec1d7eed381d0d23c
|
||||
|
||||
@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/kyotocabinet/kyotocabinet-1.2.76.ebuild,v 1.1 2012/05/30 03:42:10 patrick Exp $
|
||||
|
||||
EAPI="2"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="A straightforward implementation of DBM"
|
||||
HOMEPAGE="http://fallabs.com/kyotocabinet/"
|
||||
SRC_URI="${HOMEPAGE}pkg/${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris"
|
||||
IUSE="debug doc examples static-libs"
|
||||
|
||||
DEPEND="sys-libs/zlib
|
||||
app-arch/xz-utils"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/fix_configure-1.2.62.patch"
|
||||
sed -ie "/ldconfig/d" Makefile.in
|
||||
sed -ie "/DOCDIR/d" Makefile.in
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
econf $(use_enable debug) \
|
||||
$(use_enable static-libs static) \
|
||||
$(use_enable !static-libs shared) \
|
||||
--enable-lzma --docdir=/usr/share/doc/${PF}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die "Install failed"
|
||||
use static-libs || find "${D}" \( -name '*.a' -or -name '*.la' \) -delete
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/${PF}/example
|
||||
doins example/* || die "Install failed"
|
||||
fi
|
||||
|
||||
if use doc; then
|
||||
insinto /usr/share/doc/${PF}
|
||||
doins -r doc/* || die "Install failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
emake -j1 check || die "Tests failed"
|
||||
}
|
||||
@ -1,4 +1,5 @@
|
||||
DIST gc-7.0.tar.gz 1072682 RMD160 4912e2590dd8212bebeeb1e32506762ca31d0088 SHA1 657d84b702a572f8a510d2c28578a6dbaad3fed2 SHA256 d20ac6e939b82770434b76e4f7dc18a4099d507eb4f42a5d3ad746250c011e5b
|
||||
DIST gc-7.1.tar.gz 1077714 RMD160 9338c1128686395739e3acd9052a651d1dffffb2 SHA1 e84cba5d18f4ea5ed4e5fd3f1dc6a46bc190ff6f SHA256 e3cef6028fe3efe7de3bcf4107c880eae50b3ee79841450d885467c09bcebf30
|
||||
DIST gc-7.2alpha4.tar.gz 1091329 RMD160 b076d1192ba3a309e9010ab3a40cc89dc3f24ef6 SHA1 dc816c997b831f04415b5dd48cfac8f505eb608a SHA256 0b40a7a5d129e3028a3b1a7f0c6b9ae1d01aca14fe179c44cf10f4c5438649f9
|
||||
DIST gc-7.2alpha6.tar.gz 1241386 RMD160 a634c94992b8cc1fb6ba3a9ae1c7a5e83deb9823 SHA1 190fe36d73bc00205a50d01d31664e525ca70389 SHA256 ebf425b254773d565e1690287641ed177716a78e952c96fec917edbc64535c16
|
||||
DIST gc6.8.tar.gz 756879 RMD160 6e894e7a51683a9342fd738baa6f1a2861e27400 SHA1 6d5def5ba5d29292ba9c76f04df3ec06d3ab3278 SHA256 448f8e4c6ee8c80eac059cf1c9379d20c388bcb900fc0796cd2a44d1dcbbae69
|
||||
|
||||
@ -0,0 +1,60 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/boehm-gc/boehm-gc-7.2_alpha6.ebuild,v 1.1 2012/05/29 19:17:13 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
AUTOTOOLS_AUTORECONF=yes
|
||||
|
||||
inherit autotools-utils
|
||||
|
||||
MY_P="gc-${PV/_/}"
|
||||
|
||||
DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
|
||||
HOMEPAGE="http://www.hpl.hp.com/personal/Hans_Boehm/gc/"
|
||||
SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/${MY_P}.tar.gz"
|
||||
|
||||
LICENSE="as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
|
||||
IUSE="cxx static-libs threads"
|
||||
|
||||
DEPEND="dev-libs/libatomic_ops"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
S="${WORKDIR}/${MY_P}"
|
||||
|
||||
DOCS=( README.QUICK doc/README{,.environment,.linux,.macros} doc/barrett_diagram )
|
||||
|
||||
src_prepare() {
|
||||
sed '/Cflags/s:$:/gc:g' -i bdw-gc.pc.in || die
|
||||
sed \
|
||||
-e '/gc_allocator.h/d' \
|
||||
-i Makefile.am || die
|
||||
rm -rf libatomic_ops || die
|
||||
autotools-utils_src_prepare
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
local myeconfargs=(
|
||||
--with-libatomic-ops=yes
|
||||
$(use_enable cxx cplusplus)
|
||||
$(use threads || echo --disable-threads)
|
||||
)
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-utils_src_install
|
||||
|
||||
rm -rf "${ED}"/usr/share/gc || die
|
||||
|
||||
# dist_noinst_HEADERS
|
||||
insinto /usr/include/gc
|
||||
doins include/{cord.h,ec.h,javaxfc.h}
|
||||
insinto /usr/include/gc/private
|
||||
doins include/private/*.h
|
||||
|
||||
dohtml doc/*.html
|
||||
newman doc/gc.man GC_malloc.1
|
||||
}
|
||||
@ -1,7 +1,7 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>matsuu@gentoo.org</email>
|
||||
</maintainer>
|
||||
<maintainer>
|
||||
<email>matsuu@gentoo.org</email>
|
||||
</maintainer>
|
||||
</pkgmetadata>
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
DIST gc-7.2alpha4.tar.gz 1091329 RMD160 b076d1192ba3a309e9010ab3a40cc89dc3f24ef6 SHA1 dc816c997b831f04415b5dd48cfac8f505eb608a SHA256 0b40a7a5d129e3028a3b1a7f0c6b9ae1d01aca14fe179c44cf10f4c5438649f9
|
||||
DIST gc-7.2alpha6.tar.gz 1241386 RMD160 a634c94992b8cc1fb6ba3a9ae1c7a5e83deb9823 SHA1 190fe36d73bc00205a50d01d31664e525ca70389 SHA256 ebf425b254773d565e1690287641ed177716a78e952c96fec917edbc64535c16
|
||||
DIST libatomic_ops-1.1.tar.gz 178581 RMD160 ccfa008ece3365390a05badcfd9580ffa96d0302 SHA1 4412ad70afbd5dd954378b94aa3e7e02ba89ecc3 SHA256 f5fb0d89b5b26a7f0bb00c92463aeb62a425c491391bc7e36660a1ac0b5a1f13
|
||||
DIST libatomic_ops-1.2.tar.gz 183780 RMD160 8c548b32033c954a61e740f9a0e76ca8f005c4f6 SHA1 8bf4134d614acb1a6234b3102e67a847ae9369b0 SHA256 a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781
|
||||
|
||||
@ -0,0 +1,46 @@
|
||||
Adopted from
|
||||
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=e3a384578f677c05d812d99c2c92aa13670bd06a
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Remove the `q' suffix on x86-64 atomic instructions.
|
||||
|
||||
We don't need the `q' suffix on x86_64 atomic instructions for AO_t,
|
||||
which is defined as "unsigned long". "unsigned long" is 32bit for x32
|
||||
and 64bit for x86-64. The register operand in x86-64 atomic instructions
|
||||
is sufficient to properly determine the register size.
|
||||
|
||||
Received this patch from H.J. Lu <hjl.tools@gmail.com>
|
||||
Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/02
|
||||
|
||||
diff --git a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
|
||||
index 0f68c1e..3bcde88 100644
|
||||
--- a/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
|
||||
+++ b/libatomic_ops/src/atomic_ops/sysdeps/gcc/x86_64.h
|
||||
@@ -47,7 +47,7 @@ AO_fetch_and_add_full (volatile AO_t *p, AO_t incr)
|
||||
{
|
||||
AO_t result;
|
||||
|
||||
- __asm__ __volatile__ ("lock; xaddq %0, %1" :
|
||||
+ __asm__ __volatile__ ("lock; xadd %0, %1" :
|
||||
"=r" (result), "=m" (*p) : "0" (incr), "m" (*p)
|
||||
: "memory");
|
||||
return result;
|
||||
@@ -93,7 +93,7 @@ AO_int_fetch_and_add_full (volatile unsigned int *p, unsigned int incr)
|
||||
AO_INLINE void
|
||||
AO_or_full (volatile AO_t *p, AO_t incr)
|
||||
{
|
||||
- __asm__ __volatile__ ("lock; orq %1, %0" :
|
||||
+ __asm__ __volatile__ ("lock; or %1, %0" :
|
||||
"=m" (*p) : "r" (incr), "m" (*p) : "memory");
|
||||
}
|
||||
#define AO_HAVE_or_full
|
||||
@@ -123,7 +123,7 @@ AO_compare_and_swap_full(volatile AO_t *addr, AO_t old, AO_t new_val)
|
||||
return (int)__sync_bool_compare_and_swap(addr, old, new_val);
|
||||
# else
|
||||
char result;
|
||||
- __asm__ __volatile__("lock; cmpxchgq %3, %0; setz %1"
|
||||
+ __asm__ __volatile__("lock; cmpxchg %3, %0; setz %1"
|
||||
: "=m" (*addr), "=a" (result)
|
||||
: "m" (*addr), "r" (new_val), "a" (old) : "memory");
|
||||
return (int) result;
|
||||
@ -0,0 +1,35 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libatomic_ops/libatomic_ops-7.2_alpha6.ebuild,v 1.1 2012/05/29 18:52:21 jlec Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
inherit eutils toolchain-funcs
|
||||
|
||||
DESCRIPTION="Implementation for atomic memory update operations"
|
||||
HOMEPAGE="http://www.hpl.hp.com/research/linux/atomic_ops/"
|
||||
SRC_URI="http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-${PV/_}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2 MIT as-is"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
S=${WORKDIR}/gc-${PV/_}/libatomic_ops
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-x32.patch
|
||||
sed -i \
|
||||
-e "/^pkgdatadir/s:/.*:/doc/${PF}:" \
|
||||
doc/Makefile.in || die
|
||||
find -type f -exec touch -r . {} +
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
emake AR="$(tc-getAR)"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
default
|
||||
find "${ED}" '(' -name COPYING -o -name LICENSING.txt ')' -delete
|
||||
}
|
||||
@ -0,0 +1,26 @@
|
||||
https://bugs.gentoo.org/418033
|
||||
|
||||
fix building when zlib is disabled but bzip2 is enabled
|
||||
|
||||
patch by Richard Grenville <pyxlcy@gmail.com>
|
||||
|
||||
--- a/pcregrep.c (revision 970)
|
||||
+++ b/pcregrep.c (working copy)
|
||||
@@ -1618,7 +1618,7 @@ gzFile ingz = NULL;
|
||||
BZFILE *inbz2 = NULL;
|
||||
#endif
|
||||
|
||||
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
|
||||
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
|
||||
int pathlen;
|
||||
#endif
|
||||
|
||||
@@ -1701,7 +1701,7 @@ skipping was not requested. The scan pro
|
||||
argument at top level, we don't show the file name, unless we are only showing
|
||||
the file name, or the filename was forced (-H). */
|
||||
|
||||
-#if defined SUPPORT_LIBZ || defined SUPPORT_LIBZ2
|
||||
+#if defined SUPPORT_LIBZ || defined SUPPORT_LIBBZ2
|
||||
pathlen = (int)(strlen(pathname));
|
||||
#endif
|
||||
|
||||
@ -0,0 +1 @@
|
||||
DIST starpu-1.0.1.tar.gz 3003333 RMD160 9c0da2a6b1571f0e4ef5f711198ae8738e1ab41f SHA1 944a7d60bbef8e0fa67cc33d8b59a64b29389ab7 SHA256 8cb78a4a2b2eec8ce55aca7917ab6db3fd34d0e5ba2f3eedb1dff8daf20d7165
|
||||
@ -0,0 +1,90 @@
|
||||
--- Makefile.am.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ Makefile.am 2012-05-30 00:57:47.000000000 +0100
|
||||
@@ -28,7 +28,9 @@
|
||||
SUBDIRS += socl
|
||||
endif
|
||||
|
||||
+if BUILD_EXAMPLES
|
||||
SUBDIRS += examples
|
||||
+endif
|
||||
|
||||
if BUILD_GCC_PLUGIN
|
||||
SUBDIRS += gcc-plugin
|
||||
--- gcc-plugin/Makefile.am.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ gcc-plugin/Makefile.am 2012-05-30 00:59:39.000000000 +0100
|
||||
@@ -13,7 +13,10 @@
|
||||
#
|
||||
# See the GNU Lesser General Public License in COPYING.LGPL for more details.
|
||||
|
||||
-SUBDIRS = src tests examples
|
||||
+SUBDIRS = src tests
|
||||
+if BUILD_EXAMPLES
|
||||
+SUBDIRS += examples
|
||||
+endif
|
||||
|
||||
EXTRA_DIST = COPYING README ChangeLog
|
||||
|
||||
--- configure.ac.orig 2012-05-29 23:30:19.000000000 +0100
|
||||
+++ configure.ac 2012-05-30 01:17:48.000000000 +0100
|
||||
@@ -1312,6 +1312,11 @@
|
||||
# #
|
||||
###############################################################################
|
||||
|
||||
+AC_ARG_ENABLE(build-examples, [AS_HELP_STRING([--enable-build-examples],
|
||||
+ [enable building of examples])],
|
||||
+ enable_build_examples=$enableval, enable_build_examples=no)
|
||||
+# check stuff for examples (todo)
|
||||
+AM_CONDITIONAL(BUILD_EXAMPLES, [test x$enable_build_examples != xno])
|
||||
AC_ARG_ENABLE(opengl-render, [AS_HELP_STRING([--enable-opengl-render],
|
||||
[enable OpenGL rendering of some examples])],
|
||||
enable_opengl_render=$enableval, enable_opengl_render=no)
|
||||
@@ -1434,6 +1439,11 @@
|
||||
if test x$use_system_blas = xyes; then
|
||||
AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use refblas library])
|
||||
blas_lib=system
|
||||
+ elif test x"$BLAS_LIBS" != x; then
|
||||
+ AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use user defined library])
|
||||
+ STARPU_BLAS_LDFLAGS="$BLAS_LIBS"
|
||||
+ AC_SUBST(STARPU_BLAS_LDFLAGS)
|
||||
+ blas_lib=system
|
||||
else
|
||||
blas_lib=none
|
||||
fi
|
||||
--- mpi/Makefile.a.origm 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ mpi/Makefile.am 2012-05-30 01:20:49.000000000 +0100
|
||||
@@ -94,7 +94,7 @@
|
||||
###################
|
||||
# Stencil example #
|
||||
###################
|
||||
-
|
||||
+if BUILD_EXAMPLES
|
||||
examplebin_PROGRAMS += \
|
||||
examples/stencil/stencil5
|
||||
|
||||
@@ -202,7 +202,7 @@
|
||||
|
||||
check_PROGRAMS += \
|
||||
examples/reduction/mpi_reduction
|
||||
-
|
||||
+endif
|
||||
########################
|
||||
# Unit testcases #
|
||||
########################
|
||||
--- starpufft/Makefile.am.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ starpufft/Makefile.am 2012-05-30 01:23:40.000000000 +0100
|
||||
@@ -67,10 +67,13 @@
|
||||
endif
|
||||
|
||||
examplebindir = $(libdir)/starpu/examples/starpufft
|
||||
-examplebin_PROGRAMS = \
|
||||
+
|
||||
+examplebin_PROGRAMS =
|
||||
+if BUILD_EXAMPLES
|
||||
+examplebin_PROGRAMS += \
|
||||
examples/testf \
|
||||
examples/test
|
||||
-
|
||||
+endif
|
||||
check_PROGRAMS = examples/testf
|
||||
examples_testf_LDADD = libstarpufft-@STARPU_EFFECTIVE_VERSION@.la $(top_builddir)/src/libstarpu-@STARPU_EFFECTIVE_VERSION@.la $(FFTWF_LIBS)
|
||||
|
||||
@ -0,0 +1,66 @@
|
||||
--- libstarpu.pc.in.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ libstarpu.pc.in 2012-05-30 01:09:41.000000000 +0100
|
||||
@@ -24,6 +24,6 @@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ -DSTARPU_USE_DEPRECATED_API
|
||||
Libs: -L${libdir} -lstarpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_LDFLAGS@ @STARPU_OPENCL_LDFLAGS@
|
||||
-Libs.private: @LDFLAGS@ @LIBS@
|
||||
+Libs.private: @LIBS@
|
||||
Requires: @HWLOC_REQUIRES@
|
||||
Requires.private: @GORDON_REQUIRES@
|
||||
--- mpi/libstarpumpi.pc.in.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ mpi/libstarpumpi.pc.in 2012-05-30 01:09:53.000000000 +0100
|
||||
@@ -24,6 +24,6 @@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ -DSTARPU_USE_DEPRECATED_API
|
||||
Libs: -L${libdir} -lstarpumpi-@STARPU_EFFECTIVE_VERSION@
|
||||
-Libs.private: @LDFLAGS@ @LIBS@
|
||||
+Libs.private: @LIBS@
|
||||
Requires: libstarpu
|
||||
Requires.private:
|
||||
--- mpi/starpumpi-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ mpi/starpumpi-1.0.pc.in 2012-05-30 01:10:11.000000000 +0100
|
||||
@@ -24,6 +24,6 @@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@
|
||||
Libs: -L${libdir} -lstarpumpi-@STARPU_EFFECTIVE_VERSION@
|
||||
-Libs.private: @LDFLAGS@ @LIBS@
|
||||
+Libs.private: @LIBS@
|
||||
Requires: starpu-1.0
|
||||
Requires.private:
|
||||
--- starpufft/starpufft-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ starpufft/starpufft-1.0.pc.in 2012-05-30 01:10:25.000000000 +0100
|
||||
@@ -24,4 +24,4 @@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
|
||||
Libs: -L${libdir} -lstarpufft-@STARPU_EFFECTIVE_VERSION@
|
||||
-Libs.private: @LDFLAGS@ @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
|
||||
+Libs.private: @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
|
||||
--- starpufft/libstarpufft.pc.in.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ starpufft/libstarpufft.pc.in 2012-05-30 01:10:43.000000000 +0100
|
||||
@@ -24,4 +24,4 @@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@ -DSTARPU_USE_DEPRECATED_API
|
||||
Libs: -L${libdir} -lstarpufft-@STARPU_EFFECTIVE_VERSION@
|
||||
-Libs.private: @LDFLAGS@ @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
|
||||
+Libs.private: @LIBS@ @STARPU_CUFFT_LDFLAGS@ @FFTW_LIBS@ @FFTWF_LIBS@
|
||||
--- starpu-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ starpu-1.0.pc.in 2012-05-30 01:11:06.000000000 +0100
|
||||
@@ -30,6 +30,6 @@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_CPPFLAGS@
|
||||
Libs: -L${libdir} -lstarpu-@STARPU_EFFECTIVE_VERSION@ @STARPU_CUDA_LDFLAGS@ @STARPU_OPENCL_LDFLAGS@
|
||||
-Libs.private: @LDFLAGS@ @LIBS@
|
||||
+Libs.private: @LIBS@
|
||||
Requires: @HWLOC_REQUIRES@
|
||||
Requires.private: @GORDON_REQUIRES@
|
||||
--- socl/socl-1.0.pc.in.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ socl/socl-1.0.pc.in 2012-05-30 01:11:19.000000000 +0100
|
||||
@@ -24,6 +24,6 @@
|
||||
Version: @PACKAGE_VERSION@
|
||||
Cflags: -I${includedir}/starpu/@STARPU_EFFECTIVE_VERSION@/socl
|
||||
Libs: -L${libdir} -lsocl-@STARPU_EFFECTIVE_VERSION@
|
||||
-Libs.private: @LDFLAGS@ @LIBS@
|
||||
+Libs.private: @LIBS@
|
||||
Requires: starpu-1.0
|
||||
Requires.private:
|
||||
@ -0,0 +1,11 @@
|
||||
--- configure.ac.orig 2012-05-29 23:16:20.000000000 +0100
|
||||
+++ configure.ac 2012-05-29 23:20:48.000000000 +0100
|
||||
@@ -773,8 +773,6 @@
|
||||
if test x$enable_debug = xyes; then
|
||||
CFLAGS="$CFLAGS -O0"
|
||||
AC_DEFINE(STARPU_SPINLOCK_CHECK, [1], [check spinlock use])
|
||||
-else
|
||||
- CFLAGS="$CFLAGS -O3"
|
||||
fi
|
||||
CFLAGS+=" -gdwarf-2 -g3 "
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
--- starpu-1.0.1/configure.ac.orig 2012-05-29 23:30:19.000000000 +0100
|
||||
+++ starpu-1.0.1/configure.ac 2012-05-30 00:02:22.000000000 +0100
|
||||
@@ -1434,6 +1434,11 @@
|
||||
if test x$use_system_blas = xyes; then
|
||||
AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use refblas library])
|
||||
blas_lib=system
|
||||
+ elif test x"$BLAS_LIBS" != x; then
|
||||
+ AC_DEFINE(STARPU_SYSTEM_BLAS, [1], [use user defined library])
|
||||
+ STARPU_BLAS_LDFLAGS="$BLAS_LIBS"
|
||||
+ AC_SUBST(STARPU_BLAS_LDFLAGS)
|
||||
+ blas_lib=system
|
||||
else
|
||||
blas_lib=none
|
||||
fi
|
||||
@ -0,0 +1,20 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer>
|
||||
<email>bicatali@gentoo.org</email>
|
||||
</maintainer>
|
||||
<longdescription lang='en'>
|
||||
StarPU is a runtime system that offers support for heterogeneous
|
||||
multicore machines. While many efforts are devoted to design efficient
|
||||
computation kernels for those architectures (e.g. to implement BLAS
|
||||
kernels on GPUs or on Cell's SPUs), StarPU not only takes care of
|
||||
offloading such kernels (and implementing data coherency across
|
||||
the machine), but it also makes sure the kernels are executed as
|
||||
efficiently as possible.
|
||||
</longdescription>
|
||||
<use>
|
||||
<flag name="cuda">Enable NVIDIA CUDA toolkit support</flag>
|
||||
<flag name="opencl">Enable OpenCL support</flag>
|
||||
</use>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.0.1.ebuild,v 1.1 2012/05/30 00:29:47 bicatali Exp $
|
||||
|
||||
EAPI=4
|
||||
|
||||
AUTOTOOLS_AUTORECONF=1
|
||||
inherit autotools-utils
|
||||
|
||||
PID=30852
|
||||
|
||||
DESCRIPTION="Unified runtime system for heterogeneous multicore architectures"
|
||||
HOMEPAGE="http://runtime.bordeaux.inria.fr/StarPU/"
|
||||
SRC_URI="https://gforge.inria.fr/frs/download.php/${PID}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
IUSE="blas cuda fftw mpi opencl qt4 static-libs"
|
||||
RDEPEND="sys-apps/hwloc
|
||||
sci-mathematics/glpk
|
||||
blas? ( virtual/blas )
|
||||
cuda? ( dev-util/nvidia-cuda-toolkit )
|
||||
fftw? ( sci-libs/fftw:3.0 )
|
||||
mpi? ( virtual/mpi )
|
||||
opencl? ( virtual/opencl )
|
||||
qt4? ( >=x11-libs/qt-gui-4.7
|
||||
>=x11-libs/qt-opengl-4.7
|
||||
>=x11-libs/qt-sql-4.7
|
||||
x11-libs/qwt )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-respect-cflags.patch
|
||||
"${FILESDIR}"/${P}-system-blas.patch
|
||||
"${FILESDIR}"/${P}-no-examples.patch
|
||||
"${FILESDIR}"/${P}-no-pc-ldflags.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
use blas && export BLAS_LIBS="$(pkg-config --libs blas)"
|
||||
myeconfargs+=(
|
||||
--disable-gcc-extensions
|
||||
$(use_enable cuda)
|
||||
$(use_enable fftw starpufft)
|
||||
$(use_enable opencl)
|
||||
$(use_enable qt4 starpu-top)
|
||||
$(use_with mpi mpicc "$(type -P mpicc)")
|
||||
)
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue