root
10 years ago
parent
4aa45e6f84
commit
86bba56331
@ -0,0 +1,21 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-arch/par2cmdline/par2cmdline-0.6.7.ebuild,v 1.1 2014/06/20 08:18:19 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit autotools
|
||||
|
||||
DESCRIPTION="A PAR-2.0 file verification and repair tool"
|
||||
HOMEPAGE="http://github.com/BlackIkeEagle/par2cmdline"
|
||||
SRC_URI="http://github.com/BlackIkeEagle/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE=""
|
||||
|
||||
DOCS="AUTHORS ChangeLog README" # NEWS is empty, PORTING and ROADMAP are for building
|
||||
|
||||
src_prepare() {
|
||||
eautoreconf
|
||||
}
|
||||
@ -0,0 +1,393 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-backup/bacula/bacula-7.0.4.ebuild,v 1.1 2014/06/21 10:01:19 tomjbe Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
inherit eutils multilib qt4-r2 systemd 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 ~ppc ~sparc ~x86"
|
||||
IUSE="acl bacula-clientonly bacula-nodir bacula-nosd examples ipv6 logwatch mysql postgres qt4 readline +sqlite3 ssl static tcpd vim-syntax X"
|
||||
|
||||
DEPEND="
|
||||
dev-libs/gmp
|
||||
!bacula-clientonly? (
|
||||
postgres? ( dev-db/postgresql-base[threads] )
|
||||
mysql? ( virtual/mysql )
|
||||
sqlite3? ( dev-db/sqlite:3 )
|
||||
!bacula-nodir? ( virtual/mta )
|
||||
)
|
||||
qt4? (
|
||||
dev-qt/qtsvg:4
|
||||
x11-libs/qwt:5
|
||||
)
|
||||
logwatch? ( sys-apps/logwatch )
|
||||
tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
|
||||
readline? ( >=sys-libs/readline-4.1 )
|
||||
static? (
|
||||
acl? ( virtual/acl[static-libs] )
|
||||
sys-libs/zlib[static-libs]
|
||||
dev-libs/lzo[static-libs]
|
||||
sys-libs/ncurses[static-libs]
|
||||
ssl? ( dev-libs/openssl[static-libs] )
|
||||
)
|
||||
!static? (
|
||||
acl? ( virtual/acl )
|
||||
sys-libs/zlib
|
||||
dev-libs/lzo
|
||||
sys-libs/ncurses
|
||||
ssl? ( dev-libs/openssl )
|
||||
)"
|
||||
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 )
|
||||
static? ( bacula-clientonly )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
#XOR and !bacula-clientonly controlled by REQUIRED_USE
|
||||
use mysql && export mydbtype="mysql"
|
||||
use postgres && export mydbtype="postgresql"
|
||||
use sqlite3 && export mydbtype="sqlite3"
|
||||
|
||||
# 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
|
||||
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 466688 drop deprecated categories from Desktop file
|
||||
sed -i -e 's/Application;//' scripts/bat.desktop.in || die
|
||||
|
||||
# bug 466690 Use CXXFLAGS instead of CFLAGS
|
||||
sed -i -e 's/@CFLAGS@/@CXXFLAGS@/' autoconf/Make.common.in || 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}"/7.0.2/${PN}-7.0.2-fix-static.patch
|
||||
|
||||
# do not strip binaries
|
||||
sed -i -e "s/strip /# strip /" src/filed/Makefile.in || die
|
||||
sed -i -e "s/strip /# strip /" src/console/Makefile.in || die
|
||||
|
||||
# fix file not found error during make depend
|
||||
epatch "${FILESDIR}"/7.0.2/${PN}-7.0.2-depend.patch
|
||||
|
||||
# Fix systemd unit files:
|
||||
# bug 497748
|
||||
sed -i -e '/Requires/d' platforms/systemd/*.service.in || die
|
||||
sed -i -e '/StandardOutput/d' platforms/systemd/*.service.in || die
|
||||
# bug 504370
|
||||
sed -i -e '/Alias=bacula-dir/d' platforms/systemd/bacula-dir.service.in || die
|
||||
}
|
||||
|
||||
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} \
|
||||
--with-${mydbtype} \
|
||||
--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} \
|
||||
$(use_with X x) \
|
||||
$(use_enable !readline conio) \
|
||||
$(use_enable readline) \
|
||||
$(use_with readline readline /usr) \
|
||||
$(use_with ssl openssl) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable acl) \
|
||||
$(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-logdir=/var/lib/bacula \
|
||||
--with-scriptdir=/usr/libexec/bacula \
|
||||
--with-systemd=$(systemd_get_unitdir) \
|
||||
--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 \
|
||||
--disable-afs \
|
||||
--host=${CHOST} \
|
||||
${myconf}
|
||||
# correct configuration for QT based bat
|
||||
if use qt4 ; then
|
||||
pushd src/qt-console
|
||||
eqmake4
|
||||
popd
|
||||
fi
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Make build log verbose (bug #447806)
|
||||
emake NO_ECHO=""
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install
|
||||
doicon 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
|
||||
doicon src/qt-console/images/bat_icon.png
|
||||
domenu 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
|
||||
|
||||
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 ReleaseNotes SUPPORT technotes
|
||||
|
||||
# install examples (bug #457504)
|
||||
if use examples; then
|
||||
docinto examples/
|
||||
dodoc -r examples/*
|
||||
fi
|
||||
|
||||
# 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"
|
||||
|
||||
# now set the 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
|
||||
|
||||
systemd_dounit "${S}"/platforms/systemd/bacula-{dir,fd,sd}.service
|
||||
systemd_dotmpfilesd "${S}"/platforms/systemd/bacula.conf
|
||||
|
||||
# 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
|
||||
|
||||
if use sqlite3; then
|
||||
einfo
|
||||
einfo "Be aware that Bacula does not officially support SQLite database anymore."
|
||||
einfo "Best use it only for a client-only installation. See Bug #445540."
|
||||
einfo
|
||||
fi
|
||||
|
||||
einfo "Please note that 'bconsole' will always be installed. To compile 'bat'"
|
||||
einfo "you have to enable 'USE=qt4'."
|
||||
einfo
|
||||
}
|
||||
@ -0,0 +1,55 @@
|
||||
Bug #513762
|
||||
|
||||
From 4b45a32ba7c4f7b447919de6ce28a14150584290 Mon Sep 17 00:00:00 2001
|
||||
From: Russ Allbery <rra@stanford.edu>
|
||||
Date: Wed, 21 Mar 2012 04:16:36 +0000
|
||||
Subject: [PATCH] Move redeclaration of sig_t after all system includes
|
||||
|
||||
Move some internal messing about with sig_t done by gssftp/ftp/ftp_var.h
|
||||
after the last system include to keep from stomping on system headers.
|
||||
Required for kFreeBSD and Hurd.
|
||||
|
||||
git-svn-id: svn://anonsvn.mit.edu/krb5-appl/trunk@3331 dc483132-0cff-0310-8789-dd5450dbe970
|
||||
---
|
||||
gssftp/ftp/ftp_var.h | 18 +++++++++---------
|
||||
1 file changed, 9 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/gssftp/ftp/ftp_var.h b/gssftp/ftp/ftp_var.h
|
||||
index 3efbdb1..e478961 100644
|
||||
--- a/gssftp/ftp/ftp_var.h
|
||||
+++ b/gssftp/ftp/ftp_var.h
|
||||
@@ -53,15 +53,6 @@ FILE* fdopen_socket(SOCKET s, char* mode);
|
||||
#define PERROR_SOCKET(str) perror(str)
|
||||
#endif
|
||||
|
||||
-#ifdef _WIN32
|
||||
-typedef void (*sig_t)(int);
|
||||
-typedef void sigtype;
|
||||
-#else
|
||||
-#define sig_t my_sig_t
|
||||
-#define sigtype krb5_sigtype
|
||||
-typedef sigtype (*sig_t)();
|
||||
-#endif
|
||||
-
|
||||
/*
|
||||
* FTP global variables.
|
||||
*/
|
||||
@@ -168,6 +159,15 @@ extern int macnum; /* number of defined macros */
|
||||
extern struct macel macros[16];
|
||||
extern char macbuf[4096];
|
||||
|
||||
+#ifdef _WIN32
|
||||
+typedef void (*sig_t)(int);
|
||||
+typedef void sigtype;
|
||||
+#else
|
||||
+#define sig_t my_sig_t
|
||||
+#define sigtype krb5_sigtype
|
||||
+typedef sigtype (*sig_t)();
|
||||
+#endif
|
||||
+
|
||||
#ifdef DEFINITIONS
|
||||
#undef extern
|
||||
#endif
|
||||
--
|
||||
1.9.3
|
||||
|
||||
@ -1,3 +1,2 @@
|
||||
DIST xmlto-0.0.24-mans.tar.bz2 4575 SHA256 1a5b78cf9b349023aaed17c2b39d94e123da58d9b682693013fb3bcdaac7735b SHA512 8a421306d769cafee59dabfa4298e14c15276ab762d0feece1817c732694dc632ef1811e05176115ac3cb25e9ed424ebea448d2d74fcc57761c19571c3257df6 WHIRLPOOL d111fd0f6b25771a6c8acaaa3a05236506f4d48d1a503db02978f733351cdb37ce43c84ca616c7ac14cbc6d2f668032a0de397971c621b607c0c8f6bf9569dad
|
||||
DIST xmlto-0.0.24.tar.bz2 111860 SHA256 30f59f4cc87a5e86f74fc1d2e63ceb6adc7a260d438e0439689efc2588976e13 SHA512 f503b30f7bda2bc8e5c3cf422503c2c73148b6a74959df2e01107509c8a6d30cbc3204e45b212ed7c459ac6a631e72559b950a0a7916ae89815d3c8fab5141bd WHIRLPOOL e68636b925ba9ff719631e002d046fa7393f152589e41ed5f14186d38b6ca203617e06d89d3c65d8b0ce04810f1653235a511997660ebd483174dd33673a504e
|
||||
DIST xmlto-0.0.25.tar.bz2 116496 SHA256 361cb70d5d0b4b753db00b67ed8bc1d53d0bc96c407d0310aefe854470b7e536 SHA512 53d99619f4c067dc72c0ccf32c85a4efa21d25666c4ed984c63a99ec2291c0264ea05ad79faa801feaddc599c7bcdb2fb851f0384a0989b527fb97ed4980ed48 WHIRLPOOL 6aef4048131c4c9a05ab433f52fbd3c20e14be31d65a5b76eebc13a26578c3d6a0b3f4c8f3604c16529de7d127fe05e91c2cdc77f597d9e6c9ca8b97e7498ba1
|
||||
DIST xmlto-0.0.26.tar.bz2 119819 SHA256 efb49b2fb3bc27c1a1e24fe34abf19b6bf6cbb40844e6fd58034cdf21c54b5ec SHA512 85110f22a7b5a5c8de4115ae5d0391645a223191b17455a4f9539b02f56f7003fd4ba70e48f0e5e46cdb91220a9027802e725f88ca8659e3ce1576f8609ccd18 WHIRLPOOL f7ded4ceb65adcfc7c06bfdb8a3d22ca7195c098b5bcf26b3884111f536b72efbf5e642eeeee8be17d4a33db3accc139d78178dba2fe5a98037712048c2410e4
|
||||
|
||||
@ -1,56 +0,0 @@
|
||||
From f2ada08ce5b92de1869419f1ed50aa1190a8bfb4 Mon Sep 17 00:00:00 2001
|
||||
From: Mike Frysinger <vapier@gentoo.org>
|
||||
Date: Fri, 19 Aug 2011 10:47:10 -0400
|
||||
Subject: [PATCH] fix building manpages in parallel
|
||||
|
||||
The current man page rules allow make to fire off two children (1 per
|
||||
man page), but each child will attempt to create all the required man
|
||||
pages. So it's possible for the children to collide on their outputs.
|
||||
Rewrite the rules so that each man page will fire off one child and
|
||||
only process its specific man page.
|
||||
|
||||
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
|
||||
---
|
||||
Makefile.am | 8 +++-----
|
||||
1 files changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -68,11 +68,9 @@ EXTRA_DIST = xmlto.spec \
|
||||
doc/xmlif.xml \
|
||||
xmlto.mak
|
||||
|
||||
-$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
|
||||
- for xml in xmlif.xml xmlto.xml; do \
|
||||
- FORMAT_DIR=$(top_srcdir)/format \
|
||||
- $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
|
||||
- done || ( RC=$$?; exit $$RC )
|
||||
+GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $<
|
||||
+man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE)
|
||||
+man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE)
|
||||
|
||||
TESTS_ENVIRONMENT = top_srcdir=$(top_srcdir) top_builddir=$(top_builddir)
|
||||
TESTS = xmlif/test/run-test
|
||||
|
||||
The Makefile.in patch is trivial, so avoid autotools just for this
|
||||
|
||||
--- a/Makefile.in
|
||||
+++ b/Makefile.in
|
||||
@@ -959,11 +959,9 @@
|
||||
uninstall-man uninstall-man1 uninstall-nobase_pkgdataDATA
|
||||
|
||||
|
||||
-$(man1_MANS): $(top_srcdir)/doc/xmlto.xml $(top_srcdir)/doc/xmlif.xml
|
||||
- for xml in xmlif.xml xmlto.xml; do \
|
||||
- FORMAT_DIR=$(top_srcdir)/format \
|
||||
- $(BASH) ./xmlto -o man/man1 man $(top_srcdir)/doc/$$xml ; \
|
||||
- done || ( RC=$$?; exit $$RC )
|
||||
+GEN_MANPAGE = FORMAT_DIR=$(top_srcdir)/format $(BASH) ./xmlto -o $(@D) man $<
|
||||
+man/man1/xmlto.1: doc/xmlto.xml ; $(GEN_MANPAGE)
|
||||
+man/man1/xmlif.1: doc/xmlif.xml ; $(GEN_MANPAGE)
|
||||
|
||||
tag:
|
||||
cvs tag -c `echo V@VERSION@ | tr . _`
|
||||
--
|
||||
1.7.6
|
||||
|
||||
@ -1,47 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.24-r1.ebuild,v 1.8 2014/01/18 11:51:22 vapier Exp $
|
||||
|
||||
EAPI="3"
|
||||
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
|
||||
HOMEPAGE="https://fedorahosted.org/xmlto/"
|
||||
SRC_URI="https://fedorahosted.org/releases/x/m/xmlto/${P}.tar.bz2
|
||||
mirror://gentoo/${P}-mans.tar.bz2
|
||||
http://dev.gentoo.org/~vapier/dist/${P}-mans.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
|
||||
IUSE="latex"
|
||||
|
||||
RDEPEND="app-shells/bash
|
||||
|| ( sys-apps/which sys-freebsd/freebsd-ubin )
|
||||
dev-libs/libxslt
|
||||
>=app-text/docbook-xsl-stylesheets-1.62.0-r1
|
||||
~app-text/docbook-xml-dtd-4.2
|
||||
|| ( sys-apps/util-linux app-misc/getopt )
|
||||
|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
|
||||
latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-devel/flex"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
|
||||
epatch "${FILESDIR}"/${PN}-0.0.24-parallelmake.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
export BASH
|
||||
has_version sys-apps/util-linux || export GETOPT="getopt-long"
|
||||
econf
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" install || die
|
||||
dodoc AUTHORS ChangeLog FAQ NEWS README THANKS
|
||||
insinto /usr/share/doc/${PF}/xml
|
||||
doins doc/*.xml
|
||||
}
|
||||
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-text/xmlto/xmlto-0.0.26.ebuild,v 1.1 2014/06/21 06:59:51 ssuominen Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils
|
||||
|
||||
DESCRIPTION="script for converting XML and DocBook formatted documents to a variety of output formats"
|
||||
HOMEPAGE="https://fedorahosted.org/xmlto/"
|
||||
SRC_URI="https://fedorahosted.org/releases/${PN:0:1}/${PN:1:1}/${PN}/${P}.tar.bz2"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris"
|
||||
IUSE="latex"
|
||||
|
||||
RDEPEND=">=app-text/docbook-xsl-stylesheets-1.62.0-r1
|
||||
app-text/docbook-xml-dtd:4.2
|
||||
app-shells/bash
|
||||
dev-libs/libxslt
|
||||
sys-apps/sed
|
||||
|| ( >=sys-apps/coreutils-6.10-r1 sys-freebsd/freebsd-ubin )
|
||||
|| ( sys-apps/util-linux app-misc/getopt )
|
||||
|| ( sys-apps/which sys-freebsd/freebsd-ubin )
|
||||
latex? ( >=app-text/passivetex-1.25 >=dev-tex/xmltex-1.9-r2 )"
|
||||
# We only depend on flex when we patch the imput lexer.
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS="AUTHORS ChangeLog FAQ NEWS README THANKS"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${PN}-0.0.22-format_fo_passivetex_check.patch
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
# We don't want the script to detect /bin/sh if it is bash.
|
||||
export ac_cv_path_BASH=/bin/bash
|
||||
has_version sys-apps/util-linux || export GETOPT=getopt-long
|
||||
econf
|
||||
}
|
||||
@ -1,165 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.1-r1.ebuild,v 1.2 2014/05/26 11:08:23 ultrabug Exp $
|
||||
|
||||
EAPI=5
|
||||
SCONS_MIN_VERSION="1.2.0"
|
||||
CHECKREQS_DISK_BUILD="2400M"
|
||||
CHECKREQS_DISK_USR="512M"
|
||||
CHECKREQS_MEMORY="1024M"
|
||||
|
||||
inherit eutils flag-o-matic multilib scons-utils systemd user versionator check-reqs
|
||||
|
||||
MY_P=${PN}-src-r${PV/_rc/-rc}
|
||||
|
||||
DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
|
||||
HOMEPAGE="http://www.mongodb.org"
|
||||
SRC_URI="http://downloads.mongodb.org/src/${MY_P}.tar.gz
|
||||
mms-agent? ( http://dev.gentoo.org/~ultrabug/20140409-mms-monitoring-agent.zip )"
|
||||
|
||||
LICENSE="AGPL-3 Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="kerberos mms-agent ssl static-libs"
|
||||
|
||||
PDEPEND="mms-agent? ( dev-python/pymongo app-arch/unzip )"
|
||||
RDEPEND="
|
||||
app-arch/snappy
|
||||
>=dev-cpp/yaml-cpp-0.5.1
|
||||
>=dev-libs/boost-1.50[threads(+)]
|
||||
>=dev-libs/libpcre-8.30[cxx]
|
||||
dev-libs/snowball-stemmer
|
||||
dev-util/google-perftools[-minimal]
|
||||
net-libs/libpcap
|
||||
ssl? ( >=dev-libs/openssl-1.0.1g )"
|
||||
DEPEND="${RDEPEND}
|
||||
sys-libs/ncurses
|
||||
sys-libs/readline
|
||||
kerberos? ( dev-libs/cyrus-sasl[kerberos] )"
|
||||
|
||||
S=${WORKDIR}/${MY_P}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup mongodb
|
||||
enewuser mongodb -1 -1 /var/lib/${PN} mongodb
|
||||
|
||||
scons_opts="--variant-dir=build --cc=$(tc-getCC) --cxx=$(tc-getCXX)"
|
||||
scons_opts+=" --use-system-boost"
|
||||
scons_opts+=" --use-system-pcre"
|
||||
scons_opts+=" --use-system-snappy"
|
||||
scons_opts+=" --use-system-stemmer"
|
||||
scons_opts+=" --use-system-tcmalloc"
|
||||
scons_opts+=" --use-system-yaml"
|
||||
scons_opts+=" --usev8"
|
||||
|
||||
if use prefix; then
|
||||
scons_opts+=" --cpppath=${EPREFIX}/usr/include"
|
||||
scons_opts+=" --libpath=${EPREFIX}/usr/$(get_libdir)"
|
||||
fi
|
||||
|
||||
if use kerberos; then
|
||||
scons_opts+=" --use-sasl-client"
|
||||
fi
|
||||
|
||||
if use ssl; then
|
||||
scons_opts+=" --ssl"
|
||||
fi
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}/${PN}-2.6.1-fix-scons.patch"
|
||||
epatch "${FILESDIR}/${PN}-2.4-fix-v8-pythonpath.patch"
|
||||
|
||||
# fix yaml-cpp detection
|
||||
sed -i -e "s/\[\"yaml\"\]/\[\"yaml-cpp\"\]/" SConstruct || die
|
||||
|
||||
# bug #462606
|
||||
sed -i -e "s@\$INSTALL_DIR/lib@\$INSTALL_DIR/$(get_libdir)@g" src/SConscript.client || die
|
||||
|
||||
# bug #482576
|
||||
sed -i -e "/-Werror/d" src/third_party/v8/SConscript || die
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
escons ${scons_opts} all
|
||||
}
|
||||
|
||||
src_install() {
|
||||
escons ${scons_opts} --full --nostrip install --prefix="${ED}"/usr
|
||||
|
||||
use static-libs || find "${ED}"/usr/ -type f -name "*.a" -delete
|
||||
|
||||
for x in /var/{lib,log}/${PN}; do
|
||||
keepdir "${x}"
|
||||
fowners mongodb:mongodb "${x}"
|
||||
done
|
||||
|
||||
doman debian/mongo*.1
|
||||
dodoc README docs/building.md
|
||||
|
||||
newinitd "${FILESDIR}/${PN}.initd-r2" ${PN}
|
||||
newconfd "${FILESDIR}/${PN}.confd-r2" ${PN}
|
||||
newinitd "${FILESDIR}/${PN/db/s}.initd-r2" ${PN/db/s}
|
||||
newconfd "${FILESDIR}/${PN/db/s}.confd-r2" ${PN/db/s}
|
||||
|
||||
insinto /etc
|
||||
newins "${FILESDIR}/${PN}.conf-r2" ${PN}.conf
|
||||
newins "${FILESDIR}/${PN/db/s}.conf-r2" ${PN/db/s}.conf
|
||||
|
||||
systemd_dounit "${FILESDIR}/${PN}.service"
|
||||
|
||||
insinto /etc/logrotate.d/
|
||||
newins "${FILESDIR}/${PN}.logrotate" ${PN}
|
||||
|
||||
if use mms-agent; then
|
||||
local MY_PN="mms-agent"
|
||||
local MY_D="/opt/${MY_PN}"
|
||||
|
||||
insinto /etc
|
||||
newins "${WORKDIR}/${MY_PN}/settings.py" mms-agent.conf
|
||||
rm "${WORKDIR}/${MY_PN}/settings.py"
|
||||
|
||||
insinto ${MY_D}
|
||||
doins "${WORKDIR}/${MY_PN}/"*
|
||||
dosym /etc/mms-agent.conf ${MY_D}/settings.py
|
||||
|
||||
fowners -R mongodb:mongodb ${MY_D}
|
||||
newinitd "${FILESDIR}/${MY_PN}.initd-r2" ${MY_PN}
|
||||
fi
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
# wrt bug #461466
|
||||
if [[ "$(get_libdir)" == "lib64" ]]; then
|
||||
rmdir "${ED}"/usr/lib/ &>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
src_test() {
|
||||
escons ${scons_opts} test
|
||||
"${S}"/test --dbpath=unittest || die
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
if [[ ${REPLACING_VERSIONS} < 2.6 ]]; then
|
||||
ewarn "!! IMPORTANT !!"
|
||||
ewarn " "
|
||||
ewarn "${PN} configuration files have changed !"
|
||||
ewarn " "
|
||||
ewarn "Make sure you migrate from /etc/conf.d/${PN} to the new YAML standard in /etc/${PN}.conf"
|
||||
ewarn " http://docs.mongodb.org/manual/reference/configuration-options/"
|
||||
ewarn " "
|
||||
ewarn "Make sure you also follow the upgrading process :"
|
||||
ewarn " http://docs.mongodb.org/master/release-notes/2.6-upgrade/"
|
||||
ewarn " "
|
||||
if use mms-agent; then
|
||||
ewarn "MMS Agent configuration file has been moved to :"
|
||||
ewarn " /etc/mms-agent.conf"
|
||||
fi
|
||||
else
|
||||
if use mms-agent; then
|
||||
elog "Edit your MMS Agent configuration file :"
|
||||
elog " /etc/mms-agent.conf"
|
||||
fi
|
||||
fi
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.2.ebuild,v 1.1 2014/06/17 07:46:55 ultrabug Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-db/mongodb/mongodb-2.6.3.ebuild,v 1.1 2014/06/20 16:44:09 ultrabug Exp $
|
||||
|
||||
EAPI=5
|
||||
SCONS_MIN_VERSION="1.2.0"
|
||||
@ -0,0 +1,151 @@
|
||||
diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
|
||||
index a0ba7e8..42834c1 100644
|
||||
--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
|
||||
+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPEntryChangeControl.java
|
||||
@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
|
||||
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
|
||||
numRead);
|
||||
|
||||
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
|
||||
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
|
||||
|
||||
- _changeTypes = enum.getValue();
|
||||
+ _changeTypes = enumx.getValue();
|
||||
|
||||
if (s.size() > 1) {
|
||||
if (s.elementAt(1) instanceof BEROctetString) {
|
||||
diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
|
||||
index c73bb68..5539f11 100644
|
||||
--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
|
||||
+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/controls/LDAPPersistSearchControl.java
|
||||
@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
|
||||
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
|
||||
numRead);
|
||||
|
||||
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
|
||||
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
|
||||
|
||||
- con.setChangeType(enum.getValue());
|
||||
+ con.setChangeType(enumx.getValue());
|
||||
|
||||
if (s.size() > 1) {
|
||||
if (s.elementAt(1) instanceof BEROctetString) {
|
||||
diff --git a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
|
||||
index e126d47..b5f6809 100644
|
||||
--- a/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
|
||||
+++ b/mozilla/directory/java-sdk/ietfldap/org/ietf/ldap/util/RDN.java
|
||||
@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
|
||||
* @see org.ietf.ldap.util.RDN#getAttributeSyntax
|
||||
*/
|
||||
public static String[] getAttributesForSyntax( String oid ) {
|
||||
- Enumeration enum = m_attributehash.keys();
|
||||
+ Enumeration enumx = m_attributehash.keys();
|
||||
Vector key_v = new Vector();
|
||||
String tmp_str = null;
|
||||
|
||||
- while ( enum.hasMoreElements() ) {
|
||||
- tmp_str = (String)enum.nextElement();
|
||||
+ while ( enumx.hasMoreElements() ) {
|
||||
+ tmp_str = (String)enumx.nextElement();
|
||||
if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
|
||||
key_v.addElement( tmp_str );
|
||||
}
|
||||
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
|
||||
index a4d9e88..85cc7af 100644
|
||||
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
|
||||
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/LDAPConnection.java
|
||||
@@ -4519,9 +4519,9 @@ public class LDAPConnection
|
||||
LDAPControl[] controls = null;
|
||||
|
||||
synchronized(m_responseControlTable) {
|
||||
- Enumeration enum = m_responseControlTable.keys();
|
||||
- while (enum.hasMoreElements()) {
|
||||
- Object client = enum.nextElement();
|
||||
+ Enumeration enumx = m_responseControlTable.keys();
|
||||
+ while (enumx.hasMoreElements()) {
|
||||
+ Object client = enumx.nextElement();
|
||||
ResponseControls rspCtrls = (ResponseControls)m_responseControlTable.get(client);
|
||||
|
||||
if (msgID == rspCtrls.msgID) {
|
||||
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
|
||||
index 8e486c5..9256aa0 100644
|
||||
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
|
||||
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPEntryChangeControl.java
|
||||
@@ -107,9 +107,9 @@ public class LDAPEntryChangeControl extends LDAPControl {
|
||||
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
|
||||
numRead);
|
||||
|
||||
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
|
||||
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
|
||||
|
||||
- m_changeTypes = enum.getValue();
|
||||
+ m_changeTypes = enumx.getValue();
|
||||
|
||||
if (s.size() > 1) {
|
||||
if (s.elementAt(1) instanceof BEROctetString) {
|
||||
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
|
||||
index 9bab06a..a5836e8 100644
|
||||
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
|
||||
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/controls/LDAPPersistSearchControl.java
|
||||
@@ -263,9 +263,9 @@ public class LDAPPersistSearchControl extends LDAPControl {
|
||||
BERSequence s = (BERSequence)BERElement.getElement(decoder, inStream,
|
||||
numRead);
|
||||
|
||||
- BEREnumerated enum = (BEREnumerated)s.elementAt(0);
|
||||
+ BEREnumerated enumx = (BEREnumerated)s.elementAt(0);
|
||||
|
||||
- con.setChangeType(enum.getValue());
|
||||
+ con.setChangeType(enumx.getValue());
|
||||
|
||||
if (s.size() > 1) {
|
||||
if (s.elementAt(1) instanceof BEROctetString) {
|
||||
diff --git a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
|
||||
index 57bce3a..392d7ea 100644
|
||||
--- a/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
|
||||
+++ b/mozilla/directory/java-sdk/ldapjdk/netscape/ldap/util/RDN.java
|
||||
@@ -402,12 +402,12 @@ public final class RDN implements java.io.Serializable {
|
||||
* @see netscape.ldap.util.RDN#getAttributeSyntax
|
||||
*/
|
||||
public static String[] getAttributesForSyntax( String oid ) {
|
||||
- Enumeration enum = m_attributehash.keys();
|
||||
+ Enumeration enumx = m_attributehash.keys();
|
||||
Vector key_v = new Vector();
|
||||
String tmp_str = null;
|
||||
|
||||
- while ( enum.hasMoreElements() ) {
|
||||
- tmp_str = (String)enum.nextElement();
|
||||
+ while ( enumx.hasMoreElements() ) {
|
||||
+ tmp_str = (String)enumx.nextElement();
|
||||
if ( oid.equals( (String)m_attributehash.get( tmp_str ) ) ) {
|
||||
key_v.addElement( tmp_str );
|
||||
}
|
||||
diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
|
||||
index 4bcb46d..7b22371 100644
|
||||
--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
|
||||
+++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/AttributesImpl.java
|
||||
@@ -151,8 +151,8 @@ class AttributesImpl implements Attributes {
|
||||
*/
|
||||
static LDAPAttributeSet jndiAttrsToLdapAttrSet(Attributes jndiAttrs) throws NamingException{
|
||||
LDAPAttributeSet attrs = new LDAPAttributeSet();
|
||||
- for (Enumeration enum = jndiAttrs.getAll(); enum.hasMoreElements();) {
|
||||
- attrs.add(jndiAttrToLdapAttr((Attribute) enum.nextElement()));
|
||||
+ for (Enumeration enumx = jndiAttrs.getAll(); enumx.hasMoreElements();) {
|
||||
+ attrs.add(jndiAttrToLdapAttr((Attribute) enumx.nextElement()));
|
||||
}
|
||||
return attrs;
|
||||
}
|
||||
diff --git a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
|
||||
index 2595b8a..d9bd103 100644
|
||||
--- a/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
|
||||
+++ b/mozilla/directory/java-sdk/ldapsp/com/netscape/jndi/ldap/ObjectMapper.java
|
||||
@@ -465,8 +465,8 @@ public class ObjectMapper {
|
||||
*/
|
||||
static Attributes encodeDirCtxObj(DirContext obj, Attributes attrs) throws NamingException{
|
||||
Attributes ctxAttrs = obj.getAttributes("");
|
||||
- for (NamingEnumeration enum = ctxAttrs.getAll(); enum.hasMore();) {
|
||||
- attrs.put((Attribute)enum.next());
|
||||
+ for (NamingEnumeration enumx = ctxAttrs.getAll(); enumx.hasMore();) {
|
||||
+ attrs.put((Attribute)enumx.next());
|
||||
}
|
||||
return attrs;
|
||||
}
|
||||
@ -0,0 +1,56 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/ldapsdk/ldapsdk-4.1.7-r4.ebuild,v 1.1 2014/06/21 06:58:30 ercpe Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="Netscape Directory SDK for Java"
|
||||
HOMEPAGE="http://www.mozilla.org/directory/javasdk.html"
|
||||
SRC_URI="http://www.mozilla.org/directory/${PN}_java_20020819.tar.gz"
|
||||
|
||||
LICENSE="MPL-1.1"
|
||||
SLOT="4.1"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND=">=virtual/jre-1.4
|
||||
dev-java/jss:3.4
|
||||
dev-java/jakarta-oro:2.0"
|
||||
DEPEND=">=virtual/jdk-1.4
|
||||
${RDEPEND}"
|
||||
|
||||
S=${WORKDIR}/mozilla/directory/java-sdk
|
||||
|
||||
java_prepare() {
|
||||
cd "${WORKDIR}"/mozilla || die
|
||||
epatch "${FILESDIR}"/ldapsdk-gentoo.patch
|
||||
epatch "${FILESDIR}"/${PV}-*.patch
|
||||
|
||||
echo "ororegexp.jar=$(java-pkg_getjars jakarta-oro-2.0)" > "${S}"/build.properties || die
|
||||
echo "jss.jar=$(java-pkg_getjars jss-3.4)" >> "${S}"/build.properties || die
|
||||
|
||||
cd "${S}"/ldapjdk/lib || die
|
||||
rm -f *.jar || die
|
||||
java-pkg_jar-from jss-3.4
|
||||
|
||||
cd "${S}"/ldapsp/lib || die
|
||||
rm *.jar || die
|
||||
|
||||
java-pkg_filter-compiler jikes
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
eant dist-jdk dist-filter dist-beans dist-jndi $(use_doc build-docs)
|
||||
}
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar dist/packages/*.jar
|
||||
|
||||
use doc && java-pkg_dojavadoc dist/doc/ldapsp
|
||||
use source && \
|
||||
java-pkg_dosrc {ldapsp,ldapjdk}/com {ldapjdk,ldapbeans,ldapfilter}/netscape
|
||||
}
|
||||
@ -0,0 +1,15 @@
|
||||
diff --git a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
|
||||
index b2f0e5e..bca566f 100644
|
||||
--- a/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
|
||||
+++ b/relaxngcc-20031218/src/relaxngcc/javabody/JavaBodyParser.java
|
||||
@@ -6850,8 +6850,8 @@ public class JavaBodyParser implements JavaBodyParserConstants {
|
||||
jj_expentry[i] = jj_lasttokens[i];
|
||||
}
|
||||
boolean exists = false;
|
||||
- for (java.util.Enumeration enum = jj_expentries.elements(); enum.hasMoreElements();) {
|
||||
- int[] oldentry = (int[])(enum.nextElement());
|
||||
+ for (java.util.Enumeration enumx = jj_expentries.elements(); enumx.hasMoreElements();) {
|
||||
+ int[] oldentry = (int[])(enumx.nextElement());
|
||||
if (oldentry.length == jj_expentry.length) {
|
||||
exists = true;
|
||||
for (int i = 0; i < jj_expentry.length; i++) {
|
||||
@ -0,0 +1,64 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/relaxngcc/relaxngcc-1.12-r2.ebuild,v 1.1 2014/06/21 06:51:25 ercpe Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
JAVA_PKG_IUSE="doc examples source"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
MY_DATE="20031218"
|
||||
|
||||
DESCRIPTION="RELAX NG Compiler Compiler"
|
||||
HOMEPAGE="http://relaxngcc.sourceforge.net/"
|
||||
SRC_URI="mirror://sourceforge/${PN}/${PN}-${MY_DATE}.zip"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
|
||||
IUSE=""
|
||||
|
||||
RDEPEND=">=virtual/jre-1.4
|
||||
dev-java/relaxng-datatype:0
|
||||
dev-java/msv:0
|
||||
dev-java/ant-core:0
|
||||
dev-java/xsdlib:0"
|
||||
DEPEND=">=virtual/jdk-1.4
|
||||
app-arch/unzip
|
||||
${RDEPEND}"
|
||||
|
||||
S="${WORKDIR}/${PN}-${MY_DATE}"
|
||||
|
||||
java_prepare() {
|
||||
mv relaxngcc.jar relaxngcc.orig.zip || die
|
||||
|
||||
rm -v *.jar || die
|
||||
rm -v sample/*/*.class || die
|
||||
|
||||
mkdir lib || die
|
||||
cd lib || die
|
||||
java-pkg_jarfrom relaxng-datatype
|
||||
java-pkg_jarfrom msv
|
||||
java-pkg_jarfrom xsdlib
|
||||
java-pkg_jarfrom ant-core
|
||||
cd "${S}" || die
|
||||
|
||||
cp "${FILESDIR}/build.xml-1.12-r1" build.xml || die "cp failed"
|
||||
epatch "${FILESDIR}"/${PV}-*.patch
|
||||
rm -rf "src/relaxngcc/maven"
|
||||
java-pkg_filter-compiler jikes
|
||||
}
|
||||
|
||||
EANT_DOC_TARGET=""
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar relaxngcc.jar
|
||||
|
||||
use source && java-pkg_dosrc src/*
|
||||
use examples && java-pkg_doexamples sample
|
||||
|
||||
dodoc readme.txt
|
||||
use doc && dohtml -r doc/en/*
|
||||
|
||||
}
|
||||
@ -0,0 +1,30 @@
|
||||
diff --git a/com/jclark/xml/sax/Driver.java b/com/jclark/xml/sax/Driver.java
|
||||
index 2b0d90a..d1efd3e 100644
|
||||
--- a/com/jclark/xml/sax/Driver.java
|
||||
+++ b/com/jclark/xml/sax/Driver.java
|
||||
@@ -160,9 +160,9 @@ public class Driver extends ApplicationImpl
|
||||
|
||||
DTD dtd = event.getDTD();
|
||||
|
||||
- for (Enumeration enum = dtd.entityNames(DTD.NOTATION);
|
||||
- enum.hasMoreElements(); ) {
|
||||
- String name = (String)enum.nextElement();
|
||||
+ for (Enumeration enumx = dtd.entityNames(DTD.NOTATION);
|
||||
+ enumx.hasMoreElements(); ) {
|
||||
+ String name = (String)enumx.nextElement();
|
||||
Entity entity = dtd.getEntity(DTD.NOTATION, name);
|
||||
String systemId = entity.getSystemId();
|
||||
if (systemId != null) {
|
||||
@@ -173,9 +173,9 @@ public class Driver extends ApplicationImpl
|
||||
}
|
||||
dtdHandler.notationDecl(name, entity.getPublicId(), systemId);
|
||||
}
|
||||
- for (Enumeration enum = dtd.entityNames(DTD.GENERAL_ENTITY);
|
||||
- enum.hasMoreElements();) {
|
||||
- String name = (String)enum.nextElement();
|
||||
+ for (Enumeration enumx = dtd.entityNames(DTD.GENERAL_ENTITY);
|
||||
+ enumx.hasMoreElements();) {
|
||||
+ String name = (String)enumx.nextElement();
|
||||
Entity entity = dtd.getEntity(DTD.GENERAL_ENTITY, name);
|
||||
String notationName = entity.getNotationName();
|
||||
if (notationName != null) {
|
||||
@ -0,0 +1,41 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-java/xp/xp-0.5-r2.ebuild,v 1.1 2014/06/21 07:04:40 ercpe Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
JAVA_PKG_IUSE="doc source"
|
||||
|
||||
inherit java-pkg-2 java-ant-2
|
||||
|
||||
DESCRIPTION="XP is an XML 1.0 parser written in Java"
|
||||
HOMEPAGE="http://www.jclark.com/xml/xp"
|
||||
SRC_URI="ftp://ftp.jclark.com/pub/xml/xp.zip"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~ppc ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=virtual/jdk-1.4
|
||||
app-arch/unzip"
|
||||
RDEPEND=">=virtual/jre-1.4"
|
||||
|
||||
S="${WORKDIR}"
|
||||
|
||||
java_prepare() {
|
||||
rm -v xp.jar || die
|
||||
cp "${FILESDIR}/build.xml" . || die
|
||||
epatch "${FILESDIR}"/${PV}-*.patch
|
||||
}
|
||||
|
||||
#premade javadocs
|
||||
EANT_DOC_TARGET=""
|
||||
|
||||
src_install() {
|
||||
java-pkg_dojar xp.jar
|
||||
dodoc docs/copying.txt
|
||||
#has index.html and javadocs here
|
||||
use doc && java-pkg_dohtml -r docs/*
|
||||
use source && java-pkg_dosrc com
|
||||
}
|
||||
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-lang/elixir/elixir-0.14.1.ebuild,v 1.1 2014/06/20 17:27:58 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit multilib
|
||||
|
||||
DESCRIPTION="Elixir programming language"
|
||||
HOMEPAGE="http://elixir-lang.org"
|
||||
SRC_URI="https://github.com/elixir-lang/elixir/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 ErlPL-1.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
DEPEND=">=dev-lang/erlang-17"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
src_compile() {
|
||||
emake Q=""
|
||||
}
|
||||
|
||||
src_install() {
|
||||
emake DESTDIR="${D}" LIBDIR="$(get_libdir)" PREFIX="/usr" install
|
||||
dodoc README.md CHANGELOG.md CONTRIBUTING.md
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Sun Mar 23 13:45:39 UTC 2014
|
||||
Subject: fix RWX sections
|
||||
|
||||
--- a/sdk/angelscript/source/as_callfunc_arm_gcc.S
|
||||
+++ b/sdk/angelscript/source/as_callfunc_arm_gcc.S
|
||||
@@ -696,3 +696,6 @@
|
||||
|
||||
#endif /* arm */
|
||||
|
||||
+#if defined(__linux__) && defined(__ELF__)
|
||||
+.section .note.GNU-stack,"",%progbits
|
||||
+#endif
|
||||
@ -1,39 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgit2/libgit2-0.19.0.ebuild,v 1.1 2013/06/25 18:19:57 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit cmake-utils multilib
|
||||
|
||||
DESCRIPTION="A linkable library for Git"
|
||||
HOMEPAGE="http://libgit2.github.com/"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-2-with-linking-exception"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~ppc-macos"
|
||||
IUSE="examples test"
|
||||
|
||||
RDEPEND="sys-libs/zlib"
|
||||
DEPEND="${RDEPEND}"
|
||||
|
||||
DOCS=( README.md )
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DLIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)"
|
||||
$(cmake-utils_use_build test CLAR)
|
||||
)
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cmake-utils_src_install
|
||||
|
||||
if use examples ; then
|
||||
find examples -name .gitignore -delete
|
||||
dodoc -r examples
|
||||
docompress -x /usr/share/doc/${PF}/examples
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1,2 @@
|
||||
DIST starpu-1.0.5.tar.gz 2785368 SHA256 aeb5b52dfef00f9f215981230ecf914ec2751a3981995507625be7d74720f223 SHA512 680c57d2e9b6b7aec8c3aad8f6685613fb55fcef75991cc23dac1331d369b1b8f25c1f644d3c8cc3fecd6ec2d32a15584ee35bd035c42d00d939a2c4c4e9dd42 WHIRLPOOL 628f9d128853bf838bbb02c1d85e67983cdc4caf306dfa0e8495babcadb3e4585e04c1d926236c39a869a4155cc8c67ab4cf5fb0d90db1b758c0efd5295af393
|
||||
DIST starpu-1.1.0.tar.gz 3910718 SHA256 3bef1d19ff16754f2e5671622a4963604b626d9f0893a4a8c4758b549d51b235 SHA512 80b2fa383eb960bcfa8bfb1107ce1a26f5ce97158463402ecbac42b8a974c02a46affd361cd274287fda7dba523fc6ae40e0290577e976c6e7c6e512d02d22d4 WHIRLPOOL 66b3f69869025a5198a0679601debd2df077da3e18e2c8abe5e6e3af10ca058efb39be1a37b8631540db9fe4851fd8c1af1773290297fa12d429c0bd6b34b964
|
||||
DIST starpu-1.1.1.tar.gz 4738623 SHA256 0a8031efdaca6387d4173527d6ff011e6bdd0ff85d0c06b487d4b10d6aba21fa SHA512 b2cb6824fca1f8a684f18c8c3ef37f51146763109209f5717160942c0940c5d0519926d4cba7beb41643faf585579fa7232b1863e477ab8e2052a319ccc7e3d6 WHIRLPOOL cf616ba05c7a2a0109ef81b1e91dd97e711e4fe407121f9667043431401f7f683621f274c80c7480dd8254d3cb5c5896da2838282d6b1da4e4784dcf18bad045
|
||||
DIST starpu-1.1.2.tar.gz 4704168 SHA256 971e324a936ab5a572202d3356a1e783e6fcca8d068ab2814209f737fcf03dfa SHA512 8601fe1564e86f731211993d2aa851898e20b4ce110943dd5037824b2d538aca5cd2fe8bc868805c1e48c20d47e15bc1db8c22be60113d2aabf191882a7039f8 WHIRLPOOL fc572857269339b68120286b829f259f565ef19947ac017dd61e3d3b663f555dc918139f5a3a88f2a17be6df088a05ae9261d08dbf6f966948a3663dc33667c0
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
Allow detection of qt, and disable when qt is present but user does not want it
|
||||
|
||||
bicatali@gentoo.org
|
||||
--- configure.ac.orig 2012-05-31 19:31:03.000000000 +0100
|
||||
+++ configure.ac 2012-05-31 19:50:42.000000000 +0100
|
||||
@@ -1085,13 +1085,13 @@
|
||||
AC_ARG_ENABLE([starpu-top],
|
||||
[AS_HELP_STRING([--disable-starpu-top],
|
||||
[build StarPU-Top])],
|
||||
- [enable_starpu_top="no"],
|
||||
+ [enable_starpu_top="$enableval"],
|
||||
[enable_starpu_top="maybe"])
|
||||
|
||||
# Check whether StarPU-Top can be built
|
||||
AC_MSG_CHECKING(for StarPU-Top)
|
||||
|
||||
-if test "x$enable_starpu_top" = "xmaybe" ; then
|
||||
+if test "x$enable_starpu_top" != "xno" ; then
|
||||
can_build_starpu_top=no
|
||||
AC_PATH_PROGS([QMAKE], [qmake-qt4 qmake], [not-found])
|
||||
if test x$QMAKE != xnot-found; then
|
||||
@@ -1133,7 +1133,7 @@
|
||||
fi
|
||||
fi
|
||||
|
||||
-if test "x$enable_starpu_top" = "xmaybe" ; then
|
||||
+if test "x$enable_starpu_top" != "xno" ; then
|
||||
build_starpu_top=$can_build_starpu_top
|
||||
else
|
||||
build_starpu_top=no
|
||||
@ -1,94 +0,0 @@
|
||||
Do not build examples if user did not ask for it
|
||||
|
||||
bicatali@gentoo.org
|
||||
|
||||
--- 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)
|
||||
|
||||
@ -1,69 +0,0 @@
|
||||
Do not add LDFLAGS to pkg-config flags, let user use its own
|
||||
|
||||
bicatali@gentoo.org
|
||||
--- 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:
|
||||
@ -1,15 +0,0 @@
|
||||
Do not force optimization flags on user
|
||||
|
||||
bicatali@gentoo.org
|
||||
|
||||
--- 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 "
|
||||
|
||||
@ -1,19 +0,0 @@
|
||||
Allow user to set BLAS_LIBS for own blas libraries and mimic standard AX_BLAS
|
||||
autoconf macro behaviour.
|
||||
|
||||
bicatali@gentoo.org
|
||||
|
||||
--- 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
|
||||
@ -1,68 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-libs/starpu/starpu-1.0.5.ebuild,v 1.2 2013/03/02 20:04:56 hwoarang Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
AUTOTOOLS_AUTORECONF=1
|
||||
inherit autotools-utils toolchain-funcs
|
||||
|
||||
PID=32086
|
||||
|
||||
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 ~amd64-linux ~x86-linux"
|
||||
|
||||
IUSE="blas cuda debug doc examples fftw gcc-plugin mpi opencl qt4 static-libs test"
|
||||
|
||||
RDEPEND="
|
||||
sys-apps/hwloc
|
||||
sci-mathematics/glpk
|
||||
blas? ( virtual/blas )
|
||||
cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
|
||||
fftw? ( sci-libs/fftw:3.0 )
|
||||
mpi? ( virtual/mpi )
|
||||
opencl? ( virtual/opencl )
|
||||
qt4? ( >=dev-qt/qtgui-4.7:4
|
||||
>=dev-qt/qtopengl-4.7:4
|
||||
>=dev-qt/qtsql-4.7:4
|
||||
x11-libs/qwt )"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
virtual/pkgconfig
|
||||
test? ( gcc-plugin? ( dev-scheme/guile ) )"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-1.0.1-respect-cflags.patch
|
||||
"${FILESDIR}"/${PN}-1.0.1-system-blas.patch
|
||||
"${FILESDIR}"/${PN}-1.0.1-no-pc-ldflags.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
use blas && export BLAS_LIBS="$($(tc-getPKG_CONFIG) --libs blas)"
|
||||
local myeconfargs=(
|
||||
$(use_enable cuda)
|
||||
$(use_enable debug)
|
||||
$(use_enable examples build-examples)
|
||||
$(use_enable fftw starpufft)
|
||||
$(use_enable gcc-plugin gcc-extensions)
|
||||
$(use_enable opencl)
|
||||
$(use_enable qt4 starpu-top)
|
||||
$(use_with mpi mpicc "$(type -P mpicc)")
|
||||
$(use mpi && use_enable test mpi-check)
|
||||
)
|
||||
autotools-utils_src_configure
|
||||
}
|
||||
|
||||
src_install() {
|
||||
autotools-utils_src_install
|
||||
use doc && dodoc doc/*.pdf
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins -r examples/*
|
||||
fi
|
||||
}
|
||||
@ -1,3 +1 @@
|
||||
DIST pygeocoder-1.1.4.tar.gz 8005 SHA256 f85f91a392e8344d9e68debdea14d197b2a7261b7211c4dd2e9674214b5df052 SHA512 b621d768091ca79f3a8fb73006989a5c0947e2c8b9900336585178cb03c73ea15867219b30102dae8bfb197cf7514de304903a5bbe1cc1f3aa5ea6f1efa4ab57 WHIRLPOOL e46dec5871fa6ad6f3107f190afc6eb4b255d33f168d8c1b2c632ac8615c3907d5ed44cf6a1ff2af03001bdf541056b6625695c6d6eb8255c8c9c0f87cc33bc7
|
||||
DIST pygeocoder-1.2.1.tar.gz 7571 SHA256 c8ee501d561163a19cd8138efd25d848a65d7c2e57df7e9e733bdf640e75fa8e SHA512 7134e171fdf12a5bf3504dc951b295fdaf11126dcb574d5325c9035d61e7a0cbc8cd9acccc7bf93529bb2a92be846be546858d69087d71575ffbb477bfbbe0bf WHIRLPOOL 66a40c86ad83493cda80e5aac7e8a13d93e5a2ceba335a453914804455fc66e845cf612924b886fcdd634751db58ad61db22988f9eb4e1aff06a9bb4a96c832c
|
||||
DIST pygeocoder-1.2.4.tar.gz 8078 SHA256 d3d2b65123135e000fd2999de7ca74839c64cf298e721cbcd67ab42e1435826a SHA512 9faa40b83590ebf642eb0e7cc76edb99ca7c3db91b180a4f1257308fb870edb3e21a9733b38cb8b1dcb3451710e8f42914ec5a7e65443471dc18f1ef1b860908 WHIRLPOOL a832d3ef83a094d45f45ddd39584fad54a87c7efd70a1b108c34ed1744f78aa9996e9008b6b2ca32fb8d573b672456479789f2423edeb7bd93fc1d8252e7380a
|
||||
DIST pygeocoder-1.2.5.tar.gz 8105 SHA256 c1b8353ec8877cedd070d58cb597c4a94b70df00dc0c482d43aa9a21c90bbba0 SHA512 eb395d2f334f5a1de9ed8abb6298d16b49ab7c29cc421daecc816737e89fd7c6f205024a553f2b0d559401df8f26729c042604fbb0ed49f5a763fe833db3745f WHIRLPOOL 8b2cf90af2c035afca455d661fdc330f180c89fc23a865dc6aa0df71d6eb7c7265a21cd97bed0420f457ab77e705ad40c680e1297ab0af4a5349030170e2004f
|
||||
|
||||
@ -1,17 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pygeocoder/pygeocoder-1.1.4.ebuild,v 1.3 2013/09/12 20:59:37 mgorny Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python wrapper for Google Geocoding API V3"
|
||||
HOMEPAGE="http://code.xster.net/pygeocoder/overview"
|
||||
SRC_URI="http://code.xster.net/${PN}/downloads/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
@ -1,17 +0,0 @@
|
||||
# Copyright 1999-2013 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-python/pygeocoder/pygeocoder-1.2.1.ebuild,v 1.1 2013/10/21 07:45:14 patrick Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
PYTHON_COMPAT=( python{2_6,2_7} )
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Python wrapper for Google Geocoding API V3"
|
||||
HOMEPAGE="http://code.xster.net/pygeocoder/overview"
|
||||
SRC_URI="http://code.xster.net/${PN}/downloads/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
@ -0,0 +1,29 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/metasploit_data_models/metasploit_data_models-0.17.2.ebuild,v 1.1 2014/06/20 19:18:12 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
USE_RUBY="ruby19 ruby20"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC=""
|
||||
|
||||
# Tests depend on unpackaged factory_girl_rails
|
||||
RUBY_FAKEGEM_RECIPE_TEST=""
|
||||
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="app db script spec"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="The database layer for Metasploit"
|
||||
HOMEPAGE="https://github.com/rapid7/metasploit_data_models"
|
||||
SRC_URI="https://github.com/rapid7/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend "
|
||||
>=dev-ruby/activerecord-3.2.12:3.2[postgres]
|
||||
dev-ruby/activesupport"
|
||||
@ -0,0 +1,52 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/minitest/minitest-5.3.5.ebuild,v 1.1 2014/06/21 06:26:01 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 ruby21 jruby"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_DOC="rdoc"
|
||||
|
||||
RUBY_FAKEGEM_DOCDIR="doc"
|
||||
RUBY_FAKEGEM_EXTRADOC="History.txt Manifest.txt README.txt"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="minitest/unit is a small and fast replacement for ruby's huge and slow test/unit."
|
||||
HOMEPAGE="https://github.com/seattlerb/minitest"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="5"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE="doc test"
|
||||
|
||||
each_ruby_prepare() {
|
||||
case ${RUBY} in
|
||||
*jruby)
|
||||
# Make sure __jtrap is available in all threads. This should
|
||||
# be fixed in jruby 1.7.x
|
||||
sed -i -e '8i trap :INFO do ; end' lib/minitest/parallel.rb || die
|
||||
|
||||
# Avoid failures. Most of these look like low-level jruby
|
||||
# differences and it looks like these were not run properly
|
||||
# in previous versions.
|
||||
for t in test_return_mock_does_not_raise test_mock_args_does_not_raise test_stub_block test_stub_value ; do
|
||||
local command="/${t}/,/^ end/ s:^:#:"
|
||||
sed -i -e "${command}" test/minitest/test_minitest_mock.rb || die
|
||||
done
|
||||
for t in test_run_failing test_run_skip test_run_error test_run_skip_verbose test_run_error_teardown test_runnable_methods_random test_assert_throws_different test_to_s_error_in_test_and_teardown test_run_filtered_including_suite_name_string test_run_filtered_string_method_only test_run_filtered_including_suite_name ; do
|
||||
command="/${t}/,/^ end/ s:^:#:"
|
||||
sed -i -e "${command}" test/minitest/test_minitest_unit.rb || die
|
||||
done
|
||||
for t in test_name2 "needs to verify throw" ; do
|
||||
command="/${t}/,/^ end/ s:^:#:"
|
||||
sed -i -e "${command}" test/minitest/test_minitest_spec.rb || die
|
||||
done
|
||||
sed -i -e '/test_report_error/,/^ end/ s:^:#:' test/minitest/test_minitest_reporter.rb || die
|
||||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
${RUBY} -Ilib:test:. -e "Dir['**/test_*.rb'].each{|f| require f}" || die "Tests failed"
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST rake-remote_task-2.2.1.gem 16896 SHA256 26e7f076540a8f1fc7f2dd3796753dfa958e40b26b05ba5532a3aad1fbeb3d95 SHA512 b01b6b393a0d2887b664b9567945d74766e5f5fb790d66960c66436a08c26b3ec739a0fe35317592f7c63cfc2aec687b69eca52fc52ec4151c62724044b43468 WHIRLPOOL e8915bc0896437d403b5941e22831c3f311330838cef806e7e4d2858eb29d9720582af9cf327d7de2d49c0340d6e33216daf286c0723d46c2130fee69f002ad5
|
||||
DIST rake-remote_task-2.2.2.gem 18944 SHA256 ca01188a5e9a94cc3cf9c5c8c455508ae3ac059aafe98c53427ef3f5e3c74043 SHA512 f26bdd63686587b111983fbb6d1a7e449785ea25b8c7facda71fa686fd091a021a1a75b2341163e73f215b5897ea64c355ffaed312d3db74308afe890a334eae WHIRLPOOL 043df936695763a1eeb0546225415491db74ef68a4c2924404c41ef2bdee89ce91a5a560dd69c2da50ca80a9ef35a976a8a4c10591756c29e75324041463617f
|
||||
|
||||
@ -0,0 +1,28 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/rake-remote_task/rake-remote_task-2.2.2.ebuild,v 1.1 2014/06/20 19:04:54 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20 ruby21"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="docs"
|
||||
RUBY_FAKEGEM_DOCDIR="doc"
|
||||
RUBY_FAKEGEM_EXTRADOC="History.txt README.txt"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Vlad the Deployer's sexy brainchild is rake-remote_task, extending
|
||||
Rake with remote task goodness."
|
||||
HOMEPAGE="http://rubyhitsquad.com/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_bdepend ">=dev-ruby/hoe-2.9.2 test? ( dev-ruby/minitest )"
|
||||
ruby_add_rdepend ">=dev-ruby/open4-1.0"
|
||||
|
||||
all_ruby_prepare() {
|
||||
sed -i -e '/isolate/ s:^:#:' Rakefile || die
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
DIST twitter-4.8.1.gem 504320 SHA256 c4ea9a881d48b75d0fa9d13ff6a369e051472290593867cb60fe01a254bfaae4 SHA512 4358d6f612d6a078098bc901965a4a8598d3418638288481f76e6749951a21b3e2f4335eaf7a3ddfde81b43a12a69fbf70bce711c22f9760244dd1bf5a3e1d39 WHIRLPOOL c48db65c593b4f6d0fe89ba2f99b222e10d88ca361251cef466c59302921fa41f11f3b40b138919f347839a85c2439117deb5ea60f0e141de0fe6a86a6e2279a
|
||||
DIST twitter-5.10.0.gem 505856 SHA256 31eafd3e7d39df0600d156722190e5c35f407c8ce7fe1379846145ed70c64cf1 SHA512 58aeccb7f6643f65fa0ebd712144a159fb3b1197df38dd74b6c2e46fb226cd5488c5dd90efb4161ba234fb71fa754eee009a2bad74990f8988dbbe6331f331a8 WHIRLPOOL 4e65802b8e75c7788659989174f50d3c02a435774c44e86363686e9b92b82d86c1a9dc500cad99fa1df7e26a205cb5bbef788aae71cafda3cf17b66299053c57
|
||||
DIST twitter-5.11.0.gem 505856 SHA256 155054b1b64d162c31d343140a97f29ad36a6fa01e9473863aa776e51279e087 SHA512 7282623f7019892df2d9d4cf11e9002ec42f96faf0a4321877a2f06eef9803059424c1fc5e6c7b266a675f97aec2253b817f07d08884e27a0237b9230bccbc5c WHIRLPOOL aeb07fb6b0906575df75a27f20d865f5fd77d029d5c749526ec8856ea756a9632cfb83c3a262dd275f8acd71e5b3ffb3ef9eae7ebf6748f2903d39cc188e035e
|
||||
DIST twitter-5.7.1.gem 504832 SHA256 a6931053e3bfac0a9d420ce4cfb7f7ff9901dccd942dcc11f255795fbe1a178a SHA512 0d2ba4984c06eaffce2da80bdf492fd7239dcdb698851baa2e7f89a136afe85287311c16bb145710a34cfdd611b91536dfb3772d2951e0ff53bd17376a151b51 WHIRLPOOL 27370fcc55b85d79cf7711bb4ca4a64db8dc4cb620d0c3c19e777b8d88ad1baadaa92e91b7cd7f7e419c060b6c7105c5e4cb93ec6af247ef5336aa48710edf45
|
||||
DIST twitter-5.8.0.gem 501760 SHA256 ca7ce4423eacbc41b37a50aacde44ca070df16ff182e3f5e6a8d36d3f1a6f57b SHA512 1ac7cbfb2c1aba9092d1e29a9628bdfea6fcdf967e848289594637d926363ccd341d7a39adf60fc937c2af6f6329053c9ad98456a50244a7811c6d4b803bfc9d WHIRLPOOL c7b2a11fe81785955c85c98b3c116a83bc8ecf48c4664d621355e108024e4a1d2fc239adb1e8c476310eaaef5e30ea4276219902ff6c15f78179273fefafba85
|
||||
DIST twitter-5.9.0.gem 504832 SHA256 7493087ba82d6ebbe9a9a0f0e72919138bbe604bf16ca056824ebb74429c6803 SHA512 e168f171af4641ecf27b395805097617d45e3cc8ea91215cfdc49812ecb00bb7fb01d2869b6175a5deb002c47d43ee4cf3dde1cb1ca1fdfffd3b084757e7b2d7 WHIRLPOOL bc26d5af1ac2cda7b4e9db5d230b0b2ab3e176a1bd0333334bef3f1dcdddd5258812351d9e4856a0ba33abd1e9814683d8188460efd00ccb8c3325e30fff8ff5
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-ruby/twitter/twitter-5.11.0.ebuild,v 1.1 2014/06/20 18:52:52 graaff Exp $
|
||||
|
||||
EAPI=5
|
||||
USE_RUBY="ruby19 ruby20"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_DOC="yard"
|
||||
RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
|
||||
|
||||
inherit ruby-fakegem
|
||||
|
||||
DESCRIPTION="Ruby wrapper around the Twitter API"
|
||||
HOMEPAGE="http://twitter.rubyforge.org/"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="5"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE=""
|
||||
|
||||
ruby_add_rdepend "
|
||||
>=dev-ruby/addressable-2.3
|
||||
>=dev-ruby/buftok-0.2.0
|
||||
>=dev-ruby/equalizer-0.0.9
|
||||
=dev-ruby/faraday-0*
|
||||
>=dev-ruby/faraday-0.9.0
|
||||
>=dev-ruby/http-0.6.0:0.6
|
||||
>=dev-ruby/http_parser_rb-0.6.0
|
||||
>=dev-ruby/json-1.8
|
||||
>=dev-ruby/memoizable-0.4.0
|
||||
>=dev-ruby/naught-1.0
|
||||
=dev-ruby/simple_oauth-0*
|
||||
>=dev-ruby/simple_oauth-0.2"
|
||||
|
||||
ruby_add_bdepend "test? (
|
||||
dev-ruby/rspec:2
|
||||
dev-ruby/webmock
|
||||
)
|
||||
doc? ( dev-ruby/yard )"
|
||||
|
||||
all_ruby_prepare() {
|
||||
# rm Gemfile || die
|
||||
sed -i -e '/[Bb]undler/d' Rakefile || die "Unable to remove bundler code."
|
||||
|
||||
sed -i -e '/\(simplecov\|coveralls\)/ s:^:#:' spec/helper.rb || die
|
||||
}
|
||||
|
||||
each_ruby_test() {
|
||||
CI=true ${RUBY} -S rspec spec || die
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST glossaries-3.04.zip 3838009 SHA256 7597d2b61b2a253e562e6b16c33c8db09ea9bd940968d3e5ac96857503f30669 SHA512 1669c2288c31f1b1b79dc9776c55c2abfc8fd216482cf6175e9f788a2882cfe997ca13c9d93d317e4d31fcc9eba8dc977bc806874179654141ca7235ec7c3889 WHIRLPOOL 003016d2a2aaa8241d17464b74d902f228e2aad2730804af3e41075a5bbd176284a7f69ed95493fdd02842a502afde680be0e22b13b27740996563deaf35ba93
|
||||
DIST glossaries-4.07.zip 5009472 SHA256 156a625f51adec6524e67d49128fae7e009720b0616c6d73a36ac17c3b1f1b79 SHA512 576c52b0502e9854ac1332142a724ed1b97b37502322d52195f343f864a82e249529715b0a637f984ab01662d288f2ba57f7a932d2523435d5147dfb43145d61 WHIRLPOOL 7db0548b00a3e6544bc7c1a096b645f2f9fe492ca0adc4a5d5f49e42593348b930fad587e3877c769918840c21ae95ef7321becc29a36748d4f2f15a58f190a7
|
||||
|
||||
@ -0,0 +1,40 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-tex/glossaries/glossaries-4.07.ebuild,v 1.1 2014/06/20 08:06:34 radhermit Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
inherit latex-package
|
||||
|
||||
DESCRIPTION="Create glossaries and lists of acronyms."
|
||||
HOMEPAGE="http://www.ctan.org/tex-archive/help/Catalogue/entries/glossaries.html"
|
||||
SRC_URI="http://dev.gentoo.org/~radhermit/dist/${P}.zip"
|
||||
|
||||
LICENSE="LPPL-1.2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="doc examples"
|
||||
|
||||
RDEPEND="dev-lang/perl
|
||||
dev-texlive/texlive-latexrecommended
|
||||
>=dev-texlive/texlive-latexextra-2012"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip"
|
||||
|
||||
TEXMF="/usr/share/texmf-site"
|
||||
S=${WORKDIR}/${PN}
|
||||
|
||||
src_install() {
|
||||
latex-package_src_doinstall styles
|
||||
|
||||
dobin makeglossaries
|
||||
|
||||
dodoc CHANGES README
|
||||
if use doc ; then
|
||||
latex-package_src_doinstall pdf
|
||||
fi
|
||||
if use examples ; then
|
||||
docinto examples
|
||||
dodoc samples/*.tex
|
||||
fi
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST diffstat-1.58.tgz 246826 SHA256 fad5135199c3b9aea132c5d45874248f4ce0ff35f61abb8d03c3b90258713793 SHA512 b2870a604e3e6fcde1929de763839c3b840575bc96f3816b215e102c670d65b73d40eececa41a01f385b9932b65d86005b4d478ecbf78623faa8cc34fec77cac WHIRLPOOL 2767e925235775604a784ddfa2d07eb6e665c036c51460c25d1195fa168ae00c5e5b6e3a3e821b19939d4aa20ac6bd74076beeee06572bd856f304155b4f7cc0
|
||||
DIST diffstat-1.59.tgz 247698 SHA256 267d1441b8889cbefbb7ca7dfd4a17f6c8bc73bc114904c74ecad945a3dbf270 SHA512 347694458f73379513c0076ea0b847fe20b3cfd2c839b9f226fb349bfa3f0f0f1ffe9872fbce36fce8d402de2bec40f65fe5236127a087f08bd901d87258c169 WHIRLPOOL fd27e100872c3c6b30153352c23ba219c637a504068a9099619b40a55bacd4a9c587c45fd6ea0aa49ab0807f4b93e9125f6c9a2a1ca64b7922038396818ff25e
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-util/diffstat/diffstat-1.59.ebuild,v 1.1 2014/06/20 07:16:34 radhermit Exp $
|
||||
|
||||
EAPI="5"
|
||||
|
||||
DESCRIPTION="Display a histogram of diff changes"
|
||||
HOMEPAGE="http://invisible-island.net/diffstat/diffstat.html"
|
||||
SRC_URI="ftp://invisible-island.net/diffstat/${P}.tgz"
|
||||
|
||||
LICENSE="HPND"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
|
||||
@ -1,80 +0,0 @@
|
||||
# Copyright 1999-2012 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/stgit/stgit-0.16-r1.ebuild,v 1.3 2012/11/20 20:59:17 ago Exp $
|
||||
|
||||
EAPI="3"
|
||||
PYTHON_DEPEND="2"
|
||||
|
||||
inherit eutils distutils bash-completion-r1
|
||||
|
||||
DESCRIPTION="Manage a stack of patches using GIT as a backend"
|
||||
HOMEPAGE="http://www.procode.org/stgit/"
|
||||
SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz
|
||||
mirror://gentoo/${P}-missing-patches.tar.gz"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~ppc ~ppc64 x86"
|
||||
IUSE="doc"
|
||||
|
||||
RDEPEND=">=dev-vcs/git-1.6.3.3"
|
||||
|
||||
# NOTE: It seems to be quite important which asciidoc version to use.
|
||||
# So keep an eye on it for the future.
|
||||
DEPEND="$RDEPEND
|
||||
doc? (
|
||||
app-text/asciidoc
|
||||
app-text/xmlto
|
||||
dev-lang/perl
|
||||
)"
|
||||
|
||||
pkg_setup () {
|
||||
if ! use doc; then
|
||||
echo
|
||||
ewarn "Manpages will not be built and installed."
|
||||
ewarn "Enable the 'doc' useflag, if you want them."
|
||||
echo
|
||||
fi
|
||||
|
||||
python_set_active_version 2
|
||||
python_pkg_setup
|
||||
}
|
||||
|
||||
src_prepare () {
|
||||
epatch "${FILESDIR}/${P}-asciidoc-compat.patch"
|
||||
epatch "${FILESDIR}/${P}-man-linkfix.patch"
|
||||
|
||||
# this will be a noop, as we are working with a tarball,
|
||||
# but throws git errors --> just get rid of it
|
||||
sed -i -e 's/version\.write_builtin_version()//' setup.py
|
||||
|
||||
distutils_src_prepare
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# do not call normal 'emake' s.t. Gentoo's Python handling
|
||||
# can do its work
|
||||
# NB: run before doc-building to avoid double-build
|
||||
distutils_src_compile
|
||||
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" \
|
||||
htmldir="${ROOT}usr/share/doc/${PF}/html/" \
|
||||
mandir="${ROOT}usr/share/man/" \
|
||||
doc || die "emake doc failed"
|
||||
fi
|
||||
}
|
||||
|
||||
src_install() {
|
||||
if use doc; then
|
||||
emake DESTDIR="${D}" \
|
||||
htmldir="${ROOT}usr/share/doc/${PF}/html/" \
|
||||
mandir="${ROOT}usr/share/man/" \
|
||||
install-doc install-html || die "emake install-doc install-html failed"
|
||||
fi
|
||||
|
||||
# NB: run after installing docs to avoid double-build
|
||||
distutils_src_install
|
||||
|
||||
newbashcomp stgit-completion.bash ${PN} || die
|
||||
}
|
||||
@ -0,0 +1,717 @@
|
||||
From: Julian Ospald <hasufell@gentoo.org>
|
||||
Date: Thu Oct 11 15:00:18 UTC 2012
|
||||
Subject: build system
|
||||
|
||||
a) respect flags/linker
|
||||
b) don't take ARCH from env (we set BASE_ARCH in the ebuild)
|
||||
c) split LDFLAGS and LDFLAGS_COMMON as per bug
|
||||
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=347650
|
||||
d) don't remove angel-lib (compilation fails, why is this?)
|
||||
e) make output verbose
|
||||
f) remove start-scripts
|
||||
g) address parallel make issues
|
||||
|
||||
--- source/Makefile
|
||||
+++ source/Makefile
|
||||
@@ -33,6 +33,17 @@
|
||||
# Build Warsow client without server capabilities?
|
||||
BUILD_THIN_CLIENT?=NO
|
||||
|
||||
+# use system libRocket
|
||||
+SYSTEM_LIBS=NO
|
||||
+
|
||||
+# enable verbosity
|
||||
+V=NO
|
||||
+
|
||||
+ifneq ($(V),YES)
|
||||
+Q=@
|
||||
+endif
|
||||
+
|
||||
+
|
||||
###########################################################
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
@@ -54,10 +65,10 @@
|
||||
else
|
||||
CC?=gcc
|
||||
CXX?=g++
|
||||
-LD=gcc
|
||||
-LXX=g++
|
||||
-AR=ar
|
||||
-RANLIB=ranlib
|
||||
+LD=$(CC)
|
||||
+LXX=$(CXX)
|
||||
+AR?=ar
|
||||
+RANLIB?=ranlib
|
||||
|
||||
# this nice line comes from the linux kernel makefile
|
||||
BASE_ARCH:=$(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc/ -e s/sparc64/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/alpha/axp/)
|
||||
@@ -66,7 +77,7 @@
|
||||
ifeq ($(OS),FreeBSD)
|
||||
ARCH?=freebsd_$(BASE_ARCH)
|
||||
else
|
||||
-ARCH?=$(BASE_ARCH)
|
||||
+ARCH=$(BASE_ARCH)
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
@@ -83,7 +94,7 @@
|
||||
|
||||
ifeq ($(DEBUG_BUILD), YES)
|
||||
BINDIR=debug
|
||||
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
|
||||
+CFLAGS_DEBUG=-D_DEBUG
|
||||
else
|
||||
BINDIR=release
|
||||
endif
|
||||
@@ -136,7 +147,11 @@
|
||||
LIBROCKET_INC=$(LIBROCKET_DIR)/Include
|
||||
LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
|
||||
|
||||
+ifneq ($(SYSTEM_LIBS),YES)
|
||||
CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
|
||||
+else
|
||||
+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
|
||||
+endif
|
||||
# add the base of ui to inclusions
|
||||
CFLAGS_ROCKET+=-Iui
|
||||
|
||||
@@ -231,9 +246,9 @@
|
||||
####################### NORMAL *NIX? ######################
|
||||
LOCALBASE?=/usr/local
|
||||
|
||||
-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden -Winvalid-pch
|
||||
-CFLAGS_RELEASE=-O2 -fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG -msse2
|
||||
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
|
||||
+CFLAGS_COMMON=-I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
|
||||
+CFLAGS_RELEASE=-fno-strict-aliasing -ffast-math -funroll-loops -DNDEBUG
|
||||
+CFLAGS_DEBUG=-D_DEBUG
|
||||
ifeq ($(DEBUG_BUILD),YES)
|
||||
CFLAGS_COMMON+=$(CFLAGS_DEBUG)
|
||||
else
|
||||
@@ -245,18 +260,18 @@
|
||||
CFLAGS_MODULE=-DPIC -fPIC
|
||||
CFLAGS_TV_SERVER=-DDEDICATED_ONLY -DTV_SERVER_ONLY -DC_ONLY -DTV_MODULE_HARD_LINKED
|
||||
|
||||
-LDFLAGS_COMMON=$(LDFLAGS)
|
||||
-LXXFLAGS_COMMON=$(LDFLAGS) -lstdc++ -lsupc++
|
||||
+LDFLAGS_COMMON=
|
||||
+LXXFLAGS_COMMON=-lstdc++ -lsupc++
|
||||
|
||||
ifeq ($(OS),FreeBSD)
|
||||
LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm
|
||||
else
|
||||
-LDFLAGS_COMMON+= -L$(LOCALBASE)/lib -lm -ldl -O1 -Wl,--as-needed
|
||||
+LDFLAGS_COMMON+= -ldl -lm
|
||||
endif
|
||||
|
||||
ifneq ($(DEBUG_BUILD),YES)
|
||||
-LDFLAGS_COMMON+= -s
|
||||
-LXXFLAGS_COMMON+= -s
|
||||
+LDFLAGS_COMMON+=
|
||||
+LXXFLAGS_COMMON+=
|
||||
endif
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
@@ -270,8 +285,12 @@
|
||||
LDFLAGS_MODULE=-shared
|
||||
LDFLAGS_TV_SERVER=-lz -lpthread $(shell curl-config --libs)
|
||||
|
||||
+ifneq ($(SYSTEM_LIBS),YES)
|
||||
# static link to custombuilt lib
|
||||
LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
|
||||
+else
|
||||
+LDFLAGS_ROCKET = -lRocketCore -lRocketControls
|
||||
+endif
|
||||
|
||||
# openal
|
||||
ifeq ($(BUILD_SND_OPENAL),YES)
|
||||
@@ -357,12 +376,18 @@
|
||||
######################################################################################################
|
||||
# Helper functions
|
||||
######################################################################################################
|
||||
+ifneq ($(V),YES)
|
||||
DO_CC=echo " > Compiling $<" && \
|
||||
$(CC) $(CFLAGS_COMMON) -c $< -o $@
|
||||
DO_CXX=echo " > Compiling (c++) $<" && \
|
||||
$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
|
||||
DO_RES=echo " > Compiling resource $<" && \
|
||||
$(RES) $(RESFLAGS_COMMON) -i $< -o $@
|
||||
+else
|
||||
+DO_CC=$(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
|
||||
+DO_CXX=$(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
|
||||
+DO_RES=$(RES) $(RESFLAGS_COMMON) -i $< -o $@
|
||||
+endif
|
||||
|
||||
DO_CC_CLIENT=$(DO_CC) $(CFLAGS_CLIENT)
|
||||
DO_CC_DED=$(DO_CC) $(CFLAGS_DED)
|
||||
@@ -627,10 +652,10 @@
|
||||
|
||||
all: client openal qf ded ui cgame game irc cin ftlib steamlib ref_gl angelwrap tv_server
|
||||
|
||||
-client: $(BUILDDIRS) message-client compile-client link-client start-script-client
|
||||
+client: $(BUILDDIRS) message-client compile-client link-client
|
||||
openal: $(BUILDDIRS) message-openal compile-openal link-openal
|
||||
qf: $(BUILDDIRS) message-qf compile-qf link-qf
|
||||
-ded: $(BUILDDIRS) message-ded compile-ded link-ded start-script-ded
|
||||
+ded: $(BUILDDIRS) message-ded compile-ded link-ded
|
||||
ui: $(BUILDDIRS) message-ui compile-ui link-ui
|
||||
cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
|
||||
game: $(BUILDDIRS) message-game compile-game link-game
|
||||
@@ -640,7 +665,7 @@
|
||||
steamlib: $(BUILDDIRS) message-steamlib compile-steamlib link-steamlib
|
||||
ref_gl: $(BUILDDIRS) message-ref_gl compile-ref_gl link-ref_gl
|
||||
angelwrap: $(BUILDDIRS) message-angelwrap compile-angelwrap link-angelwrap
|
||||
-tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server start-script-tv_server
|
||||
+tv_server: $(BUILDDIRS) message-tv_server compile-tv_server link-tv_server
|
||||
|
||||
clean: clean-msg clean-depend clean-client clean-openal clean-qf clean-ded clean-ui clean-librocket clean-cgame clean-game clean-irc clean-cin clean-ftlib clean-steamlib clean-ref_gl clean-angelwrap clean-tv_server
|
||||
|
||||
@@ -734,7 +759,12 @@
|
||||
@echo "> *********************************************************"
|
||||
@echo "> * Building ui"
|
||||
@echo "> *********************************************************"
|
||||
+ifneq ($(SYSTEM_LIBS),YES)
|
||||
compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
|
||||
+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
|
||||
+else
|
||||
+compile-ui: $(PCH_UI_ROCKET) $(OBJS_UI_ROCKET)
|
||||
+endif
|
||||
link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
|
||||
clean-ui:
|
||||
@echo " > Removing ui objects" && \
|
||||
@@ -742,7 +772,7 @@
|
||||
|
||||
$(LIBROCKET_LIB):
|
||||
@echo "> * Building Rocket library"
|
||||
- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
|
||||
+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" DEBUG_BUILD=$(DEBUG_BUILD) USE_MINGW=$(USE_MINGW) $(MAKE) -C $(LIBROCKET_DIR) -f $(LIBROCKET_MAKEFILE) DEBUG_BUILD=$(DEBUG_BUILD)
|
||||
@echo "> * Done building RocketCore library."
|
||||
@echo "> *********************************************************"
|
||||
@echo "> * Continuing ui building..."
|
||||
@@ -828,7 +858,7 @@
|
||||
|
||||
$(ANGELSCRIPT_LIB): $(ANGELSCRIPT_INC)/angelscript.h
|
||||
@echo "> * Building Angelscript library first"
|
||||
- @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
|
||||
+ @CXX=$(CXX) AR=$(AR) RANLIB=$(RANLIB) CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C $(ANGELSCRIPT_PROJECT_DIR)
|
||||
@echo "> * Done building angelscript library."
|
||||
@echo "> *********************************************************"
|
||||
@echo "> * Continuing angelwrap building..."
|
||||
@@ -863,80 +893,86 @@
|
||||
########
|
||||
$(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
|
||||
@echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
|
||||
|
||||
#########
|
||||
# CLIENT
|
||||
#########
|
||||
ifeq ($(OS),Darwin)
|
||||
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) mac/SDLMain.m $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
else
|
||||
$(BINDIR)/$(CLIENT_EXE): $(OBJS_CLIENT)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $(OBJS_CLIENT) $(LDFLAGS_COMMON) $(LDFLAGS_CLIENT)
|
||||
endif
|
||||
|
||||
#########
|
||||
# OPENAL
|
||||
#########
|
||||
$(BINDIR)/libs/snd_openal_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_OPENAL)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_OPENAL)
|
||||
|
||||
#########
|
||||
# QF
|
||||
#########
|
||||
$(BINDIR)/libs/snd_qf_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_QF)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_QF)
|
||||
|
||||
########
|
||||
# .SO
|
||||
########
|
||||
$(BINDIR)/basewsw/cgame_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CGAME)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
|
||||
$(BINDIR)/basewsw/game_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_GAME)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
-
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
|
||||
+
|
||||
+ifneq ($(SYSTEM_LIBS),YES)
|
||||
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
|
||||
+else
|
||||
+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
|
||||
+endif
|
||||
|
||||
$(BINDIR)/libs/irc_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_IRC)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_IRC)
|
||||
|
||||
$(BINDIR)/libs/cin_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_CIN)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_CIN)
|
||||
|
||||
$(BINDIR)/libs/ftlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_FTLIB)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_FTLIB)
|
||||
|
||||
$(BINDIR)/libs/steamlib_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_STEAMLIB)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_STEAMLIB)
|
||||
|
||||
$(BINDIR)/libs/ref_gl_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_REF_GL)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_REF_GL)
|
||||
|
||||
$(BINDIR)/libs/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP) $(ANGELSCRIPT_LIB)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ANGELWRAP)
|
||||
|
||||
########
|
||||
# TV
|
||||
########
|
||||
$(BINDIR)/$(TV_SERVER_EXE): $(OBJS_TV_SERVER)
|
||||
- @echo " > Linking $@" && \
|
||||
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
|
||||
+ @echo " > Linking $@"
|
||||
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_TV_SERVER)
|
||||
|
||||
######################################################################################################
|
||||
# Meta Rules
|
||||
@@ -948,181 +984,181 @@
|
||||
# CLIENT
|
||||
########
|
||||
$(BUILDDIR)/client/%.o: qcommon/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: server/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: client/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: null/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: matchmaker/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/client/%.o: win32/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
|
||||
$(BUILDDIR)/client/%.o: win32/%.rc
|
||||
- @$(DO_RES_CLIENT)
|
||||
+ $(Q)$(DO_RES_CLIENT)
|
||||
else
|
||||
ifeq ($(OS),Darwin)
|
||||
$(BUILDDIR)/client/%.o: mac/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
$(BUILDDIR)/client/%.o: unix/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
else
|
||||
$(BUILDDIR)/client/%.o: unix/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
endif
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/client/%.o: gameshared/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
$(BUILDDIR)/client/%.o: qalgo/%.c
|
||||
- @$(DO_CC_CLIENT)
|
||||
+ $(Q)$(DO_CC_CLIENT)
|
||||
|
||||
$(BINDIR)/warsow: unix/start_script.sh
|
||||
- @echo " > Installing client start script" && \
|
||||
- cp $< $@ && \
|
||||
+ @echo " > Installing client start script" \
|
||||
+ $(Q)cp $< $@ && \
|
||||
chmod a+x $@
|
||||
|
||||
########
|
||||
# OPENAL
|
||||
########
|
||||
$(BUILDDIR)/openal/%.o: snd_openal/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_OPENAL)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
|
||||
$(BUILDDIR)/openal/%.o: snd_common/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_OPENAL)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_OPENAL)
|
||||
|
||||
$(BUILDDIR)/openal/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
$(BUILDDIR)/openal/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# QF
|
||||
########
|
||||
$(BUILDDIR)/qf/%.o: snd_qf/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
$(BUILDDIR)/qf/%.o: snd_common/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/qf/win_snd.o: win32/win_snd.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_DSOUND)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_DSOUND)
|
||||
else
|
||||
$(BUILDDIR)/qf/unix_snd.o: unix/unix_snd.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_QF)
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/qf/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
$(BUILDDIR)/qf/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# DED
|
||||
########
|
||||
$(BUILDDIR)/ded/%.o: qcommon/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: server/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/ded/%.o: win32/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
else
|
||||
$(BUILDDIR)/ded/%.o: unix/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/ded/%.o: null/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: game/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: gameshared/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: qalgo/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
|
||||
$(BUILDDIR)/ded/%.o: matchmaker/%.c
|
||||
- @$(DO_CC_DED)
|
||||
+ $(Q)$(DO_CC_DED)
|
||||
|
||||
$(BINDIR)/wsw_server: unix/start_script.sh
|
||||
- @echo " > Installing dedicated server start script" && \
|
||||
- cp $< $@ && \
|
||||
+ @echo " > Installing dedicated server start script" \
|
||||
+ $(Q)cp $< $@ && \
|
||||
chmod a+x $@
|
||||
|
||||
########
|
||||
# CGAME
|
||||
########
|
||||
$(BUILDDIR)/cgame/%.o: cgame/%.cpp
|
||||
- @$(DO_CXX_MODULE)
|
||||
+ $(Q)$(DO_CXX_MODULE)
|
||||
|
||||
$(BUILDDIR)/cgame/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/cgame/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# GAME
|
||||
########
|
||||
$(BUILDDIR)/game/%.o: game/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_GAME)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME)
|
||||
|
||||
$(BUILDDIR)/game/%.o: game/ai/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_GAME)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_GAME)
|
||||
|
||||
$(BUILDDIR)/game/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_GAME)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_GAME)
|
||||
|
||||
$(BUILDDIR)/game/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/game/%.o: matchmaker/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_GAME)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_GAME)
|
||||
|
||||
########
|
||||
# UI.ROCKET
|
||||
########
|
||||
$(BUILDDIR)/ui/pch/ui_precompiled.h.gch: ui/ui_precompiled.h
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/kernel/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/as/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)@$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/datasources/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/widgets/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/parsers/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
$(BUILDDIR)/ui/%.o: ui/decorators/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
|
||||
|
||||
#$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
|
||||
# @$(DO_CC_MODULE)
|
||||
@@ -1131,66 +1167,66 @@
|
||||
# IRC
|
||||
########
|
||||
$(BUILDDIR)/irc/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/irc/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/irc/%.o: irc/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
########
|
||||
# CIN
|
||||
########
|
||||
$(BUILDDIR)/cin/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/cin/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/cin/%.o: cin/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_CIN)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
|
||||
|
||||
########
|
||||
# FTLIB
|
||||
########
|
||||
$(BUILDDIR)/ftlib/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ftlib/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ftlib/%.o: ftlib/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_FTLIB)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_FTLIB)
|
||||
|
||||
########
|
||||
# STEAMLIB
|
||||
########
|
||||
$(BUILDDIR)/steamlib/%.o: steamlib/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_STEAMLIB)
|
||||
|
||||
########
|
||||
# REF_GL
|
||||
########
|
||||
$(BUILDDIR)/ref_gl/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ref_gl/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ref_gl/%.o: qcommon/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/ref_gl/%.o: ref_gl/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_REF_GL)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_REF_GL)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/ref_gl/%.o: win32/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
else
|
||||
ifeq ($(OS),Darwin)
|
||||
$(BUILDDIR)/ref_gl/%.o: mac/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
else
|
||||
$(BUILDDIR)/ref_gl/%.o: unix/%.c
|
||||
@$(DO_CC_MODULE)
|
||||
@@ -1201,52 +1237,52 @@
|
||||
# ANGELWRAP
|
||||
########
|
||||
$(BUILDDIR)/angelwrap/%.o: gameshared/%.c
|
||||
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
|
||||
$(BUILDDIR)/angelwrap/%.o: qalgo/%.c
|
||||
- @$(DO_CC_MODULE)
|
||||
+ $(Q)$(DO_CC_MODULE)
|
||||
|
||||
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
|
||||
$(BUILDDIR)/angelwrap/%.o : angelwrap/addon/%.cpp
|
||||
- @$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ANGELWRAP)
|
||||
|
||||
########
|
||||
# TV SERVER
|
||||
########
|
||||
$(BUILDDIR)/tv_server/%.o: qcommon/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: client/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: tv_server/tv_module/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: tv_server/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
|
||||
ifeq ($(USE_MINGW),YES)
|
||||
$(BUILDDIR)/tv_server/%.o: win32/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
else
|
||||
$(BUILDDIR)/tv_server/%.o: unix/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
endif
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: null/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: gameshared/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
|
||||
$(BUILDDIR)/tv_server/%.o: qalgo/%.c
|
||||
- @$(DO_CC_TV_SERVER)
|
||||
+ $(Q)$(DO_CC_TV_SERVER)
|
||||
|
||||
$(BINDIR)/wswtv_server: unix/start_script.sh
|
||||
- @echo " > Installing TV server start script" && \
|
||||
- cp $< $@ && \
|
||||
+ @echo " > Installing TV server start script" \
|
||||
+ $(Q)cp $< $@ && \
|
||||
chmod a+x $@
|
||||
|
||||
######################################################################################################
|
||||
--- libsrcs/libRocket/libRocket/Build/Makefile.qfusion
|
||||
+++ libsrcs/libRocket/libRocket/Build/Makefile.qfusion
|
||||
@@ -15,9 +15,9 @@
|
||||
endif
|
||||
|
||||
ifeq ($(DEBUG_BUILD),YES)
|
||||
- CXXFLAGS += -g -DROCKET_DEBUG
|
||||
+ CXXFLAGS += -DROCKET_DEBUG
|
||||
else
|
||||
- CXXFLAGS += -O2
|
||||
+ CXXFLAGS +=
|
||||
endif
|
||||
|
||||
BUILDDIR=obj
|
||||
@ -0,0 +1,178 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.5.1.ebuild,v 1.1 2014/06/20 20:20:40 hasufell Exp $
|
||||
|
||||
EAPI=5
|
||||
inherit eutils check-reqs gnome2-utils flag-o-matic games
|
||||
|
||||
# BASE_DATA_PV=1.0
|
||||
# BASE_DATA_P=${PN}_${BASE_DATA_PV}_unified
|
||||
DATA_PV=1.51
|
||||
UPDATE_P=${PN}_${DATA_PV}_update
|
||||
ENGINE_PV=1.51
|
||||
ENGINE_P=${PN}_${ENGINE_PV}_sdk
|
||||
|
||||
DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
|
||||
HOMEPAGE="http://www.warsow.net/"
|
||||
SRC_URI="http://www.warsow.net:1337/~warsow/${PV}/${ENGINE_P}.tar.gz
|
||||
http://www.warsow.eu/warsow_${DATA_PV}_unified.tar.gz
|
||||
mirror://gentoo/warsow.png"
|
||||
|
||||
# ZLIB: bundled angelscript
|
||||
LICENSE="GPL-2 ZLIB warsow"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="debug dedicated irc openal server"
|
||||
|
||||
RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
|
||||
media-libs/freetype
|
||||
net-misc/curl
|
||||
sys-libs/zlib
|
||||
!dedicated? (
|
||||
media-libs/libpng:0
|
||||
media-libs/libsdl
|
||||
media-libs/libtheora
|
||||
media-libs/libvorbis
|
||||
x11-libs/libX11
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libXxf86dga
|
||||
x11-libs/libXxf86vm
|
||||
virtual/jpeg
|
||||
virtual/opengl
|
||||
openal? ( media-libs/openal )
|
||||
)"
|
||||
DEPEND="${RDEPEND}
|
||||
app-arch/unzip
|
||||
x11-misc/makedepend
|
||||
!dedicated? (
|
||||
x11-proto/xineramaproto
|
||||
x11-proto/xf86dgaproto
|
||||
x11-proto/xf86vidmodeproto
|
||||
)
|
||||
openal? ( virtual/pkgconfig )"
|
||||
|
||||
S=${WORKDIR}/source/source
|
||||
|
||||
CHECKREQS_DISK_BUILD="1G"
|
||||
CHECKREQS_DISK_USR="500M"
|
||||
|
||||
src_prepare() {
|
||||
if [[ $(tc-getCC) =~ clang ]]; then
|
||||
einfo "disabling -ffast-math due to clang bug"
|
||||
einfo "http://llvm.org/bugs/show_bug.cgi?id=13745"
|
||||
append-cflags -fno-fast-math
|
||||
append-cxxflags -fno-fast-math
|
||||
fi
|
||||
|
||||
sed -i \
|
||||
-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
|
||||
qcommon/files.c \
|
||||
|| die "sed files.c failed"
|
||||
|
||||
# edos2unix breaks whitespace files
|
||||
einfo "removing dos line breaks"
|
||||
find . -type f -exec sed -i 's/\r$//' '{}' + || die
|
||||
|
||||
cd "${S}"/.. || die
|
||||
epatch "${FILESDIR}"/${PN}-1.5.1-build.patch \
|
||||
"${FILESDIR}"/${PN}-1.03-pic.patch
|
||||
epatch_user
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
yesno() { use ${1} && echo YES || echo NO ; }
|
||||
|
||||
emake -C ../libsrcs/angelscript/sdk/angelscript/projects/gnuc
|
||||
|
||||
local arch
|
||||
if use amd64 ; then
|
||||
arch=x86_64
|
||||
elif use x86 ; then
|
||||
arch=i386
|
||||
fi
|
||||
|
||||
local myconf
|
||||
if use dedicated ; then
|
||||
myconf=(
|
||||
BUILD_CLIENT=NO
|
||||
BUILD_IRC=NO
|
||||
BUILD_SND_OPENAL=NO
|
||||
BUILD_SND_QF=NO
|
||||
BUILD_CIN=NO
|
||||
BUILD_SERVER=YES
|
||||
BUILD_TV_SERVER=YES
|
||||
)
|
||||
else
|
||||
myconf=(
|
||||
BUILD_CLIENT=YES
|
||||
BUILD_IRC=$(yesno irc)
|
||||
BUILD_SND_OPENAL=$(yesno openal)
|
||||
BUILD_SND_QF=YES
|
||||
BUILD_CIN=YES
|
||||
BUILD_SERVER=$(yesno server)
|
||||
BUILD_TV_SERVER=$(yesno server)
|
||||
)
|
||||
fi
|
||||
|
||||
emake \
|
||||
V=YES \
|
||||
SYSTEM_LIBS=YES \
|
||||
BASE_ARCH=${arch} \
|
||||
BINDIR=lib \
|
||||
BUILD_ANGELWRAP=YES \
|
||||
DEBUG_BUILD=$(yesno debug) \
|
||||
${myconf[@]}
|
||||
}
|
||||
|
||||
src_install() {
|
||||
cd lib
|
||||
|
||||
if ! use dedicated ; then
|
||||
newgamesbin ${PN}.* ${PN}
|
||||
doicon -s 48 "${DISTDIR}"/${PN}.png
|
||||
make_desktop_entry ${PN} Warsow
|
||||
fi
|
||||
|
||||
if use dedicated || use server ; then
|
||||
newgamesbin wsw_server.* ${PN}-ded
|
||||
newgamesbin wswtv_server.* ${PN}-tv
|
||||
fi
|
||||
|
||||
exeinto "$(games_get_libdir)"/${PN}
|
||||
doexe */*.so
|
||||
|
||||
insinto "${GAMES_DATADIR}"/${PN}
|
||||
doins -r "${WORKDIR}"/${PN}_15/basewsw
|
||||
|
||||
local so
|
||||
for so in basewsw/*.so ; do
|
||||
dosym "$(games_get_libdir)"/${PN}/${so##*/} \
|
||||
"${GAMES_DATADIR}"/${PN}/${so}
|
||||
done
|
||||
|
||||
if [[ -e libs ]] ; then
|
||||
dodir "${GAMES_DATADIR}"/${PN}/libs
|
||||
for so in libs/*.so ; do
|
||||
dosym "$(games_get_libdir)"/${PN}/${so##*/} \
|
||||
"${GAMES_DATADIR}"/${PN}/${so}
|
||||
done
|
||||
fi
|
||||
|
||||
dodoc "${WORKDIR}"/${PN}_15/docs/*
|
||||
prepgamesdirs
|
||||
}
|
||||
|
||||
pkg_preinst() {
|
||||
games_pkg_preinst
|
||||
gnome2_icon_savelist
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
games_pkg_postinst
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue