Sync with portage [Tue Jul 1 07:45:02 MSK 2014].

mhiretskiy
root 10 years ago
parent 22f4e017fb
commit 815a2c584d

@ -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/app-admin/collectd/collectd-5.2.2.ebuild,v 1.3 2014/03/01 22:08:15 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.2.2.ebuild,v 1.4 2014/06/30 19:17:49 swift Exp $
EAPI="4"
@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
# The plugin lists have to follow here since they extend IUSE
@ -56,6 +56,7 @@ COMMON_DEPEND="
dev-libs/libgcrypt:0
sys-devel/libtool
perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
selinux? ( sec-policy/selinux-collectd )
collectd_plugins_apache? ( net-misc/curl )
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
collectd_plugins_bind? ( dev-libs/libxml2 )

@ -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/app-admin/collectd/collectd-5.3.0.ebuild,v 1.3 2014/03/01 22:08:15 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.3.0.ebuild,v 1.4 2014/06/30 19:17:49 swift Exp $
EAPI="4"
@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
# The plugin lists have to follow here since they extend IUSE
@ -56,6 +56,7 @@ COMMON_DEPEND="
dev-libs/libgcrypt:0
sys-devel/libtool
perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
selinux? ( sec-policy/selinux-collectd )
collectd_plugins_apache? ( net-misc/curl )
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
collectd_plugins_bind? ( dev-libs/libxml2 )

@ -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/app-admin/collectd/collectd-5.4.0.ebuild,v 1.3 2014/03/01 22:08:15 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.4.0.ebuild,v 1.4 2014/06/30 19:17:49 swift Exp $
EAPI="5"
@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
# The plugin lists have to follow here since they extend IUSE
@ -56,6 +56,7 @@ COMMON_DEPEND="
dev-libs/libgcrypt:0
sys-devel/libtool
perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
selinux? ( sec-policy/selinux-collectd )
collectd_plugins_apache? ( net-misc/curl )
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
collectd_plugins_bind? ( dev-libs/libxml2 )

@ -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/app-admin/collectd/collectd-5.4.1.ebuild,v 1.1 2014/05/26 01:22:40 mrueg Exp $
# $Header: /var/cvsroot/gentoo-x86/app-admin/collectd/collectd-5.4.1.ebuild,v 1.2 2014/06/30 19:17:49 swift Exp $
EAPI="5"
@ -16,7 +16,7 @@ SRC_URI="${HOMEPAGE}/files/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl static-libs"
IUSE="contrib debug kernel_linux kernel_FreeBSD kernel_Darwin perl selinux static-libs"
# The plugin lists have to follow here since they extend IUSE
@ -56,6 +56,7 @@ COMMON_DEPEND="
dev-libs/libgcrypt:0
sys-devel/libtool
perl? ( dev-lang/perl[ithreads] ( || ( sys-devel/libperl[ithreads] >=sys-devel/libperl-5.10 ) ) )
selinux? ( sec-policy/selinux-collectd )
collectd_plugins_apache? ( net-misc/curl )
collectd_plugins_ascent? ( net-misc/curl dev-libs/libxml2 )
collectd_plugins_bind? ( dev-libs/libxml2 )

@ -1,5 +1,5 @@
DIST gnupg-1.4.16.tar.bz2 3656752 SHA256 7b3b748e6aaa338092a0b26b1730cd9355765b55e3684f58dd70f9a1b00f4a2f SHA512 62bccf22211c25cf2ffbf9d35b8f47211e3a71fd92828705d12b23e7d658c9c65c6d845eb5e887e0d855d90a49a5033ecf9de4e22a63e7d3fc052eb1ed33dff4 WHIRLPOOL 7b84449fe7e49e7009d30cdfb8e4b7e1067e3d4bddf94cfa9fca6b3fcfccaa4cd1bd86c3e08507a7f9f1080feb3057b7db1ddcbbaabf42a4fc84d0c36bc91d70
DIST gnupg-1.4.17.tar.bz2 3648762 SHA256 e6dd9d19d62dc434d354076d1f7cea11e87934ff2a0912aa806f848dda0a7b5b SHA512 9a3827182d71557b9909de7c0939518c869e491874dd8120e991cb243ef79c4dd6275e4b77c4d23f124bb2a732cd1ec3357261f579e94c15f71e9afb03f2e19c WHIRLPOOL 2f93d0c16706590b85b5ed66b520e72df825af8d483a68c72ef6ae12a8979c27a9cd682332243514a235b11a28dc08e21d632cc212b34e5107071d2fc0506bf5
DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
DIST gnupg-2.0.22.tar.bz2 4277117 SHA256 437d0ab259854359fc48aa8795af80cff4975e559c111c92c03d0bc91408e251 SHA512 de534b2f4b8d3c320e97519fe0834bc403c96c6dbb2e24fc24eb68f4ff80374360ef66d83ddc3d6fa096c5199d3782abc5d06b866203378cba130b42802cc855 WHIRLPOOL c45e7b2560ae31f013f732863db99f6e23d0de83d03371fe592192c2b5f800503f7a1e273c59e4c99f3aa0401e8cfb2bdbf1c5029534f642305e768009f15fef
DIST gnupg-2.0.23.tar.bz2 4297195 SHA256 cf196b8056eafb4236f000a3e12543e0022a1fec4d6edff1b91b48936c109841 SHA512 5982b25a470b8e6c2874cfadbd2da7db7fb219b5a0be254d73772488b47e2fa1b3825c6640c3659e27905d56d53eaffd34728540081ff160bffea80678d37847 WHIRLPOOL 95184a59be90de483be82b064e8222be0957b0d17466ba80de5b6d8cd8774ca9a3fd83ac967437e4b296905f06ca0f0b2e446fa905ef5871ab1492c7db7e1b3b
DIST gnupg-2.0.24.tar.bz2 4301922 SHA256 d974a1d86c9470571411346368416d96200ef9510028763c1303cd66e3820232 SHA512 5bb879bcadd7006e57580537530517550970a6c71397b9c6630df14925d3d6a8929a51b21e01e4ba33cefa1d845c42f0fa0fdfa0128771794273d544eb514380 WHIRLPOOL 0e637e8aabe93ebe065ee612150554acc80760650752340b3fe50e390612d6778c37cdab5cf03787eca974073b6ce606fc3e744b9fbe5b2aa8a6c4cc55651874
DIST gnupg-2.0.25.tar.bz2 4301689 SHA256 b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823 SHA512 8b80c86ec53ed3b82d15a8e316baf175691e06e1bcac28d66c61fd37d07e26196a7ee7855e6eb958c301cee764866cc3cf00e5ec0aef23abddf7427bb3d23fb1 WHIRLPOOL 786f3db3af0c96249e128ce3a30dee7e9fbec38d75ed29138f0dfdcbe4f4377c39d4152844087cec0147921eed73c1a01382b542c6a27e86e8bd9265f67e65e2

@ -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/app-crypt/gnupg/gnupg-1.4.17.ebuild,v 1.1 2014/06/23 17:50:24 alonbl Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.4.18.ebuild,v 1.2 2014/07/01 01:10:36 jer Exp $
EAPI="5"
@ -17,7 +17,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
IUSE="bzip2 curl ldap mta nls readline selinux smartcard static usb zlib linguas_ru"
COMMON_DEPEND="

@ -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/app-crypt/gnupg/gnupg-2.0.24.ebuild,v 1.1 2014/06/24 14:41:22 alonbl Exp $
# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.25.ebuild,v 1.2 2014/07/01 01:19:31 jer Exp $
EAPI="5"
@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/gnupg/${P}.tar.bz2"
LICENSE="GPL-3"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="adns bzip2 doc ldap nls mta readline static selinux smartcard usb"
COMMON_DEPEND_LIBS="

@ -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/app-doc/podbrowser/podbrowser-0.12-r3.ebuild,v 1.1 2014/06/29 22:23:38 dilfridge Exp $
# $Header: /var/cvsroot/gentoo-x86/app-doc/podbrowser/podbrowser-0.12-r3.ebuild,v 1.2 2014/06/30 06:37:49 zlogene Exp $
EAPI=5
@ -12,7 +12,7 @@ SRC_URI="http://jodrell.net/files/podbrowser/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
KEYWORDS="amd64 ~x86"
IUSE=""
SRC_TEST="do"

@ -1,44 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-doc/podbrowser/podbrowser-0.12.ebuild,v 1.4 2011/03/29 10:16:12 angelos Exp $
EAPI=1
DESCRIPTION="PodBrowser is a documentation browser for Perl"
HOMEPAGE="http://jodrell.net/projects/podbrowser"
SRC_URI="http://jodrell.net/files/podbrowser/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~x86"
IUSE=""
SRC_TEST="do"
RDEPEND="dev-perl/gtk2-gladexml
dev-perl/gtk2-perl
dev-perl/HTML-Parser
dev-perl/Locale-gettext
virtual/perl-Pod-Simple
dev-perl/URI
dev-perl/Gtk2-Ex-PodViewer
dev-perl/Gtk2-Ex-PrintDialog
dev-perl/Gtk2-Ex-Simple-List
>=dev-lang/perl-5.8.0
x11-libs/gtk+:2
>=x11-themes/gnome-icon-theme-2.10.0
>=gnome-base/libglade-2"
DEPEND="${RDEPEND}
sys-devel/gettext"
src_unpack() {
unpack ${A}
cp "${FILESDIR}"/Makefile.new "${S}"/Makefile
}
src_compile() {
emake DESTDIR="${D}" PREFIX=/usr || die "emake failed"
}
src_install() {
emake PREFIX=/usr DESTDIR="${D}" install || die
}

@ -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/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild,v 1.1 2014/04/27 15:35:32 eva Exp $
# $Header: /var/cvsroot/gentoo-x86/app-editors/gedit-plugins/gedit-plugins-3.12.1.ebuild,v 1.2 2014/06/30 12:29:54 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@ -64,8 +64,10 @@ src_install() {
gnome2_src_install
# FIXME: crazy !!!
find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
find "${ED}"/usr/share/gedit -type d -empty -delete || die
if use python; then
find "${ED}"/usr/share/gedit -name "*.py*" -delete || die
find "${ED}"/usr/share/gedit -type d -empty -delete || die
fi
# FIXME: upstream made this automagic...
clean_plugin charmap

@ -1 +1,2 @@
DIST rkhunter-1.4.0.tar.gz 244211 SHA256 8a03d6add50663531994d55aff058eced74c64df948b88176621cd761b68ccf9 SHA512 597e8b2e3f75cd1cb57dd3e33df004265f03ca1503310f984211612da43a160e5d3b50626b4918bd38bf0d239fe2e4a45e55a96212c5a3b5a5645e77e030b60a WHIRLPOOL 45c023b625c7c1664a9f99438b5bebe5ed70265346f122b9d71f91611439d77a2bda01c137698898314183458c4467c66f73bb703b83fbaae2ffe65ded3307ad
DIST rkhunter-1.4.2.tar.gz 277707 SHA256 789cc84a21faf669da81e648eead2e62654cfbe0b2d927119d8b1e55b22b65c3 SHA512 a4e45caaaf5b8262619ebb890784c75c4e30db4c6c0eba305f86d419142b4796c95bc55fe8846dce8d58bc7636bdb365a4a8c41707f64d4d81373687c5a3b0d4 WHIRLPOOL 911ed8e37e112516adba3afb63e3d4862d061ea35cd4b8becea455922d6b2a744f4b8e7cf92685cff29c3192c594dfc58ba3c194f371dd4d95530bd4c09c5d84

@ -0,0 +1,68 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-forensics/rkhunter/rkhunter-1.4.0.ebuild,v 1.9 2014/06/30 14:21:44 zerochaos Exp $
EAPI=4
inherit eutils bash-completion-r1
DESCRIPTION="Rootkit Hunter scans for known and unknown rootkits, backdoors, and sniffers."
HOMEPAGE="http://rkhunter.sf.net/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 ~mips ppc x86"
IUSE=""
RDEPEND="
app-shells/bash
dev-lang/perl
sys-process/lsof[rpc]
virtual/cron
virtual/mailx
"
S="${WORKDIR}/${P}/files"
src_prepare() {
epatch "${FILESDIR}/${P}.conf.patch"
}
src_install() {
# rkhunter requires to be root
dosbin ${PN}
# rkhunter doesn't create it by itself
dodir /var/lib/${PN}/tmp
insinto /etc
doins ${PN}.conf
exeinto /usr/lib/${PN}/scripts
doexe *.pl
insinto /var/lib/${PN}/db
doins *.dat
insinto /var/lib/${PN}/db/i18n
doins i18n/*
doman ${PN}.8
dodoc ACKNOWLEDGMENTS CHANGELOG FAQ README
exeinto /etc/cron.daily
newexe "${FILESDIR}/${PN}-1.3.cron" ${PN}
newbashcomp "${FILESDIR}/${PN}.bash-completion" ${PN}
}
pkg_postinst() {
elog "A cron script has been installed to /etc/cron.daily/rkhunter."
elog "To enable it, edit /etc/cron.daily/rkhunter and follow the"
elog "directions."
elog "If you want ${PN} to send mail, you will need to install"
elog "virtual/mailx or alter the EMAIL_CMD variable in the"
elog "cron script and possibly the MAIL_CMD variable in the"
elog "${PN}.conf file to use another mail client."
}

@ -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/app-leechcraft/lc-poshuku/lc-poshuku-0.6.65.ebuild,v 1.1 2014/04/10 18:01:20 maksbotan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-poshuku/lc-poshuku-0.6.65.ebuild,v 1.2 2014/06/30 12:07:22 maksbotan Exp $
EAPI="4"
@ -9,8 +9,8 @@ inherit confutils leechcraft
DESCRIPTION="Poshuku, the full-featured web browser plugin for LeechCraft."
SLOT="0"
KEYWORDS=" ~amd64 ~x86"
IUSE="debug +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks
KEYWORDS="~amd64 ~x86"
IUSE="+autosearch debug +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks
+pcre postgres +sqlite wyfv"
DEPEND="~app-leechcraft/lc-core-${PV}[postgres?,sqlite?]
@ -30,6 +30,7 @@ pkg_setup() {
src_configure() {
local mycmakeargs="
$(cmake-utils_use_enable autosearch POSHUKU_AUTOSEARCH)
$(cmake-utils_use_enable cleanweb POSHUKU_CLEANWEB)
$(cmake-utils_use_enable fatape POSHUKU_FATAPE)
$(cmake-utils_use_enable filescheme POSHUKU_FILESCHEME)

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild,v 1.1 2013/03/08 22:05:10 maksbotan Exp $
# $Header: /var/cvsroot/gentoo-x86/app-leechcraft/lc-poshuku/lc-poshuku-9999.ebuild,v 1.2 2014/06/30 12:07:22 maksbotan Exp $
EAPI="4"
@ -10,14 +10,15 @@ DESCRIPTION="Poshuku, the full-featured web browser plugin for LeechCraft."
SLOT="0"
KEYWORDS=""
IUSE="debug +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks
+pcre postgres +sqlite wyfv"
IUSE="+autosearch debug +dcac +cleanweb +fatape +filescheme +fua +idn +keywords +onlinebookmarks
+pcre postgres qrd +sqlite wyfv"
DEPEND="~app-leechcraft/lc-core-${PV}[postgres?,sqlite?]
dev-qt/qtwebkit:4
idn? ( net-dns/libidn )
onlinebookmarks? ( >=dev-libs/qjson-0.7.1-r1 )
pcre? ( >=dev-libs/libpcre-8.12 )
qrd? ( media-gfx/qrencode )
"
RDEPEND="${DEPEND}
virtual/leechcraft-downloader-http"
@ -30,13 +31,16 @@ pkg_setup() {
src_configure() {
local mycmakeargs="
$(cmake-utils_use_enable autosearch POSHUKU_AUTOSEARCH)
$(cmake-utils_use_enable cleanweb POSHUKU_CLEANWEB)
$(cmake-utils_use_enable dcac POSHUKU_DCAC)
$(cmake-utils_use_enable fatape POSHUKU_FATAPE)
$(cmake-utils_use_enable filescheme POSHUKU_FILESCHEME)
$(cmake-utils_use_enable fua POSHUKU_FUA)
$(cmake-utils_use_enable idn IDN)
$(cmake-utils_use_enable keywords POSHUKU_KEYWORDS)
$(cmake-utils_use_enable onlinebookmarks POSHUKU_ONLINEBOOKMARKS)
$(cmake-utils_use_enable qrd POSHUKU_QRD)
$(cmake-utils_use_enable pcre POSHUKU_CLEANWEB_PCRE)
$(cmake-utils_use_enable wyfv POSHUKU_WYFV)
"

@ -3,13 +3,16 @@
<pkgmetadata>
<herd>leechcraft</herd>
<use>
<flag name="autosearch">Provide automatic search suggestions for Poshuku.</flag>
<flag name="cleanweb">Build CleanWeb for ad blocking compatible with Firefox's AdBlock+.</flag>
<flag name="dcac">Build color inverter module providing a night mode.</flag>
<flag name="fatape">Build FatApe, GreaseMonkey userscripts support layer.</flag>
<flag name="filescheme">Build FileScheme for accessing local URLs.</flag>
<flag name="fua">Build FUA for faking user agents for different hosts.</flag>
<flag name="keywords">Build Keywords for adjusting search shortcuts.</flag>
<flag name="onlinebookmarks">Build OnlineBookmarks for syncing bookmarks with social bookmarking services like Read It Later.</flag>
<flag name="pcre">Use <pkg>dev-libs/libpcre</pkg> for rules matching in CleanWeb instead of slower QRegExp.</flag>
<flag name="qrd">Build module for displaying the QR code of a web page.</flag>
<flag name="wyfv">Build WYFV for replacing Flash-based video players on some sites.</flag>
</use>
</pkgmetadata>

@ -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/app-misc/bb/bb-1.3.0_rc1-r3.ebuild,v 1.1 2014/06/30 14:18:42 slyfox Exp $
EAPI=5
inherit autotools eutils versionator
MY_P="${PN}-$(get_version_component_range 1-2)$(get_version_component_range 4-4)"
DESCRIPTION="Demonstration program for visual effects of aalib"
HOMEPAGE="http://aa-project.sourceforge.net/"
SRC_URI="mirror://sourceforge/aa-project/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="mikmod"
DEPEND="media-libs/aalib:=
dev-libs/lzo:=
mikmod? ( media-libs/libmikmod:= )
"
RDEPEND="${DEPEND}"
S="${WORKDIR}/${PN}-$(get_version_component_range 1-3)"
src_prepare() {
epatch "${FILESDIR}/${P}-noattr.patch"
epatch "${FILESDIR}/${P}-fix-protos.patch"
epatch "${FILESDIR}"/${P}-messager-overlap.patch
epatch "${FILESDIR}"/${P}-zbuff-fault.patch
epatch "${FILESDIR}"/${P}-printf-cleanup.patch
epatch "${FILESDIR}"/${P}-m4-stuff.patch
# unbundle lzo, #515286
rm -v README.LZO minilzo.{c,h} mylzo.h || die
sed -e 's/minilzo.c//' \
-e 's/minilzo.h//' \
-e 's/README.LZO//' \
-i Makefile.am || die
echo 'bb_LDADD = -llzo2' >> Makefile.am || die
# update code
sed -e 's,#include "minilzo.h",#include <lzo/lzo1x.h>,' \
-e 's,int size = image,lzo_uint size = image,' \
-i image.c || die
# rename binary and manpage bb -> bb-aalib
mv bb.1 bb-aalib.1 || die
sed -e 's/bb/bb-aalib/' \
-i bb-aalib.1
sed -e 's/bin_PROGRAMS = bb/bin_PROGRAMS = bb-aalib/' \
-e 's/man_MANS = bb.1/man_MANS = bb-aalib.1/' \
-e 's/bb_SOURCES/bb_aalib_SOURCES/' \
-e 's/bb_LDADD/bb_aalib_LDADD/' \
-i Makefile.am || die
AT_M4DIR="m4" eautoreconf
}
pkg_postinst() {
elog "bb binary has been renamed to bb-aalib to avoid a naming conflict with sys-apps/busybox."
}

@ -0,0 +1,30 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-cpp/libgnomeuimm/libgnomeuimm-2.28.0-r1.ebuild,v 1.1 2014/06/30 09:42:39 pacho Exp $
EAPI="5"
GNOME_TARBALL_SUFFIX="bz2"
GCONF_DEBUG="no"
inherit gnome2 eutils
DESCRIPTION="C++ bindings for libgnomeui"
HOMEPAGE="http://www.gtkmm.org"
LICENSE="LGPL-2.1"
SLOT="2.6"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
IUSE=""
RDEPEND="
>=gnome-base/libgnomeui-2.7.1
dev-cpp/glibmm
>=dev-cpp/libgnomemm-2.16.0
>=dev-cpp/libgnomecanvasmm-2.6
>=dev-cpp/gconfmm-2.6
>=dev-cpp/libglademm-2.4
>=dev-cpp/gnome-vfsmm-2.16
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"

@ -2,4 +2,5 @@ DIST mysql-workbench-community-6.0.8-src.tar.gz 24746042 SHA256 2598077e516a2e5e
DIST mysql-workbench-community-6.0.9-src.tar.gz 22899136 SHA256 dc88637c62336dd3e68fb2213090c66be0ca81986b7659af934e63599e778e1f SHA512 a99156feed82ce61ff127ca4a26f825bde332c68ac81558b9112933f1eda45ab1a3e5faadada336f22ba4cc4197dbb9d48a33cb6a827823660eb8350119d492c WHIRLPOOL 443350529989336c978feb9b6cbd5b3fed300ecf534941eb4e000a49936f23d3a569a6e26e605f71adac8e7b36b9e95bff8aa8e92b90f4ae202d213f2832792c
DIST mysql-workbench-community-6.1.4-src.tar.gz 22801235 SHA256 2e9b73d8a800341916fbc2d9d347c856408ffef4fe71bcc7786ad88d08302a2b SHA512 b3a8d5bc129228bcc0783838f36b72d97fb73a53592221672fc8b2530e9464d4ea94261e626aa0c040d277132958f6b2a3996f2a4ce4d025fbff7aa2c97875de WHIRLPOOL f93ae041cd06491c5f99cb6d16eb313429196b02190452afdb8fe9bb3196d50d36a6ee89dbb9cad6dec4fc5ca510f31a618df43d32bede55864f0f184b9732e1
DIST mysql-workbench-community-6.1.6-src.tar.gz 24430390 SHA256 d9fb8364784f75426c0f9c10421e272fefa1fe1994ae933eca54c637a3e769de SHA512 d2955756997b3e8121f0da095ca057407337d0c0257f94ae9b096b95996d260f569f473ffb35a68908649cdc20ca4b3438b3a4b1fabd1b1cd0bb365b3b076c3f WHIRLPOOL 55eac43876e545d0bf8ac4d05f3ad46673695f49590920620e6bb4cf5662628fcce1980f875bcb30315e0823e421a49735b032cd416db5c099f6825c5a39763c
DIST mysql-workbench-community-6.1.7-src.tar.gz 24750696 SHA256 06ac657f7f86f012f75fcf8fa59fc1d422134135485b887a4abd6c9ac2408898 SHA512 d5a4d1f6c6ade06ba775d25f40a7933ba75d87a78f19227e1f9be1c9de85d8ffbbe381161db44c05fa875b6d9f933885e542a3fb829bcedef1305190c6b60984 WHIRLPOOL 15147a2df7b64779b5955b77fe53a4c4fcef74e8d6cb3d925841892144a6256df0a8f41b2fef6c43bc4a3196beb211e393e43c057749d983883b9b857f2ac079
DIST mysql-workbench-gpl-5.2.47-src.tar.gz 21924533 SHA256 e6928beb157f1e0abbb8885d16544eefe4d25b05f54dc0fb75b8375d8775838c SHA512 0229c1c3e9b7082f1752cd3f95f4372d9af6bd83b89607f7e74b5460ad72b263b5c89c868ebe19e5182878122357113db0a782865042e096a1d4519733569e15 WHIRLPOOL 40455319a8001ae9365cd164702794be17aa134b254a6a79cfc15c2321a42dfbc463b59f6bb7a34d3d0252fca2b81310014928646d0d5d8e929c46b3de470cb5

@ -0,0 +1,94 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-db/mysql-workbench/mysql-workbench-6.1.7.ebuild,v 1.1 2014/06/30 17:59:00 graaff Exp $
EAPI=5
GCONF_DEBUG="no"
PYTHON_COMPAT=( python{2_6,2_7} )
PYTHON_REQ_USE="sqlite"
CMAKE_MIN_VERSION="2.8.11.1"
inherit gnome2 eutils flag-o-matic python-single-r1 cmake-utils
MY_P="${PN}-community-${PV}-src"
DESCRIPTION="MySQL Workbench"
HOMEPAGE="http://dev.mysql.com/workbench/"
SRC_URI="mirror://mysql/Downloads/MySQLGUITools/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="debug doc gnome-keyring +iodbc"
# glibc: deprecated mutex functions, removed in 2.36.0
CDEPEND="${PYTHON_DEPS}
dev-libs/glib:2
dev-cpp/atkmm
dev-cpp/pangomm
>=dev-cpp/glibmm-2.14:2
>=dev-cpp/gtkmm-2.14:2.4
dev-libs/atk
x11-libs/pango
>=x11-libs/gtk+-2.6:2
gnome-base/libglade:2.0
>=x11-libs/cairo-1.5.12[glib,svg]
dev-libs/libsigc++:2
dev-libs/boost
>=dev-cpp/ctemplate-0.95
>=dev-libs/libxml2-2.6.2:2
dev-libs/libzip
>=virtual/mysql-5.1
dev-libs/libpcre
virtual/opengl
>=dev-lang/lua-5.1[deprecated]
|| ( sys-libs/e2fsprogs-libs dev-libs/ossp-uuid )
dev-libs/tinyxml[stl]
dev-db/mysql-connector-c++
dev-db/vsqlite++
!iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
gnome-keyring? ( gnome-base/libgnome-keyring )
dev-python/pexpect
>=dev-python/paramiko-1.7.4
"
RDEPEND="${CDEPEND}
app-admin/sudo
>=sys-apps/net-tools-1.60_p20120127084908"
DEPEND="${CDEPEND}
dev-lang/swig
virtual/pkgconfig"
S="${WORKDIR}"/"${MY_P}"
src_prepare() {
## Patch CMakeLists.txt
epatch "${FILESDIR}/${PN}-6.0.8-CMakeLists.patch"
## remove hardcoded CXXFLAGS
sed -i -e 's/-O0 -g3//' ext/scintilla/gtk/CMakeLists.txt || die
## package is very fragile...
strip-flags
cmake-utils_src_prepare
}
src_configure() {
local mycmakeargs=(
$(cmake-utils_use_use gnome-keyring GNOME_KEYRING)
$(cmake-utils_use_use iodbc IODBC)
-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
-DPYTHON_LIBRARY="$(python_get_library_path)"
)
cmake-utils_src_configure
}
src_compile() {
# Work around parallel build issues, bug 507838
cmake-utils_src_compile -j1
}

@ -1,149 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r1.ebuild,v 1.2 2014/06/12 19:40:30 jer Exp $
EAPI="5"
inherit java-vm-2 multilib prefix
dist="http://dev.gentoo.org/~caster/distfiles/"
TARBALL_VERSION="${PV}"
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
examples? (
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
)
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
LICENSE="GPL-2-with-linking-exception"
SLOT="6"
KEYWORDS="-* ~amd64 ~x86"
IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source webstart"
REQUIRED_USE="nsplugin? ( X )"
RESTRICT="strip"
# 423161
QA_PREBUILT="opt/.*"
ALSA_COMMON_DEP="
>=media-libs/alsa-lib-1.0.20"
CUPS_COMMON_DEP="
>=net-print/cups-1.4"
X_COMMON_DEP="
>=dev-libs/glib-2.32:2
>=media-libs/freetype-2.4.9:2
>=x11-libs/gtk+-2.24:2
>=x11-libs/libX11-1.4
>=x11-libs/libXext-1.3
>=x11-libs/libXi-1.6
>=x11-libs/libXtst-1.2"
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
>=media-libs/libpng-1.6:0=
>=sys-devel/gcc-4.5.4
>=sys-libs/glibc-2.15
>=sys-libs/zlib-1.2.3-r1
|| ( virtual/jpeg:62 media-libs/jpeg:62 )
selinux? ( sec-policy/selinux-java )"
RDEPEND="${COMMON_DEP}
X? (
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
media-fonts/lklug
media-fonts/lohit-fonts
media-fonts/sazanami
)
)
alsa? ( ${ALSA_COMMON_DEP} )
cups? ( ${CUPS_COMMON_DEP} )"
PDEPEND="webstart? ( dev-java/icedtea-web:0 )
nsplugin? ( dev-java/icedtea-web:0[icedtea7] )"
src_install() {
local dest="/opt/${P}"
local ddest="${ED}/${dest}"
dodir "${dest}"
# Ensures HeadlessGraphicsEnvironment is used.
if ! use X; then
rm -r jre/lib/$(get_system_arch)/xawt || die
fi
# doins can't handle symlinks.
cp -pRP bin include jre lib man "${ddest}" || die
# Remove on next bump as the needed marks are already set by icedtea ebuild.
java-vm_set-pax-markings "${ddest}"
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
if use doc; then
dohtml -r ../doc/html/*
fi
if use examples; then
cp -pRP share/{demo,sample} "${ddest}" || die
fi
if use source; then
cp src.zip "${ddest}" || die
fi
# Remove after next bump, handled by icedtea ebuild. Bug 390663
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
eprefixify "${T}"/fontconfig.Gentoo.properties
insinto "${dest}"/jre/lib
doins "${T}"/fontconfig.Gentoo.properties
if use webstart || use nsplugin; then
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/bin/itweb-settings
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/itweb-settings ${dest}/jre/bin/itweb-settings
fi
if use webstart; then
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/bin/javaws
dosym /usr/$(get_libdir)/icedtea${SLOT}-web/bin/javaws ${dest}/jre/bin/javaws
fi
set_java_env
java-vm_revdep-mask "${dest}"
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
fi
}
pkg_postinst() {
if use nsplugin; then
if [[ -n ${REPLACING_VERSIONS} ]] && ! version_is_at_least 6.1.13.3-r1 ${REPLACING_VERSIONS} ]]; then
elog "The nsplugin for icedtea-bin is now provided by the icedtea-web package"
elog "If you had icedtea-bin-6 nsplugin selected, you may see a related error below"
elog "The switch should complete properly during the subsequent installation of icedtea-web"
elog "Afterwards you may verify the output of 'eselect java-nsplugin list' and adjust accordingly'"
fi
fi
# Set as default VM if none exists
java-vm-2_pkg_postinst
}

@ -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-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild,v 1.1 2014/06/27 14:34:25 caster Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3-r3.ebuild,v 1.2 2014/06/30 22:34:34 caster Exp $
EAPI="5"
@ -70,7 +70,7 @@ RDEPEND="${COMMON_DEP}
cups? ( ${CUPS_COMMON_DEP} )"
PDEPEND="webstart? ( dev-java/icedtea-web:0 )
nsplugin? ( dev-java/icedtea-web:0[icedtea7] )"
nsplugin? ( dev-java/icedtea-web:0[nsplugin] )"
src_install() {
local dest="/opt/${P}"

@ -1,153 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea-bin/icedtea-bin-6.1.13.3.ebuild,v 1.4 2014/06/12 19:40:30 jer Exp $
EAPI="5"
inherit java-vm-2 multilib prefix
dist="http://dev.gentoo.org/~caster/distfiles/"
TARBALL_VERSION="${PVR}"
PLUGIN_VERSION="${PVR}"
DESCRIPTION="A Gentoo-made binary build of the IcedTea JDK"
HOMEPAGE="http://icedtea.classpath.org"
SRC_URI="
amd64? ( ${dist}/${PN}-core-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-core-${TARBALL_VERSION}-x86.tar.bz2 )
doc? ( ${dist}/${PN}-doc-${TARBALL_VERSION}.tar.bz2 )
examples? (
amd64? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-examples-${TARBALL_VERSION}-x86.tar.bz2 )
)
nsplugin? (
amd64? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-amd64.tar.bz2 )
x86? ( ${dist}/${PN}-nsplugin-${PLUGIN_VERSION}-x86.tar.bz2 )
)
source? ( ${dist}/${PN}-src-${TARBALL_VERSION}.tar.bz2 )"
LICENSE="GPL-2-with-linking-exception"
SLOT="6"
KEYWORDS="-* amd64 x86"
IUSE="+X +alsa cjk +cups doc examples nsplugin selinux source"
REQUIRED_USE="nsplugin? ( X )"
RESTRICT="strip"
# 423161
QA_PREBUILT="opt/.*"
ALSA_COMMON_DEP="
>=media-libs/alsa-lib-1.0.20"
CUPS_COMMON_DEP="
>=net-print/cups-1.4"
X_COMMON_DEP="
>=dev-libs/glib-2.32:2
>=media-libs/freetype-2.4.9:2
>=x11-libs/gtk+-2.24:2
>=x11-libs/libX11-1.4
>=x11-libs/libXext-1.3
>=x11-libs/libXi-1.6
>=x11-libs/libXtst-1.2"
COMMON_DEP="
>=media-libs/giflib-4.1.6-r1
>=media-libs/libpng-1.6:0=
>=sys-devel/gcc-4.5.4
>=sys-libs/glibc-2.15
>=sys-libs/zlib-1.2.3-r1
|| ( virtual/jpeg:62 media-libs/jpeg:62 )
nsplugin? (
>=dev-libs/atk-1.30.0
>=dev-libs/nspr-4.8
>=x11-libs/cairo-1.8.8
>=x11-libs/pango-1.24.5
)
selinux? ( sec-policy/selinux-java )"
RDEPEND="${COMMON_DEP}
X? (
${X_COMMON_DEP}
media-fonts/dejavu
cjk? (
media-fonts/arphicfonts
media-fonts/baekmuk-fonts
media-fonts/lklug
media-fonts/lohit-fonts
media-fonts/sazanami
)
)
alsa? ( ${ALSA_COMMON_DEP} )
cups? ( ${CUPS_COMMON_DEP} )"
src_install() {
local dest="/opt/${P}"
local ddest="${ED}/${dest}"
dodir "${dest}"
# Ensures HeadlessGraphicsEnvironment is used.
if ! use X; then
rm -r jre/lib/$(get_system_arch)/xawt || die
fi
# doins can't handle symlinks.
cp -pRP bin include jre lib man "${ddest}" || die
# Remove on next bump as the needed marks are already set by icedtea ebuild.
java-vm_set-pax-markings "${ddest}"
dodoc ../doc/{ASSEMBLY_EXCEPTION,THIRD_PARTY_README}
if use doc; then
dohtml -r ../doc/html/*
fi
if use examples; then
cp -pRP share/{demo,sample} "${ddest}" || die
fi
if use source; then
cp src.zip "${ddest}" || die
fi
if use nsplugin; then
cp -pPR ../icedtea-web-bin-${SLOT} "${ddest}"/.. || die
install_mozilla_plugin "/opt/icedtea-web-bin-${SLOT}/$(get_libdir)/IcedTeaPlugin.so"
docinto icedtea-web
dodoc ../doc/icedtea-web/*
fi
# Remove after next bump, handled by icedtea ebuild. Bug 390663
cp "${FILESDIR}"/fontconfig.Gentoo.properties.src "${T}"/fontconfig.Gentoo.properties || die
eprefixify "${T}"/fontconfig.Gentoo.properties
insinto "${dest}"/jre/lib
doins "${T}"/fontconfig.Gentoo.properties
set_java_env
java-vm_revdep-mask "${dest}"
java-vm_sandbox-predict /proc/self/coredump_filter
}
pkg_preinst() {
if has_version "<=dev-java/icedtea-bin-1.10.4:${SLOT}"; then
# portage would preserve the symlink otherwise, related to bug #384397
rm -f "${EROOT}/usr/lib/jvm/icedtea6-bin"
elog "To unify the layout and simplify scripts, the identifier of Icedtea-bin-6*"
elog "has changed from 'icedtea6-bin' to 'icedtea-bin-6' starting from version 6.1.10.4"
elog "If you had icedtea6-bin as system VM, the change should be automatic, however"
elog "build VM settings in /etc/java-config-2/build/jdk.conf are not changed"
elog "and the same holds for any user VM settings. Sorry for the inconvenience."
fi
}
pkg_postinst() {
# Set as default VM if none exists
java-vm-2_pkg_postinst
if use nsplugin && [[ -z ${REPLACING_VERSIONS} ]]; then
elog "The icedtea-bin-${SLOT} browser plugin can be enabled using eselect java-nsplugin"
elog "Note that the plugin works only in browsers based on xulrunner-1.9.1+"
elog "such as Firefox 3.5+ and recent Chromium versions."
fi
}

@ -1,8 +1,9 @@
# Copyright 1999-2012 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblinebreak/liblinebreak-2.1.ebuild,v 1.3 2012/12/02 10:39:49 maekke Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblinebreak/liblinebreak-2.1.ebuild,v 1.4 2014/06/30 15:11:44 jer Exp $
EAPI=4
EAPI=5
inherit eutils
DESCRIPTION="Line breaking library"
HOMEPAGE="http://vimgadgets.sourceforge.net/liblinebreak/"
@ -20,5 +21,5 @@ src_configure() {
src_install() {
default
find "${ED}" -name '*.la' -exec rm -vf {} +
prune_libtool_files
}

@ -3,3 +3,4 @@ DIST liblognorm-0.3.3.tar.gz 322203 SHA256 03e1a43003ea8d6709c4b567a49f386c9c59f
DIST liblognorm-0.3.4.tar.gz 322316 SHA256 464a0a7dc92333a321c6549b7c2a2d416f92d2447af8ce78c2e0da99ef29d968 SHA512 0cdee1e5ee90c681bce53aa80a730d21aa2de1346c3f3463c7b8588f3d6c731430ae28bc6995238d52eccd1314d781b0f2f8c9285326b752050883ae64fe1cf2 WHIRLPOOL fcc64bc7341f4d3efbd2e88613dcb514888588331a27d8797daabcb62d7362a3ae1da2aced75c74c66b2b43a82628e547ca8b6c4ce57ce5d97c6db4cb261ed4d
DIST liblognorm-0.3.5.tar.gz 322410 SHA256 5714f145b379adb64fe1d87ea6adec9e8d91e5fe1bc0654febb85960dc34dd06 SHA512 e48f172fb2a41c7c5924cfe231ee4144d1e8458c836b44617f6e41173f35ff8d752b488fbb4ad76a72f7562e35be866ac81cf487bfd1fe7439437d4721b59e08 WHIRLPOOL 10044c343adab5aef5833919f8f47bd4b986e88aaa94d0864689107f7a9c3079016d1a81b24f722c0ed8ad302b8a007efcebad2949163dbf20a5c1c359a5473c
DIST liblognorm-0.3.6.tar.gz 345483 SHA256 e2cf27027905c7be91c891b5ac9304a88a5c1981cd36011c84b45de29336b111 SHA512 86138738c7945861cf012bb0148d747c1161956db9bc60589e5b91d6210aa7fcf9b28bc63ab3d865d8c20be26ed1654de4a942b5e9a4d32a967978ad6693a77c WHIRLPOOL dc6f95ae0f9f1f7f6251ec2826366660a54808f09dfc08ac70c112d1afccae24a93791c0fd34d5e07f2232a502d3880507f094ce30fd7c7098c5d24e8ce06e5c
DIST liblognorm-0.3.7.tar.gz 346903 SHA256 b000ab7aab9ed3d7a2c23303463b5bcceb7bb6538714bd41248d02913a82e223 SHA512 f7dac7b913d61cc86bf55d0278ae96055e5336ba304fefb3abf4604976f1713ad5e6bba983a1d29b71cac987e9587e5310454e9ae9e07c3f332cd2ce329c9164 WHIRLPOOL 521ea13c8311fa9411bfc026b7a6118e8a34dafcdc298b9ff8115c555bf7614f7afb3f49f806b9bbbc377f97e9d95402261f515b7cd55dcd9f45c40c89d1ad38

@ -0,0 +1,34 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/liblognorm/liblognorm-0.3.7.ebuild,v 1.1 2014/06/30 12:16:36 maksbotan Exp $
EAPI=5
AUTOTOOLS_AUTORECONF="yes"
inherit autotools-utils
DESCRIPTION="Fast samples-based log normalization library"
HOMEPAGE="http://www.liblognorm.com"
SRC_URI="http://www.liblognorm.com/files/download/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~x86 ~amd64-linux"
IUSE="debug static-libs"
RDEPEND="
>=dev-libs/libestr-0.1.3
>=dev-libs/libee-0.3.2
"
DEPEND="${RDEPEND}
virtual/pkgconfig
"
DOCS=( ChangeLog )
PATCHES=( "${FILESDIR}"/respect_CFLAGS.patch )
src_compile() {
autotools-utils_src_compile -j1
}

@ -1 +1,2 @@
DIST lzo-2.06.tar.gz 583045 SHA256 ff79e6f836d62d3f86ef6ce893ed65d07e638ef4d3cb952963471b4234d43e73 SHA512 2369b87627c6f075b58b88189344989969050289185596db1174e6d918baa2b86e6076c8ec9cc68953df10c13bd1145d841603f26bde8a80111fb0d7091bf1c7 WHIRLPOOL 7d7fd154a73ed8a123eefb7934ec387be6cc34264c7601a5b2d92be67feb7e445cabdb1a38693f6f79ab1ccde44ce9e94eb5e4542053ea1acae83593b384bda7
DIST lzo-2.08.tar.gz 589045 SHA256 ac1b3e4dee46febe9fd28737eb7f5692d3232ef1a01da10444394c3d47536614 SHA512 d03ae521000d69dd1fc92112a7b6e642c388b2898d7fb6ac4168e947a895e8d5e77199f78f05e036cefe02f346ea242bca694522f3c7959ab6ca19de956162dd WHIRLPOOL bea0357b01cb64018a5afc7b0934065dda944866aa23f44edd4eb615d53c0242b70c836d2d8144ed64df4a438bea5c1b8b5120ee4a7f08af15db171f85c11ac8

@ -0,0 +1,43 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-libs/lzo/lzo-2.08.ebuild,v 1.2 2014/06/30 14:44:28 jer Exp $
EAPI=5
inherit eutils multilib-minimal
DESCRIPTION="An extremely fast compression and decompression library"
HOMEPAGE="http://www.oberhumer.com/opensource/lzo/"
SRC_URI="http://www.oberhumer.com/opensource/lzo/download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="examples static-libs"
RDEPEND="abi_x86_32? (
!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
)"
DOCS="BUGS ChangeLog README THANKS doc/*"
multilib_src_configure() {
ECONF_SOURCE=${S} \
econf \
--docdir="${EPREFIX}"/usr/share/doc/${PF} \
--enable-shared \
$(use_enable static-libs static)
}
multilib_src_install_all() {
einstalldocs
rm -f "${ED}"/usr/share/doc/${PF}/COPYING
if use examples; then
docinto examples
dodoc examples/*.{c,h}
fi
prune_libtool_files
}

@ -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-perl/Sys-Virt/Sys-Virt-1.2.5.ebuild,v 1.1 2014/06/28 17:17:03 zlogene Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Sys-Virt/Sys-Virt-1.2.5.ebuild,v 1.2 2014/06/30 12:12:44 maksbotan Exp $
EAPI=5

@ -1,2 +1,2 @@
DIST Unicode-LineBreak-2013.10.tar.gz 293277 SHA256 83e1b9214d49837dd8c6d071168aa07d84741f783ff076186f525b5fe0602925 SHA512 07dbbb8cfdcf4824d19984ebc9aae7000d8706a012256b8d0f08232fd45555412b4e855ad0de3d2d01b4d750cc3ae6b17928cc5688853490381fa23c3ac60f6c WHIRLPOOL b8cbde0bbbac0ee485f9147c011ba364b988aa044808c119d915a11f22ef4410e0d54abb3a730c52ccf787e4989e0c60ed2473f65e90794adbe91f2d4c21193c
DIST Unicode-LineBreak-2013.11.tar.gz 289906 SHA256 8946b883ae687ff652e93d6185e23a936c7f337f2e115851fdfed72e1f73c7f9 SHA512 2b24ec1ab32127d2860d3e6bc060af95e0d3079191e17f00afed143cda0b8d8af5f0516180299ffa9cc8c2e1f047f022b64c39a308a8ac785362fac5aa166e86 WHIRLPOOL 928ff680803e888c68bc027c511ecc6611d09ac94466bbf6a1fc2da188180adedb757b64645e438a97c73b0f17e894d0d5f4bca15129e48dc27a854210fd6781
DIST Unicode-LineBreak-2014.06.tar.gz 299755 SHA256 5c06dfb5036bbcc1043b366df48fd3a993a6cfaa1c2c5b4efd2b0d87fec54f8d SHA512 35c0ff92b02a152142d66bf47d976e616f24e9cc08d5ec101fb881a87d951e71b45674082b73677391180c20d4a8ad56acbb523b25c53726f2d0d80c619d75a3 WHIRLPOOL e651349974ba1c7525604c2a6a5068b46f6526ffb1501a255ca620cd2addb59aee42d9ca3330078558776b407ae46f1691df3a25c5e27557ee6d566b83ac7933

@ -1,14 +1,15 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2013.10.ebuild,v 1.1 2013/10/21 07:24:27 mrueg Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unicode-LineBreak/Unicode-LineBreak-2014.60.0.ebuild,v 1.1 2014/07/01 00:06:07 mrueg Exp $
EAPI=5
MODULE_AUTHOR="NEZUMI"
MODULE_VERSION="2014.06"
inherit perl-module
DESCRIPTION=" UAX #14 Unicode Line Breaking Algorithm"
DESCRIPTION="UAX #14 Unicode Line Breaking Algorithm"
SLOT="0"
KEYWORDS="~amd64"

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unix-Getrusage/Unix-Getrusage-0.030.0.ebuild,v 1.3 2013/04/27 18:42:12 ago Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Unix-Getrusage/Unix-Getrusage-0.030.0.ebuild,v 1.4 2014/06/30 08:12:09 zlogene Exp $
EAPI=5
@ -12,6 +12,6 @@ inherit perl-module
DESCRIPTION="Perl interface to the Unix getrusage system call"
SLOT="0"
KEYWORDS="amd64 x86"
KEYWORDS="amd64 ~mips x86"
SRC_TEST="do parallel"

@ -1,5 +1 @@
DIST fells_loop.gpx 29789 SHA256 29dc50a741ce01d15370fea60e128d557bdc688b3ed9652df6484a2194a649ac SHA512 329f6d764a52fc759df64b8f2f71db7c085b905d12019cd67bec2de7f87c4418a9deeb046324b11d713197fa35f0d2d00a7adbba3b13a55df8fb90c636392fda WHIRLPOOL 04969a29592322917760ace209ebc1ed0ecd0a24d07eb8b86e1d8289afd5dc3537a2a7b030fcbd25c953f660ed40b396b060bd0ff9cd545284f529fdd051ef57
DIST geopy-0.95.1.tar.gz 32504 SHA256 2db216b60289d9b34d802859b4d51ad41bbc0230e934ef14b625d2f5474c9d33 SHA512 a90bf40a0f543a6699f110c8498ac10803f0f85a0fae3074eccf203279f0a84021a5c40c4ff0b3ed514471f4939b151aa2ccf73eb6fe45f7814e27227e21ed88 WHIRLPOOL cff5ff7ff62a079eb7609c714a4903c76482109e5bc288dc77f6012fa4e6058aa6d4798b1369ce61e9fc4a01a429beb967d6a93bbf12200c46c2d06cbe94a6c7
DIST geopy-0.96.2.tar.gz 27749 SHA256 2f0d250f41cdf32b5204c4e84957fa49c54e6919790688dd2b575bbf535d7506 SHA512 9eb02ac0c1b1d66dff203c736fb5d5e8f41d92d0c06b08cce6e877c22fc55bccd5b2f760f188122adac0838b8cc24bb296f24c038148b16141cb32db38a17e60 WHIRLPOOL 55ae1b51ca0a7fb49bf5c296d958e5de46236e0d53e927abcf6f06b5cd8c16c014596ef4dd4a6e75af282c332cbfc1eaaae97b0ec6dd1934645a06bf0a84017e
DIST geopy-0.97.tar.gz 62002 SHA256 17af9b4c8a07a69525537b675d8a1cea89e2c4fad7e3d7379282ecbb5c840240 SHA512 fb586c1828e8971c8d199c3781d0bdab5bbcee12a17c2d80e6a5de38776888e3c61eb768f133a17c40403607996ff0fd33651e5fa8427f6f5dbf88ae6c82f118 WHIRLPOOL 87de4f622302f4e8041a1c7a88770faa36d8fda988d6915d5509c903506a12f25d2703c6ab430b5534113c5d991fb4cdf6abb5c2aae19d5af49577226413ad9f
DIST geopy-0.99.tar.gz 65066 SHA256 463327a27871fcfe74e22b0de47b79d61dbb4085471be0efc9135fa14b11334c SHA512 67809c498c1118d75c5d8fa55354df46e6f7a95c4194f25373ac622b517fdac50bc489b3de8635518fa7b5f41807119b498abb60487314f5fc218b228e1afe22 WHIRLPOOL daac6fe50ef8f1ea11a94ac7702313ca2ae0f05c916e8f453bc05c88c0959850130db1e92e3be20ef2457dc2aefaee58bfa041d2300e8566ac7f2d0382c6b2d6

@ -1,34 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.95.1.ebuild,v 1.2 2014/03/31 21:00:15 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="A Geocoding Toolbox for Python"
HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz
http://dev.gentoo.org/~idella4/fells_loop.gpx"
IUSE="test"
RDEPEND="<=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
python_prepare_all() {
# Missing source file, http://code.google.com/p/geopy/issues/detail?id=66&thanks=66&ts=1367561505
if use test; then
cp -r "${DISTDIR}"/fells_loop.gpx geopy/tests/ || die
fi
}
python_test() {
nosetests || die "Tests failed under ${EPYTHON}"
}

@ -1,26 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.96.2.ebuild,v 1.2 2014/03/31 21:00:15 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="A Geocoding Toolbox for Python"
HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
IUSE="test"
RDEPEND="<=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
python_test() {
nosetests || die "Tests failed under ${EPYTHON}"
}

@ -1,26 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.97.ebuild,v 1.2 2014/03/31 21:00:15 mgorny Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
inherit distutils-r1
DESCRIPTION="A Geocoding Toolbox for Python"
HOMEPAGE="http://www.geopy.org/ http://pypi.python.org/pypi/geopy http://code.google.com/p/geopy/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
IUSE="test"
RDEPEND="<=dev-python/beautifulsoup-4.0[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
python_test() {
nosetests || die "Tests failed under ${EPYTHON}"
}

@ -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-python/geopy/geopy-0.99.ebuild,v 1.1 2014/04/10 15:24:36 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/geopy/geopy-0.99.ebuild,v 1.2 2014/06/30 04:45:51 floppym Exp $
EAPI=5
@ -14,7 +14,8 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
IUSE="test yahoo"
RDEPEND="yahoo? ( >=dev-python/requests-oauthlib-0.4.0[$(python_gen_usedep 'python2*' python3_3)] )"
DEPEND="test? ( dev-python/nose[${PYTHON_USEDEP}] )"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
LICENSE="MIT"
SLOT="0"

@ -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-python/mimerender/mimerender-0.5.4.ebuild,v 1.2 2014/05/30 08:55:49 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/mimerender/mimerender-0.5.4.ebuild,v 1.3 2014/06/30 04:34:42 floppym Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
@ -16,4 +16,5 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
RDEPEND="dev-python/mimeparse[${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}"
DEPEND="${RDEPEND}
dev-python/setuptools[${PYTHON_USEDEP}]"

@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pkginfo/pkginfo-1.0.ebuild,v 1.3 2014/03/31 20:41:25 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pkginfo/pkginfo-1.0.ebuild,v 1.4 2014/06/30 07:17:01 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7} pypy pypy2_0 )
PYTHON_COMPAT=( python2_7 pypy )
inherit distutils-r1

@ -1 +1,2 @@
DIST pyenchant-1.6.5.tar.gz 62294 SHA256 623f332a9fbb70ae6c9c2d0d4e7f7bae5922d36ba0fe34be8e32df32ebbb4f84 SHA512 de90f6e224880244c02537efeb38b4717973ef3aa117503ed4f582819c3ef651a1d5572c0a988bff44543e4b4b733a1a821758e329f57b40480cab97b39e8ea8 WHIRLPOOL 4b7d4e561a2a4aefe811a27f3cb6880df316273d198f8160b1150087adb6e8ff592579ccb69b6025666b27c836fc37dff66b66d8445d718bd965c2cd0e3c798d
DIST pyenchant-1.6.6.tar.gz 64010 SHA256 25c9d2667d512f8fc4410465fdd2e868377ca07eb3d56e2b6e534a86281d64d3 SHA512 af6aa1ac77b5718ec4b4aad3d0b88d26e697b472ec8261b23b37fdbf6b399a120ccc3e4ee6579b884c44b0eeb3f95bcdbceea189105c05088a48400a0c8cdb90 WHIRLPOOL 72f6be0f5012fe467395aa9e55378d1aafcdab45e75d2ea2fb8b9bff9ab6aaccbe36806074381ed7c4703dcc93bcc24caf29830302b8986e89ffc29eb0b5042e

@ -0,0 +1,31 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyenchant/pyenchant-1.6.6.ebuild,v 1.1 2014/06/30 15:28:42 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
inherit distutils-r1
DESCRIPTION="Python bindings for the Enchant spellchecking system"
HOMEPAGE="http://pyenchant.sourceforge.net http://pypi.python.org/pypi/pyenchant"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
DEPEND="
>=app-text/enchant-${PV%.*}
dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"
python_test() {
if [[ -n "$(LC_ALL="en_US.UTF-8" bash -c "" 2>&1)" ]]; then
ewarn "Disabling tests due to missing en_US.UTF-8 locale"
else
esetup.py test
fi
}

@ -1,3 +1 @@
DIST pyprof2calltree-1.1.0.tar.gz 6030 SHA256 180295d1a17caadbc4b45c94232d291c9762d3ab5445000858bd6d1ac78793ac SHA512 a553c1d70ac8548ea63148e1e6a86d0b4678febc00b366871a685c01d71b3a008744c3a1cb9fafadf0bd7d2dfcfcead3f4523aca977ebc67bbcfd8ef1d56e37b WHIRLPOOL 14e5d956d6e4dd46947b87d5e8e161e66439e24d34e16173cedff78249864c4a04d82435a0d513c209f75f56a7fd97c44b95fe24fe46ca270dad5adbe08e28b8
DIST pyprof2calltree-1.1.1.tar.gz 6323 SHA256 11279527c74cf9bde36d842bf2c2d161ec3554adf176c71007f7f7b2339732aa SHA512 ae5774301b27cfdbd034e03e17b57160bf7312af12294071ccfa3c8d8cf03576d3c2b525f226ee3666594b8ac9ebe4a4d403acee5f7d8e5685356e130ab9c169 WHIRLPOOL bc4b3338aefaccd0e194c5f432ea25e73a4f6f019959719943e398fa878f719618053d2aa3c7eba28eb3789359d544e830e37287d4706cb012f83ca57f7e922d
DIST pyprof2calltree-1.3.1.tar.gz 6565 SHA256 3afdd4e6ba4d5d02fcf4815f9eebb816c0f74ba936ae34a7e264f26739be1f89 SHA512 ba939fe9ab28066067dc0989221acbf8d5c84b5cdb68850fd90b4579f8ab812883561447ae61cc896b5e461591ba5b1e40e666e21f8a824071b9c98d80e583a9 WHIRLPOOL 1120d15deb1409eb70d9af1483fa0392be124f70848b86779dea1ef5753cef03a3c82b83bc692a1d2ea1e848f0045206d85d2af9bb99b5c429946f8f9c1a35ac

@ -1,19 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprof2calltree/pyprof2calltree-1.1.0.ebuild,v 1.2 2012/12/15 08:02:55 ulm Exp $
EAPI=3
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
inherit distutils
DESCRIPTION="convert python profile data to kcachegrind calltree form"
HOMEPAGE="http://pypi.python.org/pypi/pyprof2calltree/"
SRC_URI="mirror://pypi/p/${PN}/${PF}.tar.gz"
IUSE=
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"

@ -1,19 +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/pyprof2calltree/pyprof2calltree-1.1.1.ebuild,v 1.1 2013/10/02 02:52:01 patrick Exp $
EAPI=5
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
inherit distutils
DESCRIPTION="convert python profile data to kcachegrind calltree form"
HOMEPAGE="http://pypi.python.org/pypi/pyprof2calltree/"
SRC_URI="mirror://pypi/p/${PN}/${PF}.tar.gz"
IUSE=
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"

@ -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-python/pyprof2calltree/pyprof2calltree-1.3.1.ebuild,v 1.1 2014/04/12 13:47:40 idella4 Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyprof2calltree/pyprof2calltree-1.3.1.ebuild,v 1.2 2014/06/30 04:47:35 floppym Exp $
EAPI=5
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} )
@ -15,3 +15,5 @@ IUSE=
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"

@ -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-python/pyroma/pyroma-1.5.ebuild,v 1.1 2014/04/16 18:35:49 dastergon Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/pyroma/pyroma-1.5.ebuild,v 1.2 2014/06/30 04:33:16 floppym Exp $
EAPI=5
@ -17,11 +17,11 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=""
DOCS=( README.txt HISTORY.txt )
python_test() {
"${PYTHON}" setup.py test || die
"${PYTHON}" setup.py test || die "Testing failed with ${EPYTHON}"
}

@ -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-python/python-magic/python-magic-0.4.6-r1.ebuild,v 1.3 2014/02/15 11:24:44 jer Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-magic/python-magic-0.4.6-r1.ebuild,v 1.4 2014/06/30 04:38:55 floppym Exp $
EAPI=5
@ -16,5 +16,6 @@ SLOT="0"
KEYWORDS="~amd64 ~hppa ~ia64 ~x86"
IUSE=""
DEPEND="sys-apps/file[-python]"
DEPEND="sys-apps/file[-python]
dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND="${DEPEND}"

@ -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-python/python-stdnum/python-stdnum-0.9.ebuild,v 1.1 2014/03/31 21:16:47 cedk Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/python-stdnum/python-stdnum-0.9.ebuild,v 1.2 2014/06/30 08:45:21 cedk Exp $
EAPI=5
PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
@ -16,7 +16,7 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="vies"
RDEPEND="dev-python/setuptools
DEPEND="dev-python/setuptools
vies? ( dev-python/suds )"
RDEPEND="${DEPEND}"

@ -1,2 +1,3 @@
DIST root_numpy-3.2.0.tar.gz 316240 SHA256 ff64ebd9c4b8e99703bed8541bbd5f69742da0e442f8ab0833319252a0bf8006 SHA512 da08a33eeb225a57053eafc6247e55fec8c56e231455c255d71d3adfb6119d35d0b41fcf54d5d99690743a525e9d5ecfcde7efe53fb0551e38affa10e336485f WHIRLPOOL d0a105dcc4c03f33d3683fcdebcf8d140e9a6b6ea4fa7f7fcf4773b03dffd4972ff571aeb8c6e85caea09cc4df0fe3e73c9853d980cb0fe944dd7255e07a2e7e
DIST root_numpy-3.3.0.tar.gz 359688 SHA256 f658bdecada912aed0b92ea84a2e5a64660b28f1476c2387d1e208237da34e5a SHA512 97a75ed46cdb25ff6f7c680c359cc84cf1a9b0f6204d5ee9e7cf0d1bd0847910be7d0599e9a38df42593c56842d7cf6ecd982c2f3620db5c9162442af59c1acb WHIRLPOOL f03a0cf935e4e3ca55cc1d8752e29a5477f4e13972caa3cbfd09ef6902bf059d592af381d232a100cd3e25453def6e8b2530a0f5cb29333d5523d0159b315f7d
DIST root_numpy-3.3.1.tar.gz 361107 SHA256 932de8dea0d1586fe73c07b1a0859032cce4cd122a96c2aa5f4a0d55b8d47097 SHA512 5fe0340c8e0550492b97bde0a75bef4c3b5a302d61090f79e2858b9adf93e0b522dba341a3fb60ca6557d033c429f6c93c1330caf38568a6060ad41e664063e9 WHIRLPOOL 65507c731a53bbc7617a44e2cebb2b6ca11127b6c05d11998b04360fa32ff1cd9f6716bd391331dfdb97307bef08f72bfadf7b65bdc216a8a3090cf505d8a1e6

@ -0,0 +1,36 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/root_numpy/root_numpy-3.3.1.ebuild,v 1.1 2014/06/30 18:40:54 bicatali Exp $
EAPI=5
DISTUTILS_SINGLE_IMPL=1
PYTHON_COMPAT=( python{2_6,2_7} )
inherit distutils-r1
DESCRIPTION="Interface between ROOT and numpy"
HOMEPAGE="https://github.com/rootpy/root_numpy"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="examples test"
RDEPEND="
dev-python/numpy[${PYTHON_USEDEP}]
sci-physics/root[python,${PYTHON_USEDEP}]"
DEPEND="${RDEPEND}
test? ( dev-python/nose[${PYTHON_USEDEP}] )"
python_test() {
cd "${BUILD_DIR}" || die
nosetests -v || die "Testing failed with ${EPYTHON}"
}
python_install_all() {
use examples && local EXAMPLES=( tutorial/. )
distutils-r1_python_install_all
}

@ -1,2 +1 @@
DIST testfixtures-2.3.4.tar.gz 73214 SHA256 376530e6608f072f6655d6a6de495a717040d47db5b04f2afac95ea7041af851 SHA512 858ebe20c0a2d682c2652a14a3e2fceea2e148f1e50d658f20237f3b15a84cf67ad61ff1d6b4a4b6c0a27981b337cf634b6b33fa7f717b7b9a5ceb289b396e47 WHIRLPOOL 4e6d7a8fd1fbac9d2f1c6b769ee810619b8a1db2d24469e7ac14867f19e92b7d0bc9596c09df3c80888dbf71350ddd80134b28564985de144cb3cfab2572d934
DIST testfixtures-3.0.0.tar.gz 75303 SHA256 20e82e23ffc39bd7d55317f2e87e49aa33ac15142f2bd38fedde696ccaa9469f SHA512 9bc7e30cad6a0c932f23de49f9aff099cb4de824f20b4f98bf1fb4a7313d7ac8d763f7c8208bc0f5351dcd899daa3d2fbc18cdc2143c1b65cefbe0f3ba29df0c WHIRLPOOL 5d51daa288f0c31ce0547815b15f7242df4d3309f2c0845cfa36241ba6d16b151caa1924977a35ae9753c1243724d1aac74cda2b7f5e64e981c378fa6696a512

@ -0,0 +1,25 @@
diff -ur testfixtures-3.0.0.orig/docs/conf.py testfixtures-3.0.0/docs/conf.py
--- docs/conf.py 2011-09-23 16:55:53.000000000 +0800
+++ docs/conf.py 2014-06-30 15:36:43.591451878 +0800
@@ -4,8 +4,7 @@
pkg_info = pkginfo.Develop(os.path.join(os.path.dirname(__file__),'..'))
extensions = [
- 'sphinx.ext.autodoc',
- 'sphinx.ext.intersphinx'
+ 'sphinx.ext.autodoc'
]
intersphinx_mapping = {'http://docs.python.org': None}
diff -ur testfixtures-3.0.0.orig/docs/Makefile testfixtures-3.0.0/docs/Makefile
--- docs/Makefile 2011-07-19 00:43:59.000000000 +0800
+++ docs/Makefile 2014-06-30 15:36:31.703450934 +0800
@@ -3,7 +3,7 @@
# You can set these variables from the command line.
SPHINXOPTS =
-SPHINXBUILD = ../bin/sphinx-build
+SPHINXBUILD = /usr/bin/sphinx-build
PAPER =
# Internal variables.

@ -1,130 +0,0 @@
diff -ur testfixtures-2.3.4.orig/testfixtures/tests/test_comparison.py testfixtures-2.3.4/testfixtures/tests/test_comparison.py
--- testfixtures/tests/test_comparison.py 2012-01-26 18:00:05.000000000 +0800
+++ testfixtures/tests/test_comparison.py 2012-04-13 19:00:15.856224293 +0800
@@ -5,7 +5,7 @@
from testfixtures.tests.sample1 import TestClassA,a_function
from unittest import TestCase,TestSuite,makeSuite
-from .compat import py_27_plus
+from compat import py_27_plus
class AClass:
diff -ur testfixtures-2.3.4.orig/tests/test_components.py testfixtures-2.3.4/testfixtures/tests/test_components.py
--- testfixtures/tests/test_components.py 2012-01-27 02:41:51.000000000 +0800
+++ testfixtures/tests/test_components.py 2012-04-13 19:08:44.434220585 +0800
@@ -14,7 +14,7 @@
from testfixtures import compare
from unittest import TestCase
-from .compat import catch_warnings
+from compat import catch_warnings
class ComponentsTests(TestCase):
diff -ur testfixtures-2.3.4.orig/testfixtures/tests/test_docs.py testfixtures-2.3.4/testfixtures/tests/test_docs.py
--- testfixtures/tests/test_docs.py 2012-01-28 16:07:57.000000000 +0800
+++ testfixtures/tests/test_docs.py 2012-04-13 19:03:36.649223003 +0800
@@ -11,7 +11,7 @@
import os
-from . import compat
+import compat
workspace = os.environ.get('WORKSPACE', join(dirname(__file__), pardir, pardir))
tests = glob(join(workspace,'docs', '*.txt'))
diff -ur testfixtures-2.3.4.orig/testfixtures/tests/test_logcapture.py testfixtures-2.3.4/testfixtures/tests/test_logcapture.py
--- testfixtures/tests/test_logcapture.py 2012-01-27 02:41:26.000000000 +0800
+++ testfixtures/tests/test_logcapture.py 2012-04-13 19:09:02.930220838 +0800
@@ -10,7 +10,7 @@
from logging import getLogger
-from .compat import catch_warnings
+from compat import catch_warnings
root = getLogger()
one = getLogger('one')
diff -ur testfixtures-2.3.4.orig/testfixtures/tests/test_replace.py testfixtures-2.3.4/testfixtures/tests/test_replace.py
--- testfixtures/tests/test_replace.py 2012-01-27 02:34:12.000000000 +0800
+++ testfixtures/tests/test_replace.py 2012-04-13 19:09:18.842220416 +0800
@@ -17,7 +17,7 @@
import sample1
import sample2
-from .compat import catch_warnings
+from compat import catch_warnings
class TestReplace(TestCase):
diff -ur testfixtures-2.3.4.orig/testfixtures/tests/test_should_raise.py testfixtures-2.3.4/testfixtures/tests/test_should_raise.py
--- testfixtures/tests/test_should_raise.py 2012-01-27 02:43:51.000000000 +0800
+++ testfixtures/tests/test_should_raise.py 2012-04-13 19:09:36.235220628 +0800
@@ -5,7 +5,7 @@
from testfixtures import should_raise,ShouldRaise,Comparison as C
from unittest import TestCase,TestSuite,makeSuite
-from .compat import py_27_plus
+from compat import py_27_plus
class TestShouldRaise(TestCase):
diff -ur testfixtures-2.3.4.orig/testfixtures/tests/test_tempdirectory.py testfixtures-2.3.4/testfixtures/tests/test_tempdirectory.py
--- testfixtures/tests/test_tempdirectory.py 2012-01-27 02:25:43.000000000 +0800
+++ testfixtures/tests/test_tempdirectory.py 2012-04-13 19:09:54.971220623 +0800
@@ -13,7 +13,7 @@
from logging import getLogger
-from .compat import catch_warnings
+from compat import catch_warnings
class DemoTempDirectory:
diff -ur testfixtures-2.3.4.orig/testfixtures/tests/test_manuel_examples.py testfixtures-2.3.4/testfixtures/tests/test_manuel_examples.py
--- testfixtures/tests/test_manuel_examples.py 2012-01-26 04:31:12.000000000 +0800
+++ testfixtures/tests/test_manuel_examples.py 2012-04-13 21:14:05.390172684 +0800
@@ -11,7 +11,7 @@
from testfixtures import TempDirectory
from testfixtures.manuel import Files
-from . import compat
+import compat
def setUp(test):
test.globs['tempdir']=TempDirectory()
diff -ur testfixtures-2.3.4.orig/testfixtures/components.py testfixtures-2.3.4/testfixtures/components.py
--- testfixtures/components.py 2011-10-12 00:21:45.000000000 +0800
+++ testfixtures/components.py 2012-04-29 18:12:41.891588669 +0800
@@ -4,8 +4,8 @@
import atexit
import warnings
-from zope.component import getSiteManager
-from zope.component.registry import Components
+#from zope.component import getSiteManager
+#from zope.component.registry import Components
class TestComponents:
"""
@@ -20,11 +20,8 @@
atexit_setup = False
def __init__(self):
- self.registry = Components('Testing')
- self.old = getSiteManager.sethook(lambda:self.registry)
self.instances.add(self)
if not self.__class__.atexit_setup:
- atexit.register(self.atexit)
self.__class__.atexit_setup = True
def uninstall(self):
@@ -33,7 +30,6 @@
was in place before this :class:`TestComponents` was
instantiated.
"""
- getSiteManager.sethook(self.old)
self.instances.remove(self)
@classmethod

@ -1,50 +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/testfixtures/testfixtures-2.3.4.ebuild,v 1.3 2013/03/15 20:58:09 idella4 Exp $
EAPI=4
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS=1
RESTRICT_PYTHON_ABIS="3.* *-pypy-* *-jython"
DISTUTILS_SRC_TEST="py.test"
inherit distutils eutils
DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
HOMEPAGE="http://pypi.python.org/pypi/testfixtures/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="doc test"
RDEPEND=""
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx )
test? ( dev-python/manuel )"
src_prepare() {
sed -e s':../bin/sphinx-build:/usr/bin/sphinx-build:' \
-i docs/Makefile || die
epatch "${FILESDIR}"/${P}-adjust_tests.patch
# remove test that tests the stripped zope-component test_components.ComponentsTests
rm -f testfixtures/tests/test_components.py || die
distutils_src_prepare
}
src_compile() {
distutils_src_compile
use doc && emake -C docs html
}
src_test() {
distutils_src_test ${PN}/tests/
}
src_install() {
distutils_src_install
if use doc; then
dohtml -r docs/_build/html/
fi
}

@ -1,9 +1,9 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v 1.3 2014/03/19 23:10:07 bicatali Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/testfixtures/testfixtures-3.0.0.ebuild,v 1.4 2014/06/30 08:18:54 idella4 Exp $
EAPI=5
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
PYTHON_COMPAT=( python{2_7,3_2,3_3} )
inherit distutils-r1
@ -16,18 +16,19 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND=""
DEPEND="${RDEPEND}
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
DEPEND=" dev-python/setuptools[${PYTHON_USEDEP}]
doc? ( dev-python/sphinx[${PYTHON_USEDEP}]
$(python_gen_cond_dep 'dev-python/pkginfo[${PYTHON_USEDEP}]' python2_7) )
test? ( dev-python/manuel[${PYTHON_USEDEP}] )"
src_prepare() {
sed -e s':../bin/sphinx-build:/usr/bin/sphinx-build:' \
-i docs/Makefile || die
# Prevent un-needed download during build, fix Makefile for doc build
PATCHES=( "${FILESDIR}"/docbuild.patch )
python_prepare() {
# remove test that tests the stripped zope-component test_components.ComponentsTests
rm -f testfixtures/tests/test_components.py || die
distutils-r1_src_prepare
distutils-r1_python_prepare
}
python_compile_all() {
@ -39,7 +40,6 @@ python_test() {
}
python_install_all() {
if use doc; then
dohtml -r docs/_build/html/
fi
use doc && HTML_DOCS=( docs/_build/html/. )
distutils-r1_python_install_all
}

@ -1,40 +1,28 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/xlrd-0.9.3.ebuild,v 1.1 2014/05/07 06:43:58 patrick Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/xlrd-0.9.3.ebuild,v 1.2 2014/06/30 09:59:15 idella4 Exp $
EAPI="5"
PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} pypy pypy2_0 )
PYTHON_COMPAT=( python{2_7,3_2,3_3,3_4} pypy )
inherit distutils-r1
DESCRIPTION="Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"
HOMEPAGE="http://pypi.python.org/pypi/xlrd"
HOMEPAGE="http://www.python-excel.org/
https://github.com/python-excel/xlrd/"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
IUSE="doc examples"
DEPEND=""
RDEPEND=""
python_prepare_all() {
# Remove this if examples get reintroduced
sed -i -e "s/test_names_demo/_&/" tests/test_open_workbook.py || die
src_prepare() {
distutils-r1_src_prepare
# add shebang to runxlrd.py
sed -i -e '1i#!/usr/bin/encompdoc.html xlrd.htmlv python' scripts/runxlrd.py || die
distutils-r1_python_prepare_all
}
python_install_all() {
distutils-r1_python_install_all
if use doc; then
dohtml ${PN}/doc/{compdoc.html,xlrd.html}
fi
if use examples; then
docompress -x usr/share/doc/${P}/examples/
insinto usr/share/doc/${P}/examples
doins ${PN}/examples/*
fi
python_test() {
"${PYTHON}" -m unittest discover || die "Test failed with ${EPYTHON}"
}

@ -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-python/yolk-portage/yolk-portage-0.1-r1.ebuild,v 1.2 2014/03/31 20:59:39 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/dev-python/yolk-portage/yolk-portage-0.1-r1.ebuild,v 1.3 2014/06/30 04:32:03 floppym Exp $
EAPI=5
@ -17,5 +17,5 @@ SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE=""
DEPEND=""
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
RDEPEND=">=app-portage/portage-utils-0.1.23"

@ -2,3 +2,4 @@ DIST amqp-0.6.7.gem 83456 SHA256 7d7faf3e394d0a9c5c3574fbd87f9877b85dbd1fa419f5e
DIST amqp-1.0.2.gem 1159680 SHA256 ed5aa5fd296d3a9296000677f666604428d5e3cb30970500b6eb8ddefc06a171 SHA512 3a2bd4f3b28808262fc898e05645264c2a124b6ce8d6be7e49a53ea5c39f129cf8e1b172a930fb523c5d3d228a63f82359d169438eda5c52e6d8428e432a6388 WHIRLPOOL 8f14b3e66bc91605f63f34b8d6c3900e837fca6b223d7bdf521302f9f363e1613d569c032e8cc1c33a03cbe020b6a2fea0554078a7fca9db46d1d7579412a008
DIST amqp-1.1.8.gem 1174528 SHA256 3effc0d3f816b214e588a3cb816d02ec537239609cf538e96a175791307386eb SHA512 c00f34242af6a73df11579c80262663769858a49904c1333635c6ec83259b3cbb5bf0ab6bd9fc8dacf4c406c64165f4f0466ec64313f8b715cfc3f732c7a4e1c WHIRLPOOL c21fc55e9597a77fc0fbc05fa238c618bc7c1a9bc8fd3e6e0b69ffe21cbe2b336f7bd04b8985a80cbea6797b807346e394182fa0b3ec65171ed53141dadb1d7b
DIST amqp-1.3.0.gem 1176576 SHA256 fe0c6ccfc94fd6a52a3a094e283140b7288a7a212fcbd08997ebdfcaac233da9 SHA512 62f8ff88ccd4e100eb984d998ffcd0885293ecf0f90bc2d7b2b26a08ffef4ec8a94a9762b2f028f9416300bbee887edd47d5b2cbe47a62a77c0a48e7e0f78420 WHIRLPOOL e55c5f10b1cc63902a416a81fcc97ea718eddb1048ece11ecc38af350fabadfdd68b07273ac4a49bd70904d1bc7cfa55b544b4d18a03bdb550994ba41b91dab6
DIST amqp-1.4.0.gem 1176576 SHA256 c79c45c9881c2c74ad2bbfdcee2fd11307d0e96760712902079a3e196dae37dc SHA512 456436d361b6b77ccf3004e4cb2110367f59653ba73bf8beb24745210f919f2039147f4527662f9c239b7fbb91d2b614ee60dbd05c071914df12cbc3640530f0 WHIRLPOOL 55d756df8cdee6f45b5c8ac3fbd8d3874aa671a93587d9e890f994bee57a72812a4b009fd8bf1c9d72f52ea11b367828f129b1724e865b4f128ee6af8e2fd857

@ -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-ruby/amqp/amqp-1.4.0.ebuild,v 1.1 2014/06/30 06:09:01 graaff Exp $
EAPI=5
USE_RUBY="ruby19 ruby20 ruby21"
RUBY_FAKEGEM_TASK_DOC=""
RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_BINWRAP=""
inherit versionator ruby-fakegem
DESCRIPTION="AMQP client implementation in Ruby/EventMachine"
HOMEPAGE="http://amqp.rubyforge.org/"
LICENSE="Ruby"
SLOT="$(get_version_component_range 1-2)"
KEYWORDS="~amd64 ~x86"
IUSE=""
ruby_add_bdepend "test? ( dev-ruby/multi_json dev-ruby/evented-spec )"
ruby_add_rdepend ">=dev-ruby/eventmachine-0.12.4
>=dev-ruby/amq-protocol-1.9.2"
all_ruby_prepare() {
#rm Gemfile || die
sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
# Many specs require a live rabbit server, but only root can start
# an instance. Skip these specs for now.
rm -rf spec/integration spec/unit/amqp/connection_spec.rb || die
}
all_ruby_install() {
dodoc -r docs examples
}

@ -1,2 +1,3 @@
DIST buildbot-slave-0.8.7p1.tar.gz 104575 SHA256 bbdb07a3847efa186f942142a09394b467d7375745c49da0a42e9aa5b206eadc SHA512 ee9a119461915716167a258d9c022956e239e21ed524c2ae148b6682dd1410b5d918723e8e51002bc1fc27f67cb59da15cb2293e4939ee5ba08d1e5e067e11fe WHIRLPOOL c523849db5cb743f3b4d93f33305a46682710afcf66fdda3ab807dd412171c5e40e1089849b0f3c901dd75525fe97995a791bf9c15f01f47fdb18d0456b17de3
DIST buildbot-slave-0.8.8.tar.gz 107470 SHA256 8b7532d4d34527aea41e353d1bc3c35291ec335d3224c27800d2cc0cfc9837cc SHA512 1a5b02298696016a8743bc81e7e899a8bc11a09481f6c911cf4d3e016d111d707ca393d102635c4841d5f2ec5f3a0c9413dc0768170415a59c7523a3bc680fd1 WHIRLPOOL 6c387dbe61c2c3223312e3456afa07bcaab345e69667b9aabd600d8abdf93df955d592283dee423eee40596ee90133688c6c0f26f73fe9e4c8d5cced205c0f24
DIST buildbot-slave-0.8.9.tar.gz 120831 SHA256 864ca4a975bdbe3e973812a7d4ac7ffaf6f9ea5b6364e9ddb2fc92bccacf93af SHA512 3cc6b0cafe752fcfe5b91b70faff249cffb2dbfc03274cccffccd739ec448b66986db171924d14ba4de85e843b2f67a36650bcb965f600ec1dd8278f6198a283 WHIRLPOOL c55e51ab6ff54127fed11ba6054867e02b73c899e5d04a7e6a91405057a399e77d4922063ac22b09b1eb366f7ed84964065315a1cef322a18b0741bcab6b9115

@ -0,0 +1,65 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot-slave/buildbot-slave-0.8.9.ebuild,v 1.1 2014/06/30 18:12:05 hwoarang Exp $
EAPI="5"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
DISTUTILS_SRC_TEST="trial buildslave"
DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
inherit distutils readme.gentoo systemd user
DESCRIPTION="BuildBot Slave Daemon"
HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot-slave"
MY_PV="${PV/_p/p}"
MY_P="${PN}-${MY_PV}"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux"
IUSE="test"
RDEPEND="dev-python/setuptools
dev-python/twisted-core
!!<dev-util/buildbot-0.8.1
!<dev-util/buildbot-0.8.3"
DEPEND="${RDEPEND}
test? ( dev-python/mock )"
PYTHON_MODNAME="buildslave"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
python_pkg_setup
enewuser buildbot
DOC_CONTENTS="The \"buildbot\" user and the \"buildslave\" init script has been added
to support starting buildslave through Gentoo's init system. To use this,
set up your build slave following the documentation, make sure the
resulting directories are owned by the \"buildbot\" user and point
\"${ROOT}etc/conf.d/buildslave\" at the right location. The scripts can
run as a different user if desired. If you need to run more than one
build slave, just copy the scripts."
}
src_install() {
distutils_src_install
doman docs/buildslave.1
newconfd "${FILESDIR}/buildslave.confd" buildslave
newinitd "${FILESDIR}/buildslave.initd" buildslave
systemd_dounit "${FILESDIR}/buildslave.service"
readme.gentoo_create_doc
}
pkg_postinst() {
distutils_pkg_postinst
readme.gentoo_print_elog
}

@ -1,2 +1,3 @@
DIST buildbot-0.8.7p1.tar.gz 4597202 SHA256 8dee3f887bce55a7f7cf01e6c421a2511898c2f89f55f202f5193a100a9a5776 SHA512 60d5fc6b65ef3fa4a63b1aed8e7ec352c40e13ef90bd55ef1ea580e1bc6beefea856f245ff33b15cd401db747e5e9c3ea36b37d72e5ca611e492e0ae2050ac4f WHIRLPOOL bb7872017634f3daf3569225e3b9e5c6d5b3c039cfef0b31b8b3b8eabbd1b2484d7956f3840306775a991bc41cfece2190f2c65097453c8322cd2cd9f3d50def
DIST buildbot-0.8.8.tar.gz 4641582 SHA256 5013e3f3d83d2fcac8b5c391e3a740597330015300f0ebb94005ed2f90d739d0 SHA512 bd6f9a7a8bdf53a3f7012af7ec4aa2f1f40479496ca1e95dc1b9e0524dbf3bfcd0fbe09a94f8e68b0fd8018949c841d8b3f6ecc306b388e4b917ad21597d9168 WHIRLPOOL 8eb462502a98c87663eb90c9f6e280bd8c19161ef965424a8a12fe8dbbb481d52cd37bfaa33d6ae874c62fc017cc60d4b83c4f01fdbb2508d0533ec88c1c7f7a
DIST buildbot-0.8.9.tar.gz 4798654 SHA256 6b9e465e6d4825fe1f09d28505318fdb1a75b283c80a140af0f2e2a5039cfa8a SHA512 5788b268689d8594592c2c5dc8c2d0178aca64c1816c7faa0181b446f8b657a4781dbb9a9d4ea0965ccfcd217dc485973fda01bf9d7cac638328dfef01959484 WHIRLPOOL e9a972d29fa6e83273ba5c23dd80b24abefbc346b391f65162ff68da7779374efbb1702918de40717d6402678c37f4918ed4cd6359ba43203f944229c71b0b61

@ -0,0 +1,118 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/buildbot/buildbot-0.8.9.ebuild,v 1.1 2014/06/30 18:10:33 hwoarang Exp $
EAPI="5"
PYTHON_DEPEND="2"
SUPPORT_PYTHON_ABIS="1"
RESTRICT_PYTHON_ABIS="3.* *-jython"
DISTUTILS_SRC_TEST="trial"
DISTUTILS_DISABLE_TEST_DEPENDENCY="1"
inherit distutils readme.gentoo systemd user
MY_PV="${PV/_p/p}"
MY_P="${PN}-${MY_PV}"
DESCRIPTION="BuildBot build automation system"
HOMEPAGE="http://trac.buildbot.net/ http://code.google.com/p/buildbot/ http://pypi.python.org/pypi/buildbot"
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris"
IUSE="doc examples irc mail manhole test"
# sqlite3 module of Python 2.5 is not supported.
RDEPEND=">=dev-python/jinja-2.1
|| ( dev-lang/python:2.7 dev-lang/python:2.6 dev-python/simplejson )
|| ( dev-lang/python:2.7[sqlite] dev-lang/python:2.6[sqlite] dev-python/pysqlite:2 )
>=dev-python/twisted-core-8.0.0
dev-python/twisted-web
<dev-python/sqlalchemy-migrate-0.8
irc? ( dev-python/twisted-words )
mail? ( dev-python/twisted-mail )
manhole? ( dev-python/twisted-conch )"
DEPEND="${DEPEND}
dev-python/setuptools
doc? ( dev-python/sphinx )
test? (
dev-python/python-dateutil
dev-python/mock
dev-python/twisted-mail
dev-python/twisted-web
dev-python/twisted-words
)"
S="${WORKDIR}/${MY_P}"
pkg_setup() {
python_pkg_setup
enewuser buildbot
DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
to support starting buildbot through Gentoo's init system. To use this,
set up your build master following the documentation, make sure the
resulting directories are owned by the \"buildbot\" user and point
\"${EROOT}etc/conf.d/buildmaster\" at the right location. The scripts can
run as a different user if desired. If you need to run more than one
build master, just copy the scripts."
}
src_compile() {
distutils_src_compile
if use doc; then
einfo "Generation of documentation"
pushd docs > /dev/null
#'man' target is currently broken
emake html
popd > /dev/null
fi
}
src_install() {
distutils_src_install
doman docs/buildbot.1
if use doc; then
dohtml -r docs/_build/html/
# TODO: install man pages
fi
if use examples; then
insinto /usr/share/doc/${PF}
doins -r contrib docs/examples
fi
newconfd "${FILESDIR}/buildmaster.confd" buildmaster
newinitd "${FILESDIR}/buildmaster.initd" buildmaster
systemd_dounit "${FILESDIR}"/${PN}.service
# In case of multiple masters, it's possible to edit web files
# so all master can share the changes. So protect them!
# If something else need to be protected, please open a bug
# on http://bugs.gentoo.org
local cp
add_config_protect() {
cp+=" $(python_get_sitedir)/${PN}/status/web"
}
python_execute_function -q add_config_protect
echo "CONFIG_PROTECT=\"${cp}\"" \
> 85${PN} || die
doenvd 85${PN}
readme.gentoo_create_doc
}
pkg_postinst() {
distutils_pkg_postinst
readme.gentoo_print_elog
elog
elog "Upstream recommends the following when upgrading:"
elog "Each time you install a new version of Buildbot, you should run the"
elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
elog "This will add files and fix (or at least detect) incompatibilities between"
elog "your old config and the new code."
}

@ -0,0 +1 @@
DIST travis-yaml-0.1.0.gem 32256 SHA256 1c7fafaaff435c7e126a0bac50b9bfddb977fbf021f7cfc2bfb5388afc33e0a4 SHA512 33fb5ebfc2663e0a4d1c52430961c45dac84d974b1bc912fd8a10052db4869cc455fb8250bf95a1b6760be112a2ecc81a6ffce398a6ddea3829c338b3e20ab6b WHIRLPOOL 42e60afe4e91040f94ac0e5fa66915f4f1e2e0bacc2c0f36c78cb902b4fa7daece19ecd76d860e23daddc4caaa9144b3c88059234e6cad0dd22e0a2eab9d581a

@ -1,5 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>sci-biology</herd>
<maintainer>
<email>mrueg@gentoo.org</email>
<name>Manuel Rüger</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,27 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-util/travis-yaml/travis-yaml-0.1.0.ebuild,v 1.1 2014/06/30 17:00:33 mrueg Exp $
EAPI=5
USE_RUBY="ruby19 ruby20"
RUBY_FAKEGEM_RECIPE_TEST="rspec"
RUBY_FAKEGEM_TASK_DOC="rdoc"
RUBY_FAKEGEM_EXTRADOC="README.md"
inherit ruby-fakegem
DESCRIPTION="Parses and validates your .travis.yml, fast and secure"
HOMEPAGE="https://github.com/travis-ci/travis-yaml"
LICENSE="MIT"
SLOT="0"
KEYWORDS="~amd64"
IUSE=""
ruby_add_rdepend "dev-ruby/psych"
all_ruby_prepare() {
sed -i -e "/bundler/d" -e "/coverage/d" spec/support.rb || die
sed -i -e "1igem \"psych\"" -e "2irequire \"psych\"" spec/support/environment.rb || die
}

@ -1,3 +1,4 @@
DIST gitolite-2.3.1.tar.gz 255807 SHA256 53303fea0154914356830202d3de23f94682bab26197ead8ca05d58818c56e82 SHA512 a658104b54ff6668022a6010b961fbe13b8e7a66242d547e0e4cf685574d8a1fd60065112095b0d73b826f6346973cb3a5db307d84fd5aceba852f2ddd0c86ee WHIRLPOOL 5d08b9c22e6a07478836cca3b7190b61729ef89e181e4746286a4cf48f253fe07647b165f22483d983bae1767d83b39f231414dc96b4e803140f64eb244fc241
DIST gitolite-3.5.3.1.tar.gz 148133 SHA256 688b7f0f93792ae87c6c15d9ba9ba2a16c05a3df4813359e13a40f9ebe35ac58 SHA512 4a40b82f63886430fbd87fe9ba9f3cd70102909b41e1344215d78ed7e698cf5f094658c7bb0e1f07542cee94c88f703766535d749e348c022f39b4516cd0009e WHIRLPOOL e03965eaa6677f1391ad92bedf630929ce155b708981857b539ee8b8264b450cdd730186ac010fdc0fba594a29128cd4322340b41a9212803455729b62bbde17
DIST gitolite-3.6.1.tar.gz 165506 SHA256 7ee03d715cc4d87c0b6dbca5d79daf6f50f657ab33b99da256d7ab02cefe3f6a SHA512 b568f9e96ddfa4cd482197a89cb0142fcb2717028227a0a2e9caa9864bb95379042ec464352a1d99dfd8ccff780b1211e8f926ad8de284245fc280038eda481a WHIRLPOOL 9101ba55ba1a94b53ba3e9421d170d5b650e3e72c390abb3aea186630638b4fa6b8a5d69d9553ed574444be00f263dabcfe11e63f89f2eb3787ab8765e67c4ce
DIST gitolite-3.6.tar.gz 156481 SHA256 ae9180a180a05cad344788eadc8340d6ebcb4cc60d96a1f5ab5fc355d395ba4b SHA512 91606a5fed202f0da2194310bc7da8e5d35cdfa2924b009ed3447ba41e2fd856b9043f1b57d16600ec44f17d640e9ee988b4086bea032827bf5fca83e5ff024f WHIRLPOOL 79b3a553dd25db9a3e99d7725c0932bb0b126f30bd013b9cc53d69f60d0c906eac4134b25f6759d9635e50df3324d731f16c30fb44c25e89df7e35560a3e00b1

@ -0,0 +1,82 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-vcs/gitolite/gitolite-3.6.1.ebuild,v 1.1 2014/07/01 01:22:11 radhermit Exp $
EAPI=5
inherit perl-module user versionator
DESCRIPTION="Highly flexible server for git directory version tracker"
HOMEPAGE="http://github.com/sitaramc/gitolite"
SRC_URI="https://github.com/sitaramc/gitolite/archive/v${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~arm ~x86"
IUSE="tools vim-syntax"
DEPEND="dev-lang/perl
virtual/perl-File-Path
virtual/perl-File-Temp
>=dev-vcs/git-1.6.6"
RDEPEND="${DEPEND}
!dev-vcs/gitolite-gentoo
vim-syntax? ( app-vim/gitolite-syntax )"
pkg_setup() {
enewgroup git
enewuser git -1 /bin/sh /var/lib/gitolite git
}
src_prepare() {
echo $PF > src/VERSION
}
src_install() {
local uexec=/usr/libexec/${PN}
rm -rf src/lib/Gitolite/Test{,.pm}
insinto $VENDOR_LIB
doins -r src/lib/Gitolite
dodoc README.txt CHANGELOG
insopts -m0755
insinto $uexec
doins -r src/{commands,syntactic-sugar,triggers,VREF}/
insopts -m0644
doins src/VERSION
exeinto $uexec
doexe src/gitolite{,-shell}
dodir /usr/bin
for bin in gitolite{,-shell}; do
dosym /usr/libexec/${PN}/${bin} /usr/bin/${bin}
done
if use tools; then
dobin check-g2-compat convert-gitosis-conf
fi
keepdir /var/lib/gitolite
fowners git:git /var/lib/gitolite
fperms 750 /var/lib/gitolite
fperms 0644 ${uexec}/VREF/MERGE-CHECK # It's meant as example only
}
pkg_postinst() {
if [[ "$(get_major_version $REPLACING_VERSIONS)" == "2" ]]; then
ewarn
elog "***NOTE*** This is a major upgrade and will likely break your existing gitolite-2.x setup!"
elog "Please read http://sitaramc.github.com/gitolite/install.html#migr first!"
fi
# bug 352291
ewarn
elog "Please make sure that your 'git' user has the correct homedir (/var/lib/gitolite)."
elog "Especially if you're migrating from gitosis."
ewarn
}

@ -1,2 +1,2 @@
DIST advancemenu-2.5.0.tar.gz 2317328 SHA256 2f0509974c4cfd9dcc30506581897a456bcb525a773fafe7df8150763d0f15ab
DIST advancemenu-2.6.tar.gz 2384272 SHA256 e854c9d58d8e936f926493476e25a37089e3c39ab53863cfecaa4fb645dc4b31 SHA512 e9ea915cb987ea0d0cb6e98820f003e130d2f3ffe3a713ceed528ab777de3ef70cfbd811e30c295f728d5eb5e4ad7be01da6ff181bb8049b5ab391488bdc5488 WHIRLPOOL 8c6791385b8f61878eae19229964b1d9ee9f2169351d40b10604e35238e7a671c7d34befdcda70245abe79e504fe060a4979155dbcffb72636e0f54295436dc6
DIST advancemenu-2.7.tar.gz 2371297 SHA256 e635f8d236b08e40587344daa33ef78d50d14e01fb6a7ef74eb6fdb3e80cb224 SHA512 72aa75b189e4507ce0fe1c5203476833fd04ec9238102631061ed82c2894890044ae40c82154a76533b6ba0a255c42cdfe2ab5c0f497d595783fa13ea32c71bb WHIRLPOOL f27c1a766601a65ed415794fbe650e2530f3447b80ffb98fb86ed0f9ede4946c0e9cb3b3c72d986f4adbc4e19bb38f6bcb4e34c77b512ba791b61f58594baff4

@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.6.ebuild,v 1.1 2013/01/18 10:06:08 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/games-emulation/advancemenu/advancemenu-2.7.ebuild,v 1.1 2014/06/30 22:59:34 mr_bones_ Exp $
EAPI=5
inherit autotools eutils games
@ -12,15 +12,14 @@ SRC_URI="mirror://sourceforge/advancemame/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~x86"
IUSE="alsa debug fbcon ncurses oss sdl slang static svga truetype"
IUSE="alsa debug fbcon ncurses oss sdl slang static truetype"
RDEPEND="dev-libs/expat
alsa? ( media-libs/alsa-lib )
ncurses? ( sys-libs/ncurses )
sdl? ( media-libs/libsdl )
slang? ( >=sys-libs/slang-1.4 )
svga? ( >=media-libs/svgalib-1.9 )
!sdl? ( !svga? ( !fbcon? ( media-libs/libsdl ) ) )
!sdl? ( ( !fbcon? ( media-libs/libsdl ) ) )
truetype? ( >=media-libs/freetype-2 )"
DEPEND="${RDEPEND}
x86? ( >=dev-lang/nasm-0.98 )
@ -35,7 +34,7 @@ src_prepare() {
use x86 && ln -s $(type -P nasm) "${T}/${CHOST}-nasm"
use sdl && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
use !sdl && use !svga && use !fbcon && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
use !sdl && use !fbcon && ln -s $(type -P sdl-config) "${T}/${CHOST}-sdl-config"
use truetype && ln -s $(type -P freetype-config) "${T}/${CHOST}-freetype-config"
eautoreconf
}
@ -45,6 +44,7 @@ src_configure() {
egamesconf \
--enable-expat \
--enable-zlib \
--disable-svgalib \
$(use_enable alsa) \
$(use_enable debug) \
$(use_enable fbcon fb) \
@ -54,8 +54,7 @@ src_configure() {
$(use_enable sdl) \
$(use_enable slang) \
$(use_enable static) \
$(use_enable svga svgalib) \
$(use !sdl && use !svga && use !fbcon && echo --enable-sdl) \
$(use !sdl && use !fbcon && echo --enable-sdl) \
$(use_enable x86 asm)
}

@ -1,5 +1,5 @@
--- ./advance/blit/blit.c.orig 2004-12-19 01:01:46.039956536 -0500
+++ ./advance/blit/blit.c 2004-12-19 01:01:19.566981040 -0500
--- ./advance/blit/blit.c.orig
+++ ./advance/blit/blit.c
@@ -28,6 +28,10 @@
* do so, delete this exception statement from your version.
*/

@ -1,6 +1,5 @@
diff -ru advancemenu-2.6.orig/configure.ac advancemenu-2.6/configure.ac
--- advancemenu-2.6.orig/configure.ac 2013-01-03 14:18:35.000000000 -0500
+++ advancemenu-2.6/configure.ac 2013-01-18 04:56:12.072085027 -0500
--- advancemenu-2.6.orig/configure.ac
+++ advancemenu-2.6/configure.ac
@@ -512,7 +512,7 @@
[snd_pcm_open],
[ac_lib_alsa=yes],

@ -1,5 +1,5 @@
--- ./advance/blit/blit.c.orig 2004-12-19 01:01:46.039956536 -0500
+++ ./advance/blit/blit.c 2004-12-19 01:01:19.566981040 -0500
--- ./advance/blit/blit.c.orig
+++ ./advance/blit/blit.c
@@ -28,6 +28,10 @@
* do so, delete this exception statement from your version.
*/

@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.12 2014/03/19 03:06:38 twitch153 Exp $
# $Header: /var/cvsroot/gentoo-x86/games-emulation/dolphin/dolphin-9999.ebuild,v 1.13 2014/06/30 05:39:48 twitch153 Exp $
EAPI=5
WX_GTK_VER="2.9"
WX_GTK_VER="3.0"
inherit cmake-utils eutils pax-utils toolchain-funcs versionator wxwidgets games
@ -48,7 +48,7 @@ DEPEND="${RDEPEND}
media-libs/freetype
media-libs/libsoundtouch
>=sys-devel/gcc-4.6.0
x11-libs/wxGTK:2.9
x11-libs/wxGTK:${WX_GTK_VER}
"
pkg_pretend() {

@ -1,10 +1,5 @@
DIST warsow.png 1692 SHA256 086968e72271b248ef32609ed1818ff9f5c355297b1eee3cbee9e41f4e18a954 SHA512 76476fd6f624b4043405fbddeaa0fa46338b96bf46a9b64434940d9a84738a20c25243ef1316048159698b6a70b3e0f26218da3332203a93944312e77ba22c8f WHIRLPOOL 94b7c77641d5a8f581de4eb0e4e91b71f25347248a6aa6c1160e8fefda92951daa3fbbf04aee4920fc9b53fb07872d3fb7d870d4207d13844e07afa51c93e85b
DIST warsow_1.02_sdk.tar.gz 56541955 SHA256 bec1f0ec26c39defad393578b28eb955504f054599142b096773c28889cabb2c SHA512 d62399baa13341bc87863d123a9d852ec688d0aa279eb626b8c95bda28b7ac1d602c7571e02dfda7dd8ea83a231cd8c3310a0126c1235968291e9e700679fbca WHIRLPOOL 7c44fb252b95b400e829c752c58a4d715b695d56f7e9b35504be9c1e1566c513f101090f7bbe0eabba5aef11ff3f320106fe7ce1d4b7b17e7368979b0b193621
DIST warsow_1.02_update.zip 20582996 SHA256 23efd46590be99140b836125335dc973f606625785926377b60bd1467e661ac1 SHA512 4f0985c9a17e4562d46d289bfc78bf44fa544bdc30af3b0b670572e819966a2fa8f38902cb6810b09ce38a49f7de956177f31bf2858883ad2b3f27d41e6c2276 WHIRLPOOL 978987c70aa8b82a4252505fab95717056701a599d8e52a308206aee59a4cd36520be4f6b202411733d22dcca82f64919423bbd4bcd227d71b6e59cf6859e5b2
DIST warsow_1.03_sdk.tar.gz 63908911 SHA256 98cd7aa25707f9baf97a8e1feb78e1874b6b5dd95af759bf5edda10bc62ed97c SHA512 eb88ba3c7ac3c83b264ff5163af690e187ade4035b4f9560e35830a82b0d87f66bff369ada67ebe89390a33a12cf8285faf8986ffd17c6a9fe45d52a89670314 WHIRLPOOL dae624b0913dbaecf06856b1cfe674bd025a6909caa87ea67124adcab3592481a5ef8ca42824ca20a5e352c4435e91de1ee31ca42ca75235b079246b6f2364e0
DIST warsow_1.0_sdk.tar.gz 56525636 SHA256 2e394b5c50ad206723a59636ab93448f69d8602e710ab334451badf746870e22 SHA512 dee6591fb5ed7150e3e18db20b18366777dbacd4a465074eb3c978a04b7df5140e8a7817a5248542af06d2a6eb972ad986690f16e57ac08f753cccb2470d7bfe WHIRLPOOL e30772b49f37dede19d54e129cc1ca05bf9f01c9a10f372c9c420ceba25514c6a928c12ba61e140efc5ea8d46cbd6db403ca03aee215964173662127b9dbfd59
DIST warsow_1.0_unified.tar.gz 518459004 SHA256 f933d251de4c92b6107d4db1eef5326baf4873d32a6e2f1c3daae14bc92e85ec SHA512 78706093fb4b8684893d9b497fd10f1ce3ef096b68bbf7d36ed2bc775fa649738f0153a723b2788ef6a54d30826ec96bc36899d2e5c230bf09022b98cc105aad WHIRLPOOL efdffd7f358c704a6c08eb1d8c91543db3b76805edba775f88570debfa1b4a9ac64772958831fff7d0be4d72f2d29abbb7610d115e92cdb0fd897a8e31b1059c
DIST warsow_1.51_sdk.tar.gz 89191554 SHA256 ac635c654e088566d30d53e8fab21abd2d40762d7f4ab0e09faa827aac5c4f97 SHA512 64de961de91eee781b90442b275d24e13239dc2b594ece665c24c1d8da75e206a00ab43a2a6f193a953e9b0173b4a93dd18fa94b9b33d92eebcb776493a8b158 WHIRLPOOL 0a1db561eedfb4cafa2bb8f91e4de121adbbb171405828936788c9fa537a821855d89dd7c5b8a9ec186ece0655f1c821b38fa07fc0c2477c61681cf354d3d657
DIST warsow_1.51_unified.tar.gz 601553865 SHA256 94510d85e4a245b5f8c0c715ae41b1d162c96e06dbfe75ccd99fffb9a76426b5 SHA512 a6c3392010de192d9984655193cb2c4359e9e3959bb39176416936c0227e3f6060bb19149688b89e36285572045c2ab19c6ef8de71ace7cd514e30196da83da9 WHIRLPOOL 1f0bf896dd0aad18e3bf3090d856a6ecbfabfa1873d62f9f5c0ccb1fa8dd0e34f0a22e8c095030c309adf32c85894bbadc77496916bddc6302f7646f500aa6ac
DIST warsow_15_sdk.tar.gz 89175325 SHA256 277bbe87744352ee02476dc1bf9258ed5b204345b1b8eb394442dcec6a956949 SHA512 86ed6f0d52d8bce69b015bebfbee95c9e19ee532d70acfa7dc395be83dbc5148dda63e307aeaaa0a2866c3cea3d0df7956fcdd62cfd07ee5b3e7deec77d06082 WHIRLPOOL 8043f8163206d91d245c69744611c941193b5b8d74d73fffa2edd96bf7be5203180dbe0654e1df4f912825793ebc6367c662037329f38a020a2e4d102e5e5554
DIST warsow_15_unified.tar.gz 584507931 SHA256 4b4715d45339bdabfc94d4385df4defac0974743061f63e6a025460ab24668d7 SHA512 a831226f9340f0be6ba90c1d5367dcdbdc80ccdbd4cd80de20c67bb5c1495f1adf9976293a86d16fa4cca67553fea4aa9bb35a463f5cb125ddc8e1c3f7341b10 WHIRLPOOL bb8ec4d4b4047dab937e3a5de56cb9bb16bca726e1f1888a365118876341e5daa805463b9c6dc1e058b7a74f9100692bf156fc4f7fcd5100cd0bc99028ef203e

@ -1,27 +0,0 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Sat Nov 9 11:55:42 UTC 2013
Subject: fix clang build
based on
https://github.com/viciious/qfusion/commit/b926e692a00dcdeb25a1075c196d6bbefed34172
--- a/source/unix/unix_glw.c
+++ b/source/unix/unix_glw.c
@@ -31,17 +31,7 @@ Foundation, Inc., 59 Temple Place - Suit
**
*/
-#include <termios.h>
-#include <sys/ioctl.h>
-#include <sys/stat.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <unistd.h>
-#include <signal.h>
-#include <dlfcn.h>
-
#include "../ref_gl/r_local.h"
-#include "../client/keys.h"
#include "x11.h"

@ -1,67 +0,0 @@
From c63672c41ae5332a5d123e3d59abf38417fab961 Mon Sep 17 00:00:00 2001
From: Victor Luchits <vluchits@gmail.com>
Date: Sat, 12 Oct 2013 15:04:53 +0400
Subject: [PATCH] This should fix compilation in clang
ctassert<false> was evaluated in template function (probably due to two-phase name lookup?). Change it to ctassert<sizeof(typename)==0) so evaluation is delayed until actual template function instantiation.
---
source/ui/as/asbind.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/source/ui/as/asbind.h b/source/ui/as/asbind.h
index 9906859..f78ef42 100644
--- a/source/ui/as/asbind.h
+++ b/source/ui/as/asbind.h
@@ -268,7 +268,7 @@ struct ctassert {
}
// throw ?
- template<typename T> const char * typestr() { ctassert<false>(); return "ERROR"; }
+ template<typename T> const char * typestr() { ctassert<sizeof(T)==0>(); return "ERROR"; }
template<> inline const char *typestr<signed int>() { return "int"; }
template<> inline const char *typestr<unsigned int>() { return "uint"; }
@@ -439,7 +439,7 @@ struct __ptr<T*> {
struct FunctionStringProxy {
std::string operator()( const char *s )
{
- ctassert<false>();
+ ctassert<sizeof(R)==0>();
throw Exception( std::string("FunctionStringProxy base called with " ) + s );
}
};
@@ -542,7 +542,7 @@ struct FunctionStringProxy<R (*)(A1,A2,A3,A4,A5,A6)> {
template<typename T> struct MethodStringProxy {
std::string operator()( const char *s )
{
- ctassert<false>();
+ ctassert<sizeof(T)==0>();
throw Exception( std::string( "MethodStringProxy: base class called in " ) + s );
}
};
@@ -904,12 +904,12 @@ struct StripThisProxy<R(*)(A1,A2,A3,A4,A5,A6,A7)> {
// first define structs to get/set arguments (struct to partial-specialize)
template<typename T> struct SetArg {
void operator()( asIScriptContext *ctx, int idx, T &t ) {
- ctassert<false>();
+ ctassert<sizeof(T)==0>();
}
};
template<typename T> struct GetArg {
T operator()() {
- ctassert<false>();
+ ctassert<sizeof(T)==0>();
return T();
}
};
@@ -1046,7 +1046,7 @@ struct FunctionPtr : FunctionPtrBase {
FunctionPtr( asIScriptFunction *fptr=NULL ) : FunctionPtrBase( fptr ) {}
R operator()( void )
{
- ctassert<false>();
+ ctassert<sizeof(R)==0>();
throw std::runtime_error( "FunctionPtr baseclass called!" );
return R();
}
--
1.8.4

@ -1,39 +0,0 @@
From: Julian Ospald <hasufell@gentoo.org>
Date: Sat Nov 9 12:01:14 UTC 2013
Subject: fix clang warnings
based on
https://github.com/viciious/qfusion/commit/792e50cc9b55e0c5e4c954a1c0c4e4a61ad54e2c.patch
--- a/source/cgame/cg_draw.c
+++ b/source/cgame/cg_draw.c
@@ -309,7 +309,7 @@ void CG_DrawMiniMap( int x, int y, int i
coords[2] = ( coords[2] + (float)z_lefttop ) / (float)map_z;
// is it a player?
- if( ( cent->current.type == ET_PLAYER ) )
+ if( cent->current.type == ET_PLAYER )
{
int box_size = (int)( 3.0 + coords[2] * 10.0 );
--- a/source/cgame/cg_ents.c
+++ b/source/cgame/cg_ents.c
@@ -376,7 +376,6 @@ static void CG_UpdatePlayerState( void )
// set up the playerstates
// current
- index = index;
CG_SetFramePlayerState( &cg.frame, index );
// old
--- a/source/client/console.c
+++ b/source/client/console.c
@@ -1343,7 +1343,7 @@ void Con_KeyDown( int key )
return;
}
- if( ( key == K_BACKSPACE ) )
+ if( key == K_BACKSPACE )
{
if( key_linepos > 1 )
{

@ -1,624 +0,0 @@
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
@@ -30,6 +30,16 @@
# 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)
@@ -50,10 +60,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/)
@@ -62,7 +72,7 @@
ifeq ($(OS),FreeBSD)
ARCH?=freebsd_$(BASE_ARCH)
else
-ARCH?=$(BASE_ARCH)
+ARCH=$(BASE_ARCH)
endif
SHARED_LIBRARY_EXTENSION=so
@@ -72,7 +82,7 @@
ifeq ($(DEBUG_BUILD), YES)
BINDIR=debug
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
+CFLAGS_DEBUG=-D_DEBUG
else
BINDIR=release
endif
@@ -118,15 +128,22 @@
LIBROCKET_INC=$(LIBROCKET_DIR)/Include
LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
-CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
# add the base of ui to inclusions
CFLAGS_ROCKET+=-Iui
# static link to custombuilt lib
-LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
+LDFLAGS_ROCKET=
# dynamic link to 'official' build
# LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
+ifneq ($(SYSTEM_LIBS),YES)
+CFLAGS_ROCKET += -DSTATIC_LIB -I$(LIBROCKET_INC)
+LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
+else
+LDFLAGS_ROCKET = -lRocketCore -lRocketControls
+endif
+
###########################################################
####################### MINGW ######################
@@ -195,9 +212,9 @@
LOCALBASE?=/usr/local
X11BASE?=/usr/X11R6
-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
-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
@@ -209,18 +226,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/usr/local/lib -lm -pthread
else
-LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -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)
@@ -298,12 +315,19 @@
######################################################################################################
# Helper functions
######################################################################################################
+ifneq ($(V),YES)
DO_CC=echo " > Compiling $<" && \
- $(CC) $(CFLAGS_COMMON) -c $< -o $@
+ $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
DO_CXX=echo " > Compiling (c++) $<" && \
- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
+ $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
DO_RES=echo " > Compiling resource $<" && \
- $(RES) $(RESFLAGS_COMMON) -i $< -o $@
+ $(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)
@@ -505,17 +529,17 @@
all: client openal qf ded cgame game ui irc cin 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
cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
game: $(BUILDDIRS) message-game compile-game link-game
ui: $(BUILDDIRS) message-ui compile-ui link-ui
irc: $(BUILDDIRS) message-irc compile-irc link-irc
cin: $(BUILDDIRS) message-cin compile-cin link-cin
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-cgame clean-game clean-ui clean-librocket clean-irc clean-cin clean-angelwrap clean-tv_server
@@ -609,7 +633,14 @@
@echo "> *********************************************************"
@echo "> * Building ui"
@echo "> *********************************************************"
+
+ifneq ($(SYSTEM_LIBS),YES)
compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
+else
+compile-ui: $(OBJS_UI_ROCKET)
+endif
+
link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
clean-ui:
@echo " > Removing ui objects" && \
@@ -617,7 +648,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..."
@@ -656,7 +687,6 @@
@echo "> *********************************************************"
@echo "> * Building angelwrap"
@echo "> *********************************************************"
- -@rm $(ANGELSCRIPT_LIB)
$(ANGELSCRIPT_INC)/angelscript.h:
@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@echo "!!!"
@@ -668,7 +698,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..."
@@ -702,69 +732,69 @@
# DED
########
$(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
- @echo " > Linking $@" && \
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
+ @echo " > Linking $@"
+ $(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 $@" && \
- $(LD) -o $@ $^ $(LDFLAGS_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 $@" && \
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
+ @echo " > Linking $@"
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
- @echo " > Linking $@" && \
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
+ @echo " > Linking $@"
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
$(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/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP)
- @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
@@ -776,229 +806,229 @@
# 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: ref_gl/%.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: game/%.c
- @$(DO_CC_CLIENT)
+ $(Q)$(DO_CC_CLIENT)
$(BUILDDIR)/client/%.o: gameshared/%.c
- @$(DO_CC_DED)
+ $(Q)$(DO_CC_DED)
$(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: gameshared/%.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)
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_SDL)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
endif
$(BUILDDIR)/qf/%.o: gameshared/%.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: 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/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/cgame/%.o: gameshared/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
########
# GAME
########
$(BUILDDIR)/game/%.o: game/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/game/%.o: game/ai/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/game/%.o: gameshared/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/game/%.o: matchmaker/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
########
# UI.ROCKET
########
$(BUILDDIR)/ui/%.o: gameshared/%.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/decorators/%.cpp
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
#$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
-# @$(DO_CC_MODULE)
+# $(DO_CC_MODULE)
########
# IRC
########
$(BUILDDIR)/irc/%.o: gameshared/%.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: cin/%.c
- @$(DO_CC_MODULE) $(CFLAGS_CIN)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
########
# ANGELWRAP
########
$(BUILDDIR)/angelwrap/%.o: gameshared/%.c
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
$(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)
$(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/Makefile.warsow
+++ libsrcs/libRocket/libRocket/Makefile.warsow
@@ -13,9 +13,9 @@
endif
ifeq ($(DEBUG_BUILD),YES)
- CXXFLAGS += -g -DROCKET_DEBUG
+ CXXFLAGS += -DROCKET_DEBUG
else
- CXXFLAGS += -O2
+ CXXFLAGS +=
endif
BUILDDIR=Build/obj
--- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
@@ -47,7 +47,7 @@
CXX ?= gcc
# On i686 architecture you may need to add -march=i686 if you get
# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
+ CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
endif
AR ?= ar

@ -1,624 +0,0 @@
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
@@ -30,6 +30,16 @@
# 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)
@@ -50,10 +60,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/)
@@ -62,7 +72,7 @@
ifeq ($(OS),FreeBSD)
ARCH?=freebsd_$(BASE_ARCH)
else
-ARCH?=$(BASE_ARCH)
+ARCH=$(BASE_ARCH)
endif
SHARED_LIBRARY_EXTENSION=so
@@ -72,7 +82,7 @@
ifeq ($(DEBUG_BUILD), YES)
BINDIR=debug
-CFLAGS_DEBUG=-O0 -ggdb -D_DEBUG
+CFLAGS_DEBUG=-D_DEBUG
else
BINDIR=release
endif
@@ -118,15 +128,22 @@
LIBROCKET_INC=$(LIBROCKET_DIR)/Include
LIBROCKET_LIB=$(LIBROCKET_DIR)/lib/libRocketWSW.a
-CFLAGS_ROCKET=-DSTATIC_LIB -I$(LIBROCKET_INC) -I$(ANGELSCRIPT_INC)
+CFLAGS_ROCKET=-I$(ANGELSCRIPT_INC)
# add the base of ui to inclusions
CFLAGS_ROCKET+=-Iui
# static link to custombuilt lib
-LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
+LDFLAGS_ROCKET=
# dynamic link to 'official' build
# LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/Build -lRocketCore -lRocketControls -lfreetype
+ifneq ($(SYSTEM_LIBS),YES)
+CFLAGS_ROCKET += -DSTATIC_LIB -I$(LIBROCKET_INC)
+LDFLAGS_ROCKET=-L$(LIBROCKET_DIR)/lib -lRocketWSW -lfreetype
+else
+LDFLAGS_ROCKET = -lRocketCore -lRocketControls
+endif
+
###########################################################
####################### MINGW ######################
@@ -195,9 +212,9 @@
LOCALBASE?=/usr/local
X11BASE?=/usr/X11R6
-CFLAGS_COMMON=$(CFLAGS) -pipe -I. -I$(LOCALBASE)/include -I$(X11BASE)/include -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -Wall -Wno-unused-function -fvisibility=hidden
-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
@@ -209,18 +226,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/usr/local/lib -lm -pthread
else
-LDFLAGS_COMMON+= -L/usr/local/lib -ldl -lm -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)
@@ -298,12 +315,19 @@
######################################################################################################
# Helper functions
######################################################################################################
+ifneq ($(V),YES)
DO_CC=echo " > Compiling $<" && \
- $(CC) $(CFLAGS_COMMON) -c $< -o $@
+ $(CC) $(CFLAGS_COMMON) $(CFLAGS) -c $< -o $@
DO_CXX=echo " > Compiling (c++) $<" && \
- $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) -c $< -o $@
+ $(CXX) $(CFLAGS_COMMON) $(CXXFLAGS_COMMON) $(CXXFLAGS) -c $< -o $@
DO_RES=echo " > Compiling resource $<" && \
- $(RES) $(RESFLAGS_COMMON) -i $< -o $@
+ $(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)
@@ -505,17 +529,17 @@
all: client openal qf ded cgame game ui irc cin 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
cgame: $(BUILDDIRS) message-cgame compile-cgame link-cgame
game: $(BUILDDIRS) message-game compile-game link-game
ui: $(BUILDDIRS) message-ui compile-ui link-ui
irc: $(BUILDDIRS) message-irc compile-irc link-irc
cin: $(BUILDDIRS) message-cin compile-cin link-cin
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-cgame clean-game clean-ui clean-librocket clean-irc clean-cin clean-angelwrap clean-tv_server
@@ -609,7 +633,14 @@
@echo "> *********************************************************"
@echo "> * Building ui"
@echo "> *********************************************************"
+
+ifneq ($(SYSTEM_LIBS),YES)
compile-ui: $(OBJS_UI_ROCKET) $(LIBROCKET_LIB)
+$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(LIBROCKET_LIB)
+else
+compile-ui: $(OBJS_UI_ROCKET)
+endif
+
link-ui: $(BINDIR)/basewsw $(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION)
clean-ui:
@echo " > Removing ui objects" && \
@@ -617,7 +648,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..."
@@ -656,7 +687,6 @@
@echo "> *********************************************************"
@echo "> * Building angelwrap"
@echo "> *********************************************************"
- -@rm $(ANGELSCRIPT_LIB)
$(ANGELSCRIPT_INC)/angelscript.h:
@echo "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!"
@echo "!!!"
@@ -668,7 +698,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..."
@@ -702,69 +732,69 @@
# DED
########
$(BINDIR)/$(SERVER_EXE): $(OBJS_DED)
- @echo " > Linking $@" && \
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_DED)
+ @echo " > Linking $@"
+ $(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 $@" && \
- $(LD) -o $@ $^ $(LDFLAGS_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 $@" && \
- $(LD) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
+ @echo " > Linking $@"
+ $(Q)$(LD) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_COMMON) $(LDFLAGS_MODULE)
$(BINDIR)/basewsw/ui_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_UI_ROCKET)
- @echo " > Linking $@" && \
- $(LXX) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
+ @echo " > Linking $@"
+ $(Q)$(LXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $^ $(LXXFLAGS_COMMON) $(LDFLAGS_MODULE) $(LDFLAGS_ROCKET)
$(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/angelwrap_$(ARCH).$(SHARED_LIBRARY_EXTENSION): $(OBJS_ANGELWRAP)
- @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
@@ -776,229 +806,229 @@
# 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: ref_gl/%.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: game/%.c
- @$(DO_CC_CLIENT)
+ $(Q)$(DO_CC_CLIENT)
$(BUILDDIR)/client/%.o: gameshared/%.c
- @$(DO_CC_DED)
+ $(Q)$(DO_CC_DED)
$(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: gameshared/%.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)
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_SDL)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
endif
$(BUILDDIR)/qf/%.o: gameshared/%.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: 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/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/cgame/%.o: gameshared/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
########
# GAME
########
$(BUILDDIR)/game/%.o: game/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/game/%.o: game/ai/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/game/%.o: gameshared/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
$(BUILDDIR)/game/%.o: matchmaker/%.c
- @$(DO_CC_MODULE)
+ $(Q)$(DO_CC_MODULE)
########
# UI.ROCKET
########
$(BUILDDIR)/ui/%.o: gameshared/%.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/decorators/%.cpp
- @$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
+ $(Q)$(DO_CXX_MODULE) $(CFLAGS_ROCKET)
#$(BUILDDIR)/ui.as/%.o: matchmaker/%.c
-# @$(DO_CC_MODULE)
+# $(DO_CC_MODULE)
########
# IRC
########
$(BUILDDIR)/irc/%.o: gameshared/%.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: cin/%.c
- @$(DO_CC_MODULE) $(CFLAGS_CIN)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_CIN)
########
# ANGELWRAP
########
$(BUILDDIR)/angelwrap/%.o: gameshared/%.c
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
$(BUILDDIR)/angelwrap/%.o: angelwrap/%.c
- @$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_ANGELWRAP)
$(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)
$(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/Makefile.warsow
+++ libsrcs/libRocket/libRocket/Makefile.warsow
@@ -13,9 +13,9 @@
endif
ifeq ($(DEBUG_BUILD),YES)
- CXXFLAGS += -g -DROCKET_DEBUG
+ CXXFLAGS += -DROCKET_DEBUG
else
- CXXFLAGS += -O2
+ CXXFLAGS +=
endif
BUILDDIR=Build/obj
--- libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
+++ libsrcs/angelscript/angelSVN/sdk/angelscript/projects/gnuc/makefile
@@ -47,7 +47,7 @@
CXX ?= gcc
# On i686 architecture you may need to add -march=i686 if you get
# an undefined symbol for __sync_sub_and_fetch_4 in as_atomic.cpp.
- CXXFLAGS += -g -Wall -fPIC -fno-strict-aliasing
+ CXXFLAGS += -Wall -fPIC -fno-strict-aliasing
endif
AR ?= ar

@ -1,11 +0,0 @@
--- source/snd_qf/snd_mix.c
+++ source/snd_qf/snd_mix.c
@@ -27,7 +27,7 @@
int *snd_p, snd_linear_count, snd_vol, music_vol;
short *snd_out;
-#if !defined ( id386 ) || defined ( __MACOSX__ )
+#if defined ( PIC ) || !defined ( id386 ) || defined ( __MACOSX__ )
#ifdef _WIN32
#pragma warning( push )
#pragma warning( disable : 4310 ) // cast truncates constant value

@ -1,715 +0,0 @@
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)
@@ -358,12 +377,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)
@@ -626,10 +651,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
@@ -639,7 +664,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
@@ -733,7 +758,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" && \
@@ -741,7 +771,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..."
@@ -827,7 +857,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..."
@@ -862,80 +892,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
@@ -947,177 +983,177 @@
# 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: 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)
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_SDL)
+ $(Q)$(DO_CC_MODULE) $(CFLAGS_SDL)
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)
@@ -1126,69 +1162,69 @@
# 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)
+ $(Q)$(DO_CC_MODULE)
endif
endif
@@ -1196,52 +1232,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

@ -1,180 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.02-r1.ebuild,v 1.6 2013/07/03 10:06:14 ago Exp $
EAPI=4
inherit eutils check-reqs gnome2-utils games
MY_P=${PN}_${PV}
DESCRIPTION="Multiplayer FPS based on the QFusion engine (evolved from Quake 2)"
HOMEPAGE="http://www.warsow.net/"
SRC_URI="http://funpark.warsow-esport.net/~${PN}/1.0/${PN}_1.0_unified.tar.gz
http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_sdk.tar.gz
http://funpark.warsow-esport.net/~${PN}/${PV}/${MY_P}_update.zip
mirror://gentoo/${PN}.png"
# ZLIB: bundled angelscript
LICENSE="GPL-2 ZLIB warsow"
SLOT="0"
KEYWORDS="amd64 x86"
IUSE="+angelscript 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}/${MY_P}_sdk/source
S_U=${WORKDIR}/${PN}_1.0
S_UPDATE=${WORKDIR}/${MY_P}_update
CHECKREQS_DISK_BUILD="1G"
CHECKREQS_DISK_USR="500M"
src_unpack() {
unpack ${PN}_1.0_unified.tar.gz ${MY_P}_sdk.tar.gz
mkdir "${S_UPDATE}" || die
cd "${S_UPDATE}" || die
unpack ${MY_P}_update.zip
}
src_prepare() {
sed -i \
-e "/fs_basepath =/ s:\.:${GAMES_DATADIR}/${PN}:" \
qcommon/files.c \
|| die "sed files.c failed"
sed -i \
-e "s:q_jpeg_mem_src:_&:" \
ref_gl/r_image.c || die "sed r_image.c failed"
rm -r "${S_U}"/docs/old* || die
cd "${WORKDIR}"/${MY_P}_sdk || die
epatch "${FILESDIR}"/${P}-build.patch \
"${FILESDIR}"/${P}-pic.patch
epatch_user
}
src_compile() {
yesno() { use ${1} && echo YES || echo NO ; }
use angelscript &&
emake -C ../libsrcs/angelscript/angelSVN/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=$(yesno angelscript) \
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 "${S_U}"/basewsw
doins -r "${S_UPDATE}"/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 "${S_U}"/docs/*
dodoc "${S_UPDATE}"/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
}

@ -1,197 +0,0 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.03.ebuild,v 1.2 2013/12/31 12:38: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.02
UPDATE_P=${PN}_${DATA_PV}_update
ENGINE_PV=${PV}
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://funpark.warsow-esport.net/~warsow/${BASE_DATA_PV}/${BASE_DATA_P}.tar.gz
http://www.warsow.net:1337/~warsow/${PV}/${ENGINE_P}.tar.gz
http://funpark.warsow-esport.net/~warsow/${PV}/${UPDATE_P}.zip
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}/${ENGINE_P}/source
S_U=${WORKDIR}/${PN}_${BASE_DATA_PV}
S_UPDATE=${WORKDIR}/${UPDATE_P}
CHECKREQS_DISK_BUILD="1G"
CHECKREQS_DISK_USR="500M"
src_unpack() {
unpack ${BASE_DATA_P}.tar.gz ${ENGINE_P}.tar.gz
mkdir "${S_UPDATE}" || die
cd "${S_UPDATE}" || die
unpack ${UPDATE_P}.zip
}
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"
sed -i \
-e "s:q_jpeg_mem_src:_&:" \
ref_gl/r_image.c || die "sed r_image.c failed"
rm -r "${S_U}"/docs/old* || die
# edos2unix breaks whitespace files
einfo "removing dos line breaks"
find . -type f -exec sed -i 's/\r$//' '{}' + || die
cd "${S}"/.. || die
epatch "${FILESDIR}"/${PF}-build.patch \
"${FILESDIR}"/${P}-pic.patch \
"${FILESDIR}"/{01..03}-${P}-clang.patch
epatch_user
}
src_compile() {
yesno() { use ${1} && echo YES || echo NO ; }
emake -C ../libsrcs/angelscript/angelSVN/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 "${S_U}"/basewsw
doins -r "${S_UPDATE}"/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 "${S_U}"/docs/*
dodoc "${S_UPDATE}"/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
}

@ -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/games-fps/warsow/warsow-1.5.1.ebuild,v 1.2 2014/06/22 16:28:54 hasufell Exp $
# $Header: /var/cvsroot/gentoo-x86/games-fps/warsow/warsow-1.5.1.ebuild,v 1.3 2014/06/30 06:22:30 mr_bones_ Exp $
EAPI=5
inherit eutils check-reqs gnome2-utils flag-o-matic games
@ -34,6 +34,7 @@ RDEPEND=">=dev-libs/libRocket-1.2.1_p20130110
media-libs/libtheora
media-libs/libvorbis
x11-libs/libX11
x11-libs/libXi
x11-libs/libXinerama
x11-libs/libXrandr
x11-libs/libXxf86dga
@ -75,8 +76,8 @@ src_prepare() {
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 "${FILESDIR}"/${P}-build.patch \
"${FILESDIR}"/${P}-pic.patch
epatch_user
}

@ -1,178 +0,0 @@
# 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.ebuild,v 1.1 2014/05/11 00:32:18 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=15
UPDATE_P=${PN}_${DATA_PV}_update
ENGINE_PV=15
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-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
}

@ -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/games-misc/opengfx/opengfx-0.5.1.ebuild,v 1.1 2014/06/13 08:57:57 mr_bones_ Exp $
# $Header: /var/cvsroot/gentoo-x86/games-misc/opengfx/opengfx-0.5.1.ebuild,v 1.2 2014/06/30 06:39:35 mr_bones_ Exp $
EAPI=5
inherit eutils games
@ -25,9 +25,12 @@ src_prepare() {
# ensure that we will not use gimp to regenerate the pngs
# causes sandbox violations and not worth the effort anyway
sed -i -e '/^GFX_SCRIPT_LIST_FILES/s/^/#/' Makefile.config || die
# work with later versions of unix2dos from app-text/dos2unix
sed -i -e '/^UNIX2DOS_FLAGS/s/null/null >&2/' Makefile || die
}
src_compile() {
emake help # print out the env to make bug reports better
_V= emake bundle_tar
}

@ -1,3 +1,2 @@
DIST kdeconnect-kde-0.5.1.tar.xz 114696 SHA256 de9f67600020f099dd01950faca3cf8b2edf483935b6624119da562ee03de8a1 SHA512 6419875774ec90e154fd4374b422435ae4521a443840e2111eec3d97fd35c769ef9de62d68d710d079d41a84023a4c46cc455f95da92f75d52beb39c62c562c6 WHIRLPOOL a2e52e6bc2b24dc69b027a8a743b3cdee0222e93040bce64d40f6ca90c4ce525fd6b439e47bc4f5bbf8adccbdf2746bab33be2d419c767929f73f40dbfeb5388
DIST kdeconnect-kde-0.5.2.1.tar.xz 121272 SHA256 08c444705e3f018c016be6fc27ac7de6af334cf90d40c2d2400eb37e1414c33c SHA512 b86b6046d8a49f9eda3186e810e78eaa0f24befd768f666aeaf37fdbf80092da4b01b7bf9dbaec625d88879a99097b8a7010138929cb096e0e8fe8129df28531 WHIRLPOOL 5245f8603e37ca9f4ee9e4657de0a4c5aff70a069aa8f74a5500787ee18851f13a6b7afbea50754f44fc5ac860c212180372a3b15181d3331c45c907a31b13bb
DIST kdeconnect-kde-0.7.tar.xz 125200 SHA256 52e0047cfb9904ba017efd23bd58b06ee062388926b0e1d801b2f4f4b61a0f29 SHA512 2da9d7b200815d714c3e664131317cd1e9d8b586778e525a2e39248ec181a540da35ab8f5f2a6d3877b1bc8de649750b0b3754ba5b5645b5cbb9751471e0c935 WHIRLPOOL 756d7538e264a12c986c36438be019ab5149e536b7090f578961d33896d5ce3f530e61d51fbffaae7b7b80b7b9e40013491e3e4d498bceb053ddb80bfbe3dc95
DIST kdeconnect-kde-0.7.1.tar.xz 127144 SHA256 2a8ccd469a7d5871683282e43096673c0d0ca61b89d46c623027925a5d7f00d0 SHA512 9e92542d3b747dfc9edf7f8b4358f801f046ced88c97356251f8f620b56be85e9077e7d4dfa498192912ade4da4cbae9c898fb33f509cfb34befdcf4d29525ce WHIRLPOOL 75e5214f5af240ba2f28cd3cdffa768394e84786a5a498cabf02a0e9dc54263958d011c3a9ca6c4c6ca38756a6991bd6952c1161bee71fb1ccd43adec6fe596c

@ -1,52 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.5.1.ebuild,v 1.2 2014/06/16 10:52:52 kensington Exp $
EAPI=5
MY_PN=${PN}-kde
DECLARATIVE_REQUIRED="always"
inherit kde4-base
if [[ ${KDE_BUILD_TYPE} != live ]]; then
MY_P=${MY_PN}-${PV}
SRC_URI="mirror://kde/unstable/${PN}/${PV}/src/${MY_P}.tar.xz"
KEYWORDS="~amd64 ~x86"
else
EGIT_REPO_URI="git://anongit.kde.org/${MY_PN}"
KEYWORDS=""
fi
DESCRIPTION="Adds communication between KDE and your smartphone"
HOMEPAGE="http://www.kde.org/"
LICENSE="GPL-2+"
SLOT="4"
IUSE="debug"
DEPEND="
app-crypt/qca:2
dev-libs/qjson
"
RDEPEND="${DEPEND}
$(add_kdebase_dep plasma-workspace)
app-crypt/qca-ossl:2
net-dns/avahi
"
[[ ${KDE_BUILD_TYPE} != live ]] && S=${WORKDIR}/${MY_P}
src_prepare(){
sed -i -e "s:QtCrypto/QtCrypto:QtCrypto:" kded/networkpackage.cpp || die
kde4-base_src_prepare
}
pkg_postinst(){
elog
elog "Optional dependency:"
elog "sys-fs/sshfs-fuse (for 'remote filesystem browser' plugin)"
elog
elog "The Android .apk file is available via"
elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
elog
}

@ -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/kde-misc/kdeconnect/kdeconnect-0.7.ebuild,v 1.1 2014/06/28 21:33:21 mrueg Exp $
# $Header: /var/cvsroot/gentoo-x86/kde-misc/kdeconnect/kdeconnect-0.7.1.ebuild,v 1.1 2014/06/30 23:02:43 mrueg Exp $
EAPI=5

@ -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/mail-client/evolution/evolution-3.12.3-r1.ebuild,v 1.1 2014/06/28 18:46:16 pacho Exp $
# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.3-r1.ebuild,v 1.2 2014/06/30 09:50:57 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
@ -137,6 +137,7 @@ src_install() {
# Problems with prelink:
# https://bugzilla.gnome.org/show_bug.cgi?id=731680
# https://bugzilla.gnome.org/show_bug.cgi?id=732148
# https://bugzilla.redhat.com/show_bug.cgi?id=1114538
echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
doenvd "${T}"/99${PN}

@ -1,141 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-3.12.3.ebuild,v 1.1 2014/06/12 18:38:01 pacho Exp $
EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit eutils flag-o-matic readme.gentoo gnome2 #autotools
DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
SLOT="2.0"
IUSE="+bogofilter crypt highlight ldap map spamassassin spell ssl +weather"
KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
# We need a graphical pinentry frontend to be able to ask for the GPG
# password from inside evolution, bug 160302
PINENTRY_DEPEND="|| ( app-crypt/pinentry[gtk] app-crypt/pinentry-qt app-crypt/pinentry[qt4] )"
# glade-3 support is for maintainers only per configure.ac
# pst is not mature enough and changes API/ABI frequently
COMMON_DEPEND="
>=app-crypt/gcr-3.4
>=dev-libs/glib-2.36:2
>=x11-libs/cairo-1.9.15:=[glib]
>=x11-libs/gtk+-3.8.0:3
>=x11-libs/gdk-pixbuf-2.24:2
>=gnome-base/gnome-desktop-2.91.3:3=
>=gnome-base/gsettings-desktop-schemas-2.91.92
>=media-libs/libcanberra-0.25[gtk3]
>=x11-libs/libnotify-0.7:=
>=gnome-extra/evolution-data-server-${PV}:=[weather?]
>=gnome-extra/gtkhtml-4.5.2:4.0
dev-libs/atk
>=dev-libs/dbus-glib-0.6
>=dev-libs/libxml2-2.7.3:2
>=net-libs/libsoup-2.42:2.4
>=x11-misc/shared-mime-info-0.22
>=x11-themes/gnome-icon-theme-2.30.2.1
>=dev-libs/libgdata-0.10:=
>=net-libs/webkit-gtk-2.0.1:3
x11-libs/libSM
x11-libs/libICE
crypt? ( || (
( >=app-crypt/gnupg-2.0.1-r2 ${PINENTRY_DEPEND} )
=app-crypt/gnupg-1.4* ) )
map? (
>=app-misc/geoclue-0.12.0:0
>=media-libs/libchamplain-0.12:0.12[gtk]
>=media-libs/clutter-1.0.0:1.0
>=media-libs/clutter-gtk-0.90:1.0
>=sci-geosciences/geocode-glib-3.10.0
x11-libs/mx:1.0 )
spell? ( app-text/gtkspell:3 )
ldap? ( >=net-nds/openldap-2:= )
ssl? (
>=dev-libs/nspr-4.6.1:=
>=dev-libs/nss-3.11:= )
weather? ( >=dev-libs/libgweather-3.8:2= )
"
DEPEND="${COMMON_DEPEND}
app-text/docbook-xml-dtd:4.1.2
dev-util/gtk-doc-am
>=dev-util/intltool-0.40.0
virtual/pkgconfig
"
# eautoreconf needs:
# app-text/yelp-tools
# >=gnome-base/gnome-common-2.12
RDEPEND="${COMMON_DEPEND}
bogofilter? ( mail-filter/bogofilter )
highlight? ( app-text/highlight )
spamassassin? ( mail-filter/spamassassin )
!gnome-extra/evolution-exchange
"
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
~/.local/share/applications/mimeapps.list so it includes the
following content:
[Default Applications]
x-scheme-handler/http=firefox.desktop
x-scheme-handler/https=firefox.desktop
(replace firefox.desktop with the name of the appropriate .desktop
file from /usr/share/applications if you use a different browser)."
src_prepare() {
# Reason?
ELTCONF="--reverse-deps"
#eautoreconf # See https://bugzilla.gnome.org/701904
gnome2_src_prepare
# Fix compilation flags crazyness
sed -e 's/\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \
-i configure || die "CPPFLAGS sed failed"
}
src_configure() {
# Use NSS/NSPR only if 'ssl' is enabled.
# image-inline plugin needs a gtk+:3 gtkimageview, which does not exist yet
gnome2_src_configure \
--without-glade-catalog \
--disable-image-inline \
--disable-pst-import \
--enable-canberra \
$(use_enable bogofilter) \
$(use_enable highlight text-highlight) \
$(use_enable map contact-maps) \
$(use_enable spamassassin) \
$(use_enable spell gtkspell) \
$(use_enable ssl nss) \
$(use_enable ssl smime) \
$(use_with ldap openldap) \
$(usex ssl --enable-nss=yes "--without-nspr-libs
--without-nspr-includes
--without-nss-libs
--without-nss-includes") \
$(use_enable weather) \
ITSTOOL=$(type -P true)
}
src_install() {
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS* README"
gnome2_src_install
readme.gentoo_create_doc
}
pkg_postinst() {
gnome2_pkg_postinst
readme.gentoo_print_elog
}

@ -0,0 +1,5 @@
DIST quivira-4.0-Combining.pdf 311026 SHA256 c7f96c47abd668b6cddb951bab68e14f55609161c69a0a9c8c9aa5df53be10c9 SHA512 f904b8587623782093db25d2a069e32ba671f6f1a60ea3b8c8374ede3f48ab0daaa2e0cdff5acc72e97422c00c4f7286a2fe9503960d666429073379282aab9c WHIRLPOOL 28781486605a9303b62fd521f1165569a478a4ae906883e908a0ef51eef9ee8a20f4cd68d7563e248f46ed98912ff8f82b3a65abbb27722f0603036302a742fb
DIST quivira-4.0-PUA.pdf 354040 SHA256 c92555134dbc5c7c8d21599d34c780411b71be462b67c9569d6be893dbb1bb32 SHA512 a07a41e1e0027a03f7f1f4e81ddfb50b09a8dfad4f1342a32aab71505e6ce9ef2a7a8733145887651b20dd472c58b4167faa34945f8ca61bc4e016859a65cbba WHIRLPOOL 1e1098127c8c75d417dd246f925c11987730a9f92b4221ded12a56d387642cb90ee003e104195fc82551c4e4721a59ebbeed43014f14c1c33cfeef2d474561b7
DIST quivira-4.0-Testpage.pdf 822289 SHA256 440f1d2e94dc2f10ab8d05bbdb848ff0a13782a68520e40318ed5a5ca81a99a5 SHA512 8ed238c9aa03544308dcd471eb6145aa81423a6877a2a5e6d1022277545317568ba642871eb2f3c03c38a9d3030e3f94d8c30469b6c331eaed553b81db154585 WHIRLPOOL 9efac5c1e68493da0da2c6a9148ac8a356160e7c4f4c9c4198424c28cea3abd8f5d2f3cf270928434142d511ac5b604fccf9d4b104679374f9e9f3a82fce7ee3
DIST quivira-4.0.otf 1475236 SHA256 1bd014113883716a090e4332d088cb7544233de987de59bf38782dd099483abe SHA512 2887152660a8908947c1baa83025c408ac11139067278bce6c8a789d846cf764b9a464dc678ee6acc2b555c9f0d40be3464ac102a97fac8aa9bc04acf926f1b6 WHIRLPOOL abdb920e9d54d1a2efbb6059b9408add513fa405027b89b715c34082d8b59b7e9b031f7ffb3a9f125a46e07f85c09e3e352444630a77054e9828945a92ed34ca
DIST quivira-4.0.pdf 3877062 SHA256 f2debb88b289215e0338583aaabf64b5b8bf2ac3a4930a187f0624be1b92eddb SHA512 38469819d0b8e062ac2b4f35ef5d8be300ea36645ffc7841428015191d129e1239ec0dff1605cfa0af76fd32ee1e590ed4a146117408afaa9a826328115db4a7 WHIRLPOOL 75b2b7a7ab5b111dc295e47ac4391208261998bb0bb72c1a4dd9ccb81874c0b6c4752004bf87f7a14823d9bbce226f5d62fb22354f66ca314ff497f7bf84b3c3

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>fonts</herd>
<maintainer>
<email>chithanh@gentoo.org</email>
<name>Chí-Thanh Christopher Nguyễn</name>
</maintainer>
</pkgmetadata>

@ -0,0 +1,36 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-fonts/quivira/quivira-4.0.ebuild,v 1.1 2014/06/30 12:36:16 chithanh Exp $
EAPI=5
MY_PN="${PN/q/Q}"
inherit font
DESCRIPTION="Unicode font for alphabetic writing systems and elder scripts like Runes, Gothic and ancient Greek"
HOMEPAGE="http://www.quivira-font.com/"
SRC_URI="http://www.quivira-font.com/files/${MY_PN}.otf -> ${P}.otf
doc? ( http://www.quivira-font.com/files/${MY_PN}.pdf -> ${P}.pdf
http://www.quivira-font.com/files/${MY_PN}Testpage.pdf -> ${P}-Testpage.pdf
http://www.quivira-font.com/files/${MY_PN}Combining.pdf -> ${P}-Combining.pdf
http://www.quivira-font.com/files/${MY_PN}PUA.pdf -> ${P}-PUA.pdf )"
LICENSE="freedist"
SLOT="0"
KEYWORDS="~amd64 ~arm ~ppc ~x86"
IUSE="doc"
S="${WORKDIR}"
FONT_SUFFIX="otf"
src_prepare() {
cp "${DISTDIR}"/${P}.otf "${S}"/${MY_PN}.otf || die
if use doc; then
DOCS="${MY_PN}.pdf ${MY_PN}Testpage.pdf ${MY_PN}Combining.pdf ${MY_PN}PUA.pdf"
cp "${DISTDIR}"/${P}.pdf "${S}"/${MY_PN}.pdf || die
cp "${DISTDIR}"/${P}-Testpage.pdf "${S}"/${MY_PN}Testpage.pdf || die
cp "${DISTDIR}"/${P}-Combining.pdf "${S}"/${MY_PN}Combining.pdf || die
cp "${DISTDIR}"/${P}-PUA.pdf "${S}"/${MY_PN}PUA.pdf || die
fi
}

@ -0,0 +1,26 @@
--- SDL-1.2.15/configure.in
+++ SDL-1.2.15/configure.in
@@ -1507,11 +1507,10 @@
, enable_video_caca=no)
if test x$enable_video = xyes -a x$enable_video_caca = xyes; then
video_caca=no
- AC_PATH_PROG(CACACONFIG, caca-config, no)
- if test x$CACACONFIG != xno; then
+ PKG_PROG_PKG_CONFIG([0.20])
+ PKG_CHECK_MODULES(CACA, caca, has_caca_pc=yes, has_caca_pc=no])
+ if test x$has_caca_pc == xyes; then
AC_MSG_CHECKING(for libcaca support)
- CACA_CFLAGS=`$CACACONFIG --cflags`
- CACA_LDFLAGS=`$CACACONFIG --libs`
save_CFLAGS="$CFLAGS"
AC_TRY_COMPILE([
#include <caca.h>
@@ -1524,7 +1523,7 @@
if test x$video_caca = xyes; then
AC_DEFINE(SDL_VIDEO_DRIVER_CACA)
EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS"
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LIBS"
SOURCES="$SOURCES $srcdir/src/video/caca/*.c"
fi
fi

@ -1,156 +0,0 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r5.ebuild,v 1.5 2014/06/18 19:48:49 mgorny Exp $
# TODO: convert media-libs/libggi to multilib
EAPI=5
inherit autotools flag-o-matic multilib toolchain-funcs eutils multilib-minimal
DESCRIPTION="Simple Direct Media Layer"
HOMEPAGE="http://www.libsdl.org/"
SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
# WARNING:
# If you turn on the custom-cflags use flag in USE and something breaks,
# you pick up the pieces. Be prepared for bug reports to be marked INVALID.
IUSE="oss alsa nas X dga xv xinerama fbcon ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
RDEPEND="
abi_x86_32? (
!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
!<=app-emulation/emul-linux-x86-sdl-20140406
)
sound? ( >=media-libs/audiofile-0.3.5[${MULTILIB_USEDEP}] )
alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
nas? (
>=media-libs/nas-1.9.4[${MULTILIB_USEDEP}]
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
)
X? (
>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
)
ggi? ( >=media-libs/libggi-2.0_beta3 )
svga? ( >=media-libs/svgalib-1.4.2 )
aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
opengl? (
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
)
ppc64? ( ps3? ( sys-libs/libspe2 ) )
tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
nas? (
>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
)
X? (
>=x11-proto/xextproto-7.2.1-r1[${MULTILIB_USEDEP}]
>=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}]
)
x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
S=${WORKDIR}/SDL-${PV}
MULTILIB_WRAPPED_HEADERS=(
/usr/include/SDL/SDL_byteorder.h
/usr/include/SDL/SDL_config.h
/usr/include/SDL/SDL_endian.h
/usr/include/SDL/SDL_getenv.h
/usr/include/SDL/SDL_keysym.h
/usr/include/SDL/SDL_syswm.h
/usr/include/SDL/SDL_types.h
)
pkg_setup() {
if use custom-cflags ; then
ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
ewarn "don't bother filing libsdl-related bugs until trying to remerge"
ewarn "libsdl without the custom-cflags use flag in USE."
fi
}
src_prepare() {
epatch \
"${FILESDIR}"/${P}-sdl-config.patch \
"${FILESDIR}"/${P}-resizing.patch \
"${FILESDIR}"/${P}-joystick.patch \
"${FILESDIR}"/${P}-gamma.patch \
"${FILESDIR}"/${P}-const-xdata32.patch
AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
}
multilib_src_configure() {
local myconf=
if [[ $(tc-arch) != "x86" ]] ; then
myconf="${myconf} --disable-nasm"
else
myconf="${myconf} --enable-nasm"
fi
use custom-cflags || strip-flags
use sound || myconf="${myconf} --disable-audio"
use video \
&& myconf="${myconf} --enable-video-dummy" \
|| myconf="${myconf} --disable-video"
use joystick || myconf="${myconf} --disable-joystick"
ECONF_SOURCE="${S}" econf \
--disable-rpath \
--disable-arts \
--disable-esd \
--enable-events \
--enable-cdrom \
--enable-threads \
--enable-timers \
--enable-file \
--enable-cpuinfo \
--disable-alsa-shared \
--disable-esd-shared \
--disable-pulseaudio-shared \
--disable-arts-shared \
--disable-nas-shared \
--disable-osmesa-shared \
$(use_enable oss) \
$(use_enable alsa) \
$(use_enable pulseaudio) \
$(use_enable nas) \
$(use_enable X video-x11) \
$(use_enable dga) \
$(use_enable xv video-x11-xv) \
$(use_enable xinerama video-x11-xinerama) \
$(use_enable X video-x11-xrandr) \
$(use_enable dga video-dga) \
$(use_enable fbcon video-fbcon) \
$(multilib_native_use_enable ggi video-ggi) \
$(multilib_native_use_enable svga video-svga) \
$(use_enable aalib video-aalib) \
$(use_enable libcaca video-caca) \
$(use_enable opengl video-opengl) \
$(multilib_native_use_enable ps3 video-ps3) \
$(use_enable tslib input-tslib) \
$(use_with X x) \
$(use_enable static-libs static) \
--disable-video-x11-xme \
--disable-video-directfb \
${myconf}
}
multilib_src_install() {
emake DESTDIR="${D}" install
}
multilib_src_install_all() {
use static-libs || prune_libtool_files --all
dodoc BUGS CREDITS README README-SDL.txt README.HG TODO WhatsNew
dohtml -r ./
}

@ -1,8 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r6.ebuild,v 1.1 2014/06/22 13:39:57 hasufell Exp $
# TODO: convert media-libs/libggi to multilib
# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.15-r7.ebuild,v 1.1 2014/06/30 20:27:40 hasufell Exp $
EAPI=5
inherit autotools flag-o-matic multilib toolchain-funcs eutils multilib-minimal
@ -17,7 +15,7 @@ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd6
# WARNING:
# If you turn on the custom-cflags use flag in USE and something breaks,
# you pick up the pieces. Be prepared for bug reports to be marked INVALID.
IUSE="oss alsa nas X dga xv xinerama fbcon ggi svga tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio ps3 static-libs"
IUSE="oss alsa nas X dga xv xinerama fbcon tslib aalib opengl libcaca +sound +video +joystick custom-cflags pulseaudio static-libs"
RDEPEND="
abi_x86_32? (
@ -38,15 +36,12 @@ RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
>=x11-libs/libXrandr-1.4.2[${MULTILIB_USEDEP}]
)
ggi? ( >=media-libs/libggi-2.0_beta3 )
svga? ( >=media-libs/svgalib-1.4.2 )
aalib? ( >=media-libs/aalib-1.4_rc5-r6[${MULTILIB_USEDEP}] )
libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
opengl? (
>=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
>=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
)
ppc64? ( ps3? ( sys-libs/libspe2 ) )
tslib? ( >=x11-libs/tslib-1.0-r3[${MULTILIB_USEDEP}] )
pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
@ -76,7 +71,8 @@ src_prepare() {
"${FILESDIR}"/${P}-resizing.patch \
"${FILESDIR}"/${P}-joystick.patch \
"${FILESDIR}"/${P}-gamma.patch \
"${FILESDIR}"/${P}-const-xdata32.patch
"${FILESDIR}"/${P}-const-xdata32.patch \
"${FILESDIR}"/${P}-caca.patch
AT_M4DIR="/usr/share/aclocal acinclude" eautoreconf
}
@ -121,12 +117,12 @@ multilib_src_configure() {
$(use_enable X video-x11-xrandr) \
$(use_enable dga video-dga) \
$(use_enable fbcon video-fbcon) \
$(multilib_native_use_enable ggi video-ggi) \
$(multilib_native_use_enable svga video-svga) \
--disable-video-ggi \
--disable-video-svga \
$(use_enable aalib video-aalib) \
$(use_enable libcaca video-caca) \
$(use_enable opengl video-opengl) \
$(multilib_native_use_enable ps3 video-ps3) \
--disable-video-ps3 \
$(use_enable tslib input-tslib) \
$(use_with X x) \
$(use_enable static-libs static) \

@ -1,102 +0,0 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/sdl-mixer/sdl-mixer-1.2.12-r1.ebuild,v 1.11 2012/10/20 18:48:42 armin76 Exp $
EAPI=4
inherit eutils
MY_P=${P/sdl-/SDL_}
DESCRIPTION="Simple Direct Media Layer Mixer Library"
HOMEPAGE="http://www.libsdl.org/projects/SDL_mixer/"
SRC_URI="http://www.libsdl.org/projects/SDL_mixer/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris"
IUSE="flac fluidsynth mad midi mikmod mod modplug mp3 playtools smpeg static-libs timidity vorbis +wav"
REQUIRED_USE="
midi? ( || ( timidity fluidsynth ) )
timidity? ( midi )
fluidsynth? ( midi )
mp3? ( || ( smpeg mad ) )
smpeg? ( mp3 )
mad? ( mp3 )
mod? ( || ( mikmod modplug ) )
mikmod? ( mod )
modplug? ( mod )
"
DEPEND=">=media-libs/libsdl-1.2.10
flac? ( media-libs/flac )
midi? (
fluidsynth? ( media-sound/fluidsynth )
timidity? ( media-sound/timidity++ )
)
mp3? (
mad? ( media-libs/libmad )
smpeg? ( >=media-libs/smpeg-0.4.4-r1 )
)
mod? (
modplug? ( media-libs/libmodplug )
mikmod? ( >=media-libs/libmikmod-3.1.10 )
)
vorbis? ( >=media-libs/libvorbis-1.0_beta4 media-libs/libogg )"
RDEPEND=${DEPEND}
S=${WORKDIR}/${MY_P}
src_prepare() {
epatch "${FILESDIR}"/${P}-wav.patch
sed -i \
-e '/link.*play/s/-o/$(LDFLAGS) -o/' \
Makefile.in || die
}
src_configure() {
econf \
--disable-dependency-tracking \
--disable-music-flac-shared \
--disable-music-fluidsynth-shared \
--disable-music-mod-shared \
--disable-music-mp3-shared \
--disable-music-ogg-shared \
$(use_enable wav music-wave) \
$(use_enable vorbis music-ogg) \
$(use_enable mikmod music-mod) \
$(use_enable modplug music-mod-modplug) \
$(use_enable flac music-flac) \
$(use_enable static-libs static) \
$(use_enable smpeg music-mp3) \
$(use_enable mad music-mp3-mad-gpl) \
$(use_enable timidity music-timidity-midi) \
$(use_enable fluidsynth music-fluidsynth-midi)
}
src_install() {
emake DESTDIR="${D}" install
if use playtools; then
emake DESTDIR="${D}" install-bin
fi
dodoc CHANGES README
if ! use static-libs ; then
find "${D}" -type f -name '*.la' -exec rm {} + || die
fi
}
pkg_postinst() {
# bug 412035
# https://bugs.gentoo.org/show_bug.cgi?id=412035
if use midi ; then
if use fluidsynth; then
ewarn "FluidSynth support requires you to set the SDL_SOUNDFONTS"
ewarn "environment variable to the location of a SoundFont file"
ewarn "unless the game or application happens to do this for you."
if use timidity; then
ewarn "Failing to do so will result in Timidity being used instead."
else
ewarn "Failing to do so will result in silence."
fi
fi
fi
}

@ -1,10 +1,10 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/waffle/waffle-9999.ebuild,v 1.3 2014/06/18 19:58:04 mgorny Exp $
# $Header: /var/cvsroot/gentoo-x86/media-libs/waffle/waffle-9999.ebuild,v 1.4 2014/06/30 19:00:34 mattst88 Exp $
EAPI=5
EGIT_REPO_URI="git://people.freedesktop.org/~chadversary/waffle"
EGIT_REPO_URI="git://github.com/waffle-gl/waffle.git"
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-2"

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

Loading…
Cancel
Save