diff --git a/app-admin/eselect/eselect-1.4.5.ebuild b/app-admin/eselect/eselect-1.4.5.ebuild index 767e2861ecd0..a3f3ad10c8a0 100644 --- a/app-admin/eselect/eselect-1.4.5.ebuild +++ b/app-admin/eselect/eselect-1.4.5.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz" LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc emacs vim-syntax" RDEPEND="sys-apps/sed diff --git a/app-admin/logrotate/logrotate-3.9.2.ebuild b/app-admin/logrotate/logrotate-3.9.2.ebuild index 962e6932b64d..b97c5a3b7c91 100644 --- a/app-admin/logrotate/logrotate-3.9.2.ebuild +++ b/app-admin/logrotate/logrotate-3.9.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://github.com/logrotate/logrotate/archive/${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="acl +cron selinux" CDEPEND=" diff --git a/app-admin/mcollective/mcollective-2.8.0.ebuild b/app-admin/mcollective/mcollective-2.8.0.ebuild index 9c400cd87f20..3a4a9bc976d2 100644 --- a/app-admin/mcollective/mcollective-2.8.0.ebuild +++ b/app-admin/mcollective/mcollective-2.8.0.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI="5" -USE_RUBY="ruby19 ruby20" +USE_RUBY="ruby20" inherit ruby-ng diff --git a/app-admin/webmin/Manifest b/app-admin/webmin/Manifest index e5ae1da3bfd5..88cfda8e437c 100644 --- a/app-admin/webmin/Manifest +++ b/app-admin/webmin/Manifest @@ -1,4 +1,2 @@ -DIST webmin-1.770-minimal.tar.gz 2612198 SHA256 e976091dcf0a68dfb02d5633d09da2ce9dc69d8ea2bde95c3cc57a0a25384488 SHA512 3661e37bbeb9f814862ff208d32ec4bfa15e8e826c15833e47c3a39cb0bb47d1f227c0c942f72aed4f3e9344556cc0ef8de42a5961c6795ef01986abafe9949b WHIRLPOOL 92a89623da8ba09d921ffec38c45c2c4bf04c8249178d9d13d34339ecc902d8d7184396ce29c04bfb6e9eba463c2942dc5d9d10d05af463b4dbf9337891bcc02 -DIST webmin-1.770.tar.gz 28441983 SHA256 eb84f1adbb099d0a2e633fbc4ea4838d1ddbcc84135d6a897803fbd0284719ba SHA512 460d9e06379df8d950874906589938077fd0fc70ed12948a685c1386c9995538d92387e252373398319469406b8ef0daab67dabe8c71b2f1961a5d5cb6848a7f WHIRLPOOL 4556f51001d010b66c6af265904b3f634f7bccf1afeb74be6de0824fefb2a5b2a5508d751bfa4abcfd0cb8b670659474ecf4e564505e446ed36a737e4f100dc0 -DIST webmin-1.780-minimal.tar.gz 2624841 SHA256 d4f51fcc448a881d568a32dce1712f4feb1d15bccb05005117179b8a6488e403 SHA512 a0fc61c202d94419f52572a95df23f4dd54c3b0552ce96df356b13b529988cb4be02e5f1165fbd5fbe30921697baac8b229d8d587860e3adabcbe2a4bfb11806 WHIRLPOOL f8b94e16b041cef115cfa7a49fbb34d432f9f96b28959e3f161df9de5805d4a38d7a019479e96ee886dd6f4c21e5884864a69b923ec3b0ac92422c530a95249c -DIST webmin-1.780.tar.gz 28578888 SHA256 eb2613a4f4525cbbd04435580a843cb2a454bcf2712301105657cc114beda40e SHA512 1d5552fc09e0a42218881d2d028b8e73deadfca36022a6212e540e8dbbd2ff5fe23883fc4d3b4d63abee0a2aee570ce9710e4e1b75c2cc28f70724502d6680d7 WHIRLPOOL 7ef76b9e3f64d01978aa281d7e57db37078bab4ec101faa115f51ebf43bc0823d8a8bfa925dff5d1a39b0b9aabdada2218d543b14d3961b1346de05c46137d4b +DIST webmin-1.791-minimal.tar.gz 2635024 SHA256 d269fcccf0034edff44654fb40b83f63e3274f722a8f0d5b14f1fa9f74f49b00 SHA512 e8e7b43865399e918ef017d4d710b21cc7ce2f6566056faa82d756be29f038e07a20055978531f8785639c78339970fbfeabd4a4aa1fa4b331f3a344a78954d2 WHIRLPOOL e8380478edf6b994e03623a9a6b84f736a6c5efd1dbe0aac3905f85457d172a783af0231d4b3606d69c63129c4c4d3d80fa10608dd47374a01f45be7fd53b281 +DIST webmin-1.791.tar.gz 28800013 SHA256 e62148a2263c016a66e7c825c5cb124614268c1da1e0f0bee75cd060c3acfa9c SHA512 4ba19f057ee70bc0a283753a6c190bbae15f0e2af1650ef1656c7b94e07a6750203ef3b7190f7abd544b25988446df6b174bf06191426893bd4224e54451e771 WHIRLPOOL 2d739e1c3ba06b04086b7d20eb646f950aa8776b4fc41bc975cb160733e70a5c7a4de6f331c294bf168e3f8fd5009c72d617eab662078f6d901087b3cfc2db36 diff --git a/app-admin/webmin/files/gentoo-setup b/app-admin/webmin/files/gentoo-setup-1.791 similarity index 97% rename from app-admin/webmin/files/gentoo-setup rename to app-admin/webmin/files/gentoo-setup-1.791 index 47d6127a56cf..680dfbb5303b 100644 --- a/app-admin/webmin/files/gentoo-setup +++ b/app-admin/webmin/files/gentoo-setup-1.791 @@ -94,12 +94,13 @@ if [ "$upgrading" = 1 ]; then real_os_type=`grep "^real_os_type=" $config_dir/config | sed -e 's/real_os_type=//g'` real_os_version=`grep "^real_os_version=" $config_dir/config | sed -e 's/real_os_version=//g'` - # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, no_tls1, no_tls1_1 and keyfile + # Get port, ssl, no_ssl2, no_ssl3, ssl_redirect, no_sslcompression, ssl_honorcipherorder, no_tls1, no_tls1_1 and keyfile port=`grep "^port=" $config_dir/miniserv.conf | sed -e 's/port=//g'` ssl=`grep "^ssl=" $config_dir/miniserv.conf | sed -e 's/ssl=//g'` no_ssl2=`grep "^no_ssl2=" $config_dir/miniserv.conf | sed -e 's/no_ssl2=//g'` no_ssl3=`grep "^no_ssl3=" $config_dir/miniserv.conf | sed -e 's/no_ssl3=//g'` ssl_redirect=`grep "^ssl_redirect=" $config_dir/miniserv.conf | sed -e 's/ssl_redirect=//g'` + ssl_honorcipherorder=`grep "^ssl_honorcipherorder=" $config_dir/miniserv.conf | sed -e 's/ssl_honorcipherorder=//g'` no_sslcompression=`grep "^no_sslcompression=" $config_dir/miniserv.conf | sed -e 's/no_sslcompression=//g'` no_tls1=`grep "^no_tls1=" $config_dir/miniserv.conf | sed -e 's/no_tls1=//g'` no_tls1_1=`grep "^no_tls1_1=" $config_dir/miniserv.conf | sed -e 's/no_tls1_1=//g'` @@ -146,6 +147,7 @@ else echo "no_ssl2=$no_ssl2" >> $cfile echo "no_ssl3=$no_ssl3" >> $cfile echo "ssl_redirect=$ssl_redirect" >> $cfile + echo "ssl_honorcipherorder=$ssl_honorcipherorder" >> $cfile echo "no_sslcompression=$no_sslcompression" >> $cfile echo "no_tls1=$no_tls1" >> $cfile echo "no_tls1_1=$no_tls1_1" >> $cfile @@ -307,6 +309,11 @@ if [ "$?" != "0" ]; then echo passwd_mode=0 >> $config_dir/miniserv.conf fi +grep ssl_honorcipherorder= $config_dir/miniserv.conf >/dev/null +if [ "$?" != "0" ]; then + echo ssl_honorcipherorder=1 >> $config_dir/miniserv.conf +fi + # Disable SSL compression to defeat BEAST attack grep no_sslcompression= $config_dir/miniserv.conf >/dev/null if [ "$?" != "0" ]; then diff --git a/app-admin/webmin/webmin-1.780.ebuild b/app-admin/webmin/webmin-1.780.ebuild deleted file mode 100644 index eb7f7a9fb001..000000000000 --- a/app-admin/webmin/webmin-1.780.ebuild +++ /dev/null @@ -1,307 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -inherit eutils pam ssl-cert systemd - -DESCRIPTION="A web-based Unix systems administration interface" -HOMEPAGE="http://www.webmin.com/" -SRC_URI="minimal? ( mirror://sourceforge/webadmin/${P}-minimal.tar.gz ) - !minimal? ( mirror://sourceforge/webadmin/${P}.tar.gz )" - -LICENSE="BSD GPL-2" -SLOT="0" - -KEYWORDS="~amd64 ~x86" - -# NOTE: The ssl flag auto added by ssl-cert eclass is not used actually -# because openssl is forced by dev-perl/Net-SSLeay -IUSE="minimal +ssl mysql postgres ldap" - -# All the required perl modules can be found easily using (in Webmin's root src dir): -# find . -name cpan_modules.pl -exec grep "::" {} \; -# NOTE: If Webmin doesn't find the required perl modules, it offers(runtime) the user -# to install them using the in-built cpan module, and this will mess up perl on the system -# That's why some modules are forced without a use flag -# NOTE: pam, ssl and dnssec-tools deps are forced for security and Gentoo compliance installation reasons -DEPEND="virtual/perl-MIME-Base64 - virtual/perl-Socket - virtual/perl-Sys-Syslog - virtual/perl-Time-HiRes - virtual/perl-Time-Local - dev-perl/Authen-Libwrap - dev-perl/IO-Tty - dev-perl/MD5 - dev-perl/Net-SSLeay - dev-perl/Authen-PAM - dev-perl/Sys-Hostname-Long - >=net-dns/dnssec-tools-1.13 - !minimal? ( - mysql? ( dev-perl/DBD-mysql ) - postgres? ( dev-perl/DBD-Pg ) - ldap? ( dev-perl/perl-ldap ) - dev-perl/XML-Generator - dev-perl/XML-Parser - )" -RDEPEND="${DEPEND}" - -src_prepare() { - local perl="$( which perl )" - - # Remove the unnecessary and incompatible files - rm -rf acl/Authen-SolarisRBAC-0.1* - if ! use minimal ; then - rm -rf {format,{bsd,hpux,sgi}exports,zones,rbac} - rm -f mount/{free,net,open}bsd-mounts* - rm -f mount/macos-mounts* - fi - - # For security reasons remove the SSL certificate that comes with Webmin - # We will create our own later - rm -f miniserv.pem - - # Remove the Webmin setup scripts to avoid Webmin in runtime to mess up config - # We will use our own later - rm -f setup.{sh,pl} - - # Set the installation type/mode to Gentoo - echo "gentoo" > install-type - - # Fix the permissions of the install files - chmod -R og-w "${S}" - - # Since we should not modify any files after install - # we set the perl path in all cgi and pl files here using Webmin's routines - # The pl file is Prefix safe and works only on provided input, no other filesystem files - ebegin "Fixing perl path in source files" - (find "${S}" -name '*.cgi' -print ; find "${S}" -name '*.pl' -print) | $perl "${S}"/perlpath.pl $perl - - eend $? -} - -src_install() { - # Create config dir and keep - diropts -m0755 - dodir /etc/webmin - keepdir /etc/webmin - - # Create install dir - # Third party modules installed through Webmin go here too, so keep - dodir /usr/libexec/webmin - keepdir /usr/libexec/webmin - - # Copy our own setup script to installation folder - insinto /usr/libexec/webmin - newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh - fperms 0744 /usr/libexec/webmin/gentoo-setup.sh - - # This is here if we ever want in future ebuilds to add some specific - # config values in the /etc/webmin/miniserv.conf - # The format of this file should be the same as the one of miniserv.conf: - # var=value - # - # Uncomment it if you use such file. Before that check if upstream - # has this file in root dir too. - #newins "${FILESDIR}/miniserv-conf" miniserv-conf - - # Create the log dir and keep - diropts -m0700 - dodir /var/log/webmin - keepdir /var/log/webmin - - # Create the init.d file and put the neccessary variables there - newinitd "${FILESDIR}"/init.d.webmin webmin - sed -i \ - -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \ - -e "s:%pid%:${EROOT}var/run/webmin.pid:" \ - -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \ - -e "s:%config%:${EROOT}etc/webmin/config:" \ - -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \ - "${ED}etc/init.d/webmin" \ - || die "Failed to patch the webmin init file" - - # Create the systemd service file and put the neccessary variables there - systemd_newunit "${FILESDIR}"/webmin.service webmin.service - sed -i \ - -e "s:%exe%:${EROOT}usr/libexec/webmin/miniserv.pl:" \ - -e "s:%pid%:${EROOT}var/run/webmin.pid:" \ - -e "s:%conf%:${EROOT}etc/webmin/miniserv.conf:" \ - -e "s:%config%:${EROOT}etc/webmin/config:" \ - -e "s:%perllib%:${EROOT}usr/libexec/webmin:" \ - "${ED}$(_systemd_get_systemunitdir)/webmin.service" \ - || die "Failed to patch the webmin systemd service file" - - # Setup pam - pamd_mimic system-auth webmin auth account session - - # Copy files to installation folder - ebegin "Copying install files to destination" - cp -pPR "${S}"/* "${ED}usr/libexec/webmin" - eend $? -} - -pkg_preinst() { - # First stop service if running so Webmin to not messup our config - ebegin "Stopping any running Webmin instance prior merging" - if systemd_is_booted ; then - systemctl stop webmin.service 2>/dev/null - else - rc-service --ifexists -- webmin --ifstarted stop - fi - eend $? -} - -pkg_postinst() { - # Run pkg_config phase first - non interactively - export INTERACTIVE="no" - pkg_config - # Every next time pkg_config should be interactive - INTERACTIVE="yes" - - ewarn - ewarn "Bare in mind that not all Webmin modules are Gentoo tweaked and may have some issues." - ewarn "Always be careful when using modules that modify init entries, do update of webmin, install CPAN modules etc." - ewarn "To avoid problems, please before using any module, look at its configuration options first." - ewarn "(Usually there is a link at top in the right pane of Webmin for configuring the module.)" - ewarn - if systemd_is_booted ; then - elog "- To make Webmin start at boot time, run: 'systemctl enable webmin.service'" - else - elog "- To make Webmin start at boot time, run: 'rc-update add webmin default'" - fi - elog "- The default URL to connect to Webmin is: https://localhost:10000" - elog "- The default user that can login is: root" - elog "- To reconfigure Webmin in case of problems run 'emerge --config app-admin/webmin'" -} - -pkg_prerm() { - # First stop service if running - we do not want Webmin to mess up config - ebegin "Stopping any running Webmin instance prior unmerging" - if systemd_is_booted ; then - systemctl stop webmin.service 2>/dev/null - else - rc-service --ifexists -- webmin --ifstarted stop - fi - eend $? -} - -pkg_postrm() { - # If removing webmin completely, remind the user for the Webmin's own cron jobs. - if [[ ! ${REPLACED_BY_VERSION} ]]; then - ewarn - ewarn "You have uninstalled Webmin, so have in mind that all cron jobs scheduled" - ewarn "by Webmin for its own modules, are left active and they will fail when Webmin is missing." - ewarn "To fix this just disable them if you intend to use Webmin again," - ewarn "OR delete them if not." - ewarn - fi -} - -pkg_config(){ - # First stop service if running - ebegin "Stopping any running Webmin instance" - if systemd_is_booted ; then - systemctl stop webmin.service 2>/dev/null - else - rc-service --ifexists -- webmin --ifstarted stop - fi - eend $? - - # Next set the default reset variable to 'none' - # reset/_reset can be: - # 'none' - does not reset anything, just upgrades if a conf is present - # OR installs new conf if a conf is missing - # 'soft' - deletes only $config_dir/config file and thus resetting most - # conf values to their defaults. Keeps the specific Webmin cron jobs - # 'hard' - deletes all files in $config_dir (keeping the .keep_* Gentoo file) - # and thus resetting all Webmin. Deletes the specific Webmin cron jobs too. - local _reset="none" - - # If in interactive mode ask user what should we do - if [[ "${INTERACTIVE}" = "yes" ]]; then - einfo - einfo "Please enter the number of the action you would like to perform?" - einfo - einfo "1. Update configuration" - einfo " (keeps old config options and adds the new ones)" - einfo "2. Soft reset configuration" - einfo " (keeps some old config options, the other options are set to default)" - ewarn " All Webmin users will be reset" - einfo "3. Hard reset configuration" - einfo " (all options including module options are set to default)" - ewarn " You will lose all Webmin configuration options you have done till now" - einfo "4. Exit this configuration utility (default)" - while [ "$correct" != "true" ] ; do - read answer - if [[ "$answer" = "1" ]] ; then - _reset="none" - correct="true" - elif [[ "$answer" = "2" ]] ; then - _reset="soft" - correct="true" - elif [[ "$answer" = "3" ]] ; then - _reset="hard" - correct="true" - elif [ "$answer" = "4" -o "$answer" = "" ] ; then - die "User aborted configuration." - else - echo "Answer not recognized. Enter a number from 1 to 4" - fi - done - - if [[ "$_reset" = "hard" ]]; then - while [ "$sure" != "true" ] ; do - ewarn "You will lose all Webmin configuration options you have done till now." - ewarn "Are you sure you want to do this? (y/n)" - read answer - if [[ $answer =~ ^[Yy]([Ee][Ss])?$ ]] ; then - sure="true" - elif [[ $answer =~ ^[Nn]([Oo])?$ ]] ; then - die "User aborted configuration." - else - echo "Answer not recognized. Enter 'y' or 'n'" - fi - done - fi - fi - - export reset=$_reset - - # Create ssl certificate for Webmin if there is not one in the proper place - if [[ ! -e "${EROOT}etc/ssl/webmin/server.pem" ]]; then - SSL_ORGANIZATION="${SSL_ORGANIZATION:-Webmin Server}" - SSL_COMMONNAME="${SSL_COMMONNAME:-*}" - install_cert "${EROOT}/etc/ssl/webmin/server" - fi - - # Ensure all paths passed to the setup script use EROOT - export wadir="${EROOT}usr/libexec/webmin" - export config_dir="${EROOT}etc/webmin" - export var_dir="${EROOT}var/log/webmin" - export tempdir="${T}" - export pidfile="${EROOT}var/run/webmin.pid" - export perl="$( which perl )" - export os_type='gentoo-linux' - export os_version='*' - export real_os_type='Gentoo Linux' - export real_os_version='Any version' - # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression', - # 'no_tls1' and 'no_tls1_1' for tightening security - export ssl=1 - export no_ssl2=1 - export no_ssl3=1 - export ssl_redirect=1 - export no_sslcompression=1 - export no_tls1=1 - export no_tls1_1=1 - export keyfile="${EROOT}etc/ssl/webmin/server.pem" - export port=10000 - - export atboot=0 - - einfo "Executing Webmin's configure script" - $wadir/gentoo-setup.sh - - einfo "Configuration of Webmin done" -} diff --git a/app-admin/webmin/webmin-1.770.ebuild b/app-admin/webmin/webmin-1.791.ebuild similarity index 97% rename from app-admin/webmin/webmin-1.770.ebuild rename to app-admin/webmin/webmin-1.791.ebuild index eb7f7a9fb001..8e25d1b8e6c7 100644 --- a/app-admin/webmin/webmin-1.770.ebuild +++ b/app-admin/webmin/webmin-1.791.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,6 +19,7 @@ KEYWORDS="~amd64 ~x86" # NOTE: The ssl flag auto added by ssl-cert eclass is not used actually # because openssl is forced by dev-perl/Net-SSLeay IUSE="minimal +ssl mysql postgres ldap" +REQUIRED_USE="minimal? ( !mysql !postgres !ldap )" # All the required perl modules can be found easily using (in Webmin's root src dir): # find . -name cpan_modules.pl -exec grep "::" {} \; @@ -93,7 +94,7 @@ src_install() { # Copy our own setup script to installation folder insinto /usr/libexec/webmin - newins "${FILESDIR}"/gentoo-setup gentoo-setup.sh + newins "${FILESDIR}"/gentoo-setup-${PV} gentoo-setup.sh fperms 0744 /usr/libexec/webmin/gentoo-setup.sh # This is here if we ever want in future ebuilds to add some specific @@ -287,11 +288,12 @@ pkg_config(){ export real_os_type='Gentoo Linux' export real_os_version='Any version' # Forcing 'ssl', 'no_ssl2', 'no_ssl3', 'ssl_redirect', 'no_sslcompression', - # 'no_tls1' and 'no_tls1_1' for tightening security + # 'ssl_honorcipherorder', 'no_tls1' and 'no_tls1_1' for tightening security export ssl=1 export no_ssl2=1 export no_ssl3=1 export ssl_redirect=1 + export ssl_honorcipherorder=1 export no_sslcompression=1 export no_tls1=1 export no_tls1_1=1 diff --git a/app-arch/cpio/cpio-2.12-r1.ebuild b/app-arch/cpio/cpio-2.12-r1.ebuild index 68006d2f6c35..bb2c6d8a1917 100644 --- a/app-arch/cpio/cpio-2.12-r1.ebuild +++ b/app-arch/cpio/cpio-2.12-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/cpio/${P}.tar.bz2" LICENSE="GPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="nls" src_prepare() { diff --git a/app-arch/unrar/unrar-5.3.11.ebuild b/app-arch/unrar/unrar-5.3.11.ebuild index 421be0dae40f..0165d18a72f3 100644 --- a/app-arch/unrar/unrar-5.3.11.ebuild +++ b/app-arch/unrar/unrar-5.3.11.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.rarlab.com/rar/${MY_PN}-${PV}.tar.gz" LICENSE="unRAR" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" RDEPEND="!<=app-arch/unrar-gpl-0.0.1_p20080417" diff --git a/app-arch/xz-utils/xz-utils-5.2.2.ebuild b/app-arch/xz-utils/xz-utils-5.2.2.ebuild index 0567cbbe4ed3..358098a8e7f5 100644 --- a/app-arch/xz-utils/xz-utils-5.2.2.ebuild +++ b/app-arch/xz-utils/xz-utils-5.2.2.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == "9999" ]] ; then else MY_P="${PN/-utils}-${PV/_}" SRC_URI="http://tukaani.org/xz/${MY_P}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" S=${WORKDIR}/${MY_P} EXTRA_DEPEND= fi diff --git a/app-backup/borgbackup/Manifest b/app-backup/borgbackup/Manifest new file mode 100644 index 000000000000..71527d575171 --- /dev/null +++ b/app-backup/borgbackup/Manifest @@ -0,0 +1 @@ +DIST borgbackup-1.0.0.tar.gz 424089 SHA256 500b9e311331aa88ec07df94d9f3280a79ca207bf1a997b92dd1e6a1f1664671 SHA512 5a94f1b0dfe17d383bcc917db69ed272b9b752b96912a21ac62886972cdbd718b58fe3f9529af455ab325ba418cfc05b89985e32a23fed5e946c5f7e53e6e3b1 WHIRLPOOL c0a5c40aff70c9872e62861a0e971f659191f3a99112dfe940db2440666def3a04af284f5f31ccaef410c7028a49377df96fb38fd462917ad11cd095e33b12e9 diff --git a/app-backup/borgbackup/borgbackup-1.0.0.ebuild b/app-backup/borgbackup/borgbackup-1.0.0.ebuild new file mode 100644 index 000000000000..5267b911de82 --- /dev/null +++ b/app-backup/borgbackup/borgbackup-1.0.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python3_4 ) + +inherit distutils-r1 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/borgbackup/borg.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/b/borgbackup/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Deduplicating backup program with compression and authenticated encryption." +HOMEPAGE="https://borgbackup.github.io/" + +LICENSE="BSD" +SLOT="0" +IUSE="libressl +fuse" + +RDEPEND=" + app-arch/lz4 + dev-python/msgpack[${PYTHON_USEDEP}] + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + fuse? ( dev-python/llfuse[${PYTHON_USEDEP}] ) +" + +DEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + ${RDEPEND} +" diff --git a/app-backup/borgbackup/borgbackup-9999.ebuild b/app-backup/borgbackup/borgbackup-9999.ebuild new file mode 100644 index 000000000000..5267b911de82 --- /dev/null +++ b/app-backup/borgbackup/borgbackup-9999.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +PYTHON_COMPAT=( python3_4 ) + +inherit distutils-r1 + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/borgbackup/borg.git" + inherit git-r3 +else + SRC_URI="mirror://pypi/b/borgbackup/${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +DESCRIPTION="Deduplicating backup program with compression and authenticated encryption." +HOMEPAGE="https://borgbackup.github.io/" + +LICENSE="BSD" +SLOT="0" +IUSE="libressl +fuse" + +RDEPEND=" + app-arch/lz4 + dev-python/msgpack[${PYTHON_USEDEP}] + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl ) + fuse? ( dev-python/llfuse[${PYTHON_USEDEP}] ) +" + +DEPEND=" + dev-python/setuptools_scm[${PYTHON_USEDEP}] + dev-python/cython[${PYTHON_USEDEP}] + ${RDEPEND} +" diff --git a/app-backup/borgbackup/metadata.xml b/app-backup/borgbackup/metadata.xml new file mode 100644 index 000000000000..520d60139017 --- /dev/null +++ b/app-backup/borgbackup/metadata.xml @@ -0,0 +1,14 @@ + + + + + blueness@gentoo.org + Anthony G. Basile + + + Mount archive as a FUSE filesystem. + + + borgbackup/borg + + diff --git a/app-backup/dirvish/dirvish-1.2.1.ebuild b/app-backup/dirvish/dirvish-1.2.1.ebuild index b9b053177ff7..02af1882673d 100644 --- a/app-backup/dirvish/dirvish-1.2.1.ebuild +++ b/app-backup/dirvish/dirvish-1.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -13,7 +13,7 @@ IUSE="" DEPEND="app-arch/tar" RDEPEND="dev-perl/Time-modules - dev-perl/Period + dev-perl/Time-Period >=net-misc/rsync-2.5.7" src_compile() { diff --git a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild index bfb5436c157e..c224b6ea9598 100644 --- a/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild +++ b/app-benchmarks/bonnie++/bonnie++-1.97-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="debug" S="${WORKDIR}/${P}.1" diff --git a/app-benchmarks/bonnie++/bonnie++-1.97.ebuild b/app-benchmarks/bonnie++/bonnie++-1.97.ebuild deleted file mode 100644 index 66c735bc2f43..000000000000 --- a/app-benchmarks/bonnie++/bonnie++-1.97.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="2" - -inherit eutils - -DESCRIPTION="Hard drive bottleneck testing benchmark suite" -HOMEPAGE="http://www.coker.com.au/bonnie++/" -SRC_URI="http://www.coker.com.au/bonnie++/experimental/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="debug" - -DEPEND="" -RDEPEND="" - -# hmm? -S="${WORKDIR}/${P}.1" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.96-compile-flags.patch" -} - -src_configure() { - econf \ - $(use_with debug) \ - --disable-stripping \ - || die -} - -src_compile() { - emake || die "emake failed" - emake zcav || die "emake zcav failed" # see #9073 -} - -src_install() { - dosbin bonnie++ zcav || die - dobin bon_csv2html bon_csv2txt || die - doman bon_csv2html.1 bon_csv2txt.1 bonnie++.8 zcav.8 - dohtml readme.html - dodoc changelog.txt credits.txt -} diff --git a/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild b/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild new file mode 100644 index 000000000000..f3ba307cd34a --- /dev/null +++ b/app-benchmarks/filebench/filebench-1.4.9.1-r1.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit autotools + +DESCRIPTION="Filebench - A Model Based File System Workload Generator" +HOMEPAGE="http://sourceforge.net/projects/filebench/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="CDDL" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="auto-completion" + +RDEPEND=" + auto-completion? ( dev-libs/libtecla ) +" +DEPEND="${RDEPEND} + sys-devel/flex + sys-devel/bison +" + +PATCHES=( "${FILESDIR}"/${PN}-fix-automagic-libtecla-dependency.patch ) + +src_prepare() { + default + eautoreconf +} + +src_configure() { + econf $(use_with auto-completion libtecla) +} diff --git a/app-benchmarks/filebench/filebench-1.4.9.1.ebuild b/app-benchmarks/filebench/filebench-1.4.9.1.ebuild deleted file mode 100644 index bc981643acde..000000000000 --- a/app-benchmarks/filebench/filebench-1.4.9.1.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils autotools - -DESCRIPTION="Filebench - A Model Based File System Workload Generator" -HOMEPAGE="http://sourceforge.net/projects/filebench/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="CDDL" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -DEPEND="dev-libs/libaio - sys-devel/flex - sys-devel/bison" -RDEPEND="" - -src_unpack() { - unpack ${A} - cd "${S}" - #epatch "${FILESDIR}/linux-port.patch" - eautoreconf -} - -src_compile() { - econf - emake -j1 || die "emake failed" -} - -src_install() { - emake DESTDIR="${D}" install || die "Install failed" - - dodoc README AUTHORS -} diff --git a/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch b/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch new file mode 100644 index 000000000000..8d24a62a89d6 --- /dev/null +++ b/app-benchmarks/filebench/files/filebench-fix-automagic-libtecla-dependency.patch @@ -0,0 +1,22 @@ +From: Göktürk Yüksek +Subject: [PATCH] Fix automagic dependency on libtecla + +Replace the unconditional AC_CHECK_LIB logic with AC_ARG_WITH to +eliminate the automagic dependency on libtecla. + +--- a/configure.ac ++++ b/configure.ac +@@ -164,8 +164,11 @@ + AC_CHECK_LIB([kstat], [kstat_open]) + # Use libtecla for autocompletion if it is available. If it + # is, then conditionally compile auto_comp.c (see Makefile.am) +-AC_CHECK_LIB([tecla], [cpl_add_completion]) +-AM_CONDITIONAL(AUTOCOMP_LIBTECLA, test "$ac_cv_lib_tecla_cpl_add_completion" = yes) ++AC_ARG_WITH([libtecla], AS_HELP_STRING([--with-libtecla], [Build with libtecla for autocompletion support (default: test)])) ++AS_IF([test "x$with_libtecla" != "xno"], [ ++ AC_CHECK_LIB([tecla], [cpl_add_completion]) ++]) ++AM_CONDITIONAL([AUTOCOMP_LIBTECLA], [test "x$ac_cv_lib_tecla_cpl_add_completion" = "xyes"]) + # Check that librt is installed and supports async IO. First line + # allows to add librt to the linkers path, second one checks + # if aio_wait() is in it, third one checks if aio_waitn() is there (usually diff --git a/app-benchmarks/filebench/files/linux-port.patch b/app-benchmarks/filebench/files/linux-port.patch deleted file mode 100644 index c0608128d558..000000000000 --- a/app-benchmarks/filebench/files/linux-port.patch +++ /dev/null @@ -1,369 +0,0 @@ -Index: filebench-1.2.4/filebench/flowop_library.c -=================================================================== ---- filebench-1.2.4.orig/filebench/flowop_library.c -+++ filebench-1.2.4/filebench/flowop_library.c -@@ -789,6 +789,7 @@ flowoplib_aiowait(threadflow_t *threadfl - for (ncompleted = 0, inprogress = 0, - aio = flowop->fo_thread->tf_aiolist; - ncompleted < todo, aio != NULL; aio = aio->al_next) { -+ int result; - - result = aio_error64(&aio->al_aiocb); - -Index: filebench-1.2.4/filebench/fileset.c -=================================================================== ---- filebench-1.2.4.orig/filebench/fileset.c -+++ filebench-1.2.4/filebench/fileset.c -@@ -32,8 +32,9 @@ - #include - #include - #include --#include "fileset.h" -+ - #include "filebench.h" -+#include "fileset.h" - #include "gamma_dist.h" - - /* -@@ -631,9 +632,9 @@ fileset_create(fileset_t *fileset) - /* we are re-using */ - reusing = 1; - filebench_log(LOG_VERBOSE, -- "Re-using %s %s on %s file system.", -+ "Re-using %s %s.", - fileset_entity_name(fileset), -- fileset_name, sb.st_fstype); -+ fileset_name); - } - } - (void) mkdir(path, 0755); -Index: filebench-1.2.4/filebench/filebench.h -=================================================================== ---- filebench-1.2.4.orig/filebench/filebench.h -+++ filebench-1.2.4/filebench/filebench.h -@@ -32,6 +32,15 @@ - - #include - #include -+#include -+ -+#ifndef HAVE_BOOLEAN_T -+typedef enum { B_FALSE, B_TRUE } boolean_t; -+#endif -+ -+#ifndef HAVE_U_LONGLONG_T -+typedef unsigned long long u_longlong_t; -+#endif - - #include "vars.h" - #include "misc.h" -Index: filebench-1.2.4/filebench/eventgen.c -=================================================================== ---- filebench-1.2.4.orig/filebench/eventgen.c -+++ filebench-1.2.4/filebench/eventgen.c -@@ -40,9 +40,10 @@ - */ - - #include -+ -+#include "filebench.h" - #include "vars.h" - #include "eventgen.h" --#include "filebench.h" - #include "flowop.h" - #include "ipc.h" - -Index: filebench-1.2.4/filebench/procflow.c -=================================================================== ---- filebench-1.2.4.orig/filebench/procflow.c -+++ filebench-1.2.4/filebench/procflow.c -@@ -30,8 +30,8 @@ - #include - #include - --#include "procflow.h" - #include "filebench.h" -+#include "procflow.h" - #include "flowop.h" - #include "ipc.h" - -@@ -162,7 +162,7 @@ procflow_createproc(procflow_t *procflow - } - - #else -- if (execl(execname, procname, "-a", procname, "-i", -+ if (execlp(execname, procname, "-a", procname, "-i", - instance, "-s", shmaddr, "-m", shmpath, NULL) < 0) { - filebench_log(LOG_ERROR, - "procflow exec proc failed: %s", -Index: filebench-1.2.4/filebench/threadflow.c -=================================================================== ---- filebench-1.2.4.orig/filebench/threadflow.c -+++ filebench-1.2.4/filebench/threadflow.c -@@ -31,8 +31,9 @@ - #include - #endif - #include --#include "threadflow.h" -+ - #include "filebench.h" -+#include "threadflow.h" - #include "flowop.h" - #include "ipc.h" - -Index: filebench-1.2.4/filebench/utils.c -=================================================================== ---- filebench-1.2.4.orig/filebench/utils.c -+++ filebench-1.2.4/filebench/utils.c -@@ -34,6 +34,8 @@ - #ifdef HAVE_STDINT_H - #include - #endif -+ -+#include "filebench.h" - #include "utils.h" - #include "parsertypes.h" - -Index: filebench-1.2.4/filebench/vars.c -=================================================================== ---- filebench-1.2.4.orig/filebench/vars.c -+++ filebench-1.2.4/filebench/vars.c -@@ -30,12 +30,12 @@ - #include - #include - -+#include "filebench.h" - #include "vars.h" - #include "misc.h" - #include "utils.h" - #include "stats.h" - #include "eventgen.h" --#include "filebench.h" - #include "fb_random.h" - - static var_t *var_find_dynamic(char *name); -Index: filebench-1.2.4/filebench/parser_gram.y -=================================================================== ---- filebench-1.2.4.orig/filebench/parser_gram.y -+++ filebench-1.2.4/filebench/parser_gram.y -@@ -46,8 +46,9 @@ - #ifdef HAVE_LIBTECLA - #include - #endif --#include "parsertypes.h" -+ - #include "filebench.h" -+#include "parsertypes.h" - #include "utils.h" - #include "stats.h" - #include "vars.h" -@@ -2642,7 +2643,7 @@ parser_help(cmd_t *cmd) - } else { - filebench_log(LOG_INFO, - "load (ls " -- "/usr/benchmarks/filebench/workloads for list)"); -+ FILEBENCHDIR "/workloads for list)"); - } - } - -Index: filebench-1.2.4/filebench/parser_lex.l -=================================================================== ---- filebench-1.2.4.orig/filebench/parser_lex.l -+++ filebench-1.2.4/filebench/parser_lex.l -@@ -38,9 +38,10 @@ - #ifdef HAVE_STDINT_H - #include - #endif -+ -+#include "filebench.h" - #include "parsertypes.h" - #include "utils.h" --#include "filebench.h" - - #include "parser_gram.h" - -Index: filebench-1.2.4/filebench/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/filebench/Makefile.am -+++ filebench-1.2.4/filebench/Makefile.am -@@ -7,19 +7,19 @@ - # - - bin_PROGRAMS = go_filebench --filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \ -+go_filebench_SOURCES = gamma_dist.c misc.c procflow.c threadflow.c \ - utils.c flowop.c flowop_library.c ipc.c \ - vars.c stats.c eventgen.c fileset.c fb_random.c \ - parser_gram.y parser_lex.l --filebenchdir = $(datadir)/filebench --INCLUDES = -I../intl -DFILEBENCHDIR=\"$(prefix)/filebench\" -+INCLUDES = -I../intl -DFILEBENCHDIR=\"$(FILEBENCHDIR)\" - - MV=@MV@ - LEX=@LEX@ - YACC=@YACC@ --LFLAGS = @LFLAGS@ --YFLAGS = @YFLAGS@ -+AM_LFLAGS = @LFLAGS@ -+AM_YFLAGS = @YFLAGS@ - DEFS = -D_REENTRANT @DEFINES@ -+LIBS = @LDLIBS@ - BUILD = @BUILD@ - - parser_lex.c: parser_lex.l parser_gram.h Makefile -Index: filebench-1.2.4/configure.in -=================================================================== ---- filebench-1.2.4.orig/configure.in -+++ filebench-1.2.4/configure.in -@@ -73,8 +73,8 @@ case "$host_os$host_cpu" in - YFLAGS="-d" - AC_DEFINE(HAVE_OFF64_T, 1, - [ Define if we can use 64 bit files ]) -- FILEBENCHDIR=${prefix}/filebench -- FILEBENCHBIN=${prefix}/bin -+ FILEBENCHDIR=${datadir}/filebench -+ FILEBENCHBIN=${bindir} - ;; - esac - -@@ -324,6 +324,6 @@ AC_SUBST(SRCDIR) - AC_SUBST(FILEBENCHDIR) - AC_SUBST(FILEBENCHBIN) - --AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile]) -+AC_CONFIG_FILES([Makefile filebench/Makefile fastsu/Makefile workloads/Makefile workloads/build/Makefile scripts/Makefile benchpoint/Makefile benchpoint/bin/Makefile benchpoint/config/Makefile benchpoint/functions/Makefile benchpoint/profiles/Makefile bin/Makefile]) - - AC_OUTPUT -Index: filebench-1.2.4/fastsu/fastsu.c -=================================================================== ---- filebench-1.2.4.orig/fastsu/fastsu.c -+++ filebench-1.2.4/fastsu/fastsu.c -@@ -1,23 +1,26 @@ - #include - #include - #include --#include -+#include - --void -+int - main(int argc, char *argv[], char *envp[]) - { - char *shell; - char cmd[2048]; - -- *cmd = NULL; -+ *cmd = '\0'; - shell=getenv("SHELL"); -- *(argv++); -+ argv++; - argc--; - while(argc-- != 0) { - (void) strcat(cmd,*argv); - (void) strcat(cmd," "); -- *(argv++); -+ argv++; - } - - execlp(shell, shell, "-c", cmd, (char *) 0); -+ -+ /* control should not reach here */ -+ return -1; - } -Index: filebench-1.2.4/benchpoint/config/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/benchpoint/config/Makefile.am -+++ filebench-1.2.4/benchpoint/config/Makefile.am -@@ -6,8 +6,7 @@ - # See the file LICENSING in this distribution for details. - # - --filebenchdir = $(prefix)/filebench --configdir = $(filebenchdir)/config -+configdir = ${FILEBENCHDIR}/config - - config_DATA = *.conf - -Index: filebench-1.2.4/benchpoint/profiles/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/benchpoint/profiles/Makefile.am -+++ filebench-1.2.4/benchpoint/profiles/Makefile.am -@@ -6,8 +6,7 @@ - # See the file LICENSING in this distribution for details. - # - --filebenchdir = $(prefix)/filebench --configdir = $(filebenchdir)/config -+configdir = ${FILEBENCHDIR}/config - - config_DATA = *.prof - -Index: filebench-1.2.4/bin/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/bin/Makefile.am -+++ filebench-1.2.4/bin/Makefile.am -@@ -6,8 +6,5 @@ - # See the file LICENSING in this distribution for details. - # - --filebenchdir = $(prefix)/filebench --scriptsdir = $(filebenchdir)/bin -- --scripts_SCRIPTS = filebench -+bin_SCRIPTS = filebench - -Index: filebench-1.2.4/benchpoint/functions/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/benchpoint/functions/Makefile.am -+++ filebench-1.2.4/benchpoint/functions/Makefile.am -@@ -6,8 +6,7 @@ - # See the file LICENSING in this distribution for details. - # - --filebenchdir = $(prefix)/filebench --configdir = $(filebenchdir)/config -+configdir = ${FILEBENCHDIR}/config - - config_SCRIPTS = *.func - -Index: filebench-1.2.4/scripts/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/scripts/Makefile.am -+++ filebench-1.2.4/scripts/Makefile.am -@@ -6,8 +6,7 @@ - # See the file LICENSING in this distribution for details. - # - --filebenchdir = $(prefix)/filebench --scriptsdir = $(filebenchdir)/scripts -+scriptsdir = ${FILEBENCHDIR}/scripts - - scripts_SCRIPTS = filebench_compare filebench_summary filebench_plot fs_flush - -Index: filebench-1.2.4/workloads/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/workloads/Makefile.am -+++ filebench-1.2.4/workloads/Makefile.am -@@ -6,8 +6,6 @@ - # See the file LICENSING in this distribution for details. - # - --filebenchdir = $(datadir)/filebench -- - SUBDIRS = build - - pkg: filebench -Index: filebench-1.2.4/workloads/build/Makefile.am -=================================================================== ---- filebench-1.2.4.orig/workloads/build/Makefile.am -+++ filebench-1.2.4/workloads/build/Makefile.am -@@ -6,8 +6,7 @@ - # See the file LICENSING in this distribution for details. - # - --filebenchdir = $(prefix)/filebench --workloadsdir = $(filebenchdir)/workloads -+workloadsdir = ${FILEBENCHDIR}/workloads - - workloads_DATA = BUILD \ - bringover.f \ diff --git a/app-benchmarks/filebench/metadata.xml b/app-benchmarks/filebench/metadata.xml index 5d5529c3de77..3b9298e7df62 100644 --- a/app-benchmarks/filebench/metadata.xml +++ b/app-benchmarks/filebench/metadata.xml @@ -16,6 +16,12 @@ Proxy Maintainers please CC on bugs + + + Enable command-line autocompletion using + dev-libs/libtecla. + + filebench diff --git a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild index b6ff4023a515..bc1dea6197ee 100644 --- a/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild +++ b/app-cdr/disc-cover/disc-cover-1.5.6-r1.ebuild @@ -9,7 +9,7 @@ HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html" SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz" LICENSE="GPL-2" -KEYWORDS="amd64 ppc ~sparc x86" +KEYWORDS="amd64 ppc sparc x86" IUSE="" SLOT="0" diff --git a/app-cdr/disc-cover/disc-cover-1.5.6.ebuild b/app-cdr/disc-cover/disc-cover-1.5.6.ebuild deleted file mode 100644 index b572b4ed184d..000000000000 --- a/app-cdr/disc-cover/disc-cover-1.5.6.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -DESCRIPTION="Creates CD-Covers via LaTeX by fetching cd-info from freedb.org or local file" -HOMEPAGE="http://www.vanhemert.co.uk/disc-cover.html" -SRC_URI="http://www.vanhemert.co.uk/files/${P}.tar.gz" - -LICENSE="GPL-2" -KEYWORDS="amd64 ppc sparc x86" -IUSE="cdrom" - -SLOT="0" - -DEPEND="dev-lang/perl" -RDEPEND="${DEPEND} - virtual/latex-base - cdrom? ( dev-perl/Audio-CD-disc-cover )" - -src_compile() { - pod2man disc-cover > disc-cover.1 || die -} - -src_install() { - dobin disc-cover - dodoc AUTHORS CHANGELOG TODO - doman disc-cover.1 - insinto /usr/share/${PN}/templates - doins templates/* -} diff --git a/app-cdr/disc-cover/metadata.xml b/app-cdr/disc-cover/metadata.xml index 3542a2056624..2eadb7c03808 100644 --- a/app-cdr/disc-cover/metadata.xml +++ b/app-cdr/disc-cover/metadata.xml @@ -8,8 +8,4 @@ bound by the fact that they come from the same source package. That's why the web application ebuild is manually slotted to 0. - - Enable audio CD support. This is not needed to make - www-apps/disc-cover work. - diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest index c44af1ad8bee..d02c45be5951 100644 --- a/app-crypt/eid-mw/Manifest +++ b/app-crypt/eid-mw/Manifest @@ -1,4 +1,2 @@ -DIST eid-mw-4.0.6-1480.tar.gz 4292450 SHA256 1ff3a7740a30891df2da12fca66cb5324dc286f9490ee839d61d9f1028b9127c SHA512 4b6ba684a43183e11cf29a73bee7bc6ecda24aa15029e55593d6ad3cc9f58726d551089c3c9f95f07d03847df70f2662a0ea9e3db5dd5591cc9b8b0e839d364b WHIRLPOOL cca8b871a2780dae282f5eed12cd79df0bb9d57c3c968ca740b7063ca3c48425be492d3dfcb7bee5c0037b14571df8b76b825540f52025b14afed8f718d56c22 -DIST eid-mw-4.0.6-1620.tar.gz 4335514 SHA256 1ecb30f9f318bdb61a8d774fe76b948eb5841d4de6fee106029ed78daa7efbf2 SHA512 511bf6cf7a9a4d0a2232d95f1a6ba6f4fa8ee174cf919f88e1fa0c71357b9717544a6006ad412d7a0b4090c4c56ca86f8e6f69dabc6912bfd77a2e948cae8104 WHIRLPOOL b89ae4ba659e8dedd93f70368af1e058468cfd3761bec099276fadc017dcf21d245ceb8db001c3e82f30c7e6f670e13ab6c17e221c8c8ee02a45cc5833f39867 DIST eid-mw-4.1.4-v4.1.4.tar.gz 3475913 SHA256 2996960ea92504c7cee1953ccf4520ba78979c7771645e2b2c1207f94be0a308 SHA512 efcc4dbd0fa383896df9f5a7492b18beb5259cfa368a919ae18bd996e5976a67d0570c0fbccd5ab38ea95c31f48b92c145c526aa59866217a418a80a550d502f WHIRLPOOL 11e35b3649a0c3bd40e4c901ba4d922305dc2b4098018bd018ee71b963b08898e6295e4f71cb7180b0fc8e64d1afe01ce49bcaa36a60c065c2de84b81d19e398 DIST eid-mw-4.1.9-v4.1.9.tar.gz 3475708 SHA256 0c46c73b805884dd4ae739eb6025c137c1055ad119eac1ab37cb83eb32d92953 SHA512 bc61b3f212bfedf6f47f2841bc6c9b1198be5e3c7b382e3e28635c9e6f5c4ed8ccb118b105f668969fba31e49750cb1c5b129cd5b67a2725af122a8eae491b1c WHIRLPOOL 06b1f9780e984ac6c562bacab03936cd759ea1fce45687f09ae314d4fa77edce02c7ba4db5a9bc3fd739392f8b7b182b19b2734c1d21d63f6995c3cd572695d9 diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild deleted file mode 100644 index 300793e737b6..000000000000 --- a/app-crypt/eid-mw/eid-mw-4.0.6_p1480.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils versionator mozextension multilib - -if [[ ${PV} == "9999" ]] ; then - ESVN_REPO_URI="https://eid-mw.googlecode.com/svn/trunk/" - inherit subversion autotools - SRC_URI="" -else - MY_P="${PN}-${PV/_p/-}" - SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-250016.gz -> ${MY_P}.tar.gz" - KEYWORDS="~x86 ~amd64" - S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)" -fi - -SLOT="0" -LICENSE="LGPL-3" -DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government" - -HOMEPAGE="http://eid.belgium.be" - -IUSE="+gtk +xpi" - -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - >=sys-apps/pcsc-lite-1.2.9 - xpi? ( || ( >=www-client/firefox-bin-3.6.24 - >=www-client/firefox-3.6.20 ) ) - !app-misc/beid-runtime" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -if [[ ${PV} == "9999" ]]; then - src_prepare() { - eautoreconf - } -else - src_prepare() { - epatch "${FILESDIR}"/fix-nodialog-bug.patch - } -fi - -src_configure() { - econf $(use_enable gtk dialogs) --disable-static -} - -src_install() { - emake DESTDIR="${D}" install - if use xpi; then - declare MOZILLA_FIVE_HOME - if has_version '>=www-client/firefox-3.6.20'; then - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" - fi - if has_version '>=www-client/firefox-bin-3.6.24'; then - MOZILLA_FIVE_HOME="/opt/firefox" - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" - fi - fi - rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la -} diff --git a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild b/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild deleted file mode 100644 index 9ef575a906b3..000000000000 --- a/app-crypt/eid-mw/eid-mw-4.0.6_p1620.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils versionator mozextension multilib - -if [[ ${PV} == "9999" ]] ; then - EGIT_REPO_URI="git://github.com/Fedict/${PN}.git - https://github.com/Fedict/${PN}.git" - inherit git-2 autotools - SRC_URI="" -else - MY_P="${PN}-${PV/_p/-}" - SRC_URI="http://eid.belgium.be/en/binaries/${MY_P}.tar_tcm406-258906.gz -> ${MY_P}.tar.gz" - KEYWORDS="~x86 ~amd64" - S="${WORKDIR}/eid-mw-$(get_version_component_range 1-3)" -fi - -SLOT="0" -LICENSE="LGPL-3" -DESCRIPTION="Belgian Electronic Identity Card middleware supplied by the Belgian Federal Government" - -HOMEPAGE="http://eid.belgium.be" - -IUSE="+gtk +xpi" - -RDEPEND="gtk? ( x11-libs/gtk+:2 ) - >=sys-apps/pcsc-lite-1.2.9 - xpi? ( || ( >=www-client/firefox-bin-3.6.24 - >=www-client/firefox-3.6.20 ) ) - !app-misc/beid-runtime" - -DEPEND="${RDEPEND} - virtual/pkgconfig" - -if [[ ${PV} == "9999" ]]; then - src_prepare() { - eautoreconf - } -fi - -src_configure() { - econf $(use_enable gtk dialogs) --disable-static -} - -src_install() { - emake DESTDIR="${D}" install - if use xpi; then - declare MOZILLA_FIVE_HOME - if has_version '>=www-client/firefox-3.6.20'; then - MOZILLA_FIVE_HOME="/usr/$(get_libdir)/firefox" - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" - fi - if has_version '>=www-client/firefox-bin-3.6.24'; then - MOZILLA_FIVE_HOME="/opt/firefox" - xpi_install "${D}/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/belgiumeid@eid.belgium.be" - fi - fi - rm -r "${D}/usr/share" "${D}"/usr/lib*/*.la -} diff --git a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch b/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch deleted file mode 100644 index 1f70c781dd95..000000000000 --- a/app-crypt/eid-mw/files/eid-mw-4.0.2_p1188+gcc-4.7.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: eid-mw-4.0.2/common/src/socket/socket.cpp -=================================================================== ---- eid-mw-4.0.2.orig/common/src/socket/socket.cpp -+++ eid-mw-4.0.2/common/src/socket/socket.cpp -@@ -21,6 +21,8 @@ - #include "../eiderrors.h" - #include - -+#include -+ - namespace eIDMW - { - -Index: eid-mw-4.0.2/common/src/socket/socketserver.cpp -=================================================================== ---- eid-mw-4.0.2.orig/common/src/socket/socketserver.cpp -+++ eid-mw-4.0.2/common/src/socket/socketserver.cpp -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #ifndef SOCKET_ERROR - #define SOCKET_ERROR -1 - #endif -Index: eid-mw-4.0.2/common/src/util.cpp -=================================================================== ---- eid-mw-4.0.2.orig/common/src/util.cpp -+++ eid-mw-4.0.2/common/src/util.cpp -@@ -27,6 +27,8 @@ - - #include - -+#include -+ - #ifdef WIN32 - #include - #endif diff --git a/app-crypt/eid-mw/files/fix-nodialog-bug.patch b/app-crypt/eid-mw/files/fix-nodialog-bug.patch deleted file mode 100644 index 5ea003216241..000000000000 --- a/app-crypt/eid-mw/files/fix-nodialog-bug.patch +++ /dev/null @@ -1,20 +0,0 @@ -Index: cardlayer/src/pinpadlib.h -=================================================================== ---- cardlayer/src/pinpadlib.h (revision 1501) -+++ cardlayer/src/pinpadlib.h (revision 1502) -@@ -43,13 +43,14 @@ - #endif - #ifndef NO_DIALOGS - #include "../dialogs/src/dialogs.h" -+#endif - #ifdef __APPLE__ - typedef void* BEID_DIALOGHANDLE; - #else - typedef unsigned long BEID_DIALOGHANDLE; - #endif --#endif - -+ - namespace eIDMW - { - #ifdef EIDMW_PF_EXPORT diff --git a/app-crypt/libu2f-host/Manifest b/app-crypt/libu2f-host/Manifest index ef3c5ce86aae..e8a1ec5b8c32 100644 --- a/app-crypt/libu2f-host/Manifest +++ b/app-crypt/libu2f-host/Manifest @@ -1,2 +1,3 @@ DIST libu2f-host-1.0.0.tar.xz 454376 SHA256 18c56b9b5cfea2566925bba45b25a4e20b3ef8696905d8f2a06116316e164374 SHA512 ef953ffd8179e5ed4bcd1e02ccc82e671a7979b03a61ac73098be6509ab9d6badd6bb4e3e805de4ddbddbae3e8be71b091344f4230657464f6ba4ac3af171387 WHIRLPOOL cc76b778bcf20ef696900dd0ea65c0925052360a22e505a34ecb8738289d7bbaa88b31f2b25b91b6a1a22a240d01784bc6ef1cb9774c818fa0570328e9f13183 DIST libu2f-host-1.1.0.tar.xz 455424 SHA256 441bb832ee42acf3a5e5a229444c610218da381eb7daaf2aa750c004dc756d86 SHA512 3861ea748ff6ae0bae756182c6c4bd9a25dafc6e28eec3d6aad0eb700dcddc56ba61ed0c6a60395b8a296764c83b3fadb6954f9001cfb880e93758aaeecf34df WHIRLPOOL b6a91afd99a70db8c78a2a72950f210bbcbea0322780b768611aa528ad0159647bdc7446e1dffd91f8d9b6bcbd8105b8b38c9eb5d9eb2db9ef7d193c97096f3e +DIST libu2f-host-1.1.1.tar.xz 455652 SHA256 e14d06196aba1fcf80498929e6460370e58b96e8298c57e4660030c045000e3c SHA512 1f6d26d47cabd44391a780f03d88b6ab9ed996bab26e2605f1942bfff2203aa9a8e90fa80c010ccf2e575dbfca3bd03d3322381343cdf6def3829bbe45db8693 WHIRLPOOL 46fc4e087e2679bf8c07922fbd31200d702c5c88838812618c763615f24f7c0ecdc71ed4bd436fde1a9526eea23820bd6f2448040ce711f7fd87ca5c96281efd diff --git a/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild new file mode 100644 index 000000000000..f3567fab1bf9 --- /dev/null +++ b/app-crypt/libu2f-host/libu2f-host-1.1.1.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools-utils linux-info udev user + +DESCRIPTION="Yubico Universal 2nd Factor (U2F) Host C Library" +HOMEPAGE="https://developers.yubico.com/libu2f-host/" +SRC_URI="https://developers.yubico.com/${PN}/Releases/${P}.tar.xz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="kernel_linux static-libs systemd" + +RDEPEND=" + dev-libs/hidapi + dev-libs/json-c" +DEPEND="${RDEPEND} + virtual/pkgconfig" +RDEPEND="${RDEPEND} + systemd? ( sys-apps/systemd[acl] )" + +CONFIG_CHECK="~HIDRAW" + +pkg_setup() { + # The U2F device node will be owned by group 'plugdev' + # in non-systemd configurations + if ! use systemd; then + enewgroup plugdev + fi +} + +src_prepare() { + autotools-utils_src_prepare + + sed -e 's:TAG+="uaccess":MODE="0664", GROUP="plugdev":g' \ + 70-u2f.rules > 70-u2f-udev.rules || die +} + +src_configure() { + autotools-utils_src_configure +} + +src_install() { + autotools-utils_src_install + + if use kernel_linux; then + if use systemd; then + udev_dorules 70-u2f.rules + else + udev_newrules 70-u2f-udev.rules 70-u2f.rules + fi + fi +} + +pkg_postinst() { + if ! use systemd; then + elog "Users must be a member of the 'plugdev' group" + elog "to be able to access U2F devices" + fi +} diff --git a/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild b/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild index 24184e5aafc2..32e0a0a1f6c3 100644 --- a/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild +++ b/app-crypt/mit-krb5/mit-krb5-1.14.1.ebuild @@ -15,7 +15,7 @@ SRC_URI="http://web.mit.edu/kerberos/dist/krb5/${P_DIR}/${MY_P}.tar.gz" LICENSE="openafs-krb5-a BSD MIT OPENLDAP BSD-2 HPND BSD-4 ISC RSA CC-BY-SA-3.0 || ( BSD-2 GPL-2+ )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" IUSE="doc +keyutils libressl openldap +pkinit selinux +threads test xinetd" CDEPEND=" diff --git a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild index a43710f82a21..be92c2652abe 100644 --- a/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild +++ b/app-dicts/myspell-de/myspell-de-2015.12.28.ebuild @@ -44,7 +44,7 @@ SRC_URI=" LICENSE="GPL-2 LGPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="" src_prepare() { diff --git a/app-editors/emacs/Manifest b/app-editors/emacs/Manifest index b99b34acab99..ec86873ba990 100644 --- a/app-editors/emacs/Manifest +++ b/app-editors/emacs/Manifest @@ -1,8 +1,6 @@ DIST emacs-18.59-linux22x-elf-glibc21.diff.gz 15671 SHA256 fb810d893938883d50a3a8d7c43fbeb1604d5454f760b8f1f700326c8ee659dd SHA512 c6c6ea33850dadf08d68fff56fc6aacc80ad1aa36661260715d50b95438942d56e6244094427d50356cfe716f26559feb885254c436399bff7be639637d605b6 WHIRLPOOL cafaa0fb0d06058cac8e445a7a1b5cba145d23186477a9c681efdab8ca0f18a9675dec3a93851fd7138890701f83fab83300c28a548c8fc22478a0cfff95d5da -DIST emacs-18.59-patches-8.tar.bz2 19667 SHA256 637542bf5ee07d4abac11b76e742598a60787f3869dbf377eed99ae005fbc59d SHA512 a6564bc16724bfdb22f77b0e21b6064ca5e0e1bc91f3223c1037c26f8a048f28ac7a5da6817dc940a5f00f1f39bbfcda2277645409cd7e143a55fabdc3d3fe5d WHIRLPOOL 6b81f978aef2b429262e79ab1d995cca9237dc9c9d98144d2dc3de07bc2cdcec8547adbaf5ad41d9cce3239554918c04c7b9ff783b7931582a3a7398eb2b66f1 DIST emacs-18.59-patches-9.tar.xz 21380 SHA256 69411c57b20850e8aab1e20614437f9a836c2ddf47c46a833d0262c138fa3270 SHA512 595a4a7a4052c3b3325e4d4952eed24c98d3dd62b7ce89bd149f046552e2dd67ec3e720b7559fbc086b06a667c992bccc60201ef53b263dbd0fc96cbcdceee38 WHIRLPOOL 23f803d940c35fe9519fe7169e6bca7012c2d2db2246dec121fba37e8dbf39f411a9e579a9cbd4193562da72b9ac226286ad687877ccadd7cb78ea7eb615ab3f DIST emacs-18.59.tar.gz 2962652 SHA256 1e27e33f91984a91e9b4c1f21433f931aba03670960ecc147bb6d7b0de0f051e SHA512 03ce565e346e89b7aacb1852f4783e8907f394de7da0c543b475cb038eb89b87f980d0f7ca1841b1d2108b20f211e95113c7214e4a33e5767a1827ff43173f33 WHIRLPOOL 5e98e71518f665e2a8278afe54e0ace6d7fdd9df23ff0a3354ffc1d5cc25cd21b0dd4d82766fcb436d4f24e9291c933295e956e1ffea43cfeedf915175763be6 -DIST emacs-23.4-patches-17.tar.xz 16164 SHA256 bc9d4a36239f2749e218d903b67102e211a3a62ef162f5ab2801865dab77b752 SHA512 ceccd559b4f53328d75016b64d246ecf6fca7edebd080ce3bbba5f4d000bec38be5da91f3195c972ede0710da14b3be0545891321259b0a0b2963981c8fd62de WHIRLPOOL 4b70ce4d876e92a006e3dc0a31301f604aa8fa53a198515d1cbb3517a94933b1d7a11636494c1bd28ad1049a5a233d4ec13213e74e1eaff1cf96bb1fd095c345 DIST emacs-23.4-patches-19.tar.xz 17684 SHA256 078f5e103af9b9950afefcb8575eefd7b07eb0a241ab67ddb3b8b6d31f657abb SHA512 118d58cd5c8a74b39642bf45920fed25687af2e4a076affe985bf359862950eeba4f2ca99c6482c17c311466fbfaab3f4d583466821da4917fae9bec6e95940a WHIRLPOOL f6fe96f5cb0c2de2a48e6eda2cd26c9c724cd2da661ef4d3e4e4dd14382299615aac4b95bd4e7a21caae74b7630a70d160d65e89f6ac5fa91ad8d9bedaddded4 DIST emacs-23.4.tar.bz2 38646508 SHA256 26576f9e664397c729f78f5ffcd092969251988461896fe8793062346ee988b9 SHA512 def7a95ecaefae24d8102b96b1d575a23def1b11a8f0bb17b68f7913bd118e2ea4449a8feee76c1bd649f099b70419f0d494ddd9bb32b26f92720cda842b0296 WHIRLPOOL 2384c3f63ff153c3975e373334d6021d46b23ad3cab448ed2e1180501236453a61d13bf1dfbb2e6075bb141dd8511d85f77e37c763b39769f98de48eacc56f3b DIST emacs-24.4-patches-5.tar.xz 6000 SHA256 967dac364282a51933f90c56f368bc3f2741efe0b7ff42d3151bb4824b70fa04 SHA512 0a337ad5b7601f5e453645d1fba99717328c6bc7a5505bcb4bd8e853179cf61be43eb6f3b9370edf0f44aa6485d4847c14554c1592ccc7da87b10dabaaa9d421 WHIRLPOOL 149f3a431d055963c544d9fa6c6447a16aa093840f6bf4086f50506979356a12407af16291c46ee62a92b3ee41767452046f45a7163214be33ab7bdbcd6059dc diff --git a/app-editors/emacs/emacs-18.59-r10.ebuild b/app-editors/emacs/emacs-18.59-r10.ebuild deleted file mode 100644 index c2bd1754d9a8..000000000000 --- a/app-editors/emacs/emacs-18.59-r10.ebuild +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils toolchain-funcs flag-o-matic multilib - -DESCRIPTION="The extensible self-documenting text editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" -SRC_URI="ftp://ftp.gnu.org/old-gnu/emacs/${P}.tar.gz - ftp://ftp.splode.com/pub/users/friedman/emacs/${P}-linux22x-elf-glibc21.diff.gz - https://dev.gentoo.org/~ulm/emacs/${P}-patches-8.tar.bz2" - -LICENSE="GPL-1+ GPL-2+ BSD" #HPND -SLOT="18" -KEYWORDS="amd64 x86" -IUSE="abi_x86_x32" - -RDEPEND=">=app-eselect/eselect-emacs-1.16 - sys-libs/ncurses:0 - amd64? ( - abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_x32(-)?] ) - !abi_x86_x32? ( >=sys-libs/ncurses-5.9-r3:0[abi_x86_32(-)] ) - )" -# X? ( x11-libs/libX11[-xcb] ) -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - epatch "${WORKDIR}/${P}-linux22x-elf-glibc21.diff" - EPATCH_SUFFIX=patch epatch - epatch_user -} - -src_configure() { - # autoconf? What's autoconf? We are living in 1992. ;-) - local arch - case ${ARCH} in - amd64) - if use abi_x86_x32; then - arch=x86-x32 - multilib_toolchain_setup x32 - else - arch=intel386 - multilib_toolchain_setup x86 - fi - ;; - x86) arch=intel386 ;; - *) die "Architecture ${ARCH} not yet supported" ;; - esac - local cmd="s/\"s-.*\.h\"/\"s-linux.h\"/;s/\"m-.*\.h\"/\"m-${arch}.h\"/" - #use X && cmd="${cmd};s/.*\(#define HAVE_X_WINDOWS\).*/\1/" - sed -e "${cmd}" src/config.h-dist >src/config.h || die - - cat <<-END >src/paths.h - #define PATH_LOADSEARCH "/usr/share/emacs/${PV}/lisp" - #define PATH_EXEC "/usr/share/emacs/${PV}/etc" - #define PATH_LOCK "/var/lib/emacs/lock/" - #define PATH_SUPERLOCK "/var/lib/emacs/lock/!!!SuperLock!!!" - END - - sed -i -e "s:/usr/lib/\([^ ]*\).o:/usr/$(get_libdir)/\1.o:g" \ - -e "s:-lncurses:$("$(tc-getPKG_CONFIG)" --libs ncurses):" \ - src/s-linux.h || die - - # -O3 and -finline-functions cause segmentation faults at run time. - filter-flags -finline-functions - replace-flags -O[3-9] -O2 - strip-flags -} - -src_compile() { - # Do not use the sandbox, or the dumped Emacs will be twice as large - export SANDBOX_ON=0 - emake --jobs=1 \ - CC="$(tc-getCC)" CFLAGS="${CFLAGS} -Demacs" \ - LD="$(tc-getCC) -nostdlib" LDFLAGS="${LDFLAGS}" -} - -src_install() { - local basedir="/usr/share/emacs/${PV}" i - - dodir ${basedir} - dodir /usr/share/man/man1 - emake --jobs=1 \ - LIBDIR="${D}"${basedir} \ - BINDIR="${D}"/usr/bin \ - MANDIR="${D}"/usr/share/man/man1 \ - install - - rmdir "${D}"${basedir}/lock || die - find "${D}"${basedir} -type f \( -name "*.c" -o -name ChangeLog \ - -o -name COPYING ! -path "*/etc/COPYING" \) -exec rm "{}" + || die - fperms -R go-w ${basedir} - - # remove duplicate DOC file - rm "${D}"${basedir}/etc/DOC || die - - # move executables to the correct place - mv "${D}"/usr/bin/emacs{,-${SLOT}} || die - for i in etags ctags emacsclient; do - mv "${D}"/usr/bin/${i}{,-emacs-${SLOT}} || die - rm "${D}"${basedir}/etc/${i} || die - done - - dodir /usr/libexec/emacs/${PV} - for i in wakeup digest-doc sorted-doc movemail cvtmail fakemail \ - yow env server - do - mv "${D}"${basedir}/etc/${i} "${D}"/usr/libexec/emacs/${PV}/${i} || die - dosym ../../../../libexec/emacs/${PV}/${i} ${basedir}/etc/${i} - done - for i in test-distrib make-docfile; do - rm "${D}"${basedir}/etc/${i} || die - done - - # move man page - mv "${D}"/usr/share/man/man1/emacs{,-${SLOT}}.1 || die - - # move Info files - dodir /usr/share/info - mv "${D}"${basedir}/info "${D}"/usr/share/info/emacs-${SLOT} || die - dosym ../../info/emacs-${SLOT} "${basedir}"/info - docompress -x /usr/share/info - - # move Info dir to avoid collisions with the dir file generated by portage - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{,.orig} || die - touch "${D}"/usr/share/info/emacs-${SLOT}/.keepinfodir - - dodir /var/lib/emacs - diropts -m0777 - keepdir /var/lib/emacs/lock - - dodoc README PROBLEMS -} - -pkg_preinst() { - # move Info dir file to correct name - if [[ -d "${D}"/usr/share/info ]]; then - mv "${D}"/usr/share/info/emacs-${SLOT}/dir{.orig,} || die - fi -} - -pkg_postinst() { - eselect emacs update ifunset -} - -pkg_postrm() { - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-23.4-r13.ebuild b/app-editors/emacs/emacs-23.4-r13.ebuild deleted file mode 100644 index 5f90aee5e4c8..000000000000 --- a/app-editors/emacs/emacs-23.4-r13.ebuild +++ /dev/null @@ -1,348 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -WANT_AUTOMAKE="none" - -inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo - -DESCRIPTION="The extensible, customizable, self-documenting real-time display editor" -HOMEPAGE="https://www.gnu.org/software/emacs/" -SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 - https://dev.gentoo.org/~ulm/emacs/${P}-patches-17.tar.xz" - -LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" -SLOT="23" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" -IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" -REQUIRED_USE="?? ( aqua X )" - -RDEPEND="sys-libs/ncurses:0 - >=app-eselect/eselect-emacs-1.16 - >=app-emacs/emacs-common-gentoo-1.5[games?,X?] - net-libs/liblockfile - hesiod? ( net-dns/hesiod ) - kerberos? ( virtual/krb5 ) - alsa? ( media-libs/alsa-lib ) - gpm? ( sys-libs/gpm ) - dbus? ( sys-apps/dbus ) - X? ( - x11-libs/libXmu - x11-libs/libXt - x11-misc/xbitmaps - gconf? ( >=gnome-base/gconf-2.26.2 ) - gif? ( media-libs/giflib ) - jpeg? ( virtual/jpeg:0= ) - png? ( >=media-libs/libpng-1.4:0= ) - svg? ( >=gnome-base/librsvg-2.0 ) - tiff? ( media-libs/tiff:0 ) - xpm? ( x11-libs/libXpm ) - xft? ( - media-libs/fontconfig - media-libs/freetype - x11-libs/libXft - m17n-lib? ( - >=dev-libs/libotf-0.9.4 - >=dev-libs/m17n-lib-1.5.1 - ) - ) - gtk? ( x11-libs/gtk+:2 ) - !gtk? ( - motif? ( >=x11-libs/motif-2.3:0 ) - !motif? ( - Xaw3d? ( x11-libs/libXaw3d ) - !Xaw3d? ( athena? ( x11-libs/libXaw ) ) - ) - ) - )" - -DEPEND="${RDEPEND} - alsa? ( virtual/pkgconfig ) - dbus? ( virtual/pkgconfig ) - X? ( virtual/pkgconfig ) - gzip-el? ( app-arch/gzip ) - pax_kernel? ( - sys-apps/attr - sys-apps/paxctl - )" - -RDEPEND="${RDEPEND} - !/site-lisp dir - rm -rf "${ED}"/usr/share/emacs/${FULL_VERSION}/site-lisp - - # remove COPYING file (except for etc/COPYING used by describe-copying) - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp/COPYING - - local cdir - if use source; then - cdir="/usr/share/emacs/${FULL_VERSION}/src" - insinto "${cdir}" - # This is not meant to install all the source -- just the - # C source you might find via find-function - doins src/*.{c,h,m} - doins -r src/{m,s} - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/Makefile.c - rm "${ED}"/usr/share/emacs/${FULL_VERSION}/src/{m,s}/README - elif has installsources ${FEATURES}; then - cdir="/usr/src/debug/${CATEGORY}/${PF}/${S#"${WORKDIR}/"}/src" - fi - - sed -e "${cdir:+#}/^Y/d" -e "s/^[XY]//" >"${T}/${SITEFILE}" <<-EOF - X - ;;; ${PN}-${SLOT} site-lisp configuration - X - (when (string-match "\\\\\`${FULL_VERSION//./\\\\.}\\\\>" emacs-version) - Y (setq find-function-C-source-directory - Y "${EPREFIX}${cdir}") - X (let ((path (getenv "INFOPATH")) - X (dir "${EPREFIX}/usr/share/info/${EMACS_SUFFIX}") - X (re "\\\\\`${EPREFIX}/usr/share/info\\\\>")) - X (and path - X ;; move Emacs Info dir before anything else in /usr/share/info - X (let* ((p (cons nil (split-string path ":" t))) (q p)) - X (while (and (cdr q) (not (string-match re (cadr q)))) - X (setq q (cdr q))) - X (setcdr q (cons dir (delete dir (cdr q)))) - X (setq Info-directory-list (prune-directory-list (cdr p))))))) - EOF - elisp-site-file-install "${T}/${SITEFILE}" || die - - dodoc README BUGS - - if use aqua; then - dodir /Applications/Gentoo - rm -rf "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app - mv nextstep/Emacs.app \ - "${ED}"/Applications/Gentoo/Emacs${EMACS_SUFFIX#emacs}.app || die - fi - - DOC_CONTENTS="You can set the version to be started by /usr/bin/emacs - through the Emacs eselect module, which also redirects man and info - pages. Therefore, several Emacs versions can be installed at the - same time. \"man emacs.eselect\" for details. - \\n\\nIf you upgrade from a previous major version of Emacs, then - it is strongly recommended that you use app-admin/emacs-updater - to rebuild all byte-compiled elisp files of the installed Emacs - packages." - use X && DOC_CONTENTS+="\\n\\nYou need to install some fonts for Emacs. - Installing media-fonts/font-adobe-{75,100}dpi on the X server's - machine would satisfy basic Emacs requirements under X11. - See also https://wiki.gentoo.org/wiki/Xft_support_for_GNU_Emacs - for how to enable anti-aliased fonts." - use aqua && DOC_CONTENTS+="\\n\\nEmacs${EMACS_SUFFIX#emacs}.app is in - \"${EPREFIX}/Applications/Gentoo\". You may want to copy or symlink - it into /Applications by yourself." - readme.gentoo_create_doc -} - -pkg_preinst() { - # move Info dir file to correct name - local infodir=/usr/share/info/${EMACS_SUFFIX} f - if [[ -f ${ED}${infodir}/dir.orig ]]; then - mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed" - elif [[ -d "${ED}"${infodir} ]]; then - # this should not happen in EAPI 4 - ewarn "Regenerating Info directory index in ${infodir} ..." - rm -f "${ED}"${infodir}/dir{,.*} - for f in "${ED}"${infodir}/*; do - if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then - install-info --info-dir="${ED}"${infodir} "${f}" \ - || die "install-info failed" - fi - done - fi -} - -pkg_postinst() { - elisp-site-regen - readme.gentoo_print_elog - - if use livecd; then - # force an update of the emacs symlink for the livecd/dvd, - # because some microemacs packages set it with USE=livecd - eselect emacs update - elif [[ $(readlink "${EROOT}"/usr/bin/emacs) = ${EMACS_SUFFIX} ]]; then - # refresh symlinks in case any installed files have changed - eselect emacs set ${EMACS_SUFFIX} - else - eselect emacs update ifunset - fi -} - -pkg_postrm() { - elisp-site-regen - eselect emacs update ifunset -} diff --git a/app-editors/emacs/emacs-23.4-r14.ebuild b/app-editors/emacs/emacs-23.4-r14.ebuild index 2b66a66a0220..4e4b97dea0d7 100644 --- a/app-editors/emacs/emacs-23.4-r14.ebuild +++ b/app-editors/emacs/emacs-23.4-r14.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.bz2 LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="23" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el hesiod jpeg kerberos livecd m17n-lib motif pax_kernel png sound source svg tiff toolkit-scroll-bars X Xaw3d xft +xpm" REQUIRED_USE="?? ( aqua X )" diff --git a/app-editors/emacs/emacs-24.5-r1.ebuild b/app-editors/emacs/emacs-24.5-r1.ebuild index dbd74c3ad9d2..60a85a10f477 100644 --- a/app-editors/emacs/emacs-24.5-r1.ebuild +++ b/app-editors/emacs/emacs-24.5-r1.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/emacs/${P}.tar.xz LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2" SLOT="24" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk +gtk3 gzip-el hesiod imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif pax_kernel png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib" REQUIRED_USE="?? ( aqua X )" diff --git a/app-emulation/docker-compose/Manifest b/app-emulation/docker-compose/Manifest index 488a7f479738..342b7029ebb0 100644 --- a/app-emulation/docker-compose/Manifest +++ b/app-emulation/docker-compose/Manifest @@ -1,3 +1,3 @@ -DIST docker-compose-1.4.0.tar.gz 79532 SHA256 2748cc8dd0829b44f0f686e36683cab58e1a4bc869442a04508504d2f62d0337 SHA512 470442aa78ddb24e8b9287953031e17a96a89780edd3a85955c923ffe00f4bfe655412dc15422437121593d7e2899f0847813d3716fc9ed576f93e6455cb868b WHIRLPOOL 9dc6731dad3df6422ec1e1b66049c8e9f04068b2fc2c8180da44220c1fbedc4919dfe17475cd539c3f33a079f3d04f875baaf769a7bc0875de48cf622670dc4b DIST docker-compose-1.5.1.tar.gz 104331 SHA256 df5e885fd758a2b5983574d6718b5a07f92c7166c5706dc6ff88687d27bfaf55 SHA512 be6678c27b73516e14bf80255e52bde72517bd65a91f1be2393a15f0f0b87ff9ddd785e22016a9a5e1a68d5e6b9be395a96d60b7bc862f24647adf81752b9baa WHIRLPOOL 0b1312cb0d99a7cf02d8a88a7b00f3105f497c1cfa0ac3b32b369cd3984f2b1eaa8ea2c9e2e5a70ada3a371fb8a774245b75eaf5a7665170398df5f703793311 DIST docker-compose-1.5.2.tar.gz 106583 SHA256 79aa7e2e6ef9ab1936f8777476ffd4bb329875ec3d3664d239896d2f2a3c4f4f SHA512 be671503bbb91fdb5fdf9ff593f28d290d1c65738d055629d8252cf4c4eea7f5931a1e1d6d7a0b27640166671ecb095b413cb694b768437be3ec207e059f4ccc WHIRLPOOL bb12df93739329b9577db41a317a22976dc97ca1d1d3dd72e2ff4b8c245caf106f1aab466d42ffa7b9e6a7bf6f628f8977d2700460591051dade074535f0175e +DIST docker-compose-1.6.2.tar.gz 128730 SHA256 264e2cbdd3fa314ba75f2681d10b0cff8d989a62979c1ba42d15a6d4c4002482 SHA512 7254a7e88b9030eeac87c1c6abfeea12e978519cc4e0236e37537c3143198d448e504107b1599b355a3c75e03e0acbd6fe552d0ff482cd3e91772d759a85544a WHIRLPOOL 3755ef9c189bd08f5bb810bf527041393ab788dcd302e6f1553989de73375ba34e062d2b21c10b144132ce9eb3997310b683b1b5b46aaf992fedfaa652deb6b2 diff --git a/app-emulation/docker-compose/docker-compose-1.4.0.ebuild b/app-emulation/docker-compose/docker-compose-1.6.2.ebuild similarity index 57% rename from app-emulation/docker-compose/docker-compose-1.4.0.ebuild rename to app-emulation/docker-compose/docker-compose-1.6.2.ebuild index c8cc56aee9ee..f5ca9b96b7c4 100644 --- a/app-emulation/docker-compose/docker-compose-1.4.0.ebuild +++ b/app-emulation/docker-compose/docker-compose-1.6.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python2_7 python3_4 ) inherit bash-completion-r1 distutils-r1 @@ -18,41 +18,40 @@ IUSE="test" CDEPEND=" dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/dockerpty-0.3.4[${PYTHON_USEDEP}] - =dev-python/docker-py-1.3.1[${PYTHON_USEDEP}] - =dev-python/cached-property-1.2.0[${PYTHON_USEDEP}] + =dev-python/dockerpty-0.4.1[${PYTHON_USEDEP}] + =dev-python/docker-py-1.7.0[${PYTHON_USEDEP}] + =dev-python/docopt-0.6.1[${PYTHON_USEDEP}] =dev-python/jsonschema-2.5.1[${PYTHON_USEDEP}] + =dev-python/pyyaml-3.10[${PYTHON_USEDEP}] =dev-python/requests-2.6.1[${PYTHON_USEDEP}] + =dev-python/six-1.3.0[${PYTHON_USEDEP}] =dev-python/texttable-0.8.1[${PYTHON_USEDEP}] =dev-python/websocket-client-0.32.0[${PYTHON_USEDEP}] =dev-python/enum34-1.0.4[${PYTHON_USEDEP}]' 'python2_7' ) + $(python_gen_cond_dep 'd_op && + actualDentry->d_op->d_revalidate) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 10, 0) ++ return actualDentry->d_op->d_revalidate(actualDentry, flags); ++#else + return actualDentry->d_op->d_revalidate(actualDentry, nd); ++#endif + } + + if (compat_path_lookup(iinfo->name, 0, &actualNd)) { diff --git a/app-emulation/vmware-modules/files/308-3.10-01-inode.patch b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch new file mode 100644 index 000000000000..e12d84d10e7b --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.10-01-inode.patch @@ -0,0 +1,94 @@ +Minor change the API, now it just gets passed flags instead of a pointer to the nameidata +Properly initializes UID/GID with repsect to namespaces +Some changes the readlink/setlink APIs +--- a/vmblock-only/linux/inode.c 2015-02-07 03:11:55.000000000 +0300 ++++ c/vmblock-only/linux/inode.c 2015-02-24 03:58:06.039605762 +0300 +@@ -35,9 +35,15 @@ + + + /* Inode operations */ +-static struct dentry *InodeOpLookup(struct inode *dir, +- struct dentry *dentry, struct nameidata *nd); ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) ++static struct dentry *InodeOpLookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd); + static int InodeOpReadlink(struct dentry *dentry, char __user *buffer, int buflen); ++#else ++static struct dentry *InodeOpLookup(struct inode *, struct dentry *, unsigned int); ++static int InodeOpReadlink(struct dentry *, char __user *, int); ++#endif ++ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); + #else +@@ -49,12 +55,15 @@ + .lookup = InodeOpLookup, + }; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 13, 0) + static struct inode_operations LinkInodeOps = { ++#else ++struct inode_operations LinkInodeOps = { ++#endif + .readlink = InodeOpReadlink, + .follow_link = InodeOpFollowlink, + }; + +- + /* + *---------------------------------------------------------------------------- + * +@@ -75,7 +84,11 @@ + static struct dentry * + InodeOpLookup(struct inode *dir, // IN: parent directory's inode + struct dentry *dentry, // IN: dentry to lookup +- struct nameidata *nd) // IN: lookup intent and information ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) ++ struct nameidata *nd) // IN: lookup intent and information ++#else ++ unsigned int flags) ++#endif + { + char *filename; + struct inode *inode; +@@ -135,7 +148,12 @@ + inode->i_size = INODE_TO_IINFO(inode)->nameLen; + inode->i_version = 1; + inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + inode->i_uid = inode->i_gid = 0; ++#else ++ inode->i_gid = make_kgid(current_user_ns(), 0); ++ inode->i_uid = make_kuid(current_user_ns(), 0); ++#endif + inode->i_op = &LinkInodeOps; + + d_add(dentry, inode); +@@ -177,7 +195,12 @@ + return -EINVAL; + } + +- return vfs_readlink(dentry, buffer, buflen, iinfo->name); ++#if LINUX_VERSION_CODE <= KERNEL_VERSION(3, 14, 99) ++ return vfs_readlink(dentry, buffer, buflen, iinfo->name); ++#else ++ return readlink_copy(buffer, buflen, iinfo->name); ++#endif ++ + } + + +@@ -221,7 +244,7 @@ + goto out; + } + +- ret = vfs_follow_link(nd, iinfo->name); ++ nd_set_link(nd, iinfo->name); + + out: + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) +@@ -230,3 +253,4 @@ + return ret; + #endif + } ++ diff --git a/app-emulation/vmware-modules/files/308-3.10-02-control.patch b/app-emulation/vmware-modules/files/308-3.10-02-control.patch new file mode 100644 index 000000000000..928835337511 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.10-02-control.patch @@ -0,0 +1,57 @@ +The API to create proc entries now takes the file ops structure directly, instead of being set after the fact +Using new __getname/__putname API +--- a/vmblock-only/linux/control.c 2015-02-07 03:11:55.000000000 +0300 ++++ c/vmblock-only/linux/control.c 2015-02-24 03:58:06.038605919 +0300 +@@ -208,9 +208,11 @@ + VMBlockSetProcEntryOwner(controlProcMountpoint); + + /* Create /proc/fs/vmblock/dev */ +- controlProcEntry = create_proc_entry(VMBLOCK_CONTROL_DEVNAME, +- VMBLOCK_CONTROL_MODE, +- controlProcDirEntry); ++ controlProcEntry = proc_create(VMBLOCK_CONTROL_DEVNAME, ++ VMBLOCK_CONTROL_MODE, ++ controlProcDirEntry, ++ &ControlFileOps); ++ + if (!controlProcEntry) { + Warning("SetupProcDevice: could not create " VMBLOCK_DEVICE "\n"); + remove_proc_entry(VMBLOCK_CONTROL_MOUNTPOINT, controlProcDirEntry); +@@ -218,7 +220,10 @@ + return -EINVAL; + } + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 10, 0) + controlProcEntry->proc_fops = &ControlFileOps; ++#endif ++ + return 0; + } + +@@ -287,18 +287,24 @@ ExecuteBlockOp(const char __user *buf, + int i; + int retval; + +- name = getname(buf); ++ name = __getname(); + if (IS_ERR(name)) { + return PTR_ERR(name); + } + ++ i = strncpy_from_user(name, buf, PATH_MAX); ++ if (i < 0 || i == PATH_MAX) { ++ __putname(name); ++ return -EINVAL; ++ } ++ + for (i = strlen(name) - 1; i >= 0 && name[i] == '/'; i--) { + name[i] = '\0'; + } + + retval = i < 0 ? -EINVAL : blockOp(name, blocker); + +- putname(name); ++ __putname(name); + + return retval; + } diff --git a/app-emulation/vmware-modules/files/308-3.10-03-inline.patch b/app-emulation/vmware-modules/files/308-3.10-03-inline.patch new file mode 100644 index 000000000000..fa8f36a35c29 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.10-03-inline.patch @@ -0,0 +1,14 @@ +Hushes a warning +--- a/vmmon-only/linux/driver.c 2015-02-07 03:54:16.000000000 +0300 ++++ c/vmmon-only/linux/driver.c 2015-02-24 03:58:06.042605293 +0300 +@@ -1328,7 +1328,9 @@ + *----------------------------------------------------------------------------- + */ + +-__attribute__((always_inline)) static Bool ++#include ++ ++__always_inline static Bool + LinuxDriverSyncReadTSCs(uint64 *delta) // OUT: TSC max - TSC min + { + TSCDelta tscDelta; diff --git a/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch b/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch new file mode 100644 index 000000000000..b2f76d3e2b30 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.11-00-readdir.patch @@ -0,0 +1,41 @@ +replaces usage of vfs_readdir with iterate_dir. origionally found here: +https://bugs.gentoo.org/show_bug.cgi?id=508204 + +diff -Naur vmblock-only/linux/file.c vmblock-only/linux/file.c +--- vmblock-only/linux/file.c 2013-11-05 23:33:26.000000000 -0500 ++++ vmblock-only/linux/file.c 2014-04-26 10:58:03.062635343 -0400 +@@ -166,11 +166,9 @@ + + static int + FileOpReaddir(struct file *file, // IN +- void *dirent, // IN +- filldir_t filldir) // IN ++ struct dir_context *ctx) + { + int ret; +- FilldirInfo info; + struct file *actualFile; + + if (!file) { +@@ -184,11 +182,8 @@ + return -EINVAL; + } + +- info.filldir = filldir; +- info.dirent = dirent; +- + actualFile->f_pos = file->f_pos; +- ret = vfs_readdir(actualFile, Filldir, &info); ++ ret = iterate_dir(actualFile, ctx); + file->f_pos = actualFile->f_pos; + + return ret; +@@ -237,7 +232,7 @@ + + + struct file_operations RootFileOps = { +- .readdir = FileOpReaddir, ++ .iterate = FileOpReaddir, + .open = FileOpOpen, + .release = FileOpRelease, + }; diff --git a/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch b/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch new file mode 100644 index 000000000000..2eec99b7c1f8 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.11-01-filldir.patch @@ -0,0 +1,53 @@ +simply remove the code for Filldir since it is no longer used with the new +iterate_dir API + +diff -rupN vmblock-only/linux/file.c vmblock-only.new/linux/file.c +--- vmblock-only/linux/file.c 2014-10-07 23:22:46.832469618 -0400 ++++ vmblock-only.new/linux/file.c 2014-10-07 23:24:35.276472720 -0400 +@@ -38,46 +38,6 @@ typedef u64 inode_num_t; + typedef ino_t inode_num_t; + #endif + +-/* Specifically for our filldir_t callback */ +-typedef struct FilldirInfo { +- filldir_t filldir; +- void *dirent; +-} FilldirInfo; +- +- +-/* +- *---------------------------------------------------------------------------- +- * +- * Filldir -- +- * +- * Callback function for readdir that we use in place of the one provided. +- * This allows us to specify that each dentry is a symlink, but pass through +- * everything else to the original filldir function. +- * +- * Results: +- * Original filldir's return value. +- * +- * Side effects: +- * Directory information gets copied to user's buffer. +- * +- *---------------------------------------------------------------------------- +- */ +- +-static int +-Filldir(void *buf, // IN: Dirent buffer passed from FileOpReaddir +- const char *name, // IN: Dirent name +- int namelen, // IN: len of dirent's name +- loff_t offset, // IN: Offset +- inode_num_t ino, // IN: Inode number of dirent +- unsigned int d_type) // IN: Type of file +-{ +- FilldirInfo *info = buf; +- +- /* Specify DT_LNK regardless */ +- return info->filldir(info->dirent, name, namelen, offset, ino, DT_LNK); +-} +- +- + /* File operations */ + + /* diff --git a/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch b/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch new file mode 100644 index 000000000000..9e8d9d1a32f7 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.15-00-vsock.patch @@ -0,0 +1,46 @@ +removing the no longer existing second parameter to sk_data_ready +doesn't seem it ever served a purpose. + +diff -rupN vsock-only/linux/notify.c vsock-only.new/linux/notify.c +--- vsock-only/linux/notify.c 2013-11-05 23:33:27.000000000 -0500 ++++ vsock-only.new/linux/notify.c 2014-10-05 23:46:47.943304728 -0400 +@@ -515,8 +515,11 @@ VSockVmciHandleWrote(struct sock *sk, + vsk = vsock_sk(sk); + PKT_FIELD(vsk, sentWaitingRead) = FALSE; + #endif +- ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + +diff -rupN vsock-only/linux/notifyQState.c vsock-only.new/linux/notifyQState.c +--- vsock-only/linux/notifyQState.c 2013-11-05 23:33:27.000000000 -0500 ++++ vsock-only.new/linux/notifyQState.c 2014-10-05 23:46:33.231303931 -0400 +@@ -164,7 +164,11 @@ VSockVmciHandleWrote(struct sock *sk, + struct sockaddr_vm *dst, // IN: unused + struct sockaddr_vm *src) // IN: unused + { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + +@@ -566,7 +570,11 @@ VSockVmciNotifyPktRecvPostDequeue(struct + } + + /* See the comment in VSockVmciNotifyPktSendPostEnqueue */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 15, 0) ++ sk->sk_data_ready(sk); ++#else + sk->sk_data_ready(sk, 0); ++#endif + } + + return err; diff --git a/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch b/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch new file mode 100644 index 000000000000..22d6325c9a90 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.18-00-version-redefined.patch @@ -0,0 +1,25 @@ +Hushes some (but not all warnings) relating to redefinitions of this define +--- a/vmci-only/shared/vm_device_version.h 2015-02-07 03:11:55.000000000 +0300 ++++ c/vmci-only/shared/vm_device_version.h 2015-02-24 03:58:06.041605450 +0300 +@@ -53,7 +53,9 @@ + * VMware HD Audio codec + * VMware HD Audio controller + */ ++#ifndef PCI_VENDOR_ID_VMWARE + #define PCI_VENDOR_ID_VMWARE 0x15AD ++#endif + #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 + #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 + #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 +--- a/vmnet-only/vm_device_version.h 2015-02-07 03:54:16.000000000 +0300 ++++ c/vmnet-only/vm_device_version.h 2015-02-24 03:58:06.044604981 +0300 +@@ -53,7 +53,9 @@ + * VMware HD Audio codec + * VMware HD Audio controller + */ ++#ifndef PCI_VENDOR_ID_VMWARE + #define PCI_VENDOR_ID_VMWARE 0x15AD ++#endif + #define PCI_DEVICE_ID_VMWARE_SVGA2 0x0405 + #define PCI_DEVICE_ID_VMWARE_SVGA 0x0710 + #define PCI_DEVICE_ID_VMWARE_VGA 0x0711 diff --git a/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch b/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch new file mode 100644 index 000000000000..0182077254a1 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.19-00-compat-namei.patch @@ -0,0 +1,24 @@ +A copy of this since it is no longer exported by the kernel headers +--- a/vmblock-only/shared/compat_namei.h 2015-02-07 03:11:55.000000000 +0300 ++++ c/vmblock-only/shared/compat_namei.h 2015-02-24 03:51:25.235286047 +0300 +@@ -21,6 +21,20 @@ + + #include + ++/* Copy-n-paste from kernel's source/fs/namei.c */ ++struct nameidata { ++ struct path path; ++ struct qstr last; ++ struct path root; ++ struct inode *inode; /* path.dentry.d_inode */ ++ unsigned int flags; ++ unsigned seq, m_seq; ++ int last_type; ++ unsigned depth; ++ struct file *base; ++ char *saved_names[MAX_NESTED_LINKS + 1]; ++}; ++ + /* + * In 2.6.25-rc2, dentry and mount objects were removed from the nameidata + * struct. They were both replaced with a struct path. diff --git a/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch b/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch new file mode 100644 index 000000000000..178d1478ae59 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.19-02-vmblock-path.patch @@ -0,0 +1,67 @@ +Sources: +https://531682.bugs.gentoo.org/attachment.cgi?id=396484 +https://531682.bugs.gentoo.org/attachment.cgi?id=396482 +diff -rupN vmblock-only.orig/linux/dentry.c vmblock-only/linux/dentry.c +--- vmblock-only.orig/linux/dentry.c 2015-02-14 18:05:46.000000000 -0500 ++++ vmblock-only/linux/dentry.c 2015-02-14 18:09:59.000000000 -0500 +@@ -63,7 +63,7 @@ DentryOpRevalidate(struct dentry *dentry + unsigned int flags) // IN: lookup flags & intent + { + VMBlockInodeInfo *iinfo; +- struct nameidata actualNd; ++ struct path actualNd; + struct dentry *actualDentry; + int ret; + +diff -rupN vmblock-only.orig/linux/filesystem.c vmblock-only/linux/filesystem.c +--- vmblock-only.orig/linux/filesystem.c 2014-11-20 19:29:15.000000000 -0500 ++++ vmblock-only/linux/filesystem.c 2015-02-14 18:10:49.000000000 -0500 +@@ -322,7 +322,7 @@ Iget(struct super_block *sb, // IN: f + { + VMBlockInodeInfo *iinfo; + struct inode *inode; +- struct nameidata actualNd; ++ struct path actualNd; + + ASSERT(sb); + +diff -rupN vmblock-only.orig/shared/compat_namei.h vmblock-only/shared/compat_namei.h +--- vmblock-only.orig/shared/compat_namei.h 2014-11-20 19:29:15.000000000 -0500 ++++ vmblock-only/shared/compat_namei.h 2015-02-14 18:08:38.000000000 -0500 +@@ -26,21 +26,21 @@ + * struct. They were both replaced with a struct path. + */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) +-#define compat_vmw_nd_to_dentry(nd) (nd).path.dentry ++#define compat_vmw_nd_to_dentry(nd) (nd).dentry + #else + #define compat_vmw_nd_to_dentry(nd) (nd).dentry + #endif + + /* In 2.6.25-rc2, path_release(&nd) was replaced with path_put(&nd.path). */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) +-#define compat_path_release(nd) path_put(&(nd)->path) ++#define compat_path_release(nd) path_put(nd) + #else + #define compat_path_release(nd) path_release(nd) + #endif + + /* path_lookup was removed in 2.6.39 merge window VFS merge */ + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 38) +-#define compat_path_lookup(name, flags, nd) kern_path(name, flags, &((nd)->path)) ++#define compat_path_lookup(name, flags, nd) kern_path(name, flags, nd) + #else + #define compat_path_lookup(name, flags, nd) path_lookup(name, flags, nd) + #endif +diff -u vmblock-only.orig/linux/file.c vmblock-only/linux/file.c +--- vmblock-only.orig/linux/file.c 2015-02-11 12:18:29.000000000 -0500 ++++ vmblock-only/linux/file.c 2015-02-11 12:41:41.000000000 -0500 +@@ -92,7 +92,7 @@ + * and that would try to acquire the inode's semaphore; if the two inodes + * are the same we'll deadlock. + */ +- if (actualFile->f_dentry && inode == actualFile->f_dentry->d_inode) { ++ if (actualFile->f_path.dentry && inode == actualFile->f_path.dentry->d_inode) { + Warning("FileOpOpen: identical inode encountered, open cannot succeed.\n"); + if (filp_close(actualFile, current->files) < 0) { + Warning("FileOpOpen: unable to close opened file.\n"); diff --git a/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch b/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch new file mode 100644 index 000000000000..83f0cc8fcbbf --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.19-04-iovec.patch @@ -0,0 +1,59 @@ +Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. +--- a/vmci-only/linux/vmciKernelIf.c 2015-02-07 03:11:55.000000000 +0300 ++++ c/vmci-only/linux/vmciKernelIf.c 2015-02-24 03:58:06.041605450 +0300 +@@ -40,6 +40,7 @@ + #include /* For memcpy_{to,from}iovec(). */ + #include + #include ++#include + + #include "compat_highmem.h" + #include "compat_interrupt.h" +@@ -1196,21 +1197,21 @@ + } else { + toCopy = size - bytesCopied; + } +- ++ /* Code cloned from kernels drivers/misc/vmw_vmci/vmci_queue_pair.c */ + if (isIovec) { +- struct iovec *iov = (struct iovec *)src; +- int err; ++ struct msghdr *msg = (struct msghdr *)src; ++ int err; + +- /* The iovec will track bytesCopied internally. */ +- err = memcpy_fromiovec((uint8 *)va + pageOffset, iov, toCopy); +- if (err != 0) { +- if (kernelIf->host) { +- kunmap(kernelIf->u.h.page[pageIndex]); ++ /* The iovec will track bytes_copied internally. */ ++ err = memcpy_from_msg((u8 *)va + pageOffset, msg, toCopy); ++ if (err != 0) { ++ if (kernelIf->host) ++ kunmap(kernelIf->u.h.page[pageIndex]); ++ return VMCI_ERROR_INVALID_ARGS; + } +- return VMCI_ERROR_INVALID_ARGS; +- } +- } else { +- memcpy((uint8 *)va + pageOffset, (uint8 *)src + bytesCopied, toCopy); ++ } else { ++ memcpy((u8 *)va + pageOffset, ++ (u8 *)src + bytesCopied, toCopy); + } + + bytesCopied += toCopy; +@@ -1273,11 +1274,11 @@ + } + + if (isIovec) { +- struct iovec *iov = (struct iovec *)dest; ++ struct msghdr *msg = (struct msghdr *)dest; + int err; + + /* The iovec will track bytesCopied internally. */ +- err = memcpy_toiovec(iov, (uint8 *)va + pageOffset, toCopy); ++ err = memcpy_to_msg(msg, (uint8 *)va + pageOffset, toCopy); + if (err != 0) { + if (kernelIf->host) { + kunmap(kernelIf->u.h.page[pageIndex]); diff --git a/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch b/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch new file mode 100644 index 000000000000..4dec3c468206 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.19-05-vmci_qpair.patch @@ -0,0 +1,25 @@ +Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. +diff -rupN vsock-only.old/linux/af_vsock.c vsock-only/linux/af_vsock.c +--- vsock-only.old/linux/af_vsock.c 2015-05-06 20:41:47.684046762 -0400 ++++ vsock-only/linux/af_vsock.c 2015-05-06 20:52:15.245080779 -0400 +@@ -4629,7 +4629,7 @@ VSockVmciStreamSendmsg(struct kiocb *kio + * able to send. + */ + +- written = vmci_qpair_enquev(vsk->qpair, msg->msg_iov, ++ written = vmci_qpair_enquev(vsk->qpair, &msg->msg_iter.iov, + len - totalWritten, 0); + if (written < 0) { + err = -ENOMEM; +@@ -4874,9 +4874,9 @@ VSockVmciStreamRecvmsg(struct kiocb *kio + } + + if (flags & MSG_PEEK) { +- read = vmci_qpair_peekv(vsk->qpair, msg->msg_iov, len - copied, 0); ++ read = vmci_qpair_peekv(vsk->qpair, &msg->msg_iter.iov, len - copied, 0); + } else { +- read = vmci_qpair_dequev(vsk->qpair, msg->msg_iov, len - copied, 0); ++ read = vmci_qpair_dequev(vsk->qpair, &msg->msg_iter.iov, len - copied, 0); + } + + if (read < 0) { diff --git a/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch b/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch new file mode 100644 index 000000000000..9a2096e679a4 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.19-06-vsock.patch @@ -0,0 +1,16 @@ +Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. +diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c +--- vsock-only/linux/af_vsock.c 2015-05-05 11:31:35.710099711 -0400 ++++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:36:33.260115840 -0400 +@@ -4727,7 +4727,11 @@ VSockVmciDgramRecvmsg(struct kiocb *kioc + } + + /* Place the datagram payload in the user's iovec. */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 19, 0) + err = skb_copy_datagram_iovec(skb, sizeof *dg, msg->msg_iov, payloadLen); ++#else ++ err = skb_copy_datagram_iter(skb, sizeof *dg, &msg->msg_iter, payloadLen); ++#endif + if (err) { + goto out; + } diff --git a/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch b/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch new file mode 100644 index 000000000000..6aec2cd3d7b5 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-3.19-07-vsock.patch @@ -0,0 +1,13 @@ +Some parts of the iovec API were replaced by the similar message API. Refactoring the code to use that. +diff -rupN vsock-only/linux/af_vsock.c vsock-only.new/linux/af_vsock.c +--- vsock-only/linux/af_vsock.c 2015-05-05 11:26:05.145081792 -0400 ++++ vsock-only.new/linux/af_vsock.c 2015-05-05 11:30:54.304097466 -0400 +@@ -4266,7 +4266,7 @@ VSockVmciDgramSendmsg(struct kiocb *kioc + goto out; + } + +- memcpy_fromiovec(VMCI_DG_PAYLOAD(dg), msg->msg_iov, len); ++ memcpy_from_msg(VMCI_DG_PAYLOAD(dg), msg, len); + + dg->dst = VMCI_MAKE_HANDLE(remoteAddr->svm_cid, remoteAddr->svm_port); + dg->src = VMCI_MAKE_HANDLE(vsk->localAddr.svm_cid, vsk->localAddr.svm_port); diff --git a/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch b/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch new file mode 100644 index 000000000000..5735cd50650e --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.01-00-vsock.patch @@ -0,0 +1,61 @@ +--- vsock-only/linux/af_vsock.c 2015-05-03 00:55:58.955156116 +0200 ++++ vsock-only/linux/af_vsock.c.new 2015-05-03 01:01:14.305173750 +0200 +@@ -233,14 +233,10 @@ + static int VSockVmciStreamGetsockopt(struct socket *sock, int level, int optname, + char __user *optval, int __user * optlen); + +-static int VSockVmciDgramSendmsg(struct kiocb *kiocb, +- struct socket *sock, struct msghdr *msg, size_t len); +-static int VSockVmciDgramRecvmsg(struct kiocb *kiocb, struct socket *sock, +- struct msghdr *msg, size_t len, int flags); +-static int VSockVmciStreamSendmsg(struct kiocb *kiocb, +- struct socket *sock, struct msghdr *msg, size_t len); +-static int VSockVmciStreamRecvmsg(struct kiocb *kiocb, struct socket *sock, +- struct msghdr *msg, size_t len, int flags); ++static int VSockVmciDgramSendmsg(struct socket *sock, struct msghdr *msg, size_t len); ++static int VSockVmciDgramRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags); ++static int VSockVmciStreamSendmsg(struct socket *sock, struct msghdr *msg, size_t len); ++static int VSockVmciStreamRecvmsg(struct socket *sock, struct msghdr *msg, size_t len, int flags); + + static int VSockVmciCreate( + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 24) +@@ -4211,8 +4207,7 @@ + */ + + static int +-VSockVmciDgramSendmsg(struct kiocb *kiocb, // UNUSED +- struct socket *sock, // IN: socket to send on ++VSockVmciDgramSendmsg(struct socket *sock, // IN: socket to send on + struct msghdr *msg, // IN: message to send + size_t len) // IN: length of message + { +@@ -4541,8 +4536,7 @@ + */ + + static int +-VSockVmciStreamSendmsg(struct kiocb *kiocb, // UNUSED +- struct socket *sock, // IN: socket to send on ++VSockVmciStreamSendmsg(struct socket *sock, // IN: socket to send on + struct msghdr *msg, // IN: message to send + size_t len) // IN: length of message + { +@@ -4710,8 +4704,7 @@ + */ + + static int +-VSockVmciDgramRecvmsg(struct kiocb *kiocb, // UNUSED +- struct socket *sock, // IN: socket to receive from ++VSockVmciDgramRecvmsg(struct socket *sock, // IN: socket to receive from + struct msghdr *msg, // IN/OUT: message to receive into + size_t len, // IN: length of receive buffer + int flags) // IN: receive flags +@@ -4803,8 +4796,7 @@ + */ + + static int +-VSockVmciStreamRecvmsg(struct kiocb *kiocb, // UNUSED +- struct socket *sock, // IN: socket to receive from ++VSockVmciStreamRecvmsg(struct socket *sock, // IN: socket to receive from + struct msghdr *msg, // IN/OUT: message to receive into + size_t len, // IN: length of receive buffer + int flags) // IN: receive flags diff --git a/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch b/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch new file mode 100644 index 000000000000..66609bff6308 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.02-00-nd_set_link.patch @@ -0,0 +1,56 @@ +--- vmci-only/linux/driver.c 2015-02-07 01:11:55.000000000 +0100 ++++ vmci-only/linux/driver.c.new 2015-07-23 00:28:25.713804866 +0200 +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + + #include "compat_highmem.h" + #include "compat_interrupt.h" +--- vmblock-only/linux/inode.c 2015-08-23 00:34:11.959377109 +0200 ++++ vmblock-only/linux/inode.c.new 2015-08-23 00:37:49.839389292 +0200 +@@ -38,7 +38,9 @@ + static int InodeOpReadlink(struct dentry *, char __user *, int); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) ++static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); + #else + static int InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -203,13 +205,19 @@ + *---------------------------------------------------------------------------- + */ + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) ++static const char * ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void * + #else + static int + #endif + InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) ++ void **cookie) // OUT: stores opaque pointer ++#else + struct nameidata *nd) // OUT: stores result ++#endif + { + int ret; + VMBlockInodeInfo *iinfo; +@@ -226,7 +234,11 @@ + goto out; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) ++ return *cookie = iinfo->name; ++#else + nd_set_link(nd, iinfo->name); ++#endif + + out: + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) diff --git a/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch b/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch new file mode 100644 index 000000000000..6437d6022a36 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.02-01-sk_alloc.patch @@ -0,0 +1,22 @@ +--- vmnet-only/vmnetInt.h 2015-05-28 01:46:53.023206897 +0200 ++++ vmnet-only/vmnetInt.h.new 2015-05-28 01:47:07.911207730 +0200 +@@ -79,7 +79,7 @@ + extern struct proto vmnet_proto; + #ifdef VMW_NETDEV_HAS_NET + # define compat_sk_alloc(_bri, _pri) sk_alloc(&init_net, \ +- PF_NETLINK, _pri, &vmnet_proto) ++ PF_NETLINK, _pri, &vmnet_proto, 0) + #else + # define compat_sk_alloc(_bri, _pri) sk_alloc(PF_NETLINK, _pri, &vmnet_proto, 1) + #endif +--- vsock-only/linux/af_vsock.c 2015-05-28 01:50:03.553217551 +0200 ++++ vsock-only/linux/af_vsock.c.new 2015-05-28 01:54:55.248233862 +0200 +@@ -2829,7 +2829,7 @@ + #elif LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 24) + sk = sk_alloc(vsockVmciFamilyOps.family, priority, &vsockVmciProto, 1); + #else +- sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto); ++ sk = sk_alloc(net, vsockVmciFamilyOps.family, priority, &vsockVmciProto, 0); + #endif + if (!sk) { + return NULL; diff --git a/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch b/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch new file mode 100644 index 000000000000..b2d93a66db84 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.03-00-vmci-misc_deregister.patch @@ -0,0 +1,27 @@ +diff -ru work.old/vmci-only/linux/driver.c work/vmci-only/linux/driver.c +--- work.old/vmci-only/linux/driver.c 2015-09-14 21:07:49.751696932 +0200 ++++ work/vmci-only/linux/driver.c 2015-09-14 22:10:48.015908198 +0200 +@@ -2467,8 +2467,6 @@ + static void __exit + vmci_exit(void) + { +- int retval; +- + if (guestDeviceInit) { + pci_unregister_driver(&vmci_driver); + vfree(data_buffer); +@@ -2480,12 +2478,8 @@ + + VMCI_HostCleanup(); + +- retval = misc_deregister(&linuxState.misc); +- if (retval) { +- Warning(LGPFX "Module %s: error unregistering\n", VMCI_MODULE_NAME); +- } else { +- Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME); +- } ++ misc_deregister(&linuxState.misc); ++ Log(LGPFX"Module %s: unloaded\n", VMCI_MODULE_NAME); + + hostDeviceInit = FALSE; + } diff --git a/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch b/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch new file mode 100644 index 000000000000..9f0df66faa22 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.03-00-vmmon-misc_deregister.patch @@ -0,0 +1,14 @@ +diff -ru work.old/vmmon-only/linux/driver.c work/vmmon-only/linux/driver.c +--- work.old/vmmon-only/linux/driver.c 2015-08-14 22:39:49.000000000 +0200 ++++ work/vmmon-only/linux/driver.c 2015-09-14 22:11:06.807909249 +0200 +@@ -387,9 +387,7 @@ + #ifdef VMX86_DEVEL + unregister_chrdev(linuxState.major, linuxState.deviceName); + #else +- if (misc_deregister(&linuxState.misc)) { +- Warning("Module %s: error unregistering\n", linuxState.deviceName); +- } ++ misc_deregister(&linuxState.misc); + #endif + + Log("Module %s: unloaded\n", linuxState.deviceName); diff --git a/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch new file mode 100644 index 000000000000..c13929243275 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-4.05-00-vmblock-follow_link.patch @@ -0,0 +1,56 @@ +--- vmblock-only/linux/inode.c 2016-01-30 19:13:04.019947435 +0100 ++++ vmblock-only/linux/inode.c.new 2016-01-30 19:13:56.226950354 +0100 +@@ -44,7 +44,9 @@ + static int InodeOpReadlink(struct dentry *, char __user *, int); + #endif + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) ++static const char *InodeOpFollowlink(struct dentry *dentry, struct inode *inode, void **cookie); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) + static const char *InodeOpFollowlink(struct dentry *dentry, void **cookie); + #elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 13) + static void *InodeOpFollowlink(struct dentry *dentry, struct nameidata *nd); +@@ -63,7 +65,11 @@ + struct inode_operations LinkInodeOps = { + #endif + .readlink = InodeOpReadlink, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) ++ .get_link = InodeOpFollowlink, ++#else + .follow_link = InodeOpFollowlink, ++#endif + }; + + /* +@@ -231,6 +237,9 @@ + static int + #endif + InodeOpFollowlink(struct dentry *dentry, // IN : dentry of symlink ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) ++ struct inode *inode, ++#endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 1, 99) + void **cookie) // OUT: stores opaque pointer + #else +@@ -241,12 +250,20 @@ + VMBlockInodeInfo *iinfo; + + if (!dentry) { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) ++ ret = -ECHILD; ++#else + Warning("InodeOpReadlink: invalid args from kernel\n"); + ret = -EINVAL; ++#endif + goto out; + } + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 99) ++ iinfo = INODE_TO_IINFO(inode); ++#else + iinfo = INODE_TO_IINFO(dentry->d_inode); ++#endif + if (!iinfo) { + ret = -EINVAL; + goto out; diff --git a/app-emulation/vmware-modules/files/308-apic.patch b/app-emulation/vmware-modules/files/308-apic.patch new file mode 100644 index 000000000000..66cd45933246 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-apic.patch @@ -0,0 +1,12 @@ +diff --git a/vmmon-only/linux/hostif.c b/vmmon-only/linux/hostif.c +index f1f4b10..c43242f 100644 +--- a/vmmon-only/linux/hostif.c ++++ b/vmmon-only/linux/hostif.c +@@ -55,6 +55,7 @@ + #include + #include + ++#include + + #include "vmware.h" + #include "x86apic.h" diff --git a/app-emulation/vmware-modules/files/308-hardened.patch b/app-emulation/vmware-modules/files/308-hardened.patch new file mode 100644 index 000000000000..31d5917c37ce --- /dev/null +++ b/app-emulation/vmware-modules/files/308-hardened.patch @@ -0,0 +1,89 @@ +diff --git a/vmmon-only/linux/driver.c b/vmmon-only/linux/driver.c +index b21dd44..960c2aa 100644 +--- a/vmmon-only/linux/driver.c ++++ b/vmmon-only/linux/driver.c +@@ -178,7 +178,16 @@ static struct vm_operations_struct vmuser_mops = { + #endif + }; + +-static struct file_operations vmuser_fops; ++static struct file_operations vmuser_fops = { ++ .owner = THIS_MODULE, ++ .poll = LinuxDriverPoll, ++ .unlocked_ioctl = LinuxDriver_Ioctl, ++ .compat_ioctl = LinuxDriver_Ioctl, ++ .open = LinuxDriver_Open, ++ .release = LinuxDriver_Close, ++ .mmap = LinuxDriverMmap ++}; ++ + static struct timer_list tscTimer; + static Atomic_uint32 tsckHz; + static VmTimeStart tsckHzStartTime; +@@ -357,21 +372,6 @@ init_module(void) + linuxState.fastClockPriority = -20; + linuxState.swapSize = VMMON_UNKNOWN_SWAP_SIZE; + +- /* +- * Initialize the file_operations structure. Because this code is always +- * compiled as a module, this is fine to do it here and not in a static +- * initializer. +- */ +- +- memset(&vmuser_fops, 0, sizeof vmuser_fops); +- vmuser_fops.owner = THIS_MODULE; +- vmuser_fops.poll = LinuxDriverPoll; +- vmuser_fops.unlocked_ioctl = LinuxDriver_Ioctl; +- vmuser_fops.compat_ioctl = LinuxDriver_Ioctl; +- vmuser_fops.open = LinuxDriver_Open; +- vmuser_fops.release = LinuxDriver_Close; +- vmuser_fops.mmap = LinuxDriverMmap; +- + #ifdef VMX86_DEVEL + devel_init_module(); + linuxState.minor = 0; +diff --git a/vmnet-only/driver.c b/vmnet-only/driver.c +index b12b982..40bd4cf 100644 +--- a/vmnet-only/driver.c ++++ b/vmnet-only/driver.c +@@ -165,7 +165,16 @@ static long VNetFileOpUnlockedIoctl(struct file * filp, + unsigned int iocmd, unsigned long ioarg); + #endif + +-static struct file_operations vnetFileOps; ++static struct file_operations vnetFileOps = { ++ .owner = THIS_MODULE, ++ .read = VNetFileOpRead, ++ .write = VNetFileOpWrite, ++ .poll = VNetFileOpPoll, ++ .unlocked_ioctl = VNetFileOpUnlockedIoctl, ++ .compat_ioctl = VNetFileOpUnlockedIoctl, ++ .open = VNetFileOpOpen, ++ .release = VNetFileOpClose ++}; + + /* + * Utility functions +@@ -476,22 +491,6 @@ init_module(void) + goto err_proto; + } + +- /* +- * Initialize the file_operations structure. Because this code is always +- * compiled as a module, this is fine to do it here and not in a static +- * initializer. +- */ +- +- memset(&vnetFileOps, 0, sizeof vnetFileOps); +- vnetFileOps.owner = THIS_MODULE; +- vnetFileOps.read = VNetFileOpRead; +- vnetFileOps.write = VNetFileOpWrite; +- vnetFileOps.poll = VNetFileOpPoll; +- vnetFileOps.unlocked_ioctl = VNetFileOpUnlockedIoctl; +- vnetFileOps.compat_ioctl = VNetFileOpUnlockedIoctl; +- vnetFileOps.open = VNetFileOpOpen; +- vnetFileOps.release = VNetFileOpClose; +- + retval = register_chrdev(VNET_MAJOR_NUMBER, "vmnet", &vnetFileOps); + if (retval) { + LOG(0, (KERN_NOTICE "/dev/vmnet: could not register major device %d\n", diff --git a/app-emulation/vmware-modules/files/308-makefile-include.patch b/app-emulation/vmware-modules/files/308-makefile-include.patch new file mode 100644 index 000000000000..39c300030805 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-makefile-include.patch @@ -0,0 +1,65 @@ +diff --git a/vmblock-only/Makefile.kernel b/vmblock-only/Makefile.kernel +index ab7a727..e3ec9d2 100644 +--- a/vmblock-only/Makefile.kernel ++++ b/vmblock-only/Makefile.kernel +@@ -19,7 +19,7 @@ + + INCLUDE += -I$(SRCROOT)/include + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachecreate.c, -DVMW_KMEMCR_HAS_DTOR, ) + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/cachector.c, -DVMW_KMEMCR_CTOR_HAS_3_ARGS, ) +diff --git a/vmci-only/Makefile.kernel b/vmci-only/Makefile.kernel +index ba343ee..861ea83 100644 +--- a/vmci-only/Makefile.kernel ++++ b/vmci-only/Makefile.kernel +@@ -21,7 +21,7 @@ CC_OPTS += -DVMCI + + INCLUDE += -I$(SRCROOT)/shared -I$(SRCROOT)/common -I$(SRCROOT)/linux + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + obj-m += $(DRIVER).o + +diff --git a/vmmon-only/Makefile.kernel b/vmmon-only/Makefile.kernel +index 8770d1d..c4746c3 100644 +--- a/vmmon-only/Makefile.kernel ++++ b/vmmon-only/Makefile.kernel +@@ -22,7 +22,7 @@ CC_OPTS += -DVMMON -DVMCORE + INCLUDE := -I$(SRCROOT)/include -I$(SRCROOT)/common -I$(SRCROOT)/linux \ + -I$(SRCROOT)/vmcore + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/autoconf/smpcall.c, -DVMW_HAVE_SMP_CALL_3ARG, ) + +diff --git a/vmnet-only/Makefile.kernel b/vmnet-only/Makefile.kernel +index d1e3133..665d428 100644 +--- a/vmnet-only/Makefile.kernel ++++ b/vmnet-only/Makefile.kernel +@@ -19,7 +19,7 @@ + + INCLUDE := -I$(SRCROOT) + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_net.c,-DVMW_NETDEV_HAS_NET, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/netdev_has_dev_net.c,-DVMW_NETDEV_HAS_DEV_NET, ) + EXTRA_CFLAGS += $(call vm_check_build, $(SRCROOT)/nfhook_uses_skb.c,-DVMW_NFHOOK_USES_SKB, ) +diff --git a/vsock-only/Makefile.kernel b/vsock-only/Makefile.kernel +index b4629ee..264b8cb 100644 +--- a/vsock-only/Makefile.kernel ++++ b/vsock-only/Makefile.kernel +@@ -25,7 +25,7 @@ INCLUDE += -I$(SRCROOT)/include + INCLUDE += -I$(SRCROOT)/linux + INCLUDE += -I$(SRCROOT)/common + +-EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) ++EXTRA_CFLAGS := $(CC_OPTS) $(INCLUDE) $(LINUXINCLUDE) + EXTRA_CFLAGS += $(call vm_check_build, $(AUTOCONF_DIR)/netcreate_num_params.c, -DVMW_NETCREATE_KERNARG, ) + + diff --git a/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch b/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch new file mode 100644 index 000000000000..1a647a3302d8 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-makefile-kernel-dir.patch @@ -0,0 +1,85 @@ +diff --git a/vmblock-only/Makefile b/vmblock-only/Makefile +index 2b81323..746c8b8 100644 +--- a/vmblock-only/Makefile ++++ b/vmblock-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmblock + PRODUCT := ws +diff --git a/vmci-only/Makefile b/vmci-only/Makefile +index 8e9c5be..6ec828b 100644 +--- a/vmci-only/Makefile ++++ b/vmci-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmci + PRODUCT := ws +diff --git a/vmmon-only/Makefile b/vmmon-only/Makefile +index 5bd867b..91a83d4 100644 +--- a/vmmon-only/Makefile ++++ b/vmmon-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmmon + PRODUCT := @@PRODUCT@@ +diff --git a/vmnet-only/Makefile b/vmnet-only/Makefile +index d4eb73c..c7c6d38 100644 +--- a/vmnet-only/Makefile ++++ b/vmnet-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vmnet + PRODUCT := @@PRODUCT@@ +diff --git a/vsock-only/Makefile b/vsock-only/Makefile +index 93dd61d..9765696 100644 +--- a/vsock-only/Makefile ++++ b/vsock-only/Makefile +@@ -49,10 +49,10 @@ VM_UNAME = $(shell uname -r) + ifdef LINUXINCLUDE + HEADER_DIR = $(LINUXINCLUDE) + else +-HEADER_DIR = /lib/modules/$(VM_UNAME)/build/include ++HEADER_DIR = $(KERNEL_DIR) + endif + +-BUILD_DIR = $(HEADER_DIR)/.. ++BUILD_DIR = $(KBUILD_OUTPUT) + + DRIVER := vsock + PRODUCT := ws diff --git a/app-emulation/vmware-modules/files/308-netdevice.patch b/app-emulation/vmware-modules/files/308-netdevice.patch new file mode 100644 index 000000000000..35231a3205e3 --- /dev/null +++ b/app-emulation/vmware-modules/files/308-netdevice.patch @@ -0,0 +1,24 @@ +diff --git a/vmnet-only/compat_netdevice.h b/vmnet-only/compat_netdevice.h +index 7a56304..9ff4548 100644 +--- a/vmnet-only/compat_netdevice.h ++++ b/vmnet-only/compat_netdevice.h +@@ -47,6 +47,19 @@ + # define net_device device + #endif + ++/* it looks like these have been removed from the kernel 3.1 ++ * probably because the "transition" is considered complete. ++ * so to keep this source compatible we just redefine them like they were ++ * previously ++ */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 1, 0) ++#define HAVE_ALLOC_NETDEV /* feature macro: alloc_xxxdev ++ functions are available. */ ++#define HAVE_FREE_NETDEV /* free_netdev() */ ++#define HAVE_NETDEV_PRIV /* netdev_priv() */ ++#define HAVE_NETIF_QUEUE ++#define HAVE_NET_DEVICE_OPS ++#endif + + /* + * SET_MODULE_OWNER appeared sometime during 2.3.x. It was setting diff --git a/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild new file mode 100644 index 000000000000..98a4bd439ae4 --- /dev/null +++ b/app-emulation/vmware-modules/vmware-modules-308.1.0.ebuild @@ -0,0 +1,149 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils flag-o-matic linux-info linux-mod user versionator udev + +PV_MAJOR=$(get_major_version) +PV_MINOR=$(get_version_component_range 2-3) + +DESCRIPTION="VMware kernel modules" +HOMEPAGE="http://www.vmware.com/" + +SRC_URI="" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" +IUSE="pax_kernel +vmci +vsock" +REQUIRED_USE="!vsock? ( !vmci )" + +RDEPEND="" +DEPEND="${RDEPEND} + || ( =app-emulation/vmware-player-12.${PV_MINOR}* + =app-emulation/vmware-workstation-12.${PV_MINOR}* )" + +S=${WORKDIR} + +pkg_setup() { + CONFIG_CHECK="~HIGH_RES_TIMERS" + if kernel_is ge 2 6 37 && kernel_is lt 2 6 39; then + CONFIG_CHECK="${CONFIG_CHECK} BKL" + fi + if use vmci ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI" + fi + if use vsock ; then + CONFIG_CHECK="${CONFIG_CHECK} !VMWARE_VMCI_VSOCKETS" + else + CONFIG_CHECK="${CONFIG_CHECK} VMWARE_VMCI_VSOCKETS" + fi + + linux-info_pkg_setup + + linux-mod_pkg_setup + + VMWARE_GROUP=${VMWARE_GROUP:-vmware} + + VMWARE_MODULE_LIST_ALL="vmblock vmmon vmnet vmci vsock" + VMWARE_MODULE_LIST="vmblock vmmon vmnet" + use vmci && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vmci" + use vsock && VMWARE_MODULE_LIST="${VMWARE_MODULE_LIST} vsock" + + VMWARE_MOD_DIR="${PN}-${PVR}" + + BUILD_TARGETS="auto-build KERNEL_DIR=${KERNEL_DIR} KBUILD_OUTPUT=${KV_OUT_DIR}" + + enewgroup "${VMWARE_GROUP}" + + filter-flags -mfpmath=sse -mavx -mpclmul -maes + append-cflags -mno-sse # Found a problem similar to bug #492964 + + for mod in ${VMWARE_MODULE_LIST}; do + MODULE_NAMES="${MODULE_NAMES} ${mod}(misc:${S}/${mod}-only)" + done +} + +src_unpack() { + cd "${S}" + for mod in ${VMWARE_MODULE_LIST_ALL}; do + tar -xf /opt/vmware/lib/vmware/modules/source/${mod}.tar + done +} + +src_prepare() { + epatch "${FILESDIR}/${PV_MAJOR}-makefile-kernel-dir.patch" + epatch "${FILESDIR}/${PV_MAJOR}-makefile-include.patch" + epatch "${FILESDIR}/${PV_MAJOR}-netdevice.patch" + use pax_kernel && epatch "${FILESDIR}/${PV_MAJOR}-hardened.patch" + epatch "${FILESDIR}/${PV_MAJOR}-apic.patch" + + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-00-dentry.patch" + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-01-inode.patch" + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-02-control.patch" + kernel_is ge 3 10 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.10-03-inline.patch" + kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-00-readdir.patch" + kernel_is ge 3 11 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.11-01-filldir.patch" + kernel_is ge 3 15 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.15-00-vsock.patch" + kernel_is ge 3 18 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.18-00-version-redefined.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-00-compat-namei.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-02-vmblock-path.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-04-iovec.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-05-vmci_qpair.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-06-vsock.patch" + kernel_is ge 3 19 0 && epatch "${FILESDIR}/${PV_MAJOR}-3.19-07-vsock.patch" + kernel_is ge 4 01 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.01-00-vsock.patch" + kernel_is ge 4 02 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-00-nd_set_link.patch" + kernel_is ge 4 02 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.02-01-sk_alloc.patch" + kernel_is ge 4 03 0 && epatch "${FILESDIR}/${PV_MAJOR}-4.03-00-vmci-misc_deregister.patch" + + # Allow user patches so they can support RC kernels and whatever else + epatch_user +} + +src_install() { + linux-mod_src_install + local udevrules="${T}/60-vmware.rules" + cat > "${udevrules}" <<-EOF + KERNEL=="vmci", GROUP="vmware", MODE="660" + KERNEL=="vmw_vmci", GROUP="vmware", MODE="660" + KERNEL=="vmmon", GROUP="vmware", MODE="660" + KERNEL=="vsock", GROUP="vmware", MODE="660" + EOF + udev_dorules "${udevrules}" + + if ! use vmci ; then + dodir /etc/modprobe.d/ + + cat > "${D}"/etc/modprobe.d/vmware.conf <<-EOF + # Support for vmware vmci in kernel module + alias vmci vmw_vmci + EOF + + export installed_modprobe_conf=1 + fi + if ! use vsock ; then + dodir /etc/modprobe.d/ + cat >> "${D}"/etc/modprobe.d/vmware.conf <<-EOF + # Support for vmware vsock in kernel module + alias vsock vmw_vsock_vmci_transport + EOF + + export installed_modprobe_conf=1 + fi +} + +pkg_postinst() { + linux-mod_pkg_postinst + if [ "${installed_modprobe_conf}"x == "x" ] ; then + if [ -f "${ROOT}/etc/modprobe.d/vmware.conf" ] ; then + ewarn "Please check the /etc/modprobe.d/vmware.conf file and" + ewarn "possible conflicts when using vmci and/or vsock modules built" + ewarn "out of kernel" + fi + fi +} diff --git a/app-emulation/vmware-player/Manifest b/app-emulation/vmware-player/Manifest index 90b62101a8fa..998ca15fcc3c 100644 --- a/app-emulation/vmware-player/Manifest +++ b/app-emulation/vmware-player/Manifest @@ -1,3 +1,3 @@ -DIST VMware-Player-6.0.6-2700073.i386.bundle.tar 230184960 SHA256 f62c97771b9f9b3d62204cb72472bd3b4cf856f5bdc3fd7ea68f786127b4f98e SHA512 91ce0861eab7a122d9bca8f8899f18ed7f59effffb20ae2b6a4d1a021aa57cc179e0f8b7aebeeea857c10a8b31deffcb1649cb79e64a927bb80905746dbaaefd WHIRLPOOL 90c51b72ecdf1b1fa9575e74d196e5d3e25cc4433fc74df283ad57e5953d7671c848d2e816cd19ca7216c2af9065c092c29a66c3d42247cb952a1890d99458bf -DIST VMware-Player-6.0.6-2700073.x86_64.bundle.tar 198164480 SHA256 090f93c404d01475b4fc55db529f14e88457bde40b20140b5133a43e391dd866 SHA512 abdb5a6e6162ec297bdea4616f40ff734967fb04838ed75103ad7051a6120e4d4510f9fc192bd874382885e48444af4b00fc2dcd5f6d05929c615e5c379ae212 WHIRLPOOL 386b3a2b928ddf4ce149c1738412c46e0292648e54537b1164197d89b5dd5d86448fbe659141c2ca8d6f55ccd709e629d60b20311c69333bd2b33162a59f3a88 +DIST VMware-Player-12.1.0-3272444.x86_64.bundle.tar 138854400 SHA256 ae124888e3cef2cb8d687d0029b32ddf56dca8314d125cad66539c16501a1787 SHA512 0766ff543c4d61ff842ee8aa7b7ef7ed13c1a8adaadef2872cdd47b8029fb0b794588d9d49e4ad8cd5919793663e465439d2b7d8782f72f28461f8a008141151 WHIRLPOOL d972d76ba01295ece11cfee89a138ecea00b512de93f1a279a4ef8444333e672e094216ccaa59a4a8b78432d8b49998addb0b0a0b1abc566f8ccaa7724f7f580 DIST VMware-Player-7.1.2-2780323.x86_64.bundle.tar 211128320 SHA256 baa60996b3bed5ba89db1a0fd9a2cc263ea07ac1cf2d6f3aab68c728cc960efc SHA512 c4465a4cbf97b9fe3aa2d6a1c690047251a37929867e0b3cbddf6643b59ef8e618809973543150e6cd9a3bdba0c9c04fb55171616c2179a0ff80ee7302e07fc2 WHIRLPOOL f0bc539647a5f3838a486d62506881f752e426e2e7299b20f2828c285cb041c777f93f3d29627ff4187edfd92e43e37e70647828ce537adb67db0fe3e99fccb0 +DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6 diff --git a/app-emulation/vmware-player/files/vmware-10.0.rc b/app-emulation/vmware-player/files/vmware-12.1.rc similarity index 69% rename from app-emulation/vmware-player/files/vmware-10.0.rc rename to app-emulation/vmware-player/files/vmware-12.1.rc index 85ae7cdb0e76..2a827bc1ae31 100644 --- a/app-emulation/vmware-player/files/vmware-10.0.rc +++ b/app-emulation/vmware-player/files/vmware-12.1.rc @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ +# $Header: $ depend() { need localmount @@ -14,9 +14,14 @@ start() { @@BINDIR@@/vmware-usbarbitrator eend $? ebegin Starting VMware services - modprobe -v vmci || modprobe -v vmw_vmci + + # quiet for vmci because it may not be there + modprobe -vq vmci || modprobe -v vmw_vmci eend $? - modprobe -av vmmon vmci vsock vmblock vmnet + + # vmci or vmw_vmci was loaded by the previous modprobe + # no need to do it here + modprobe -av vmmon vsock vmblock vmnet eend $? @@BINDIR@@/vmware-networks --start eend $? @@ -32,6 +37,8 @@ stop() { ebegin Stopping VMware services modprobe -rv vsock vmmon vmblock vmnet eend $? - modprobe -rv vmci || modprobe -rv vmw_vmci + + # quiet for vmci because it may not be there + modprobe -rvq vmci || modprobe -rv vmw_vmci eend $? } diff --git a/app-emulation/vmware-player/metadata.xml b/app-emulation/vmware-player/metadata.xml index 611b1a298386..734b5607fc74 100644 --- a/app-emulation/vmware-player/metadata.xml +++ b/app-emulation/vmware-player/metadata.xml @@ -6,6 +6,7 @@ Gentoo VMware Project + Use precompiled bundled libraries instead of the system installation Install OVF tool for importing and exporting appliance files Install VMware Tools images diff --git a/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild new file mode 100644 index 000000000000..90577d8377cf --- /dev/null +++ b/app-emulation/vmware-player/vmware-player-12.1.0.3272444-r2.ebuild @@ -0,0 +1,418 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pax-utils systemd vmware-bundle + +MY_PN="VMware-Player" +MY_PV=$(get_version_component_range 1-3) +PV_MODULES="308.$(get_version_component_range 2-3)" +PV_BUILD=$(get_version_component_range 4) +MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" + +SYSTEMD_UNITS_TAG="gentoo-02" + +DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/player/" +BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" +SRC_URI=" + ${BASE_URI}${MY_P}.x86_64.bundle.tar + https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz +" + +LICENSE="vmware GPL-2 GPL-3" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="bundled-libs cups doc ovftool +vmware-tools" +RESTRICT="mirror strip preserve-libs" + +BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib + +BUNDLED_LIBS=" + libXau.so.6 + libXcomposite.so.1 + libXcursor.so.1 + libXdamage.so.1 + libXdmcp.so.6 + libXfixes.so.3 + libXft.so.2 + libXinerama.so.1 + libXrandr.so.2 + libXrender.so.1 + libaio.so.1 + libatk-1.0.so.0 + libatkmm-1.6.so.1 + libatspi.so.0 + libcairo.so.2 + libcairomm-1.0.so.1 + libcrypto.so.1.0.1 + libcurl.so.4 + libdbus-1.so.3 + libfontconfig.so.1 + libfreetype.so.6 + libfuse.so.2 + libgailutil.so.18 + libgcc_s.so.1 + libgcrypt.so.11 + libgdk-x11-2.0.so.0 + libgdk_pixbuf-2.0.so.0 + libgdkmm-2.4.so.1 + libgio-2.0.so.0 + libgiomm-2.4.so.1 + libglib-2.0.so.0 + libglibmm-2.4.so.1 + libglibmm_generate_extra_defs-2.4.so.1 + libgmodule-2.0.so.0 + libgobject-2.0.so.0 + libgpg-error.so.0 + libgthread-2.0.so.0 + libgtk-x11-2.0.so.0 + libgtkmm-2.4.so.1 + libpango-1.0.so.0 + libpangocairo-1.0.so.0 + libpangoft2-1.0.so.0 + libpangomm-1.4.so.1 + libpangox-1.0.so.0 + libpangoxft-1.0.so.0 + libpcsclite.so.1 + libpixman-1.so.0 + libpng12.so.0 + librsvg-2.so.2 + libsigc-2.0.so.0 + libssl.so.1.0.1 + libstdc++.so.6 + libxml2.so.2 + libz.so.1 +" + +BUNDLED_LIB_DEPENDS=" + app-accessibility/at-spi2-core + dev-cpp/atkmm + dev-cpp/cairomm + dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 + dev-cpp/pangomm + dev-libs/atk + dev-libs/glib:2 + dev-libs/libaio + dev-libs/libgcrypt:11/11 + dev-libs/libgpg-error + dev-libs/libsigc++:2 + dev-libs/libxml2 + dev-libs/openssl:0 + gnome-base/librsvg:2 + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:1.2 + net-misc/curl + sys-apps/dbus + sys-apps/pcsc-lite + sys-fs/fuse + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/pango + x11-libs/pangox-compat + x11-libs/pixman +" + +# vmware should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND=" + app-arch/bzip2 + dev-libs/dbus-glib + dev-libs/expat + dev-libs/gmp:0 + dev-libs/icu + dev-libs/json-c + dev-libs/libcroco + dev-libs/libffi + dev-libs/libgcrypt:0/20 + dev-libs/libtasn1:0/6 + dev-libs/nettle:0/6 + gnome-base/gconf + gnome-base/libgnome-keyring + media-gfx/graphite2 + media-libs/alsa-lib + media-libs/harfbuzz:0/0.9.18 + media-libs/libart_lgpl + media-libs/libpng:0 + media-libs/libvorbis + media-libs/mesa + net-dns/libidn + net-libs/gnutls + net-print/cups + sys-apps/tcp-wrappers + sys-apps/util-linux + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXtst + x11-libs/libXxf86vm + x11-libs/libdrm + x11-libs/libxcb + x11-libs/libxshmfence + x11-libs/startup-notification + x11-libs/xcb-util + x11-themes/hicolor-icon-theme + bundled-libs? ( + media-libs/jbigkit:0/2.1 + media-libs/tiff:3 + virtual/jpeg:62 + ) + !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) + !app-emulation/vmware-workstation +" +PDEPEND="~app-emulation/vmware-modules-${PV_MODULES} + vmware-tools? ( app-emulation/vmware-tools )" +DEPEND=">=dev-util/patchelf-0.9" + +S=${WORKDIR} +VM_INSTALL_DIR="/opt/vmware" + +QA_PREBUILT="/opt/*" + +QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" + +src_unpack() { + default + local bundle=${MY_P}.x86_64.bundle + + local component; for component in \ + vmware-player \ + vmware-player-app \ + vmware-player-setup \ + vmware-vmx \ + vmware-network-editor \ + vmware-usbarbitrator + do + vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" + done + + if use ovftool; then + vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool + fi +} + +clean_bundled_libs() { + einfo "Removing bundled libraries" + for libname in ${BUNDLED_LIBS} ; do + rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" + done + + rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs" + + # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1 + # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h. + # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link + # in libcds.so to be able to use system libs. + pushd >/dev/null . + cd "${S}"/lib/lib/libcds.so + einfo "Patching libcds.so" + patchelf --replace-needed libssl.so.1.0.{1,0} \ + --replace-needed libcrypto.so.1.0.{1,0} \ + libcds.so + popd >/dev/null + + # vmware-player seems to use a custom version of libgksu2.so, for this reason + # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED + # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage + # preserve-libs mechanism to be triggered when a system lib is available (but not required) + pushd >/dev/null . + cd "${S}"/lib/lib/libvmware-gksu.so + einfo "Patching libvmware-gksu.so" + patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \ + libvmware-gksu.so + popd >/dev/null +} + +src_prepare() { + rm -f bin/vmware-modconfig + rm -rf lib/modules/binary + # Bug 459566 + mv lib/libvmware-netcfg.so lib/lib/ + + if ! use bundled-libs ; then + clean_bundled_libs + fi + + DOC_CONTENTS=" +/etc/env.d is updated during ${PN} installation. Please run:\n +env-update && source /etc/profile\n +Before you can use ${PN}, you must configure a default network setup. +You can do this by running 'emerge --config ${PN}'.\n +To be able to run ${PN} your user must be in the vmware group.\n +You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. +" +} + +src_install() { + local major_minor=$(get_version_component_range 1-2 "${PV}") + + # revdep-rebuild entry + insinto /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} + doins "${T}"/10${PN} + + # install the binaries + into "${VM_INSTALL_DIR}" + dobin bin/* + + # install the libraries + insinto "${VM_INSTALL_DIR}"/lib/vmware + doins -r lib/* + + # workaround for hardcoded search paths needed during shared objects loading + if ! use bundled-libs ; then + dosym /usr/$(get_libdir)/libglib-2.0.so.0 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0 + # Bug 432918 + dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 + dosym /usr/$(get_libdir)/libssl.so.1.0.0 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 + fi + + # install the ancillaries + insinto /usr + doins -r share + + if use cups; then + exeinto $(cups-config --serverbin)/filter + doexe extras/thnucups + + insinto /etc/cups + doins -r etc/cups/* + fi + + if use doc; then + dodoc doc/* + fi + + exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup + doexe vmware-config + + # install ovftool + if use ovftool; then + cd "${S}" + + insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool + doins -r vmware-ovftool/* + + chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} + dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool + fi + + # create symlinks for the various tools + local tool ; for tool in thnuclnt vmplayer{,-daemon} \ + vmware-{acetool,modconfig{,-console},gksu,fuseUI} ; do + dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" + done + dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer + dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu + + # fix permissions + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper + fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} + + pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx + + # create the environment + local envd="${T}/90vmware" + cat > "${envd}" <<-EOF + PATH='${VM_INSTALL_DIR}/bin' + ROOTPATH='${VM_INSTALL_DIR}/bin' + EOF + + use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" + + doenvd "${envd}" + + # create the configuration + dodir /etc/vmware + + cat > "${D}"/etc/vmware/bootstrap <<-EOF + BINDIR='${VM_INSTALL_DIR}/bin' + LIBDIR='${VM_INSTALL_DIR}/lib' + EOF + + cat > "${D}"/etc/vmware/config <<-EOF + bindir = "${VM_INSTALL_DIR}/bin" + libdir = "${VM_INSTALL_DIR}/lib/vmware" + initscriptdir = "/etc/init.d" + authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" + gksu.rootMethod = "su" + VMCI_CONFED = "yes" + VMBLOCK_CONFED = "yes" + VSOCK_CONFED = "yes" + NETWORKING = "yes" + player.product.version = "${MY_PV}" + product.buildNumber = "${PV_BUILD}" + EOF + + # install the init.d script + local initscript="${T}/vmware.rc" + sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ + "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die + newinitd "${initscript}" vmware + + # fill in variable placeholders + if use bundled-libs ; then + sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ + -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die + fi + sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ + -e "/^Encoding/d" \ + -i "${D}/usr/share/applications/vmware-player.desktop" || die + + # install systemd unit files + systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} + + readme.gentoo_create_doc +} + +pkg_config() { + "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog + + ewarn "${P} is using an old version of libgcrypt library which" + ewarn "is going to be soon removed from portage due to security reasons" + ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)." + ewarn "Until vmware is fixed upstream you're exposed to security issues!" +} + +pkg_prerm() { + einfo "Stopping ${PN} for safe unmerge" + /etc/init.d/vmware stop +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} diff --git a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild b/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild deleted file mode 100644 index 2419f68fb029..000000000000 --- a/app-emulation/vmware-player/vmware-player-6.0.6.2700073.ebuild +++ /dev/null @@ -1,245 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils versionator fdo-mime gnome2-utils pax-utils vmware-bundle - -MY_PN="VMware-Player" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/player/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - x86? ( ${BASE_URI}${MY_P}.i386.bundle.tar ) - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - " - -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64 ~x86" -IUSE="cups doc +vmware-tools" -RESTRICT="strip" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND="dev-cpp/cairomm - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/libgnomecanvasmm:2.6 - dev-cpp/pangomm:1.4 - dev-libs/atk - dev-libs/glib:2 - dev-libs/libaio - dev-libs/libsigc++ - dev-libs/libxml2 - =dev-libs/openssl-0.9.8* - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/fontconfig - media-libs/freetype - media-libs/libart_lgpl - =media-libs/libpng-1.2* - net-misc/curl - cups? ( net-print/cups ) - sys-devel/gcc - sys-fs/fuse - sys-libs/glibc - sys-libs/zlib - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - x11-libs/startup-notification - !app-emulation/vmware-workstation" -PDEPEND="~app-emulation/vmware-modules-279.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" - -src_unpack() { - default - local bundle=${A%.tar} - - local component ; for component in \ - vmware-player \ - vmware-player-app \ - vmware-vmx \ - vmware-usbarbitrator \ - vmware-network-editor \ - vmware-player-setup - #vmware-ovftool - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ -} - -clean_bundled_libs() { - ebegin 'Removing superfluous libraries' - # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree - # see http://forums.gentoo.org/viewtopic-t-835867.html - # must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new" - ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8 -libssl.so.0.9.8 -libgcr.so.0' | while read -r libname libpath ; do - dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}" - done - eend -} - -src_install() { - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* || die "failed to install bin" - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - # install documentation - if use doc; then - dodoc doc/* - fi - - exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doexe vmware-config - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmplayer{,-daemon} \ - vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - - pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - doenvd "${envd}" || die - - # create the configuration - dodir /etc/vmware || die - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${MY_PV}" - product.buildNumber = "${PV_BUILD}" - EOF - - # install the init.d script - local initscript="${T}/vmware.rc" - - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-10.0.rc" > "${initscript}" || die - newinitd "${initscript}" vmware || die - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" || die -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - ewarn "/etc/env.d was updated. Please run:" - ewarn "env-update && source /etc/profile" - ewarn "" - ewarn "Before you can use vmware-player, you must configure a default network setup." - ewarn "You can do this by running 'emerge --config ${PN}'." -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild b/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild deleted file mode 100644 index 112860289931..000000000000 --- a/app-emulation/vmware-player/vmware-player-7.1.2.2780323.ebuild +++ /dev/null @@ -1,263 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils versionator fdo-mime gnome2-utils pax-utils systemd vmware-bundle - -MY_PN="VMware-Player" -MY_PV=$(get_version_component_range 1-3) -PV_MINOR=$(get_version_component_range 3) -PV_BUILD=$(get_version_component_range 4) -MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" - -DESCRIPTION="Emulate a complete PC on your PC without the usual performance overhead of most emulators" -HOMEPAGE="http://www.vmware.com/products/player/" -BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/player/${MY_PV}/${PV_BUILD}/linux/core/" -SRC_URI=" - amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) - " - -LICENSE="vmware GPL-2" -SLOT="0" -KEYWORDS="-* ~amd64" -IUSE="cups doc ovftool +vmware-tools" -RESTRICT="strip" - -# vmware-workstation should not use virtual/libc as this is a -# precompiled binary package thats linked to glibc. -RDEPEND="dev-cpp/cairomm - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-cpp/libgnomecanvasmm:2.6 - dev-cpp/pangomm:1.4 - dev-libs/atk - dev-libs/glib:2 - dev-libs/libaio - dev-libs/libsigc++ - dev-libs/libxml2 - =dev-libs/openssl-0.9.8* - dev-libs/xmlrpc-c - gnome-base/libgnomecanvas - gnome-base/libgtop:2 - gnome-base/librsvg:2 - gnome-base/orbit - media-libs/fontconfig - media-libs/freetype - media-libs/libart_lgpl - =media-libs/libpng-1.2* - net-misc/curl - cups? ( net-print/cups ) - sys-devel/gcc - sys-fs/fuse - sys-libs/glibc - sys-libs/zlib - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/libgksu - x11-libs/libICE - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXau - x11-libs/libxcb - x11-libs/libXcomposite - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXdmcp - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXft - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXtst - x11-libs/pango - x11-libs/startup-notification - !app-emulation/vmware-workstation" -PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR} - vmware-tools? ( app-emulation/vmware-tools )" - -S=${WORKDIR} -VM_INSTALL_DIR="/opt/vmware" - -src_unpack() { - default - local bundle=${A%.tar} - - local component ; for component in \ - vmware-player \ - vmware-player-app \ - vmware-vmx \ - vmware-usbarbitrator \ - vmware-network-editor \ - vmware-player-setup - do - vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" - done - - use ovftool && \ - vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool -} - -src_prepare() { - rm -f bin/vmware-modconfig - rm -rf lib/modules/binary - # Bug 459566 - mv lib/libvmware-netcfg.so lib/lib/ -} - -clean_bundled_libs() { - ebegin 'Removing superfluous libraries' - # exclude OpenSSL from unbundling until the AES-NI patch gets into the tree - # see http://forums.gentoo.org/viewtopic-t-835867.html - # must use shipped libgcr.so.0 or else "undefined symbol: gcr_certificate_widget_new" - ldconfig -p | sed 's:^\s\+\([^(]*[^( ]\).*=> \(/.*\)$:\1 \2:g;t;d' | fgrep -v 'libcrypto.so.0.9.8 -libssl.so.0.9.8 -libgcr.so.0' | while read -r libname libpath ; do - dosym "${libpath}" "${VM_INSTALL_DIR}/lib/vmware/lib/${libname}/${libname}" - done - eend -} - -src_install() { - # install the binaries - into "${VM_INSTALL_DIR}" - dobin bin/* || die "failed to install bin" - - # install the libraries - insinto "${VM_INSTALL_DIR}"/lib/vmware - doins -r lib/* - - # Bug 432918 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.0.9.8/libcrypto.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.0.9.8 - dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.0.9.8/libssl.so.0.9.8 \ - "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.0.9.8 - - # https://github.com/gentoo/vmware/issues/7 - dosym "${VM_INSTALL_DIR}"/lib/vmware/ /usr/$(get_libdir)/vmware - - # install the ancillaries - insinto /usr - doins -r share - - if use cups; then - exeinto $(cups-config --serverbin)/filter - doexe extras/thnucups - - insinto /etc/cups - doins -r etc/cups/* - fi - - # install documentation - if use doc; then - dodoc doc/* - fi - - exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup - doexe vmware-config - - # install ovftool - if use ovftool; then - cd "${S}" - - insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool - doins -r vmware-ovftool/* - - chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} - dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool - fi - - # create symlinks for the various tools - local tool ; for tool in thnuclnt vmplayer{,-daemon} \ - vmware-{acetool,unity-helper,modconfig{,-console},gksu,fuseUI} ; do - dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" - done - dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer - dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu - - # fix permissions - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} - fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} - fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} - - pax-mark -m "${D}${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx - - # create the environment - local envd="${T}/90vmware" - cat > "${envd}" <<-EOF - PATH='${VM_INSTALL_DIR}/bin' - ROOTPATH='${VM_INSTALL_DIR}/bin' - EOF - doenvd "${envd}" || die - - # create the configuration - dodir /etc/vmware || die - - cat > "${D}"/etc/vmware/bootstrap <<-EOF - BINDIR='${VM_INSTALL_DIR}/bin' - LIBDIR='${VM_INSTALL_DIR}/lib' - EOF - - cat > "${D}"/etc/vmware/config <<-EOF - bindir = "${VM_INSTALL_DIR}/bin" - libdir = "${VM_INSTALL_DIR}/lib/vmware" - initscriptdir = "/etc/init.d" - authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" - gksu.rootMethod = "su" - VMCI_CONFED = "yes" - VMBLOCK_CONFED = "yes" - VSOCK_CONFED = "yes" - NETWORKING = "yes" - player.product.version = "${MY_PV}" - product.buildNumber = "${PV_BUILD}" - EOF - - # install the init.d script - local initscript="${T}/vmware.rc" - - sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ - "${FILESDIR}/vmware-11.${PV_MINOR}.rc" > "${initscript}" || die - newinitd "${initscript}" vmware || die - - systemd_dounit "${FILESDIR}/vmware-usbarbitrator.service" - systemd_dounit "${FILESDIR}/vmware-network.service" - - # fill in variable placeholders - sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ - -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die - sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ - -e "/^Encoding/d" \ - -i "${D}/usr/share/applications/${PN}.desktop" || die -} - -pkg_config() { - "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update - - ewarn "/etc/env.d was updated. Please run:" - ewarn "env-update && source /etc/profile" - ewarn "" - ewarn "Before you can use vmware-player, you must configure a default network setup." - ewarn "You can do this by running 'emerge --config ${PN}'." -} - -pkg_prerm() { - einfo "Stopping ${PN} for safe unmerge" - /etc/init.d/vmware stop -} - -pkg_postrm() { - fdo-mime_desktop_database_update - gnome2_icon_cache_update -} diff --git a/app-emulation/vmware-workstation/Manifest b/app-emulation/vmware-workstation/Manifest index a9285ddbc7cd..84c6065fb659 100644 --- a/app-emulation/vmware-workstation/Manifest +++ b/app-emulation/vmware-workstation/Manifest @@ -2,7 +2,9 @@ DIST VMware-Workstation-10.0.6-2700073.i386.bundle.tar 281272320 SHA256 02b6c26b DIST VMware-Workstation-10.0.6-2700073.x86_64.bundle.tar 252610560 SHA256 e29edcb0638f32bff81d372c9eaf54e663e3376cd1d89dbd4cfe4cab533398b2 SHA512 072de1da92cbef890707a6c4e3d5223fdc60e50a5166bb72b1ebc098d28c1a75b83ed65a29fdf1311e119e590560546e376909e1384f1eab05918500ec80ede4 WHIRLPOOL 3f4252abb6c87424b88fa34adc29e1927d1e6458beca65d9b290ff0c8ad4ccaf2945e2209670f8f8d4e84548d806c18fb23dc8380ec65452841e2c0bbcce89aa DIST VMware-Workstation-11.1.2-2780323.x86_64.bundle.tar 259133440 SHA256 085b50175b253647d8b2cb188286d3cf9265ed246cc0deb3b142b0438ef5725f SHA512 1c43ebaa4f8b228ec00f24a263eddcbbad5c0c940cd67040e6e2275c3a4aab6c9e2e5ee96996ca4f007ff786ece978c5789214ad92479720182fc3153d7edbde WHIRLPOOL 60e359a1dcfe1178652d8c6be705dda4f2f31b109bf01d5b5b16dc03e26a649e8f1af2ffa03d68e9108646c98e9cad41c10a9452ea14950883f9162e57ac20ca DIST VMware-Workstation-11.1.3-3206955.x86_64.bundle.tar 259594240 SHA256 a8d333d6f6677eb1d70b3572e5bf8f34ebb6cb77bdee4b94d6ea8033f579ed5d SHA512 8cb4781dc388bcaeb82f19d18e0bf2608d393f18c4e255a1c89c9090954bbee5e78ebde5cec6df06d9c037ed4f0595a7a801d76b3a8e2b960f6822bbf1094d1b WHIRLPOOL 5ba631502ff4dbf0e480e932e9a21cbb06d25d68b9ac412beb41680d3d0e678c630ba692e7e52cda2399574b28698ca5deb6a6c54b4614ab752159b6036a0094 +DIST VMware-Workstation-12.1.0-3272444.x86_64.bundle.tar 170639360 SHA256 b15d2ae889465e6e080b84474ca49ebd6c21a0bce701a0f74d34b6e930869043 SHA512 bd64fe19ebb96b06cd34795dab46490cb0e1fe4822dbce4678185fb2cba3e921170feac7904771c14ece3450ddb0e86f5f4d03081551367b8c70afe77df3fab7 WHIRLPOOL 7d72352e272358c25fe49b05c4cdc5653bffef9e20cc2151a2f032fecb98eb7831a922d8dca0ce509d8944abeaff951e9ece8b11dac6782facc762e3b54c2aac DIST VMware-Workstation-9.0.3-1410761.i386.bundle.tar 264908800 SHA256 dfe9aaa75987793eac096c0fbdb364f94e354ab668213774ea3e90d5ddcecdc0 SHA512 5d0943400cb1fefca20f1a81d3989bf5cdda5e123d1a70b09ebc20a56498d36f597ed7a0730d2f6f752c3c4baad2c86d5ef7691e8d245147d944c6f7e4e708b0 WHIRLPOOL 14a950f2deb03c3b7a088d4fb50378c7109330d89903965c28ead0be1e2223dbce05a628b1ea859215d31a8978f497bd8f807652cf266667d67893eaf2d7372b DIST VMware-Workstation-9.0.3-1410761.x86_64.bundle.tar 232724480 SHA256 2612f8a523c9f23164d7557c105520bc6e010af82b3e6d4a3ada04d8ff03cbf0 SHA512 07923231e481550cb0348e40ef341c2d0682ac0daf6c8e0ada130c03113f43a37bf322e64fb9dc73511dea0fd2851f3cb4f5e755bbad4beba9e3cc4e69566070 WHIRLPOOL d979f2d9ef8888be89d5747c16e0db7ca45609cd9d77d84baf8485b4956f9e9f99bf46c33a2690b7b1fea851c0495ed0a06b36e3e69b51abfc11604d9a62fe4d DIST gentoo-01.tar.gz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 DIST vmware-systemd-gentoo-01.tgz 1884 SHA256 e92c694865f1b29f4d7a39efa1dd87bc71dc5f922573f00a3d31ee8e27a8c335 SHA512 454ab93997781bd0a9accddb2ac7bb446f07ea7cddef5640369025c30e03592e14869e0f0f7b4457db2f1ada31c98051426016c86201afa8bc8e3aa4ccc2f875 WHIRLPOOL 9202583b617532ab2612b384da307218e7c93c2962f0d233e28bea066b07163c9bc51c0a599309f9d703c5575ebeb292d787716225624dc1c2fdff3c44fa3513 +DIST vmware-systemd-gentoo-02.tgz 14064 SHA256 7ab23cb41bb8fbeca43bfd3baee35928731177620ae374ebb3b19b827d1a3210 SHA512 3a382bfd5f1eb2b218d8012588ea55c1f22786dba35a1fc0fdfdb4e40b05e0e735ed09c6961684f6442e863c3ed72024ce01f19113bbd9ca47c32e3f43c55f42 WHIRLPOOL dd7ac934584894f4a0ae86a9122080c49a4d09924011bc12dc1530ac6b5ee11fac6d55d6e5b306bb24d749a509236d3e39870b4d6b2ff5de37f6e54707ff8bb6 diff --git a/app-emulation/vmware-player/files/vmware-11.1.rc b/app-emulation/vmware-workstation/files/vmware-12.1.rc similarity index 100% rename from app-emulation/vmware-player/files/vmware-11.1.rc rename to app-emulation/vmware-workstation/files/vmware-12.1.rc diff --git a/app-emulation/vmware-workstation/files/vmware-server-12.1.rc b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc new file mode 100644 index 000000000000..a82b9009c109 --- /dev/null +++ b/app-emulation/vmware-workstation/files/vmware-server-12.1.rc @@ -0,0 +1,55 @@ +#!/sbin/runscript +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +depend() { + need localmount vmware + use net +} + +checkconfig() { + # Check if certificates exist. If not, we need to generate them, ala sshd. + if [ ! -e @@ETCDIR@@/ssl/rui.key -o ! -e @@ETCDIR@@/ssl/rui.crt ]; then + mkdir -p @@ETCDIR@@/ssl + openssl req -x509 -days 365 -newkey rsa:2048 -keyout @@ETCDIR@@/ssl/rui.key -out @@ETCDIR@@/ssl/rui.crt -config @@ETCDIR@@/ssl/hostd.ssl.config + chmod -R 600 @@ETCDIR@@/ssl + fi +} + +start() { + checkconfig + + ebegin Starting VMware Authentication Daemon + start-stop-daemon --start \ + --exec @@PREFIX@@/sbin/vmware-authdlauncher + eend $? + ebegin Starting VMware Workstation Server + start-stop-daemon --start \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd \ + -- -a -d @@ETCDIR@@/hostd/config.xml + + eend $? +} + +stop() { + ebegin "Shutdown VMs in the AutoStart Sequence" + local HOHO_ADMIN="$(@@BINDIR@@/vmware-wssc-adminTool "@@ETCDIR@@/hostd/authorization.xml" 2>/dev/null)" + + if [ "x" != "x${HOHO_ADMIN}" ]; then + @@BINDIR@@/vmware-vim-cmd -U "${HOHO_ADMIN}" hostsvc/autostartmanager/autostop + fi + eend $? + + ebegin Stopping VMware Workstation Server + start-stop-daemon --stop \ + --pidfile /var/run/vmware/vmware-hostd.PID \ + --exec @@BINDIR@@/vmware-hostd + eend $? + ebegin Stopping VMware Authentication Daemon + #start-stop-daemon --stop \ + # --exec @@PREFIX@@/sbin/vmware-authdlauncher + killall @@PREFIX@@/sbin/vmware-authdlauncher + eend $? +} diff --git a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild similarity index 99% rename from app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild rename to app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild index 730645e8b42d..454367851d97 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-10.0.6.2700073-r1.ebuild @@ -40,7 +40,7 @@ RDEPEND="dev-cpp/cairomm dev-libs/icu dev-libs/expat dev-libs/libaio - =dev-libs/libgcrypt-1.5* + || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) dev-libs/libsigc++ dev-libs/libxml2 dev-libs/openssl:0.9.8 diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild similarity index 99% rename from app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild rename to app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild index 530e270810dc..5ef6f109e6a2 100644 --- a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r2.ebuild +++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r3.ebuild @@ -25,7 +25,7 @@ LICENSE="vmware GPL-2" SLOT="0" KEYWORDS="-* ~amd64" IUSE="cups bundled-libs doc ovftool server vix vmware-tools" -RESTRICT="mirror strip preserve-libs" +RESTRICT="mirror strip" BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib @@ -82,7 +82,7 @@ BUNDLED_LIB_DEPENDS=" media-libs/freetype sys-fs/fuse x11-libs/gtk+:2 - =dev-libs/libgcrypt-1.5* + || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) x11-libs/gdk-pixbuf:2 dev-cpp/gtkmm:2.4 dev-libs/glib:2 diff --git a/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild new file mode 100644 index 000000000000..4f488fdc0745 --- /dev/null +++ b/app-emulation/vmware-workstation/vmware-workstation-11.1.3.3206955-r4.ebuild @@ -0,0 +1,549 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils versionator readme.gentoo fdo-mime systemd gnome2-utils pam vmware-bundle + +MY_PN="VMware-Workstation" +MY_PV=$(get_version_component_range 1-3) +PV_MINOR=$(get_version_component_range 3) +PV_BUILD=$(get_version_component_range 4) +MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" + +SYSTEMD_UNITS_TAG="gentoo-01" + +DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/workstation/" +BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" +SRC_URI=" + amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) + https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz + " +LICENSE="vmware GPL-2" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="cups bundled-libs doc ovftool server vix vmware-tools" +RESTRICT="mirror strip" + +BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib + +BUNDLED_LIBS=" + libXau.so.6 + libXcomposite.so.1 + libXcursor.so.1 + libXdamage.so.1 + libXdmcp.so.6 + libXfixes.so.3 + libXft.so.2 + libXinerama.so.1 + libXrandr.so.2 + libXrender.so.1 + libaio.so.1 + libatk-1.0.so.0 + libatkmm-1.6.so.1 + libatspi.so.0 + libcairo.so.2 + libcairomm-1.0.so.1 + libcurl.so.4 + libdbus-1.so.3 + libfontconfig.so.1 + libfreetype.so.6 + libfuse.so.2 + libgailutil.so.18 + libgdk-x11-2.0.so.0 + libgcrypt.so.11 + libgdk_pixbuf-2.0.so.0 + libgdkmm-2.4.so.1 + libgio-2.0.so.0 + libgiomm-2.4.so.1 +" + +BUNDLED_LIB_DEPENDS=" + x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + dev-libs/libaio + dev-libs/atk + dev-cpp/atkmm + app-accessibility/at-spi2-core + x11-libs/cairo + dev-cpp/cairomm + net-misc/curl + media-libs/fontconfig + media-libs/freetype + sys-fs/fuse + x11-libs/gtk+:2 + || ( dev-libs/libgcrypt:0/11 dev-libs/libgcrypt:11/11 ) + x11-libs/gdk-pixbuf:2 + dev-cpp/gtkmm:2.4 + dev-libs/glib:2 + dev-cpp/glibmm:2 +" + +# vmware-workstation should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND=" + dev-cpp/libgnomecanvasmm + dev-cpp/pangomm + dev-libs/icu + dev-libs/expat + dev-libs/libsigc++:2 + dev-libs/libxml2 + dev-libs/openssl:0 + dev-libs/xmlrpc-c + gnome-base/libgnomecanvas + gnome-base/libgtop:2 + gnome-base/librsvg:2 + gnome-base/orbit + media-libs/libart_lgpl + media-libs/libpng:1.2 + media-libs/libpng + media-libs/tiff:3 + cups? ( net-print/cups ) + sys-devel/gcc + sys-libs/glibc + sys-libs/zlib + x11-libs/libgksu + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libxcb + x11-libs/libXext + x11-libs/libXi + x11-libs/libXtst + x11-libs/pango + x11-libs/pangox-compat + x11-libs/startup-notification + x11-themes/hicolor-icon-theme + !app-emulation/vmware-player + !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) + sys-apps/dbus +" +PDEPEND="~app-emulation/vmware-modules-304.${PV_MINOR} + vmware-tools? ( app-emulation/vmware-tools )" + +S=${WORKDIR} +VM_INSTALL_DIR="/opt/vmware" +VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" +VM_HOSTD_USER="root" + +QA_PREBUILT="/opt/*" + +QA_WX_LOAD="/opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 /opt/vmware/lib/vmware/bin/vmware-vmx-stats /opt/vmware/lib/vmware/bin/vmware-vmx-debug /opt/vmware/lib/vmware/bin/vmware-vmx" + +src_unpack() { + default + local bundle + use amd64 && bundle=${MY_P}.x86_64.bundle + local component; for component in \ + vmware-vmx \ + vmware-player-app \ + vmware-player-setup \ + vmware-workstation \ + vmware-network-editor \ + vmware-network-editor-ui \ + vmware-usbarbitrator \ + vmware-vprobe + do + vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" + done + + if use server; then + vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" + fi + + if use vix; then + vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix + vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1100andvSphere600 vmware-vix + fi + if use ovftool; then + vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool + fi +} + +clean_bundled_libs() { + einfo Removing bundled libraries + for libname in ${BUNDLED_LIBS} ; do + rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" + done +} + +src_prepare() { + rm -f bin/vmware-modconfig + rm -rf lib/modules/binary + # Bug 459566 + mv lib/libvmware-netcfg.so lib/lib/ + + if use server; then + rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} + fi + + find "${S}" -name '*.a' -delete + + if ! use bundled-libs ; then + clean_bundled_libs + fi + + DOC_CONTENTS=" +/etc/env.d is updated during ${PN} installation. Please run:\n +env-update && source /etc/profile\n +Before you can use vmware workstation, you must configure a default network setup. +You can do this by running 'emerge --config ${PN}'.\n +To be able to run ${PN} your user must be in the vmware group.\n +You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. +" +} + +src_install() { + local major_minor=$(get_version_component_range 1-2 "${PV}") + local major_minor_revision=$(get_version_component_range 1-3 "${PV}") + local build=$(get_version_component_range 4 "${PV}") + + # revdep-rebuild entry + insinto /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} + doins "${T}"/10${PN} + + # install the binaries + into "${VM_INSTALL_DIR}" + dobin bin/* + + # install the libraries + insinto "${VM_INSTALL_DIR}"/lib/vmware + doins -r lib/* + + # Bug 432918 + dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libcrypto.so.1.0.1 + dosym "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libvmwarebase.so.0/libssl.so.1.0.1 + + # install the ancillaries + insinto /usr + doins -r share + + if use cups; then + exeinto $(cups-config --serverbin)/filter + doexe extras/thnucups + + insinto /etc/cups + doins -r etc/cups/* + fi + + insinto /etc/xdg + doins -r etc/xdg/* + + # install documentation + doman man/man1/vmware.1.gz + + if use doc; then + dodoc doc/* + fi + + insinto "${VM_INSTALL_DIR}"/lib/vmware/setup + doins vmware-config + + # install vmware workstation server + if use server; then + dosbin sbin/* + + cd "${S}"/vmware-workstation-server + + # install binaries + into "${VM_INSTALL_DIR}"/lib/vmware + dobin bin/* + + dobin "${FILESDIR}"/configure-hostd.sh + + dobin "${FILESDIR}"/configure-hostd.sh + + # install the libraries + insinto "${VM_INSTALL_DIR}"/lib/vmware/lib + doins -r lib/* + + into "${VM_INSTALL_DIR}" + for tool in vmware-{hostd,wssc-adminTool} ; do + cat > "${T}/${tool}" <<-EOF + #!/usr/bin/env bash + set -e + + . /etc/vmware/bootstrap + + exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ + "${VM_INSTALL_DIR}/lib/vmware/lib" \\ + "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ + "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" + EOF + dobin "${T}/${tool}" + done + + insinto "${VM_INSTALL_DIR}"/lib/vmware + doins -r hostd + + # create the configuration + insinto /etc/vmware/hostd + doins -r config/etc/vmware/hostd/* + doins -r etc/vmware/hostd/* + + insinto /etc/vmware/ssl + doins etc/vmware/ssl/* + + # pam + pamd_mimic_system vmware-authd auth account + + # create directory for shared virtual machines. + keepdir "${VM_DATA_STORE_DIR}" + keepdir /var/log/vmware + fi + + # install vmware-vix + if use vix; then + cd "${S}"/vmware-vix + + # install the binary + into "${VM_INSTALL_DIR}" + dobin bin/* + + # install the libraries + insinto "${VM_INSTALL_DIR}"/lib/vmware-vix + doins -r lib/* + + dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so + + # install headers + insinto /usr/include/vmware-vix + doins include/* + + if use doc; then + dohtml -r doc/* + fi + fi + + # install ovftool + if use ovftool; then + cd "${S}" + + insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool + doins -r vmware-ovftool/* + + chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} + dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool + fi + + # create symlinks for the various tools + local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \ + vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,unity-helper,zenity} ; do + dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" + done + dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer + dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware + dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu + + # fix permissions + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/{wrapper-gtk24.sh,libgksu2.so.0/gksu-run-helper} + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config + fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount + fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} + if use server; then + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-{hostd,wssc-adminTool} + fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd + fperms 1777 "${VM_DATA_STORE_DIR}" + fi + if use vix; then + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config + fi + + # create the environment + local envd="${T}/90vmware" + cat > "${envd}" <<-EOF + PATH='${VM_INSTALL_DIR}/bin' + ROOTPATH='${VM_INSTALL_DIR}/bin' + EOF + + use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" + + doenvd "${envd}" + + # create the configuration + dodir /etc/vmware + + cat > "${D}"/etc/vmware/bootstrap <<-EOF + BINDIR='${VM_INSTALL_DIR}/bin' + LIBDIR='${VM_INSTALL_DIR}/lib' + EOF + + cat > "${D}"/etc/vmware/config <<-EOF + bindir = "${VM_INSTALL_DIR}/bin" + libdir = "${VM_INSTALL_DIR}/lib/vmware" + initscriptdir = "/etc/init.d" + authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" + gksu.rootMethod = "su" + VMCI_CONFED = "yes" + VMBLOCK_CONFED = "yes" + VSOCK_CONFED = "yes" + NETWORKING = "yes" + player.product.version = "${major_minor_revision}" + product.version = "${major_minor_revision}" + product.buildNumber = "${build}" + product.name = "VMware Workstation" + workstation.product.version = "${major_minor_revision}" + EOF + + if use vix; then + cat >> "${D}"/etc/vmware/config <<-EOF + vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" + vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" + vix.config.version = "1" + EOF + fi + + if use server; then + cat >> "${D}"/etc/vmware/config <<-EOF + authd.client.port = "902" + authd.proxy.nfc = "vmware-hostd:ha-nfc" + authd.soapserver = "TRUE" + EOF + fi + + # install the init.d script + local initscript="${T}/vmware.rc" + sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ + "${FILESDIR}/vmware-${major_minor}.rc" > ${initscript} + newinitd "${initscript}" vmware + + if use server; then + # install the init.d script + local initscript="${T}/vmware-workstation-server.rc" + sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ + -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ + -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ + -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ + "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} + newinitd "${initscript}" vmware-workstation-server + fi + + # fill in variable placeholders + sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ + -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} + sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ + -e "/^Encoding/d" \ + -i "${D}/usr/share/applications/${PN}.desktop" + sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ + -e "/^Encoding/d" \ + -i "${D}/usr/share/applications/vmware-player.desktop" + sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ + -e "/^Encoding/d" \ + -i "${D}/usr/share/applications/vmware-netcfg.desktop" + + if use server; then + # Configuration for vmware-workstation-server + local hostdUser="${VM_HOSTD_USER:-root}" + sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ + -i "${D}/etc/vmware/hostd/authorization.xml" || die + + # Shared VMs Path: [standard]. + sed -e "s:##{DS_NAME}##:standard:g" \ + -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ + -i "${D}/etc/vmware/hostd/datastores.xml" || die + + sed -e "s:##{HTTP_PORT}##:-1:g" \ + -e "s:##{HTTPS_PORT}##:443:g" \ + -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ + -i "${D}/etc/vmware/hostd/proxy.xml" || die + + # See vmware-workstation-server.py for more details. + sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ + -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ + -e "s:##{CFGDIR}##:/etc/vmware/:g" \ + -e "s:##{ENABLE_AUTH}##:true:g" \ + -e "s:##{HOSTDMODE}##:ws:g" \ + -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ + -e "s:##{HOSTD_MOCKUP}##:false:g" \ + -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ + -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ + -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ + -e "s:##{LOGLEVEL}##:verbose:g" \ + -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ + -e "s:##{PLUGINDIR}##:./:g" \ + -e "s:##{SHLIB_PREFIX}##:lib:g" \ + -e "s:##{SHLIB_SUFFIX}##:.so:g" \ + -e "s:##{USE_BLKLISTSVC}##:false:g" \ + -e "s:##{USE_CBRCSVC}##:false:g" \ + -e "s:##{USE_CIMSVC}##:false:g" \ + -e "s:##{USE_DIRECTORYSVC}##:false:g" \ + -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ + -e "s:##{USE_DYNAMO}##:false:g" \ + -e "s:##{USE_DYNSVC}##:false:g" \ + -e "s:##{USE_GUESTSVC}##:false:g" \ + -e "s:##{USE_HBRSVC}##:false:g" \ + -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_HTTPNFCSVC}##:false:g" \ + -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ + -e "s:##{USE_NFCSVC}##:true:g" \ + -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_OVFMGRSVC}##:true:g" \ + -e "s:##{USE_PARTITIONSVC}##:false:g" \ + -e "s:##{USE_SECURESOAP}##:false:g" \ + -e "s:##{USE_SNMPSVC}##:false:g" \ + -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ + -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_VDISKSVC}##:false:g" \ + -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ + -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ + -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ + -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ + -e "s:##{WORKINGDIR}##:./:g" \ + -i "${D}/etc/vmware/hostd/config.xml" || die + + sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ + -i "${D}/etc/vmware/hostd/environments.xml" || die + + # @@VICLIENT_URL@@=XXX + sed -e "s:@@AUTHD_PORT@@:902:g" \ + -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die + fi + + # install systemd unit files + systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} + + readme.gentoo_create_doc +} + +pkg_config() { + "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_pkg_postinst +} + +pkg_prerm() { + einfo "Stopping ${PN} for safe unmerge" + /etc/init.d/vmware stop +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} diff --git a/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild new file mode 100644 index 000000000000..d698aa8c0937 --- /dev/null +++ b/app-emulation/vmware-workstation/vmware-workstation-12.1.0.3272444-r2.ebuild @@ -0,0 +1,628 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils versionator readme.gentoo-r1 fdo-mime gnome2-utils pam systemd vmware-bundle + +MY_PN="VMware-Workstation" +MY_PV=$(get_version_component_range 1-3) +PV_MODULES="308.$(get_version_component_range 2-3)" +PV_BUILD=$(get_version_component_range 4) +MY_P="${MY_PN}-${MY_PV}-${PV_BUILD}" + +SYSTEMD_UNITS_TAG="gentoo-02" + +DESCRIPTION="Emulate a complete PC without the performance overhead of most emulators" +HOMEPAGE="http://www.vmware.com/products/workstation/" +BASE_URI="https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${MY_PV}/${PV_BUILD}/linux/core/" +SRC_URI=" + amd64? ( ${BASE_URI}${MY_P}.x86_64.bundle.tar ) + https://github.com/akhuettel/systemd-vmware/archive/${SYSTEMD_UNITS_TAG}.tar.gz -> vmware-systemd-${SYSTEMD_UNITS_TAG}.tgz + " + +LICENSE="vmware GPL-2 GPL-3" +SLOT="0" +KEYWORDS="-* ~amd64" +IUSE="bundled-libs cups doc ovftool server vix +vmware-tools" +RESTRICT="mirror strip" + +BUNDLED_LIBS_DIR=/opt/vmware/lib/vmware/lib + +BUNDLED_LIBS=" + libXau.so.6 + libXcomposite.so.1 + libXcursor.so.1 + libXdamage.so.1 + libXdmcp.so.6 + libXfixes.so.3 + libXft.so.2 + libXinerama.so.1 + libXrandr.so.2 + libXrender.so.1 + libaio.so.1 + libatk-1.0.so.0 + libatkmm-1.6.so.1 + libatspi.so.0 + libcairo.so.2 + libcairomm-1.0.so.1 + libcrypto.so.1.0.1 + libcurl.so.4 + libdbus-1.so.3 + libfontconfig.so.1 + libfreetype.so.6 + libfuse.so.2 + libgailutil.so.18 + libgcc_s.so.1 + libgcrypt.so.11 + libgdk-x11-2.0.so.0 + libgdk_pixbuf-2.0.so.0 + libgdkmm-2.4.so.1 + libgio-2.0.so.0 + libgiomm-2.4.so.1 + libglib-2.0.so.0 + libglibmm-2.4.so.1 + libglibmm_generate_extra_defs-2.4.so.1 + libgmodule-2.0.so.0 + libgobject-2.0.so.0 + libgpg-error.so.0 + libgthread-2.0.so.0 + libgtk-x11-2.0.so.0 + libgtkmm-2.4.so.1 + libpango-1.0.so.0 + libpangocairo-1.0.so.0 + libpangoft2-1.0.so.0 + libpangomm-1.4.so.1 + libpangox-1.0.so.0 + libpangoxft-1.0.so.0 + libpcsclite.so.1 + libpixman-1.so.0 + libpng12.so.0 + librsvg-2.so.2 + libsigc-2.0.so.0 + libssl.so.1.0.1 + libstdc++.so.6 + libxml2.so.2 + libz.so.1 +" + +BUNDLED_LIB_DEPENDS=" + app-accessibility/at-spi2-core + dev-cpp/atkmm + dev-cpp/cairomm + dev-cpp/glibmm:2 + dev-cpp/gtkmm:2.4 + dev-cpp/pangomm + dev-libs/atk + dev-libs/glib:2 + dev-libs/libaio + dev-libs/libgcrypt:11/11 + dev-libs/libgpg-error + dev-libs/libsigc++:2 + dev-libs/libxml2 + dev-libs/openssl:0 + gnome-base/librsvg:2 + media-libs/fontconfig + media-libs/freetype + media-libs/libpng:1.2 + net-misc/curl + sys-apps/dbus + sys-apps/pcsc-lite + sys-fs/fuse + sys-libs/zlib + x11-libs/cairo + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:2 + x11-libs/libXau + x11-libs/libXcomposite + x11-libs/libXcursor + x11-libs/libXdamage + x11-libs/libXdmcp + x11-libs/libXfixes + x11-libs/libXft + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + x11-libs/pango + x11-libs/pangox-compat + x11-libs/pixman +" + +# vmware should not use virtual/libc as this is a +# precompiled binary package thats linked to glibc. +RDEPEND=" + app-arch/bzip2 + dev-libs/dbus-glib + dev-libs/expat + dev-libs/gmp:0 + dev-libs/icu + dev-libs/json-c + dev-libs/libcroco + dev-libs/libffi + dev-libs/libgcrypt:0/20 + dev-libs/libtasn1:0/6 + dev-libs/nettle:0/6 + gnome-base/gconf + gnome-base/libgnome-keyring + media-gfx/graphite2 + media-libs/alsa-lib + media-libs/harfbuzz:0/0.9.18 + media-libs/libart_lgpl + media-libs/libpng:0 + media-libs/libvorbis + media-libs/mesa + net-dns/libidn + net-libs/gnutls + net-print/cups + sys-apps/tcp-wrappers + sys-apps/util-linux + x11-libs/libICE + x11-libs/libSM + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXi + x11-libs/libXtst + x11-libs/libXxf86vm + x11-libs/libdrm + x11-libs/libxcb + x11-libs/libxshmfence + x11-libs/startup-notification + x11-libs/xcb-util + x11-themes/hicolor-icon-theme + bundled-libs? ( + media-libs/jbigkit:0/2.1 + media-libs/tiff:3 + virtual/jpeg:62 + ) + !bundled-libs? ( ${BUNDLED_LIB_DEPENDS} ) + !app-emulation/vmware-player +" +PDEPEND="~app-emulation/vmware-modules-${PV_MODULES} + vmware-tools? ( app-emulation/vmware-tools )" +DEPEND=">=dev-util/patchelf-0.9" + +S=${WORKDIR} +VM_INSTALL_DIR="/opt/vmware" +VM_DATA_STORE_DIR="/var/lib/vmware/Shared VMs" +VM_HOSTD_USER="root" + +QA_PREBUILT="/opt/*" + +QA_WX_LOAD="opt/vmware/lib/vmware/tools-upgraders/vmware-tools-upgrader-32 opt/vmware/lib/vmware/bin/vmware-vmx-stats opt/vmware/lib/vmware/bin/vmware-vmx-debug opt/vmware/lib/vmware/bin/vmware-vmx" + +src_unpack() { + default + local bundle=${MY_P}.x86_64.bundle + + local component; for component in \ + vmware-workstation \ + vmware-player-app \ + vmware-player-setup \ + vmware-vmx \ + vmware-network-editor \ + vmware-network-editor-ui \ + vmware-usbarbitrator \ + vmware-vprobe + do + vmware-bundle_extract-bundle-component "${bundle}" "${component}" "${S}" + done + + if use ovftool; then + vmware-bundle_extract-bundle-component "${bundle}" vmware-ovftool + fi + + if use server; then + vmware-bundle_extract-bundle-component "${bundle}" vmware-workstation-server #"${S}" + fi + + if use vix; then + vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-core vmware-vix + vmware-bundle_extract-bundle-component "${bundle}" vmware-vix-lib-Workstation1200 vmware-vix + fi +} + +clean_bundled_libs() { + einfo "Removing bundled libraries" + for libname in ${BUNDLED_LIBS} ; do + rm -rv "${S}"/lib/lib/${libname} || die "Failed removing bundled ${libname}" + done + + rm -rv "${S}"/lib/libconf || die "Failed removing bundled gtk conf libs" + + # Among the bundled libs there are libcrypto.so.1.0.1 and libssl.so.1.0.1 + # (needed by libcds.so) which seem to be compiled from openssl-1.0.1h. + # Upstream real sonames are *so.1.0.0 so it's necessary to fix DT_NEEDED link + # in libcds.so to be able to use system libs. + pushd >/dev/null . + einfo "Patching libcds.so" + cd "${S}"/lib/lib/libcds.so || die + patchelf --replace-needed libssl.so.1.0.{1,0} \ + --replace-needed libcrypto.so.1.0.{1,0} \ + libcds.so || die + popd >/dev/null + + # vmware-workstation seems to use a custom version of libgksu2.so, for this reason + # we leave the bundled version. The libvmware-gksu.so library declares simply DT_NEEDED + # libgksu2.so.0 but it uses at runtime the bundled version, patch the lib to avoid portage + # preserve-libs mechanism to be triggered when a system lib is available (but not required) + pushd >/dev/null . + einfo "Patching libvmware-gksu.so" + cd "${S}"/lib/lib/libvmware-gksu.so || die + patchelf --set-rpath "\$ORIGIN/../libgksu2.so.0" \ + libvmware-gksu.so || die + popd >/dev/null +} + +src_prepare() { + rm -f bin/vmware-modconfig + rm -rf lib/modules/binary + # Bug 459566 + mv lib/libvmware-netcfg.so lib/lib/ + + if use server; then + rm -f vmware-workstation-server/bin/{openssl,configure-hostd.sh} + fi + + if ! use bundled-libs ; then + clean_bundled_libs + fi + + DOC_CONTENTS=" +/etc/env.d is updated during ${PN} installation. Please run:\n +env-update && source /etc/profile\n +Before you can use ${PN}, you must configure a default network setup. +You can do this by running 'emerge --config ${PN}'.\n +To be able to run ${PN} your user must be in the vmware group.\n +You MUST set USE=bundled-libs if you are running gcc-5, otherwise vmware will not start. +" +} + +src_install() { + local major_minor=$(get_version_component_range 1-2 "${PV}") + + # revdep-rebuild entry + insinto /etc/revdep-rebuild + echo "SEARCH_DIRS_MASK=\"${VM_INSTALL_DIR}\"" >> ${T}/10${PN} + doins "${T}"/10${PN} + + # install the binaries + into "${VM_INSTALL_DIR}" + dobin bin/* + + # install the libraries + insinto "${VM_INSTALL_DIR}"/lib/vmware + doins -r lib/* + + # workaround for hardcoded search paths needed during shared objects loading + if ! use bundled-libs ; then + dosym /usr/$(get_libdir)/libglib-2.0.so.0 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libglib-2.0.so.0/libglib-2.0.so.0 + # Bug 432918 + dosym /usr/$(get_libdir)/libcrypto.so.1.0.0 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libcrypto.so.1.0.1/libcrypto.so.1.0.1 + dosym /usr/$(get_libdir)/libssl.so.1.0.0 \ + "${VM_INSTALL_DIR}"/lib/vmware/lib/libssl.so.1.0.1/libssl.so.1.0.1 + fi + + # install the ancillaries + insinto /usr + doins -r share + + if use cups; then + exeinto $(cups-config --serverbin)/filter + doexe extras/thnucups + + insinto /etc/cups + doins -r etc/cups/* + fi + + if use doc; then + dodoc doc/* + fi + + exeinto "${VM_INSTALL_DIR}"/lib/vmware/setup + doexe vmware-config + + # install vmware workstation server + if use server; then + dosbin sbin/* + + cd "${S}"/vmware-workstation-server + + # install binaries + into "${VM_INSTALL_DIR}"/lib/vmware + dobin bin/* + + dobin "${FILESDIR}"/configure-hostd.sh + + dobin "${FILESDIR}"/configure-hostd.sh + + # install the libraries + insinto "${VM_INSTALL_DIR}"/lib/vmware/lib + doins -r lib/* + + into "${VM_INSTALL_DIR}" + for tool in vmware-hostd wssc-adminTool ; do + cat > "${T}/${tool}" <<-EOF + #!/usr/bin/env bash + set -e + + . /etc/vmware/bootstrap + + exec "${VM_INSTALL_DIR}/lib/vmware/lib/wrapper-gtk24.sh" \\ + "${VM_INSTALL_DIR}/lib/vmware/lib" \\ + "${VM_INSTALL_DIR}/lib/vmware/bin/${tool}" \\ + "${VM_INSTALL_DIR}/lib/vmware/libconf" "\$@" + EOF + dobin "${T}/${tool}" + done + + insinto "${VM_INSTALL_DIR}"/lib/vmware + doins -r hostd + + # create the configuration + insinto /etc/vmware/hostd + doins -r config/etc/vmware/hostd/* + doins -r etc/vmware/hostd/* + + insinto /etc/vmware/ssl + doins etc/vmware/ssl/* + + # pam + pamd_mimic_system vmware-authd auth account + + # create directory for shared virtual machines. + keepdir "${VM_DATA_STORE_DIR}" + keepdir /var/log/vmware + fi + + # install vmware-vix + if use vix; then + cd "${S}"/vmware-vix + + # install the binary + into "${VM_INSTALL_DIR}" + dobin bin/* + + # install the libraries + insinto "${VM_INSTALL_DIR}"/lib/vmware-vix + doins -r lib/* + + dosym vmware-vix/libvixAllProducts.so "${VM_INSTALL_DIR}"/lib/libbvixAllProducts.so + + # install headers + insinto /usr/include/vmware-vix + doins include/* + + if use doc; then + dohtml -r doc/* + fi + fi + + # install ovftool + if use ovftool; then + cd "${S}" + + insinto "${VM_INSTALL_DIR}"/lib/vmware-ovftool + doins -r vmware-ovftool/* + + chmod 0755 "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/{ovftool,ovftool.bin} + dosym "${D}${VM_INSTALL_DIR}"/lib/vmware-ovftool/ovftool "${VM_INSTALL_DIR}"/bin/ovftool + fi + + # create symlinks for the various tools + local tool ; for tool in thnuclnt vmware vmplayer{,-daemon} licenseTool vmamqpd \ + vmware-{acetool,enter-serial,gksu,fuseUI,modconfig{,-console},netcfg,tray,zenity} ; do + dosym appLoader "${VM_INSTALL_DIR}"/lib/vmware/bin/"${tool}" + done + dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmplayer "${VM_INSTALL_DIR}"/bin/vmplayer + dosym "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware "${VM_INSTALL_DIR}"/bin/vmware + dosym "${VM_INSTALL_DIR}"/lib/vmware/icu /etc/vmware/icu + + # fix permissions + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{appLoader,fusermount,launcher.sh,mkisofs,vmware-remotemks} + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/wrapper-gtk24.sh + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/lib/libgksu2.so.0/gksu-run-helper + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/setup/vmware-config + fperms 4711 "${VM_INSTALL_DIR}"/bin/vmware-mount + fperms 4711 "${VM_INSTALL_DIR}"/lib/vmware/bin/vmware-vmx{,-debug,-stats} + if use server; then + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware/bin/{vmware-hostd,wssc-adminTool} + fperms 4711 "${VM_INSTALL_DIR}"/sbin/vmware-authd + fperms 1777 "${VM_DATA_STORE_DIR}" + fi + if use vix; then + fperms 0755 "${VM_INSTALL_DIR}"/lib/vmware-vix/setup/vmware-config + fi + + # create the environment + local envd="${T}/90vmware" + cat > "${envd}" <<-EOF + PATH='${VM_INSTALL_DIR}/bin' + ROOTPATH='${VM_INSTALL_DIR}/bin' + EOF + use bundled-libs && echo 'VMWARE_USE_SHIPPED_LIBS=1' >> "${envd}" + + doenvd "${envd}" + + # create the configuration + dodir /etc/vmware + + cat > "${D}"/etc/vmware/bootstrap <<-EOF + BINDIR='${VM_INSTALL_DIR}/bin' + LIBDIR='${VM_INSTALL_DIR}/lib' + EOF + + cat > "${D}"/etc/vmware/config <<-EOF + bindir = "${VM_INSTALL_DIR}/bin" + libdir = "${VM_INSTALL_DIR}/lib/vmware" + initscriptdir = "/etc/init.d" + authd.fullpath = "${VM_INSTALL_DIR}/sbin/vmware-authd" + gksu.rootMethod = "su" + VMCI_CONFED = "yes" + VMBLOCK_CONFED = "yes" + VSOCK_CONFED = "yes" + NETWORKING = "yes" + player.product.version = "${MY_PV}" + product.buildNumber = "${PV_BUILD}" + product.version = "${MY_PV}" + product.name = "VMware Workstation" + workstation.product.version = "${MY_PV}" + EOF + + if use vix; then + cat >> "${D}"/etc/vmware/config <<-EOF + vmware.fullpath = "${VM_INSTALL_DIR}/bin/vmware" + vix.libdir = "${VM_INSTALL_DIR}/lib/vmware-vix" + vix.config.version = "1" + EOF + fi + + if use server; then + cat >> "${D}"/etc/vmware/config <<-EOF + authd.client.port = "902" + authd.proxy.nfc = "vmware-hostd:ha-nfc" + authd.soapserver = "TRUE" + EOF + fi + + # install the init.d script + local initscript="${T}/vmware.rc" + sed -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ + "${FILESDIR}/vmware-${major_minor}.rc" > "${initscript}" || die + newinitd "${initscript}" vmware + + if use server; then + # install the init.d script + local initscript="${T}/vmware-workstation-server.rc" + sed -e "s:@@ETCDIR@@:/etc/vmware:g" \ + -e "s:@@PREFIX@@:${VM_INSTALL_DIR}:g" \ + -e "s:@@BINDIR@@:${VM_INSTALL_DIR}/bin:g" \ + -e "s:@@LIBDIR@@:${VM_INSTALL_DIR}/lib/vmware:g" \ + "${FILESDIR}/vmware-server-${major_minor}.rc" > ${initscript} || die + newinitd "${initscript}" vmware-workstation-server + fi + + # fill in variable placeholders + if use bundled-libs ; then + sed -e "s:@@LIBCONF_DIR@@:${VM_INSTALL_DIR}/lib/vmware/libconf:g" \ + -i "${D}${VM_INSTALL_DIR}"/lib/vmware/libconf/etc/{gtk-2.0/{gdk-pixbuf.loaders,gtk.immodules},pango/pango{.modules,rc}} || die + fi + sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmplayer:g" \ + -e "/^Encoding/d" \ + -i "${D}/usr/share/applications/vmware-player.desktop" || die + sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware:g" \ + -e "/^Encoding/d" \ + -i "${D}/usr/share/applications/vmware-workstation.desktop" || die + sed -e "s:@@BINARY@@:${VM_INSTALL_DIR}/bin/vmware-netcfg:g" \ + -e "/^Encoding/d" \ + -i "${D}/usr/share/applications/vmware-netcfg.desktop" || die + + if use server; then + # Configuration for vmware-workstation-server + local hostdUser="${VM_HOSTD_USER:-root}" + sed -e "/ACEDataUser/s:root:${hostdUser}:g" \ + -i "${D}/etc/vmware/hostd/authorization.xml" || die + + # Shared VMs Path: [standard]. + sed -e "s:##{DS_NAME}##:standard:g" \ + -e "s:##{DS_PATH}##:${VM_DATA_STORE_DIR}:g" \ + -i "${D}/etc/vmware/hostd/datastores.xml" || die + + sed -e "s:##{HTTP_PORT}##:-1:g" \ + -e "s:##{HTTPS_PORT}##:443:g" \ + -e "s:##{PIPE_PREFIX}##:/var/run/vmware/:g" \ + -i "${D}/etc/vmware/hostd/proxy.xml" || die + + # See vmware-workstation-server.py for more details. + sed -e "s:##{BUILD_CFGDIR}##:/etc/vmware/hostd/:g" \ + -e "s:##{CFGALTDIR}##:/etc/vmware/hostd/:g" \ + -e "s:##{CFGDIR}##:/etc/vmware/:g" \ + -e "s:##{ENABLE_AUTH}##:true:g" \ + -e "s:##{HOSTDMODE}##:ws:g" \ + -e "s:##{HOSTD_CFGDIR}##:/etc/vmware/hostd/:g" \ + -e "s:##{HOSTD_MOCKUP}##:false:g" \ + -e "s:##{LIBDIR}##:${VM_INSTALL_DIR}/lib/vmware:g" \ + -e "s:##{LIBDIR_INSTALLED}##:${VM_INSTALL_DIR}/lib/vmware/:g" \ + -e "s:##{LOGDIR}##:/var/log/vmware/:g" \ + -e "s:##{LOGLEVEL}##:verbose:g" \ + -e "s:##{MOCKUP}##:mockup-host-config.xml:g" \ + -e "s:##{PLUGINDIR}##:./:g" \ + -e "s:##{SHLIB_PREFIX}##:lib:g" \ + -e "s:##{SHLIB_SUFFIX}##:.so:g" \ + -e "s:##{USE_BLKLISTSVC}##:false:g" \ + -e "s:##{USE_CBRCSVC}##:false:g" \ + -e "s:##{USE_CIMSVC}##:false:g" \ + -e "s:##{USE_DIRECTORYSVC}##:false:g" \ + -e "s:##{USE_DIRECTORYSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_DYNAMIC_PLUGIN_LOADING}##:false:g" \ + -e "s:##{USE_DYNAMO}##:false:g" \ + -e "s:##{USE_DYNSVC}##:false:g" \ + -e "s:##{USE_GUESTSVC}##:false:g" \ + -e "s:##{USE_HBRSVC}##:false:g" \ + -e "s:##{USE_HBRSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_HOSTSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_HTTPNFCSVC}##:false:g" \ + -e "s:##{USE_HTTPNFCSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_LICENSESVC_MOCKUP}##:false:g" \ + -e "s:##{USE_NFCSVC}##:true:g" \ + -e "s:##{USE_NFCSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_OVFMGRSVC}##:true:g" \ + -e "s:##{USE_PARTITIONSVC}##:false:g" \ + -e "s:##{USE_SECURESOAP}##:false:g" \ + -e "s:##{USE_SNMPSVC}##:false:g" \ + -e "s:##{USE_SOLO_MOCKUP}##:false:g" \ + -e "s:##{USE_STATSSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_VCSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_VDISKSVC}##:false:g" \ + -e "s:##{USE_VDISKSVC_MOCKUP}##:false:g" \ + -e "s:##{USE_VMSVC_MOCKUP}##:false:g" \ + -e "s:##{VM_INVENTORY}##:vmInventory.xml:g" \ + -e "s:##{VM_RESOURCES}##:vmResources.xml:g" \ + -e "s:##{WEBSERVER_PORT_ENTRY}##::g" \ + -e "s:##{WORKINGDIR}##:./:g" \ + -i "${D}/etc/vmware/hostd/config.xml" || die + + sed -e "s:##{ENV_LOCATION}##:/etc/vmware/hostd/env/:g" \ + -i "${D}/etc/vmware/hostd/environments.xml" || die + + # @@VICLIENT_URL@@=XXX + sed -e "s:@@AUTHD_PORT@@:902:g" \ + -i "${D}${VM_INSTALL_DIR}/lib/vmware/hostd/docroot/client/clients.xml" || die + fi + + # install systemd unit files + systemd_dounit "${WORKDIR}/systemd-vmware-${SYSTEMD_UNITS_TAG}/"*.{service,target} + + readme.gentoo_create_doc +} + +pkg_config() { + "${VM_INSTALL_DIR}"/bin/vmware-networks --postinstall ${PN},old,new +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update + readme.gentoo_print_elog + + ewarn "${P} is using an old version of libgcrypt library which" + ewarn "is going to be soon removed from portage due to security reasons" + ewarn "(see https://bugs.gentoo.org/show_bug.cgi?id=541564)." + ewarn "Until vmware is fixed upstream you're exposed to security issues!" +} + +pkg_prerm() { + einfo "Stopping ${PN} for safe unmerge" + /etc/init.d/vmware stop +} + +pkg_postrm() { + fdo-mime_desktop_database_update + gnome2_icon_cache_update +} diff --git a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild index f1286411285e..92bea1d0e073 100644 --- a/app-eselect/eselect-php/eselect-php-0.9.1.ebuild +++ b/app-eselect/eselect-php/eselect-php-0.9.1.ebuild @@ -15,7 +15,7 @@ SRC_URI=" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="fpm apache2" # The "DirectoryIndex" line in 70_mod_php.conf requires mod_dir. diff --git a/app-misc/c_rehash/Manifest b/app-misc/c_rehash/Manifest index f31dde2fbb05..8484380fe968 100644 --- a/app-misc/c_rehash/Manifest +++ b/app-misc/c_rehash/Manifest @@ -1 +1,2 @@ +DIST openssl-1.0.2g-8.tar.gz 21497 SHA256 69e153c62a9a583a097c713be78fb19a7c494b248f1f502f7d47309109a2e105 SHA512 1b8c0cf8d21f2c9f2f32b4442e02a0832ab9cf9d4ec9943b20ec8363df916bfb218da26b9cbc79783090dea01a9b04accd797c3dada893ac767565ab32047eeb WHIRLPOOL 21e4f5ca6d38b31962d55f8e85d3f9e21615aa9f701567058d5638e0422f072cde4ea4227d3a426b20b4434392d2e3cfe85420c94d7d4d8de69639adcb00065e DIST openssl-c_rehash.sh.1.7 4167 SHA256 4999ee79892f52bd6a4a7baba9fac62262454d573bbffd72685d3aae9e48cee0 SHA512 55e8c2e827750a4f375cb83c86bfe2d166c01ffa5d7e9b16657b72b38b747c8985dd2c98f854c911dfbbee2ff3e92aff39fdf089d979b2e3534b7685ee8b80da WHIRLPOOL c88f06a3b8651f76b6289552cccceb64e13f6697c5f0ce3ff114c781ce1c218912b8ee308af9d087cd76a9600fdacda1953175bff07d7d3eb21b0c0b7f4f1ce1 diff --git a/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild new file mode 100644 index 000000000000..b15751df985b --- /dev/null +++ b/app-misc/c_rehash/c_rehash-1.0.2g_p8.ebuild @@ -0,0 +1,35 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +MY_P="openssl-${PV/_p/-}" + +DESCRIPTION="c_rehash script written in POSIX shell for OpenSSL" +HOMEPAGE="https://www.openssl.org/ https://github.com/pld-linux/openssl/" +SRC_URI="https://github.com/pld-linux/openssl/archive/auto/th/${MY_P}.tar.gz" + +LICENSE="openssl" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +IUSE="libressl" + +RDEPEND=" + !libressl? ( dev-libs/openssl:0 ) + libressl? ( dev-libs/libressl:0 ) +" + +S="${WORKDIR}/openssl-auto-th-${MY_P}" + +src_prepare() { + SSL_CNF_DIR="/etc/ssl" + sed -i \ + -e "/^DIR=/s:=.*:=${EPREFIX}${SSL_CNF_DIR}:" \ + -e '1iOPENSSL=openssl' \ + openssl-c_rehash.sh || die #416717 +} + +src_install() { + newbin openssl-c_rehash.sh c_rehash +} diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest index ba808a21b30f..d684d14707ef 100644 --- a/app-misc/ca-certificates/Manifest +++ b/app-misc/ca-certificates/Manifest @@ -1,11 +1,5 @@ -DIST ca-certificates_20140927.tar.xz 288824 SHA256 e582724ebb9d5d6fe02d02db1773c9ca76d3aaab4b15375a0d72e9abf88a65c5 SHA512 3cd08559c52aeba763a8ecc0333c7c20838db0111e52d9adf65719f14f858611271d61801a60fb3aea4e74be4a7903c1b462bf889172f5afb774280bb615b98b WHIRLPOOL e32e54b21109b7c44266480a6a5d78693b5ef7ffae1df595c4edfe2cce85d1cd29664e6d916c5bfffb965e4bb01fce6a8327a2ead5bb0ca7cdd8afd04346a270 -DIST ca-certificates_20141019.tar.xz 289092 SHA256 684902d3f4e9ad27829f4af0d9d2d588afed03667997579b9c2be86fcd1eb73a SHA512 5b0e8fb917f5642a5a2b4fde46a706db0c652ff3fb31a5053d9123a5b670b50c6e3cf2496915cc01c613dcbe964d6432f393c12d8a697baedfad58f9d13e568b WHIRLPOOL 6d3c0ccfbd4b1598ed529cb07390baaf741e24c8fd4762aa1786ada7188ec0c4e327513047bca2b93a488681e80b5a8fabc37b98b7f6e5e92cba62580c4cf74f -DIST ca-certificates_20150426.tar.xz 303256 SHA256 37dbaa93ed64cc4ae93ac295f9248fbc741bd51376438cfb1257f17efab5494f SHA512 920dfc512c018c5338bf07b6a6afcb664d9bfba659d4233ca9e87471d5e0ed05de054c96f3d7e6091549aa6deb46106a79f7f982696081f9b2164e18133eb34d WHIRLPOOL 6d068fa13ffdb1b232b1cdb99063e52e52ee9f4cd44917f4eca263f36b5d4fa3c261b45bbf51143fc08965937adc477afd88c9a909300b619d42ae72b4c4acd9 DIST ca-certificates_20151214.tar.xz 293672 SHA256 59286e6403f482a24c672e09b810c7d089a73153d4772ff4a66e86053a920525 SHA512 acee5565aa7d1f0cc120a6abb6503e0ac4b4e12f5fd1cb12442ec1374ae1570ec6dc3a8f3a247fad6835a29d96e856f12c664f466e92344db3aa1ae6292a27ac WHIRLPOOL c03d214fb15a791c14f235c58296fb06f1408c98bb78049f58b3ebf7bc1c1cea4662f90a031d86de2548267feacf6a9e3fef957aa44a19e29e9a6ba803aaa3fa DIST ca-certificates_20160104.tar.xz 293632 SHA256 09eb770122e23260316120c0cbbddc8a1d33e7147210ce44e146084d5d5abcdd SHA512 4291ba58057b66d56853162b71862832135eab6f444a5e2cf3dd1089495d44624246dc0c540871851fe9aaceb42054516309402525c8f16a88911d3af9c3518a WHIRLPOOL 8a45acdf2c0673156bc546808df5160ebbfc3a85d775cefa8918c5b64ea6ba905e89017689a407a20444f3e550133c2af228f4d4a878670af50d88fc4739edeb DIST nss-3.14.1-add_spi+cacerts_ca_certs.patch 25018 SHA256 82ca25982828fd7153ad15fc6e81408c115476eeeb4045d3a71469380b56824b SHA512 2aafbd972b073061bfd66a66a4b50060691957f2910f716f7a69d22d655c499f186f05db2101bea5248a00949f339327ba8bfffec024c61c8ee908766201ae00 WHIRLPOOL c9fe397e316dac7983b187acf7227078ebd8f8da5df53f77f2564489e85f123c4d2afb88d56e8dc14b9ebfffe8a71ade4724b3c1ea683c5c4c487cb3a64eda43 -DIST nss-3.17.2.tar.gz 6927414 SHA256 134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b SHA512 a3d165bb2c578e7b5d90349729e85a2fce09260d069093080c76cce3b8a996c6489232324fd6a0c69b959321bcdf5f1806054f165cd6ce851fe4ffeb2883ae7f WHIRLPOOL 01b3cc546aa2dd0974caa2267aa9874b01cf6096f307a114393ba5a98adc216e0f2b217631b89b20752be5881f70fc1a7e94e0e90618707d5f9b9d18fd55d859 -DIST nss-3.17.4.tar.gz 6924699 SHA256 1d98ad1881a4237ec98cbe472fc851480f0b0e954dfe224d047811fb96ff9d79 SHA512 dfc44e28c303743a72b4553f471089bc991c3cb61d5f3071082c16400d5e4f216f84a2e44536570316fe0e798c14ca370c875dad791a873034595b9e4dd70b89 WHIRLPOOL bb6e1027c5237d12fe58b4c520536022d8d4e83183a78c3421fd46bf9c3503b1f0ca4644240e383f216ec1e5174c0ae4148372db68fb9f1c10275954559d5bbf -DIST nss-3.19.tar.gz 6951461 SHA256 989ebdf79374f24181f060d332445b1a4baf3df39d08514c4349ba8573cefa9b SHA512 e428d206a4fd30087f275a33771a1d7e753b000e8fc3e7c746972a89d1b32300d3619f430ea15e870d82b3af52785d4dd36ae89c9c496f014f9f323ea373da14 WHIRLPOOL 3a8b58a8a28e31f65f40cfa6a9bd9ca2177a17552082d8de2189da6c92ff7ba9c90be13793666558a2bff609da738cb1f4313968077e1041b8f283d36005e76c -DIST nss-3.20.tar.gz 6955552 SHA256 5e38d4b9837ca338af966b97fc91c07f67ad647fb38dc4af3cfd0d84e477d15c SHA512 50f666209cadd4e463f98643ec67e35f4d1b88381e17db9eed7c67559b19799fcc27e49d72536f546d4c45bca2afa4664e5590f868775a4397a77111d68fc366 WHIRLPOOL 84f20e6764b3621762fcfcb9223a3861e1f5ff02078b19b7df2eb58430a5f96943d962dca2d3366b18cd434acf3d3be746242c5064497167d5671c50233834de DIST nss-3.21.tar.gz 6978112 SHA256 3f7a5b027d7cdd5c0e4ff7544da33fdc6f56c2f8c27fff02938fd4a6fbe87239 SHA512 0645465b5d1ab05d819355a3f4a2879499539a00d95bfab3ca14a7dcd901e510b5d9ae797386ff5a42f68b0b57f7bbec4ec9d3a85ebd508eb824aba1fb589d53 WHIRLPOOL 7504d83de606d61840e06cb855ea688eb022d5eef062bcb7ac4d1064db96b96e35ae4ce0aff9d389a2140a7c3b974aaa9a86ada52af1199d462fdb48b11b42e4 +DIST nss-3.23.tar.gz 7467001 SHA256 94b383e31c9671e9dfcca81084a8a813817e8f05a57f54533509b318d26e11cf SHA512 f3e388a415493685faa6df932e9e968af41ea2e8e4cba3fbd539c60177443e4042e8d2e2bfe74183552e14522d49048be2f80fbe038bdbd499971e82abf2cc32 WHIRLPOOL 77e22bd7a525c5b10723e1d5fb6db1e9d2efebfcdf9828aa79296f71c441c065201ecda56291f37790333d9b1d1e38fef1391a033382a885b83da31a646d6243 diff --git a/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild b/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild deleted file mode 100644 index d5538e517c5d..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20140927.3.17.2.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# When triaging bugs from users, here's some handy tips: -# - To see what cert is hitting errors, use openssl: -# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME -# Focus on the errors written to stderr. -# -# - Look at the upstream log as to why certs were added/removed: -# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt -# -# - If people want to add/remove certs, tell them to file w/mozilla: -# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk - -EAPI="4" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - inherit versionator - - DEB_VER=$(get_version_component_range 1) - NSS_VER=$(get_version_component_range 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="http://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" -${PRECOMPILED} || IUSE+=" +cacert" - -DEPEND="" -if ${PRECOMPILED} ; then - # platforms like AIX don't have a good ar - DEPEND+=" - kernel_AIX? ( app-arch/deb2targz ) - !/dev/null - epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch - popd >/dev/null - fi - fi - - epatch "${FILESDIR}"/${PN}-20110502-root.patch - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - if ! ${PRECOMPILED} ; then - python_setup - local d="${S}/${PN}/mozilla" - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla - if use cacert ; then - mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org} - mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die - mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die - fi - mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd usr/share/ca-certificates - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ca-certificates - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates - doenvd 98ca-certificates -} - -pkg_postinst() { - if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then - # if the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}" - fi - - local c badcerts=0 - for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do - ewarn "Broken symlink for a certificate at $c" - badcerts=1 - done - if [ $badcerts -eq 1 ]; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild b/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild deleted file mode 100644 index 89bc13ec6d43..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20141019.3.17.4.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# When triaging bugs from users, here's some handy tips: -# - To see what cert is hitting errors, use openssl: -# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME -# Focus on the errors written to stderr. -# -# - Look at the upstream log as to why certs were added/removed: -# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt -# -# - If people want to add/remove certs, tell them to file w/mozilla: -# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk - -EAPI="4" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - inherit versionator - - DEB_VER=$(get_version_component_range 1) - NSS_VER=$(get_version_component_range 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="http://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" -${PRECOMPILED} || IUSE+=" +cacert" - -DEPEND="" -if ${PRECOMPILED} ; then - # platforms like AIX don't have a good ar - DEPEND+=" - kernel_AIX? ( app-arch/deb2targz ) - !/dev/null - epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch - popd >/dev/null - fi - fi - - epatch "${FILESDIR}"/${PN}-20141019-root.patch - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - if ! ${PRECOMPILED} ; then - python_setup - local d="${S}/${PN}/mozilla" - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla - if use cacert ; then - mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org} - mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die - mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die - fi - mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd usr/share/ca-certificates - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ca-certificates - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates - doenvd 98ca-certificates -} - -pkg_postinst() { - if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then - # if the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${EROOT}" - fi - - local c badcerts=0 - for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do - ewarn "Broken symlink for a certificate at $c" - badcerts=1 - done - if [ $badcerts -eq 1 ]; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild b/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild deleted file mode 100644 index 309784df958d..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20141019.3.19-r1.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# When triaging bugs from users, here's some handy tips: -# - To see what cert is hitting errors, use openssl: -# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME -# Focus on the errors written to stderr. -# -# - Look at the upstream log as to why certs were added/removed: -# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt -# -# - If people want to add/remove certs, tell them to file w/mozilla: -# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk - -EAPI="4" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - inherit versionator - - DEB_VER=$(get_version_component_range 1) - NSS_VER=$(get_version_component_range 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="http://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="libressl" -${PRECOMPILED} || IUSE+=" +cacert" - -DEPEND="" -if ${PRECOMPILED} ; then - # platforms like AIX don't have a good ar - DEPEND+=" - kernel_AIX? ( app-arch/deb2targz ) - !/dev/null - epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch - popd >/dev/null - fi - fi - - epatch "${FILESDIR}"/${PN}-20141019-root.patch - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - if ! ${PRECOMPILED} ; then - python_setup - local d="${S}/${PN}/mozilla" - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla - if use cacert ; then - mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org} - mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die - mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die - fi - mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd usr/share/ca-certificates - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ca-certificates - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates - doenvd 98ca-certificates -} - -pkg_postinst() { - if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then - # if the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" - fi - - local c badcerts=0 - for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do - ewarn "Broken symlink for a certificate at $c" - badcerts=1 - done - if [ $badcerts -eq 1 ]; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild b/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild deleted file mode 100644 index 4551747385ca..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20141019.3.19.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# When triaging bugs from users, here's some handy tips: -# - To see what cert is hitting errors, use openssl: -# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME -# Focus on the errors written to stderr. -# -# - Look at the upstream log as to why certs were added/removed: -# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt -# -# - If people want to add/remove certs, tell them to file w/mozilla: -# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk - -EAPI="4" -PYTHON_COMPAT=( python2_7 ) - -inherit eutils python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - inherit versionator - - DEB_VER=$(get_version_component_range 1) - NSS_VER=$(get_version_component_range 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="http://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="" -${PRECOMPILED} || IUSE+=" +cacert" - -DEPEND="" -if ${PRECOMPILED} ; then - # platforms like AIX don't have a good ar - DEPEND+=" - kernel_AIX? ( app-arch/deb2targz ) - !/dev/null - epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch - popd >/dev/null - fi - fi - - epatch "${FILESDIR}"/${PN}-20141019-root.patch - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - usr/sbin/update-ca-certificates || die -} - -src_compile() { - cd "image/${EPREFIX}" || die - if ! ${PRECOMPILED} ; then - python_setup - local d="${S}/${PN}/mozilla" - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla - if use cacert ; then - mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org} - mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die - mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die - fi - mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd usr/share/ca-certificates - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ca-certificates - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates - doenvd 98ca-certificates -} - -pkg_postinst() { - if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then - # if the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" - fi - - local c badcerts=0 - for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do - ewarn "Broken symlink for a certificate at $c" - badcerts=1 - done - if [ $badcerts -eq 1 ]; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20150426.3.20.ebuild b/app-misc/ca-certificates/ca-certificates-20150426.3.20.ebuild deleted file mode 100644 index c37ecde622b3..000000000000 --- a/app-misc/ca-certificates/ca-certificates-20150426.3.20.ebuild +++ /dev/null @@ -1,193 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -# The Debian ca-certificates package merely takes the CA database as it exists -# in the nss package and repackages it for use by openssl. -# -# The issue with using the compiled debs directly is two fold: -# - they do not update frequently enough for us to rely on them -# - they pull the CA database from nss tip of tree rather than the release -# -# So we take the Debian source tools and combine them with the latest nss -# release to produce (largely) the same end result. The difference is that -# now we know our cert database is kept in sync with nss and, if need be, -# can be sync with nss tip of tree more frequently to respond to bugs. - -# When triaging bugs from users, here's some handy tips: -# - To see what cert is hitting errors, use openssl: -# openssl s_client -port 443 -CApath /etc/ssl/certs/ -host $HOSTNAME -# Focus on the errors written to stderr. -# -# - Look at the upstream log as to why certs were added/removed: -# https://hg.mozilla.org/projects/nss/log/tip/lib/ckfw/builtins/certdata.txt -# -# - If people want to add/remove certs, tell them to file w/mozilla: -# https://bugzilla.mozilla.org/enter_bug.cgi?product=NSS&component=CA%20Certificates&version=trunk - -EAPI="4" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils python-any-r1 - -if [[ ${PV} == *.* ]] ; then - # Compile from source ourselves. - PRECOMPILED=false - inherit versionator - - DEB_VER=$(get_version_component_range 1) - NSS_VER=$(get_version_component_range 2-) - RTM_NAME="NSS_${NSS_VER//./_}_RTM" -else - # Debian precompiled version. - PRECOMPILED=true - inherit unpacker -fi - -DESCRIPTION="Common CA Certificates PEM files" -HOMEPAGE="http://packages.debian.org/sid/ca-certificates" -NMU_PR="" -if ${PRECOMPILED} ; then - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb" -else - SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz - ftp://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz - cacert? ( https://dev.gentoo.org/~anarchy/patches/nss-3.14.1-add_spi+cacerts_ca_certs.patch )" -fi - -LICENSE="MPL-1.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" -IUSE="libressl" -${PRECOMPILED} || IUSE+=" +cacert" - -DEPEND="" -if ${PRECOMPILED} ; then - # platforms like AIX don't have a good ar - DEPEND+=" - kernel_AIX? ( app-arch/deb2targz ) - !/dev/null - epatch "${DISTDIR}"/nss-3.14.1-add_spi+cacerts_ca_certs.patch - popd >/dev/null - fi - fi - - epatch "${FILESDIR}"/${PN}-20150426-root.patch - local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g') - sed -i \ - -e '/="$ROOT/s:ROOT/:ROOT'"${EPREFIX}"'/:' \ - -e '/RELPATH="\.\./s:"$:'"${relp}"'":' \ - usr/sbin/update-ca-certificates || die - - cd "${S}" - epatch "${FILESDIR}"/${PN}-20150426-nss-certdata2pem-py3.patch #548374 -} - -src_compile() { - cd "image/${EPREFIX}" || die - if ! ${PRECOMPILED} ; then - python_setup - local d="${S}/${PN}/mozilla" - # Grab the database from the nss sources. - cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die - emake -C "${d}" - - # Now move the files to the same places that the precompiled would. - mkdir -p etc/ssl/certs etc/ca-certificates/update.d usr/share/ca-certificates/mozilla - if use cacert ; then - mkdir -p usr/share/ca-certificates/{cacert.org,spi-inc.org} - mv "${d}"/CAcert_Inc..crt usr/share/ca-certificates/cacert.org/cacert.org_root.crt || die - mv "${d}"/SPI_Inc..crt usr/share/ca-certificates/spi-inc.org/spi-cacert-2008.crt || die - fi - mv "${d}"/*.crt usr/share/ca-certificates/mozilla/ || die - else - mv usr/share/doc/{ca-certificates,${PF}} || die - fi - - ( - echo "# Automatically generated by ${CATEGORY}/${PF}" - echo "# $(date -u)" - echo "# Do not edit." - cd usr/share/ca-certificates - find * -name '*.crt' | LC_ALL=C sort - ) > etc/ca-certificates.conf - - sh usr/sbin/update-ca-certificates --root "${S}/image" || die -} - -src_install() { - cp -pPR image/* "${D}"/ || die - if ! ${PRECOMPILED} ; then - cd ca-certificates - doman sbin/*.8 - dodoc debian/README.* examples/ca-certificates-local/README - fi - - echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates - doenvd 98ca-certificates -} - -pkg_postinst() { - if [ -d "${EROOT}/usr/local/share/ca-certificates" ] ; then - # if the user has local certs, we need to rebuild again - # to include their stuff in the db. - # However it's too overzealous when the user has custom certs in place. - # --fresh is to clean up dangling symlinks - "${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}" - fi - - local c badcerts=0 - for c in $(find -L "${EROOT}"etc/ssl/certs/ -type l) ; do - ewarn "Broken symlink for a certificate at $c" - badcerts=1 - done - if [ $badcerts -eq 1 ]; then - ewarn "Removing the following broken symlinks:" - ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)" - fi -} diff --git a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild index 440abcb6a3e3..b75b17428172 100644 --- a/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild +++ b/app-misc/ca-certificates/ca-certificates-20151214.3.21.ebuild @@ -57,16 +57,13 @@ fi LICENSE="MPL-1.1" SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE="" ${PRECOMPILED} || IUSE+=" +cacert" DEPEND="" if ${PRECOMPILED} ; then - # platforms like AIX don't have a good ar - DEPEND+=" - kernel_AIX? ( app-arch/deb2targz ) - ! %l\n' -delete)" fi diff --git a/app-misc/ca-certificates/files/ca-certificates-20110502-root.patch b/app-misc/ca-certificates/files/ca-certificates-20110502-root.patch deleted file mode 100644 index f3fcf5d593d4..000000000000 --- a/app-misc/ca-certificates/files/ca-certificates-20110502-root.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/usr/sbin/update-ca-certificates -+++ b/usr/sbin/update-ca-certificates -@@ -23,6 +23,8 @@ - - verbose=0 - fresh=0 -+ROOT="" -+RELPATH="" - while [ $# -gt 0 ]; - do - case $1 in -@@ -30,6 +31,11 @@ - verbose=1;; - --fresh|-f) - fresh=1;; -+ --root|-r) -+ ROOT=$(readlink -f "$2") -+ # needed as c_rehash wants to read the files directly -+ RELPATH="../../.." -+ shift;; - --help|-h|*) -- echo "$0: [--verbose] [--fresh]" -+ echo "$0: [--verbose] [--fresh] [--root ]" - exit;; -@@ -37,11 +41,11 @@ - shift - done - --CERTSCONF=/etc/ca-certificates.conf --CERTSDIR=/usr/share/ca-certificates --LOCALCERTSDIR=/usr/local/share/ca-certificates -+CERTSCONF="$ROOT/etc/ca-certificates.conf" -+CERTSDIR="$ROOT/usr/share/ca-certificates" -+LOCALCERTSDIR="$ROOT/usr/local/share/ca-certificates" - CERTBUNDLE=ca-certificates.crt --ETCCERTSDIR=/etc/ssl/certs -+ETCCERTSDIR="$ROOT/etc/ssl/certs" - - cleanup() { - rm -f "$TEMPBUNDLE" -@@ -66,7 +70,7 @@ - -e 's/,/_/g').pem" - if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] - then -- ln -sf "$CERT" "$PEM" -+ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM" - echo +$PEM >> "$ADDED" - fi - cat "$CERT" >> "$TEMPBUNDLE" -@@ -78,22 +82,22 @@ - if test -L "$PEM" - then - rm -f "$PEM" -- echo -$PEM >> "$REMOVED" -+ echo "-$PEM" >> "$REMOVED" - fi - } - --cd $ETCCERTSDIR -+cd "$ETCCERTSDIR" - if [ "$fresh" = 1 ]; then - echo -n "Clearing symlinks in $ETCCERTSDIR..." - find . -type l -print | while read symlink - do -- case $(readlink $symlink) in -- $CERTSDIR*) rm -f $symlink;; -+ case $(readlink "$symlink") in -+ "$CERTSDIR"*) rm -f "$symlink";; - esac - done - find . -type l -print | while read symlink - do -- test -f $symlink || rm -f $symlink -+ test -f "$symlink" || rm -f "$symlink" - done - echo "done." - fi -@@ -102,12 +106,12 @@ - - # Handle certificates that should be removed. This is an explicit act - # by prefixing lines in the configuration files with exclamation marks (!). --sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt -+sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt - do - remove "$CERTSDIR/$crt" - done - --sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt -+sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt - do - if ! test -f "$CERTSDIR/$crt" - then -@@ -146,14 +150,14 @@ - - echo "$ADDED_CNT added, $REMOVED_CNT removed; done." - --HOOKSDIR=/etc/ca-certificates/update.d -+HOOKSDIR="$ROOT/etc/ca-certificates/update.d" - echo -n "Running hooks in $HOOKSDIR...." - VERBOSE_ARG= - [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose --eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook -+eval run-parts $VERBOSE_ARG --test -- \""$HOOKSDIR"\" | while read hook - do - ( cat $ADDED -- cat $REMOVED ) | $hook || echo E: $hook exited with code $?. -+ cat $REMOVED ) | "$hook" || echo E: "$hook" exited with code $?. - done - echo "done." - diff --git a/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch b/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch deleted file mode 100644 index 2b2a42c58ec5..000000000000 --- a/app-misc/ca-certificates/files/ca-certificates-20141019-root.patch +++ /dev/null @@ -1,116 +0,0 @@ -add a --root option so we can generate with DESTDIR installs - ---- a/usr/sbin/update-ca-certificates -+++ b/usr/sbin/update-ca-certificates -@@ -23,6 +23,8 @@ - - verbose=0 - fresh=0 -+ROOT="" -+RELPATH="" - while [ $# -gt 0 ]; - do - case $1 in -@@ -30,18 +32,23 @@ do - verbose=1;; - --fresh|-f) - fresh=1;; -+ --root|-r) -+ ROOT=$(readlink -f "$2") -+ # needed as c_rehash wants to read the files directly -+ RELPATH="../../.." -+ shift;; - --help|-h|*) -- echo "$0: [--verbose] [--fresh]" -+ echo "$0: [--verbose] [--fresh] [--root ]" - exit;; - esac - shift - done - --CERTSCONF=/etc/ca-certificates.conf --CERTSDIR=/usr/share/ca-certificates --LOCALCERTSDIR=/usr/local/share/ca-certificates -+CERTSCONF="$ROOT/etc/ca-certificates.conf" -+CERTSDIR="$ROOT/usr/share/ca-certificates" -+LOCALCERTSDIR="$ROOT/usr/local/share/ca-certificates" - CERTBUNDLE=ca-certificates.crt --ETCCERTSDIR=/etc/ssl/certs -+ETCCERTSDIR="$ROOT/etc/ssl/certs" - - cleanup() { - rm -f "$TEMPBUNDLE" -@@ -66,7 +73,7 @@ add() { - -e 's/,/_/g').pem" - if ! test -e "$PEM" || [ "$(readlink "$PEM")" != "$CERT" ] - then -- ln -sf "$CERT" "$PEM" -+ ln -sf "${RELPATH}${CERT#$ROOT}" "$PEM" - echo +$PEM >> "$ADDED" - fi - # Add trailing newline to certificate, if it is missing (#635570) -@@ -79,36 +86,36 @@ remove() { - if test -L "$PEM" - then - rm -f "$PEM" -- echo -$PEM >> "$REMOVED" -+ echo "-$PEM" >> "$REMOVED" - fi - } - --cd $ETCCERTSDIR -+cd "$ETCCERTSDIR" - if [ "$fresh" = 1 ]; then -- echo -n "Clearing symlinks in $ETCCERTSDIR..." -+ printf "Clearing symlinks in $ETCCERTSDIR..." - find . -type l -print | while read symlink - do -- case $(readlink $symlink) in -- $CERTSDIR*) rm -f $symlink;; -+ case $(readlink "$symlink") in -+ "$CERTSDIR"*) rm -f "$symlink";; - esac - done - find . -type l -print | while read symlink - do -- test -f $symlink || rm -f $symlink -+ test -f "$symlink" || rm -f "$symlink" - done - echo "done." - fi - --echo -n "Updating certificates in $ETCCERTSDIR... " -+printf "Updating certificates in $ETCCERTSDIR... " - - # Handle certificates that should be removed. This is an explicit act - # by prefixing lines in the configuration files with exclamation marks (!). --sed -n -e '/^$/d' -e 's/^!//p' $CERTSCONF | while read crt -+sed -n -e '/^$/d' -e 's/^!//p' "$CERTSCONF" | while read crt - do - remove "$CERTSDIR/$crt" - done - --sed -e '/^$/d' -e '/^#/d' -e '/^!/d' $CERTSCONF | while read crt -+sed -e '/^$/d' -e '/^#/d' -e '/^!/d' "$CERTSCONF" | while read crt - do - if ! test -f "$CERTSDIR/$crt" - then -@@ -151,14 +158,14 @@ mv -f "$TEMPBUNDLE" "$CERTBUNDLE" - - echo "$ADDED_CNT added, $REMOVED_CNT removed; done." - --HOOKSDIR=/etc/ca-certificates/update.d --echo -n "Running hooks in $HOOKSDIR...." -+HOOKSDIR="$ROOT/etc/ca-certificates/update.d" -+printf "Running hooks in $HOOKSDIR...." - VERBOSE_ARG= - [ "$verbose" = 0 ] || VERBOSE_ARG=--verbose --eval run-parts $VERBOSE_ARG --test -- $HOOKSDIR | while read hook -+eval run-parts $VERBOSE_ARG --test -- \""$HOOKSDIR"\" | while read hook - do - ( cat $ADDED -- cat $REMOVED ) | $hook || echo E: $hook exited with code $?. -+ cat $REMOVED ) | "$hook" || echo E: "$hook" exited with code $?. - done - echo "done." - diff --git a/app-misc/ca-certificates/files/ca-certificates-20150426-nss-certdata2pem-py3.patch b/app-misc/ca-certificates/files/ca-certificates-20150426-nss-certdata2pem-py3.patch deleted file mode 100644 index d639aefb4c09..000000000000 --- a/app-misc/ca-certificates/files/ca-certificates-20150426-nss-certdata2pem-py3.patch +++ /dev/null @@ -1,97 +0,0 @@ -https://bugs.debian.org/789753 -https://bugs.gentoo.org/548374 - ---- a/ca-certificates/mozilla/certdata2pem.py -+++ b/ca-certificates/mozilla/certdata2pem.py -@@ -31,7 +31,11 @@ objects = [] - # Dirty file parser. - in_data, in_multiline, in_obj = False, False, False - field, type, value, obj = None, None, None, dict() --for line in open('certdata.txt', 'r'): -+try: -+ f = open('certdata.txt', 'r', encoding='utf-8') -+except TypeError: -+ f = open('certdata.txt', 'r') -+for line in f: - # Ignore the file header. - if not in_data: - if line.startswith('BEGINDATA'): -@@ -53,7 +53,7 @@ for line in open('certdata.txt', 'r'): - if type == 'MULTILINE_OCTAL': - line = line.strip() - for i in re.finditer(r'\\([0-3][0-7][0-7])', line): -- value += chr(int(i.group(1), 8)) -+ value.append(int(i.group(1), 8)) - else: - value += line - continue -@@ -70,13 +70,13 @@ for line in open('certdata.txt', 'r'): - field, type = line_parts - value = None - else: -- raise NotImplementedError, 'line_parts < 2 not supported.' -+ raise NotImplementedError('line_parts < 2 not supported.') - if type == 'MULTILINE_OCTAL': - in_multiline = True -- value = "" -+ value = bytearray() - continue - obj[field] = value --if len(obj.items()) > 0: -+if len(obj) > 0: - objects.append(obj) - - # Read blacklist. -@@ -95,7 +95,7 @@ for obj in objects: - if obj['CKA_CLASS'] not in ('CKO_NETSCAPE_TRUST', 'CKO_NSS_TRUST'): - continue - if obj['CKA_LABEL'] in blacklist: -- print "Certificate %s blacklisted, ignoring." % obj['CKA_LABEL'] -+ print("Certificate %s blacklisted, ignoring." % obj['CKA_LABEL']) - elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_TRUSTED_DELEGATOR', - 'CKT_NSS_TRUSTED_DELEGATOR'): - trust[obj['CKA_LABEL']] = True -@@ -104,13 +104,13 @@ for obj in objects: - trust[obj['CKA_LABEL']] = True - elif obj['CKA_TRUST_SERVER_AUTH'] in ('CKT_NETSCAPE_UNTRUSTED', - 'CKT_NSS_NOT_TRUSTED'): -- print '!'*74 -- print "UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL'] -- print '!'*74 -+ print('!'*74) -+ print("UNTRUSTED BUT NOT BLACKLISTED CERTIFICATE FOUND: %s" % obj['CKA_LABEL']) -+ print('!'*74) - else: -- print "Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \ -+ print("Ignoring certificate %s. SAUTH=%s, EPROT=%s" % \ - (obj['CKA_LABEL'], obj['CKA_TRUST_SERVER_AUTH'], -- obj['CKA_TRUST_EMAIL_PROTECTION']) -+ obj['CKA_TRUST_EMAIL_PROTECTION'])) - - for obj in objects: - if obj['CKA_CLASS'] == 'CKO_CERTIFICATE': -@@ -121,13 +121,19 @@ for obj in objects: - .replace('(', '=')\ - .replace(')', '=')\ - .replace(',', '_') -- bname = bname.decode('string_escape') -- fname = bname + '.crt' -+ -+ # this is the only way to decode the way NSS stores multi-byte UTF-8 -+ if bytes != str: -+ bname = bname.encode('utf-8') -+ bname = bname.decode('unicode_escape').encode('latin-1').decode('utf-8') -+ fname = (bname + '.crt').encode('utf-8') -+ - if os.path.exists(fname): -- print "Found duplicate certificate name %s, renaming." % bname -- fname = bname + '_2.crt' -+ print("Found duplicate certificate name %s, renaming." % fname) -+ fname = (bname + '_2.crt').encode('utf-8') - f = open(fname, 'w') - f.write("-----BEGIN CERTIFICATE-----\n") -- f.write("\n".join(textwrap.wrap(base64.b64encode(obj['CKA_VALUE']), 64))) -+ encoded = base64.b64encode(obj['CKA_VALUE']).decode('utf-8') -+ f.write("\n".join(textwrap.wrap(encoded, 64))) - f.write("\n-----END CERTIFICATE-----\n") - diff --git a/app-misc/mc/mc-4.8.15.ebuild b/app-misc/mc/mc-4.8.15.ebuild index 6b004f738338..eca1a2171138 100644 --- a/app-misc/mc/mc-4.8.15.ebuild +++ b/app-misc/mc/mc-4.8.15.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg" REQUIRED_USE="spell? ( edit )" diff --git a/app-misc/pwsafe/metadata.xml b/app-misc/pwsafe/metadata.xml index 767bb489283e..6fcce0a560fe 100644 --- a/app-misc/pwsafe/metadata.xml +++ b/app-misc/pwsafe/metadata.xml @@ -22,5 +22,6 @@ Nicolas Dade pwsafe + nsd20463/pwsafe diff --git a/app-misc/pwsafe/pwsafe-0.2.0-r3.ebuild b/app-misc/pwsafe/pwsafe-0.2.0-r3.ebuild new file mode 100644 index 000000000000..441d09f84ae3 --- /dev/null +++ b/app-misc/pwsafe/pwsafe-0.2.0-r3.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="A Password Safe compatible command-line password manager" +HOMEPAGE="http://nsd.dyndns.org/pwsafe/" +SRC_URI="http://nsd.dyndns.org/pwsafe/releases/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +IUSE="X readline" + +DEPEND="sys-libs/ncurses:0= + dev-libs/openssl:0= + readline? ( sys-libs/readline:0= ) + X? ( x11-libs/libSM + x11-libs/libICE + x11-libs/libXmu + x11-libs/libX11 )" +RDEPEND="${DEPEND}" + +src_prepare() { + eapply -p0 "${FILESDIR}/${P}-cvs-1.57.patch" + eapply -p0 "${FILESDIR}/${P}-printf.patch" + eapply -p0 "${FILESDIR}/${P}-fake-readline.patch" + eapply -p0 "${FILESDIR}/${P}-man-page-option-syntax.patch" + eapply -p0 "${FILESDIR}/${P}-XChangeProperty.patch" + eapply_user +} + +src_configure() { + econf $(use_with X x) $(use_with readline) +} + +src_install() { + doman pwsafe.1 + dobin pwsafe + dodoc README NEWS +} diff --git a/app-misc/qlcplus/Manifest b/app-misc/qlcplus/Manifest index ba5576cb5085..8bd45b6b0b5a 100644 --- a/app-misc/qlcplus/Manifest +++ b/app-misc/qlcplus/Manifest @@ -1 +1,2 @@ DIST qlcplus_4.10.2b.tar.gz 9711691 SHA256 1bcd2eef3e327714b3a83d0f0ff4695caa81bc1336f35abce29a047232b1a780 SHA512 d9716bcdd7289a0d5b94482ae3a7a4a047dc548c0a0b0b488c1f5af50280921a6769fe6479810862291d08508884a1403327be7722681a3a367ee3f77b895eab WHIRLPOOL 5b08afb4cac96926220140dba7283666829dc46e0fdcc517f28442c0b311febce81d0127adc3eaeb7bb3b7a570662558daa98a661acecd9b889e3669d8105ef8 +DIST qlcplus_4.10.3.tar.gz 9786835 SHA256 eb2de10c2f7200522188f879aa6a98ac6eeedf50e0cc888fb418e9b736a630d7 SHA512 32d951e465fd9dccbc28b9798dc1416e2dfa7741225cc535288fac0e2e0724568fbaf2345946b907af6696c430f2b58ca7d8640254cdc34ff0d1a20ef28d5292 WHIRLPOOL 08580bc6b81a603b2a8c14b086eacf2e63982b0684040ce9f39c8cfff05597c9367866d3f933f5f17e774ce99621f4c9ae30a6d831e06ec7d7a3502dc62b95bc diff --git a/app-misc/qlcplus/qlcplus-4.10.3.ebuild b/app-misc/qlcplus/qlcplus-4.10.3.ebuild new file mode 100644 index 000000000000..53690a723f06 --- /dev/null +++ b/app-misc/qlcplus/qlcplus-4.10.3.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit qmake-utils qt4-r2 eutils virtualx + +DESCRIPTION="QLC+ - Q Light Controller Plus to control DMX interfaces" +HOMEPAGE="http://www.qlcplus.org/" +SRC_URI="http://www.${PN}.org/downloads/${PV}/${PN}_${PV}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="qt4 qt5" + +REQUIRED_USE="^^ ( qt4 qt5 )" + +RDEPEND="dev-libs/glib:2 + virtual/libusb:0 + virtual/libusb:1 + media-libs/alsa-lib + media-libs/libmad + media-libs/libsndfile + sci-libs/fftw:3.0 + virtual/udev + || ( dev-embedded/libftdi:1 dev-embedded/libftdi:0 ) + qt4? ( dev-qt/qtcore:4 + dev-qt/qtgui:4 + dev-qt/qtscript:4 + dev-qt/qttest:4 ) + qt5? ( dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtmultimedia:5[widgets] + dev-qt/qtnetwork:5 + dev-qt/qtscript:5 + dev-qt/qttest:5 + dev-qt/qtwidgets:5 )" + +DEPEND="${RDEPEND}" + +S=${WORKDIR}/${P/b/} + +src_prepare() { + sed -e "s:/etc/udev/rules.d:${EROOT}lib/udev/rules.d:" -i \ + plugins/hid/hid.pro \ + plugins/udmx/src/src.pro \ + plugins/dmxusb/src/src.pro \ + plugins/spi/spi.pro \ + plugins/peperoni/unix/unix.pro || die +} + +src_configure() { + use qt5 && eqmake5 + use qt4 && eqmake4 +} + +src_test() { + Xemake check +} diff --git a/app-office/libreoffice-l10n/Manifest b/app-office/libreoffice-l10n/Manifest index e3ec0aa60b26..21c6e1321c94 100644 --- a/app-office/libreoffice-l10n/Manifest +++ b/app-office/libreoffice-l10n/Manifest @@ -334,3 +334,171 @@ DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_xh.tar.gz 504507 SHA256 9461e123 DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 575837 SHA256 80baa0e0c65810d037ec6def3737180e3089602edee768b19ffea45c1e3b1b3f SHA512 90bad9060f3105f770cd79bcf40b54ed59c3d120948572999549e97548c408a3a3b88aaa3f543b0b0b58e83c4dec7e26d20fe712f5bd55d47dc9a5784ae4f96f WHIRLPOOL 7aecfe70f811499f65bc9e79d5880b2af1e05a7b8e1a1ecdb1f5b2f2972b9474a994e30898ef8751ae4cad25656979d16d6713c32a537c52df57777a849021b4 DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 574284 SHA256 b13dcb164621479acecfa50dadcadd9df4738b959a11f097eda7589e7a5ec630 SHA512 e02eaae2039e5cc7576b674902cc90e28b488ffb27f84c83a03880cc79b950073e488577f2b45e56b87e737bf7714ce225531a4a542fd51d7feabff1264c2efc WHIRLPOOL b162a2259b92e73f44ad7a3723e75b89dd23cbdd7b550f96fd92719c84c69b05a67eb20cda40e6d7135ce8864bb3dad3b3245c91ae09310b0141c4bb0c04ac42 DIST LibreOffice_5.1.0.3_Linux_x86_rpm_langpack_zu.tar.gz 505667 SHA256 f645c133a2076739388323481bb5ff7bf7a2fa34be9822d92b36c74cefdbe245 SHA512 accb79bf0b890d879966bc5f7c252bd876956ba7851d64e8fdc6546b8ffb5bbf5effa942c8988316d4d61e9d71b555ac7d2ac6c0d9934c638f38ee899efef91f WHIRLPOOL fe56e5a8298610036fb7a57c1736f2b6643328657ec86898fa20017027588848b5ed18d6660363cab6aa27ab3db5588bbf8ee344cdfde5d47d372b04104efd97 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_am.tar.gz 7607867 SHA256 125121749eb496a2311ba33e7cb5235d0cb84fe66b6d5b830039543321941036 SHA512 9bd9f7f1e2f690415f38666c53086c091580cb6132aef315276b73c80ec26146c8cc77902bc5aa0da9e50659916f93cb5f26408b7bd2afead060bcc42b202b08 WHIRLPOOL 6c9a70515e5ade56d8bdd4e8b7d05ea50fd33b8465ecb418f40a2cba51be5e9a3ba2ab8fc84631f8ecbb64056b9003b110ebad1135374433597a1b7baa5e252c +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ast.tar.gz 8093321 SHA256 d54b19fdfd05a4375fd3603e089d6c411a98e3049740a6d2055ec389c96b8335 SHA512 c3a90f8bc52cdb53bb23d2760f1fcaa486f29bad558aba72cd439ea8ef10f9d835eefba6b9ff58017ad777bd5131748bed8c17721f73a906deec34d42f32b95a WHIRLPOOL a1204639e6f3d7ff4282db4d7929a864cb158dff80b31a1c333603a514bcfca7c881afed7a8d0a9eafca6360f989172888a6125aa11fea0aac4df2a0e70489f4 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bg.tar.gz 8326106 SHA256 73a12f347da989e7cf46c54fe8eb53630d8b7311f3fbaf111715c30a0f080e72 SHA512 7bb5d98b1af8e2a96fb2fa9d2bdd996bf4a74c50b740ef0d5454a0bbbdf21a1af888193d8c0431710b7e11c62fcef71647fe002b529f3ea6c1bf0bee901039c1 WHIRLPOOL 91c558a4ede5c60e1be02d4925ada0bff1f9548ffb8aba544029850ddce5ecb194f629c70df96dad6ced5b58f7b54730041fa653233b13cebc7d6de6182819db +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn-IN.tar.gz 9832234 SHA256 2ab8b5d8c5e6cb61f2fb949d181ab06f5b6aa7d0a5edb33601952fe5ccc8bcb2 SHA512 f926d73e1c984c50d2e77e20d8c3849e8e101246bcefb69d079031565e60d43fd0561fc3b1620d81442d421af531300ceaf0834897067a6713e9ea69ec6ac846 WHIRLPOOL 652e0f4e8c484e78715d720165b98c368e4a31586534271d0f5c336d0cc9ab1b303adb3e705be75f9a4610fedea38a8d1629d7d2102c870f60c74c18ceffc70c +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bn.tar.gz 9832584 SHA256 31bb5d697729bf7c1b06601f800d17c018fea40571b6e179d00decc2ee335817 SHA512 845e885b469fe49cb35219eba37860cb1323ea794cd1fef5bdb8db2c667255520d24a2ff9904bd1bd1f16f096c801e02e2d371d73fce9e507a591c7caf1b5c26 WHIRLPOOL 13a0fa5c5eb947e3fee94e6893273840d0cdb70808075d5e4186e180c9b9051b3cefa8c805d585828bc02e40173ca7312da0e88feafbf5dcbf4211c9c2645144 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bo.tar.gz 9494664 SHA256 21a56d05e4cc75b74f51c576fa7803bdb9912d6b039bd47f7f554369f2d0380b SHA512 c03cccc8c6bc10259dd4ca5187884a63a2747c504ed0cc532b937faa268ca44f1bdcc74a880b86c5df127d5b539f6f7da6608133e6aac7253767eeedca81414e WHIRLPOOL ddc861f2e4a272e0e95b355c08ac671bb045cbb7d0a0873d2c178a0b06ef6e9a351f137b75559a5572c5cfc0c9b16dd5ab31886ea25748f958bec19250af9622 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_bs.tar.gz 7132765 SHA256 625ceb3d265bd5b461748bd8f4ba835d30a497d2c75a784c85e7e00bb6869731 SHA512 062672babaf1de1e89e57df89cf8956488cec880f31c63a86bcdc6b60e173e8fb096623103ce43e15fd9a36cfb1060851a1699ddf0c66d1b3e3932f9498c4ffd WHIRLPOOL fe786186e58c5ce9aa9edfdbfadb62e93d88243ff6655bf8c6bec7aff2ad8f6ade91046a9a10ee4df02928daa195a0fca08055c650fe6bcfb5d9d0885511467b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca-valencia.tar.gz 7965699 SHA256 fe587fde1e3d14f9bf0eba2f36b68af7156281fbdfe0382178ba1547ed787ea6 SHA512 79b88b5d65694198645b7f2577288fa732b603bd7af2bc187f60570796004b6ce1747b7d0e8cf7d06abac78209012e222423b86779e0d5f74905827344520ebf WHIRLPOOL a8bda959b6bb4674bf4313d7a055d707a31d14569d4749e36dbbd011eda0786ac59e12bc8d8d869e2f3b7ffbbab1f4703d0612c873dfd12f1ff4403c214e1987 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ca.tar.gz 7953432 SHA256 eefa700b5088a02c873dddd81292b970e8014a8466a2f96d07f6ee700d0d8195 SHA512 5189b5269f1795694f1bc55fd1f997d7b6c5bf7e7f513bad82f0ac16dc0748af7156788af6e31007a599d8867860b4e4368389bdc82a6f24e9062a46798b65e4 WHIRLPOOL d64bd2e3df4e3717dba82d6d0ff530cd0b09c4950079daf6c656cd955f4ab3ca4fb3c5b10ffd74632570497619e9057dc4cfd8a51ef1f8f8414c9bf6b6c5c654 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_cs.tar.gz 7583110 SHA256 fec1b70012c11aa07edd824a8448504c47a92341f4d6f62f7ae9fe56eea6fdd8 SHA512 cac380e296c0a7ccd5d68af598a08026bbc95b002113a3aef5fed7ec9473cc650a3a072c8a2e064a320e7b0cdd59a30f168986f7f02fd04c9ac3e304f4b64541 WHIRLPOOL 94cc498fbab2b550d1a894cb12c465c1db5dacc012d159ea954ef7cfbef0970a64bc898bf0c45d1b4db588ad9402ec7681cac93ed6d942ae644be35c54b2ca5a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_da.tar.gz 7585638 SHA256 986e344d6f9b8b51a8bd93d44dc854508fb5946bb27ce213bfcc489df3cbdb1c SHA512 c169a847067ec307a3a1b7fc9015079754983d5fd38f41845f831143462c6fd838340e0980177c17e83c54aad063d522c259b8cd5fd3cf693e1e7e7ab10d2c4e WHIRLPOOL 839e68befaebbc9c88ca122464f0a9a631a1b21d02671d2d0046ad67a614e0a388461e635181ee72f413f128ab6c250fafd194669301eaf168caefcc51fceea9 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_de.tar.gz 8143595 SHA256 1601c98b948d43e65db54b3a262155e39d3d72bdbb0556cd9658594f8207a245 SHA512 0dbf7c11fb722d167de124fe34b9432c99972eb919e03bb8663fd582bb54c566db9d3e0f113770906e1bf1ea6277dc0fb5c68392096f35a6a700b511ecfce9f5 WHIRLPOOL 45f66ed4b804cc20b4bea495dba96b5bc1e6006a908920b88919c3bd7b62196e9d38ffbcce1cf741dfd20a6527924ab6f084617f2f3deba37e31019b10802a91 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_dz.tar.gz 10386387 SHA256 fa8a03664b0d59cd85698d24bf48cc50e780b6de4d9644058cc98180c0de4798 SHA512 050e8a16dc9889da6dd5a8ac27741f166e08642776ee9fd2c6b3926ff627a64383caebef5a6129137eb6ca459766c751367debca7e93220e1bfee56d8d0dfd55 WHIRLPOOL defce13491ab39ba3e1f2c97d46c2b59d822afe94e21594d4d4313346814e6e54e4b9f0767d1baf47b5233024967a2bf74ec0170c71153122ce57b5fbda417c3 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_el.tar.gz 8975332 SHA256 180e8d9b63c3cc4470714fc22c9fcf9bb2d4851855478cf78b5be81db7adf152 SHA512 d50e149233fe2525481e67046e704eaa61af7a81969f7d4799ec963ed42f4c1497e4830b8eafdb32ff79dd9ed7b0392da888055534275d7fe3729f058db37a2e WHIRLPOOL d655cd8add1bc8e938d561496b31393b3ec101db60b47de8f88cb3d16864475656b33555a3a5f95f671a84ec9afaade18bf39cc2950188da882fd6469c3a1a12 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-GB.tar.gz 6443077 SHA256 c8455ce396f6796bf9db1c2c58a25aa795cc289afb553a13e80bd2f0d9652685 SHA512 c5877c3086933e1acfc5431c9aa1d6700b4e7435023518905a228cdd3c4d01bf685d37d5dd9c520fbc4c5541eb15f074d02af37f1d3aced59f2c26d960911bf7 WHIRLPOOL 253d7d1bb12534ab94aaf1732f27a95e0a3f7018a6df226335370420f86cdc3ad3043c6074e6658bb341c4ec8d32e935e5cf888f45e0bff83959164d1558e4d2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-US.tar.gz 6487145 SHA256 edb6122e2fba4a2ee936c5f3e8a36f656791e27232fec2406b9da318dc3f03f4 SHA512 7b034701fc963f32c60e3abf110da310e5bb7dfccfbe3d74b1ca1cfd5f6d1a5c99dccb29fcde22d1c9d9d1de248e675c8424783a3239e57e264ea32d282a1307 WHIRLPOOL 0f48988f278bd32595057142ad92b9057ad9af4fd63dce7c2a374a0aa86d41d9f8642b8124d5e91ec9460aa00e6b952f05cdb2f285bce911159acc0c0ceb37c1 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_en-ZA.tar.gz 6432513 SHA256 ef78d7e7d67e445855cc2fe42d374a989ab0aac995babfa14db87c509b0467c2 SHA512 1596ab9bc496d24b42856728c51697e29b4f223f2ef79ac29c561ac66cf1990981560597833a50b30df92b29bd8b92911f56ff2df636b2ef1463cd512db2129a WHIRLPOOL 614b0c666a9d6de399b0b907c72f16cedcfce6428d5ad61cb262406a8d0fccb8cce4f1af8547be26685c4e6baed4fc76f586fe3efe65176a302e4a65881393db +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eo.tar.gz 7014360 SHA256 ab00bb010ed020b811a863c85c886c2048564b125e128f371e678b8436598b1b SHA512 69f87b25cfdf9467299300545f45260b6eece8005f40d7932845924b19bc0c608fa391e8cfd39d35eb4c8db73eb66782d7ee30f3ea74c7fae44cd1ffdefa7894 WHIRLPOOL 64b05da37a9adccaccaaee6d2b0b149fa7d5bdd1f2f25a6dcd6fab04cc9c4e910c116831d3ecb209116b03deb9233e41468f21c154cc1c6802beacf2f25323f1 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_es.tar.gz 7998096 SHA256 863e5b2d9eeb96648a0f51ad58593c0a3f1a36afd437338481d973bf4cb1a62c SHA512 05c074a580d0f1720cbfcf09153732a6d4a31702d9643e98b4b283fa75a5c540aad7b39c6d86b42cd63fb9868d7c07388a7db2b118a7035d8da0c89b797a907d WHIRLPOOL 2a109f6c0609177455265d17e58d088da8fd051a75534dab02439210d1e2eb8ff96fde1d7e385d4844273b79cee3e8f3ca2b191ca9fa9a592695c09ad5be77b2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_et.tar.gz 7514720 SHA256 2d2892192da0c843e124a8e99fa8d7dc39c92e13c15e50dc0d91672a2865461e SHA512 dce7db9d41006f243a384eac1f0b6663e9304d064ffdcd8c93782f6193a04f5c68f8bbfde3bd4fe32d5e83a7ce760e2a12d13b90c929a343270dd183f06409ed WHIRLPOOL b6291bce316dc9728e3de8c2de4c98f5e2f03785bdac38bafa28dc19ec65602353203243156fd2f15f77b17d0b8b537dae77c9cf44983a95a8e2a361e76bb13a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_eu.tar.gz 7658863 SHA256 ec97e110c44abc3faede1d1efe71c549f65e59a118da601777a83627b855ac89 SHA512 9b5ce375d2ddf261858cebd9d92c9bee4f0ee7c7d6ff0df2bba843f2e9f486e2e757d22a296fe8244e74c58247c7bb5bbaaacf9afae640b335abeb0e70a4787a WHIRLPOOL 5c804477489d4071ff1f4259cf4d1269ec25d92bbc74c8fc34a70f570dd6fafa47725ce4945799724deeaed5caec265e2f11f72ee75063b05e823a4201371600 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fi.tar.gz 7796724 SHA256 a370ef15288a3bd094e85ecaedeae09657551b3a0e03be8fe3a88e4b1dc46366 SHA512 7969c1faefdf78744cb38359e4ad92c7d0face00db80c74eeef0defe5a1e35a9c1fdab47154a4f1e3304f800ac2f9f427f8ef1ec2f4b53ff06f74a7bbdbd743e WHIRLPOOL d881c3bc063b81264aeb33c5bc4a26860fdb3f8b982c06b4236ca264d01b5ee4615fe4207c4b4b7fce331a74077c25b1ea86214e6f600bbdf53dc1a0d9f72b97 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_fr.tar.gz 8182528 SHA256 5dd4e9909dc6b05a10554af6999651e980b18160fd287e98f87bc040504d8e8d SHA512 2ee299530a072e43b49e40f83a1ddced132d3e341c8181573abf487d367d8dffda39bf026fa09c3bfe19f479f93f27a8527ced5c5c2a29d85475777a0b16b15e WHIRLPOOL 4227abc7c70039219851c3596cdd890a2b146fdbe80f00d5de056bc2f404358d4cba6bf7fc136ac0ffec3b2ca84f5e7b9b947aca26a2f4b1ecb8442041b4acc5 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gl.tar.gz 7733160 SHA256 f603b1e597a380548a71ae1a01259e244479913bc70ae0b5c831df507738cce1 SHA512 f8d236b967cdfb92e0e23488094996bb775fadee1e3418eded99ce63ef72e7c05da9f9be0665c1c2f276344296fedebfb07caa78f2e819e8bcaa14eee019c7b8 WHIRLPOOL 7e906c56082cc11ca97157210ea2089fc57c41d3b4da47806a84a7bd6a9ead5f93185bab019896776190eb16633b3dd91292517fd2c94ce0e7a50c7fcb4425d2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_gu.tar.gz 6654863 SHA256 7153c816db7e43f858258ef7d83681ccf16c0e4786dc58116e2c2a73cc60cef2 SHA512 4be092bbc8bf4481a69248687a20870e4ba632f061c50e8763c5ef1e1e81a530055457535f81107b49628eafe0595c68482be10fd7dfd7c1343fa1d94eac52f1 WHIRLPOOL 95b6ff163eea8a201157b287640a1d38ae2552a792855e59c59fb6ab4d671020fd2cacd39efdae56e8cad5bb4bf43a59f3eb0033895e76ab5a3d74caa675c992 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_he.tar.gz 6270536 SHA256 1b72aaf46277fd169b83df703f49d8fccb4089b28b6a915e9c80d5300d79a388 SHA512 c2d6b4dec7955c431dac0594409652b3ecac8f59440b7c0446e71e10af90c4398dc081796e089cab8a908d1473b86403405cc9ccc10d5df6895c477576fe6418 WHIRLPOOL 5a280e9a7ca4fd80ab24af57867f17c46f29619e1c88ecedf6920e471ac5eb92527d3493319bc9f898638e5b4a12503ce0f16270dc2919c3725ba3d169fcad18 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hi.tar.gz 7334900 SHA256 9b2d9d3ae05d06fc0dc4edb3741b346eb750f51c35a6198da8397c3a90186166 SHA512 0e4666d70599d0bab4b34044120260f13e300412f7a925b35fc4fc2ae7185dcca57a401aa4c74e84df522fb48e4acb66aa14d7fcc49d2ed72a073910085b0911 WHIRLPOOL 132defb8782b0393bdfa7e7917b104877c360c85db81b34bb2092fabc995f4198fee5b7da9e6f367dd82fa116d687d6ebe8262cf4e09d2b90178d65dbbbc6e18 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hr.tar.gz 6818979 SHA256 ffc062b67d98069ca63c208632ae44f844e98180d2e211ba21d321bf97cd0e12 SHA512 5a60a28c163a275ebd80f6cbcfff6910a6babf9a6aaf5e4af7d9b0d0f27bf93721dc70a5a910a4ddfa66f83415ed9b4337ad941b0f992a298d5005772575c6bc WHIRLPOOL 7ac786140b0375e3d2b3cb8b61613af68393d055510187fdc00a71efe263ac7b9740aa3d0a6ffa66d92016f8d6fcfd4e33148b5468c74f176aa92af2cf061aa4 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_hu.tar.gz 8010379 SHA256 7f0498ef23702874b35f1e55a9c6e4f42be41afb787447b3d943c5b73ecb4793 SHA512 248fffc4bb890089dc843e62716801010b8406055d68b8405b014790c37ab7dbe5308f82bb7836bbfee22668bb094e1fe33f830d0d9efd33825e24d274d5278b WHIRLPOOL d59249b7d9f0d9eacb8b76471b88b86154e7a0743d5f21e43e18d39bd448ceef39a7dfe837724e3514a05010a4633198def9b6ab2fd9e2a94baed84065ce1d37 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_id.tar.gz 6814747 SHA256 6d0946a6f78d3478dfe69e1981e306eb055d4e24b11af59d2b512adc52dbf2aa SHA512 771ab909e2abb38466f34874bca77a7789b011ed3251d90583ba76e85723ce2dc046348fe56aeb35868e0dacab5501f1503aa293748ea8016980edcbce5eea85 WHIRLPOOL e8120ababd7394cb8b6ed4d702378588133e8fa0497f9ffe8eaa922b87e4af06ccd0fafd95904201f1d04a9ace3e3b1f263e6e21fdf3990fac9cbf3ce7b1dfc0 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_is.tar.gz 6923495 SHA256 ca0b414025408430efdf82661a04f916915d82347fbda2f58aa2cd6b313f9e60 SHA512 273f2240163f4437a11e8202d1770f3dbbf00f10329eeef9efead92d6d32892c8df0a0412d382cf580d5f2cdddea2030c5e51045cc4bc2f6f7169837d4609523 WHIRLPOOL deb0b09438b5ac804e1b648aa4349a5d7636d5c98acf718fb28c5760b6e1578f49a0f0a3060a38600f6d20580ba0e67c4ebc2f747f98919cf44eaff08570215f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_it.tar.gz 7938048 SHA256 cd7d56624ba5874e9d873a48faedf6a4757d598ff69a3c5ee587c69948c99b63 SHA512 5a7e139f5eb82de4c9f78b354c6186d7ccb7534c2409cb43cbb2894dc18d48f030a41e5236c775128bef4b91ae1bd5752d8604a0c9e1fdc272c36bbf4930ef97 WHIRLPOOL 70d6ccaf11858b8d0721be32ab69dbef0f2e4fae8521826fd707abbc1999ed5c3067aa37c108bdc48bd689dc41a152fa92a8ddd1f76502553d6c86af2ac8d5e3 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ja.tar.gz 13446138 SHA256 3daaba0cdf3b5f2946737a05b5b897d339bac663d9c5467742f26649158c6b7d SHA512 45536559159336160e037d606a7031b1c76c0814fed7b6f4f614ceeaea131b2a2c861a1f13fe596003094c35a17afb232958a9bf48e9cd704fef72665f3cd68d WHIRLPOOL 9caa481397e4ee16212861244799f41d0528a7b50dd7d03478979fd7249d69cad2b12de95bacf9e323d8c8d48a48726935811d3bf1a0931c3771302fe459730e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ka.tar.gz 7123839 SHA256 ae16bcd872c47e1fd0ffe99e7b0bda0175b00c3c457294b45e6ef0e5464f9bbd SHA512 70608c76d991f42171a2614772536a68116242f985637e4fea902a9fbecd801bc51f60a9b32e6aebd285ac063b600a8250900e4629cb7d63b6381c1e1b6ef688 WHIRLPOOL 97ecbd985f3acbddc7a8a47626385214c13d084b047da31dd88ab79cd992ca84b4a4b039f34e4690c013fda4564c2bf4b6ca212b33e015196abadec0c588125d +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_km.tar.gz 10373625 SHA256 19e38ff260b9c1a39489042475e13c7dd5bc8dfc30f78b79d8da4d8f7ac5eee3 SHA512 c1aee6bf0245c06359ce90b92df3fb9bea206897ae262a327486b61c7ebee7e7a2c39f266e83407b3773c851a1cc379e9cadd0a2593b40579f554f86d5016486 WHIRLPOOL 0d5b60a9927ce86d0d73ac4e20a781167b96e7060fe647c03152631a0272636e5b1f0dfe488ef8f5dba4661540732197107d98373a6752e9096753aecb24a051 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ko.tar.gz 9380890 SHA256 63bba3ba51673ba683d2728f99c1498ecbecf2966f0e7897fde782379730f2d2 SHA512 6d7fac669b52afb1033509667b369030e43d465bad3c12cba3a96ab0d32676ea1bb3a205ee02832a21e28655e74d201dd1377883ea48572d6be6d291d65cf0c2 WHIRLPOOL b4c15501a602106a6affcc827aa0ae1d805e424f8c87994260aecffdeb34afcffc5fb87f8498ce1805732b9de6d26eb3d8c0f81d542de688888cd9586bc14e18 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_mk.tar.gz 7359144 SHA256 5218dae68122e72da70b1a236420a848f0eaaef9c4a162861d71254278b232ee SHA512 e76f35d0377eb9afac543dfd3df3fdc3389b8d248c09b32cd33b37d3207a7f119e4522561343f387c12afa52963e6abdab3767c9215644c3fbc2886f27e1fb57 WHIRLPOOL df8effa752faaed3b4204cfe050d4afdd2890268b96f59a993756a59e8475f525f397b2b16ce2133769a0abf96182aa723efd619dc711225d2a1853782545104 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nb.tar.gz 7671657 SHA256 cf4c04220302d6e837db79805424d0ec0e5b10d34324190a1fc69d95427ab9f1 SHA512 892418f81d6c77202cfffdcc935fb4c04d60434f136d75f35e2cc99040d5fdb374b31b3a476e945436e02eaeb8dee22857a7861c376ce53397a4f4246a885a39 WHIRLPOOL 6009bd9516f82c248589f6db03ac32b78b1fd03ab70c1c1852229925ba0c6e2fa1798cb4b96e7e04cf66ea77baee9c4af152c8a97c93e0c74f5a819ce7943ea5 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ne.tar.gz 9859732 SHA256 292882efbc40e117b411ca33406f171594a840bd9ba70a43de4d3535bae8ad61 SHA512 428232843cdb19fa09fc5be0f2ad077f06e20bc2ca4577ea32c6d21303e4e232be4085713ecafdb67d240259ac50b77183a6cda587ae363929eb424e5874ade8 WHIRLPOOL be80c24ebc0fe9ca1ea3d20af81851011fa5bf817d6ef77f0bfa4ac4b18dc4adf4c33a09b3817e22bd42f39d5c09531e27e00fd65a3a1c158e24009aa15bbc9e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nl.tar.gz 7753046 SHA256 68dec80d9ef18f03c770a34a4856bb3b2acea9d69c8f10826b237f414b8fed32 SHA512 a13f653ef46ec8e1592276e92ffca5d08f30915ad08861c7b79318920387aa3fe365dd5a76313d95d5d7ca731e9a8f435037340bb1e8da0b33bdc166966e6f51 WHIRLPOOL 46a40cd0dd2ee6480672af1685da1ee236cad7e3911e20f5b10e3cabc53a972bec8a078a797d6cd5962856f4958ee30e1cc1d7f6d9781e113e8713a2a34460c3 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_nn.tar.gz 7627791 SHA256 83d1da834a89f13a19de1f77e60e5ef3b67a054e4cdddc707317e48e1d7eeb49 SHA512 0f19117b08ca28ccb9844fb3cf16d825f9645271207066cdca5e67e1714a7b442175696a91fe9a20ae1582101ae5eb2541ce9343bdd8f2ad61270026054f6348 WHIRLPOOL da7d780ac73c01a2cebd76d108533783cc17e9d8b4045ed50f5c28db6e64aa30af9949a8dae99884ab26b816b00bea0210d82911f3ec3555564cf22f973b9eee +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_om.tar.gz 8003660 SHA256 0afebc26bdbfee965655eb115a8eb25d21b9e280a2db672fe12eacda4b37ba34 SHA512 2d879326bcd5400bab5ebc2d81d6f638376f2ba78e2345e3b93a1b29178a9d651a07f0b2561de08de84f5c1657600d0e1b3cbbbecdba478990039689a94bf280 WHIRLPOOL 18f3160b20163d265eec93b3531f28082e682ab668e4ecd519eafc118c03980407add3dbe472a47e3c6404da1b7c1b9c73add7e3c6f81371929b58ad420743c7 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pl.tar.gz 8047295 SHA256 afb920edeff46c05ec206e123b3306565de788f931180b31f22cb735480648c5 SHA512 56aaaf2f8812342097fc7405fe53dd3fa74b339df210ec76bbc0ff7f4696e104c2cf125c1783d99adc8bfe39bb486899cd273f2ae29e926663c49bed9f4287a1 WHIRLPOOL a999f2da5a228a65fe8881f269819f16d3c71365a08da985ed9d3f3b1b4c6564ca1e7ec45b8452e687bd038c13fbf8405cbaeb028c9daadf79de2eb2a4d753c0 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt-BR.tar.gz 7760637 SHA256 137fba73d5f06df9dc6f707891cbe813f61af01e41031992d37e6f39462e6bc3 SHA512 68db118ae0fed81daf02b7004d1cea293baeac6d729607629e5c9e17c2176293f34c104925510f8959187c1489c62a1f4223901a12306467bb5933a014b4c542 WHIRLPOOL c9030b4cb53405ddd7f62afe75d069b815546ca4187e8d050bf50a6fd4dfc841bfb3ee49de4c9be5f0436dc87b1b6dcba3a654cbf923abdceb78152cc51275a8 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_pt.tar.gz 7688731 SHA256 1f40da8692d4e66ba58ce9b3d1e45ee24c5f19746a8b7eb10daef5be646dc320 SHA512 c4a1fe17146b4f2146fd4b8ab0614f4403ae940b5f9c6a275c8107316d34c6eb79da4ecd9d3de7e20376b8f8bce31e445b1cd985e77eec2cd5521ffc7d2e2a27 WHIRLPOOL 8a77ac3d0e95eca77a2d0eec693896867760d3dc86fdc4639cabce02ecad0efa3dbeca72efa33a5a004c203e1029f7a4777ca858937573439e8cf04043f3d9f2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ru.tar.gz 8429840 SHA256 d187069df0164012d1810d0e75097785051273dfd0c4e02133624653bf6dd4e7 SHA512 ff3c988dd481a16db1851e3a420e86a16b241e7bd04203a22bab5d47bfac6d8b451b3eab00d68af5cb98d4e9190641c04f3a74558bea4cab369be1a96dfabe0f WHIRLPOOL d916013490e8e9e9eaecbbdb09d82b535a973e344700fdf20d8626513d838558e6cf0fe329186a1708039650ad04c690ea72b1a64838d0613b940a5e8f1b0dbf +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_si.tar.gz 7210936 SHA256 90145e7bb50deaf0fa1fa0ed64564cee7655c1a2047c6c5b0b721fc991409750 SHA512 574060bf2ac77d4e0114e57394ce18ce2bdc16eda7d2e1e51349a11295a0f06682c2092319dc506cae71bd64f3998bdcccd6f2bb731f509ff699469964a3777e WHIRLPOOL 98f6d7495690a877196806b0d834bc43ff7fc234a57c531a110622414085cd8b23f28e0622e41bb25e89cd1842b64b19e53efac1d0e37b85a2b1a4de791545f7 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sk.tar.gz 7513562 SHA256 879f630eb4dd8efabfa0088ff15208a3af87d7439932c911d6a6177cc44bcee5 SHA512 dc076683012b507eeafb77fc280f2e4416bbae3ff3634666fcab9a466f5c4c0e9154239bf2847545bce4b3625b6a1f8b617c3eec9878cc64d0ef3c4edf10970d WHIRLPOOL 2c458128ea1ec2a78620185d1a9ddd1773a76e69c7d24b9c25a7db6602ea7413e2ee4bbe7626ee026a02a6ce1e174cc2affd1a23cb5122a47963017957bbafd3 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sl.tar.gz 7756946 SHA256 162cfc84efa02a9ef26122affb56a1c77c63c5d9fffa0f5581011c742ccc4f1c SHA512 d95d78a7a678addf477e098288ff13f55d252569440582dc3d7751d5f6b53f84072362ef80f331730c72ee12fc4e9642705cea9179c801e699ebe6be62aad33b WHIRLPOOL 0fa6227d36af521e5d537e0d896ebd561fd7b2d946b27fbf8ff0280f62136ed34a6f3b2d4e28dc8f7e9e350959e3b2f62f378828714a1bc4b4ec7ed81d47d48b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sq.tar.gz 6858816 SHA256 0aa8cf10d15cacb747f7592a01acee9cd2510833dfa516483fe310adcea7cf24 SHA512 42beefd0762e95d3d7b29ae083ba21ffd7ef4c3f07006cf9527392d7a2c0786c44222618d0424a21fe072b7b02297b63f4f99e75612a3c538e5c2e869cf35434 WHIRLPOOL 4a4d11f2f06c5fe6db5324a0bf424a79f00a8cd0ace7ab78a8880a611a65477c9eb4f981616c61c023899c8981b7f7bc0342e341fe5fc3dc8cc941d529923ecb +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_sv.tar.gz 7691732 SHA256 baa2851dc3298fbf28fb3d2d578cfdfd3c51971f646a39a3af79b2bb954414b3 SHA512 4762c9b7e4ef2819dc3f857a242a63e96c50f7355d6e6c499011c799ffa838b5f4abeafe940970e6baefedff1b763ef182c19975d0555244da9758774e9afbfe WHIRLPOOL a76d8917b001a06ca72bd36facd8ff109278a219d02968a96edca722deeea7f593b12a8a392b92f8366d918819607a8636f56ca63bf43e41fb2998dead11b860 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tg.tar.gz 7193274 SHA256 55ecee864fc207927e1ad9b7694e24987e07ff96c873de2e067ed595cdad4c30 SHA512 f7bb96dd1fb66a616edbc85f0b27ee261dfaaccd6cdee7b3cb87972819fd1068392aaf66409ebd74d588c04c8cf76c318ea3b22776398eb2ac2623edf61fd655 WHIRLPOOL 78253046b6cb97f261ee33868ee20e8c58e793d3ac63f8a02d2fd90d7226b635a437de0774a50abccd324f4b2de24c1ce2ba411c9bb0fd84ac4e505975b74843 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_tr.tar.gz 7944236 SHA256 af80c7c930c5ce7d9c1989470d15a0ce98f4f66430889f4d207bed5e8065a39f SHA512 28dc250e86966e99af473e9140413752fa2a188807cc8c5929f834ec749f91936db81545ef500ad6912c7d5eef9b83374c1ebe773c7fee46ae909b29b694ac65 WHIRLPOOL 2f50acf02fe08e200ff1fa17d08b8074d3417e8667a0811cc2a1288038c3c624a416de074ea245e841cdb145f852a90a03879c5deb98c64bb2c3a549e3a48839 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_ug.tar.gz 6847673 SHA256 9f9808057276cb080af3b08294a7c285a6d882fef21fedae1c5f99d89d14612a SHA512 f03307bfd5b8130dc71969fa33be68928d3caa0e2dd48a34b893b78bf46e3ff3b2ea2c8ca8d60ab032ac0ff8a5dafececbf73ee7dfb4bfd777fed0a887b85948 WHIRLPOOL 389a2c6271f8d1abfed28b4fe168891f6cd074f073fe5d1a8095ec43dcf86bf08e9e2dedb50a5ef6d6f5ac9ffedaae3a717bc889daab1d43b5310244dc6b01a6 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_uk.tar.gz 7336125 SHA256 bc27e18c1cac5f1657e4823dfb16aff53bbb0f69b1de9caf73a4f2dfe5c0c0ff SHA512 d9bb7e3b235c4d7322e2f7a4078a08e3c191c33cd5f9568e5b093a4a4818ea53ab2e97a5a6ac9191610b239135c5a836264ec1b32e5271e9afed6485aed2777a WHIRLPOOL 70c3752406dff24e0b2d3e339bd9b9097a9fc9eb802b11bd40b49b99fa865c9c41ada39cb2322673b27fdfd6c0f77922677ecf4de7186f73c3c8636c449305f0 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_vi.tar.gz 8159252 SHA256 1f6fe0bed021862b68e39d07aa2c4c2da7bd35fd7e5cb81adf144d1cb56adaa2 SHA512 a3e0a2634559ea3567bef9a3a4ad32113950d1218b2e7585f26f1dc8c81a8ba020ceced65cbc829753b7e45862a20af566b12f64cdfb9b402d814ea7f199016c WHIRLPOOL 509d18959a8c7811c9087e424b72af23ef4da838359f3622e3d24120359c9602a320b1542b868f7131780afef3336e99183af565e61159642fe2b54fd2a64c0e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-CN.tar.gz 10724937 SHA256 674118574e28499c55d96c0b8fb56ad9964ed8a594dfb3f356df2c60bc69082d SHA512 276cbb36e2b482de9a872132418dba71ab31bcaf5959d0ad8fad80fe8c726835ed4fd9c7f8e92ec3b4c50415bddfef7afce3f62e62f3567567e3a802708e9a40 WHIRLPOOL 1d70ba2f5b0325b97dd6b47152cfa8d869be3cda13e94c0eb5e121f00444125101d8f6d763072209832c214ac0c8986100f694c226e5c641d7576f0fe68b4d1b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_helppack_zh-TW.tar.gz 10763558 SHA256 2ab720b698f42533ab5f1e5fcee811bbf7fa068fcc3c680aed9ba52ba3d5f3c7 SHA512 75e35286e896f604dc108a0b5f816d2d7e0e4871c9860700c042c44d7bba3df023d62cd2a0d7449a9992b8e70a36c5068543f6741e6c3dac48667d4f0838a57e WHIRLPOOL 1789be7bcbaf777c2a0e5390c47d6cd0cd4d67092bf7c673a07ddce3fff89a3af35393cc9b60874b57a16fa5f45486bb6666fcb4d8dbb90bf9284a990791b04a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_af.tar.gz 1116713 SHA256 75f7fb07ca3d1d74efc534d6a98207bf37fd9353d7fa6042581fb9a53befd5bb SHA512 48148d9fb4791238241b96c63e51ed012fdd55d141a7fba6a3c8d4b42a0b46956482fe2a2138272de67cc272fb334eec08f2bfd3aad0f2c214b3ff07c32e2c28 WHIRLPOOL 435f2444c3ead36ebe27a29e456517485b7fa462aa49db046c2a888835f58919f8bf26107d624097d649d6be9fd77c596d5a51e5cc5f2fe0d80419a798ca7389 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_am.tar.gz 523275 SHA256 5a2cacf4d62a2296d6db3d0cf428f35f4ac8037ebd67bde8e2b6a6a673303167 SHA512 c8d5695518d339a657796c6dea3e65bd60765c9018d7489341f9b95e93e1e9c8ed91ff76cb8b26c911a20f1904b0a7b799522f63dee7e866ae489315f4c8323d WHIRLPOOL 94a696c7713be1f295f16346737f7052ee282f0cba1f88e858c0e2a97eee824dea2cb8101263fbffc1f1c577cdc303c44ce8e50e7187bf4e0650dbb5e08d2258 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ar.tar.gz 2264871 SHA256 d51fc43976f5a409c547f69d4418a35129462036af30d27789915785641a0e95 SHA512 75d53be7e3b1946b02ef64c41cd6c4048bdc5a398f61cfd50b3735b3bf140edd80ce7b109c05e2f16d69511085d143c34a15357005d739633c748adf7139eb77 WHIRLPOOL 893ee0b60825128bbc29e8c41b52c3cceef3c9200e3f9893ee7ac3106710322e5d4a4a669853422ca35733edefbaa2cc538be02c6aca9a6afb5ef8be2bcde71f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_as.tar.gz 549242 SHA256 26495bff8ee06b10dc825f0b24a071b598db4e32bbe9061aa6995addec59711b SHA512 d4e1a08467ac9caf216c7677d9fe7ff080ae2f51ff3798e45b6fb671008c01632c599fc2018ca9571187b4a93cf7008a033d9e078866f83e2b5cc57429f806f4 WHIRLPOOL f7366f5e3cfaf9d6f7c9e9801704f8e65fb1222d7c04f775a4fd7031ad8aa78969fa84657cef61fe00ead03277882e3849c544e1ae3781a9e83eae317ef4ce91 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ast.tar.gz 505692 SHA256 06f8e386fb9add6c1a016216d35da90cd3e7614c8fa8010225b6d0be379f19ad SHA512 78f178c1f3090c70b29280981bd97f2adbc886dd68d77213fecfb0cc99784992172a9f5daa6bed18a2605512cfae0b2816088ec846ee430bad36ecdc6cf38175 WHIRLPOOL 3dcaf6b2693b1993724ccc4ad81a000ddb562c8699bac50120ecd85570f9dc4c4f1501b7d5f8b43c9a5534a160e3c5a24cc2d0f9649a01578dc29ed7cbb56e87 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_be.tar.gz 884898 SHA256 f043ae8e3927a3b5c72e5a585d998f0ec868d56c8f895547be61982fa53e9310 SHA512 7930c8797e0615cc33018dc54e29a58972a9a850d025edb6e3221c5b57266d17d0a097438f1fc770577903c5b085e5a938b2188be439df8cf6e5ed4d3df524d5 WHIRLPOOL cec83806e445a32d2e860c8e1aee1a6476c1ee1709b455be3b67a3320f9b6a66e02d5c79328e599d2b4045f8ea8eb441a40bcb7d5fbc9ac28367f36c0e217afe +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bg.tar.gz 1965860 SHA256 e55d0bd76b6f52d086b52b078e6d6f615e3e6f5b81ddfbe7724bc1a42c48ad13 SHA512 c85a6fea6fed3f6b6b3c69ce2bee5171b503461de282c3146632f7de9dfd8097b5eabb8718576729a3d8a52b44f5b6765ed8dcf759a12c2cae33524a4b2814e6 WHIRLPOOL 508e9907af2603057bb070937db79a22466adb53ec8f3b00c7495fa7c729b1f912cf14f125f4701558dbcac70d82daf267221d4791f61b085c6c7895de1e99de +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn-IN.tar.gz 556939 SHA256 d9f1c4d3b2f01fabe9513dfe3d7f1feda010e2aee326fae4a0e108faf836530e SHA512 45d537a04dd1400cc524c12def8ef6df03398079334c961800ef56f93a6e45717275ab03a8877cd5d4ceb23fdcc6ca89f911ac4db542184c558e566ea738b085 WHIRLPOOL fcb654e9115f8d26cb0aa2d22264fbe5e3f89c40c27b5ab02bebf5608215a9ee81eb3bbfb6617bd68fbc7771b02ea2dd86fcd0cd50ff7176125a694932a2978c +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bn.tar.gz 903996 SHA256 0ca63dc29e1a60f18f74cd102a370d83f50ff2f5009ee7d01963cfba917d6cf6 SHA512 b0a4f6745d3381411f5b16404fe7519843dea3e23e68af5286890c516e648c5416faaac30df2a326b47cb859ed6fe2e108ba61d91f9b04ea167f5b77b8d624eb WHIRLPOOL daeffff1dc11f8007a79e9f0b6629601bf650f304b50bbbd065dce52887b566573c2c5b336e3870dadfdd2a05fc3f3f5060ab0eb6829ac0237248d76e0cca71f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bo.tar.gz 539887 SHA256 2bc63ba16170ff451ba768f7e9467be43e3477af166506f86bc76b5e76e4ebd8 SHA512 22ca93f37fbbf822fc5f1b4b3f34fad5c63e0cdc4e05c7f1454113bb9588ecce3d61c6d3ed30a0e666eea901b94195ab895dbfa39552e15a71c8a9cdc7547822 WHIRLPOOL a757ce2c93c5fcdb63e1489dd7e3e009758591dca7ba03b568d9e8971689a9bb30591bd90d846e1699db97d00294d3901912e919b3cf73ba6cdf4d3e5b6e041d +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_br.tar.gz 1720753 SHA256 64d653d4acbc0ed01cd7283c74d0e4c07ea3686fd7910cb012a3a4e71c4616ea SHA512 4d2d7f87115dc3302d5c907f59acec652057f08bbb7685204cd6bb02d11f395b1ef75bf0bc6f4b7d6e392fb49de522a7a4d92657e086f1d17107f3d52fce5c0a WHIRLPOOL 0ae1f92b2f218e8012f00d982986f546675360192b5a4eb44fae33e9ede17a66c8a681779520705f5105f92e9536179164cd52583217a623f060edfc4614a4f2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_brx.tar.gz 517685 SHA256 3bb1e955812c47cc337d06d8afaecace854cf0dbb4a78930e369af9f9c76294b SHA512 9532cf25b9b771e32297af35210a3219cb98ba4be7cec521efcf0baf03332be1927279b2f7aa958b96e4b30ea190be276a0114074525b87dadd9f78eb9c108e7 WHIRLPOOL f1a5525ce27e2ead7fc31c9cb1c405e504e2d421927c3496d87cd07419d3977fa7d468d4806c684365f3aa40de1b0370ee54213dbfecb42f784a125fb4be1b6b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_bs.tar.gz 619419 SHA256 9cfd4ddfaed65d9dd4546f0b68cc9635774432d9f4817c8141af7a244d5a71d1 SHA512 7254eb1acce5da2a80eaa176e0543f3db416384345b4aaba6b2d96034191bd1fe84abf2eecae6e64c8b9068b8b3a7de2eb8f02f127b1f4b351e8c1d52206dd19 WHIRLPOOL e355210a0912e7c974d45e626ec212c4bc25a5c97491a5b79af536afc531a44c8ca8ca024ed84c2e2c3d8f3953cb8401541adc57349e3be12a224b69c1d21955 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca-valencia.tar.gz 1774220 SHA256 327a7c34e22eb07f4e8ee38b851274aaf2696b63587c93a841ff3da18c30841a SHA512 c921655b32dcfc03feb745c18e93cf394c6cfd9458a9ef02623ece6df868b993caa133d54751bc4909fdfd3101c7c414a636b46927ddbe59e3256bf4618db6af WHIRLPOOL 80f95676bc322833c248955fd29fce3f2d7202670c941a56b5af171f1e43bb274e2c7315ce65af8cd3e3691c56e5fcf251e96b754f60f029c910f9936735cb05 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ca.tar.gz 1776339 SHA256 abed4d9c01b2df8d1063846b3d93eecb2a07d8f24929de9c24b7dbc5123575d2 SHA512 f2a2063a57c4b04fe1c8b12ff86ff259680ea8fdf33fe23e9b3d7b828e458285557a7f2f67d2a3638f1f5149bafb5789d1b50e7b037c6a6d5bdc645296c71b56 WHIRLPOOL e03c12999359a6666e3f010724c6afce46c2fae330179dce0312456afcdfc2f89e816e09fb8b35afd90262cfb915b53d06af03ec425b20c0b8bd2aa99cecf972 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cs.tar.gz 1238416 SHA256 b6ae652bb17d5c086cad2c1571f6db80c337b05a42e3bc9875d1772848054297 SHA512 22f98f9fb22f53bc68fc1de345dc5033c49501ae443f972af0d76f4e1898487342c38450bbee188fe6633de42ed7ab4090b1f50d0a2cf555b370bb626ca77e7e WHIRLPOOL bfe362a3c64a18c532bfe2e58c91323ace06e0e3a769a7e4c557b24abed9ea712be4cb73c226097c58a2cab6d2ff1c4dac0d51344ecc9f7aebbdd95791e91c8b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_cy.tar.gz 484556 SHA256 0fa497b44574e04fd375ed2adbcae4dbbf4f89ad4b6f11d1002b1328fdf3c13b SHA512 cb6cb465fecddedfabaa158cfb862ebd8d116cbb758d4e40d3a68672b82a7bee4179af8fb68686363f4bd852d19b177334179bbe1858ae399e302a471aede68c WHIRLPOOL 77363c888784706302c6fb91e8511daa11d1012d71484979144144abd0b8887f7dfccc35b2493b688970de4daa2c0d2e1ae832c9a44d3e3be7d89686aa3be787 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_da.tar.gz 2388676 SHA256 ac82496f294b4fc80a7c82c25249656634893c21dfdc90f2c1a30b04c928355d SHA512 158ab667a6923d7975a1f804b7d31fc16f36908f49ebc206f7a9ab57d938e739607e3e00e5204c57f447a6c5e47c53392f33956b848bb00490b695a2eb99aaa4 WHIRLPOOL d78be2d3f629f6711348d7dd02e7727346e923bf7b5b6970e68cbe0b0ee732779843f9eb6b24042d823e09ce2828cad980b8235bbb664a53fb08a25c70095e1a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_de.tar.gz 18842891 SHA256 9f76916891eefa4eabb70aa349674a98386678a75de8c7037a59c648f8adddd3 SHA512 6e3feed6fb9ac9b279adb455d3db2570d341cb69836199359214c2e4b85974f05f81dc39ed3d9b90f3139ca85a7cb2b1a0cf50a118ddff86703c944b97de72f3 WHIRLPOOL 2e21f37249d3ad789877f3910a52f712792edf0140fee1fb5bfd623c3a0b3578e147274eb249789b1518e5849559bf4ddaf9e8701073cb855325b4a2d14ce7fd +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dgo.tar.gz 548628 SHA256 c151056ea8b852b977a4150875116af0b7e18b3ad235b43343e849a9d4e39552 SHA512 84e73e468e0e6b1281f546b39065c99c217332292bcb35bed6e103588dd23685c57c5fc8b9bc842e2421ec7599ec26bcbf22f5d7c37e295325c35235d1a06714 WHIRLPOOL 98d48abe679a31dcf1b7c470800fc106e547a0b2a2df0db3dd3098fee401e1bb1fa2c24510d1b74f6065363ec351ff7956879a8f143ddf0a201a3ac7016741e2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_dz.tar.gz 544408 SHA256 f5ab40b85d2bdbab1fcfa01799ab139fe3061c6490b5057a4e418b6735f390c9 SHA512 fa127fdd5fc2d274c493120915d88091a9db957f04167934d1abc642845017a03a94693ca7fae461dae7063247d839e4016f67b4aa348feaf2c346b8fad915fa WHIRLPOOL 08dde67db15ca564b26605c71d9473c3e0be80a756ce6d3bed2aa445611532a1a240cf0254f7bb75829be61f1ff99edd28b952fabbf3a3c5ef22a567c3779dbc +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_el.tar.gz 2583019 SHA256 be6c02f3ee755502e5b0b62da0175bdbbb5fd72fdd4e1d957f71647a91e21815 SHA512 383a9d8f94ce42154c5be4f5d7e9462ba464625213a90bfb917ec3d500650e60b9c1f2371342b610c30d96d11699ad013c6e661abdd3ce3144fd5ccede0093a6 WHIRLPOOL bebfba5ef021ededb233b68f21fb050e3081453f2f3db26b0580d17b41b6ff8cbcae27f3bec33027a28387ba948f2616928f3e243941579d5a46a549ec5de6b6 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-GB.tar.gz 7122489 SHA256 7803b290743ca7ffccbbb5db9b5b8c5b9ca7cf88d57d2cca2b09b53a9abcfeef SHA512 24b8b777684ec978823719b1e194d1c69917883224f2cd7c1bd693666674e02a8aa81ab6916f2d7871ddd9e1b902da3d06b54b7dd76fcfbe2d51d012fcccc7ab WHIRLPOOL a0d26b3c3b3c5b5d5e43a66bbba4151d44244bdde89eada67238d39ccde5650298dcd3c5adf404f8c30992efef101eab52a48b4d11dfde3052a880ea7e4d53f4 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_en-ZA.tar.gz 7039487 SHA256 b21733c5bf9d7e6a2fe226746052fddddb124b0a96b24102215bd2a1442f462c SHA512 5c3e9813eef4ba9a7a31a8e0b10a5b00422c703751df316b4f1913058f763e9979034a25421fd89afd40842b66aa8242dbb08c0f5ddaaab996fd8b9d3d9e15fc WHIRLPOOL 87d57efd80761a671355f5277bd61759fa4836fac89f430bed8f8979f57072cb2690cad53e6abf3c22a57a51fa7d494b6fc9a9844fd215bd3b75036e46726151 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eo.tar.gz 481662 SHA256 fa5be6b105636db32fcb336f114b26a92b923ed2a7e7417ee1f07fb4547ada77 SHA512 ff1193b9ab1d63bbd213721acb27062a6a838cd946b797397ce13c41f309870ec076106721151460955b45fcbc056fa9d3783bb7cc7c6310b48859429ef52fb8 WHIRLPOOL f29df45a2866db420da68d10c0d4f8e6ec6268a7b5f2db50cc9d24f1f8da4da110eb5b3591b4fec211993fcb84843b9503a812eee9348cba2ffff81c70eb6636 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_es.tar.gz 2027809 SHA256 03a4090fcdd344a860b751cd26ad67ec0555fe4988db12bd1dd188c872b03ba0 SHA512 c6068a90ea9b9964b5a8ceb5941c91b06679746684f1ae1d68aa3bdb7924cd688ec3ffb6c6ebf86def905f5132c3753c968ced950693436ba3550aa7c06ec96a WHIRLPOOL 1d7cfd2dfbd783a5801ce0b8d014a44305dc51646f3ec3529028ea875c8ef87448ee34bc92c177211a6cceec498e0ffdcd67adf9180bee9c3d29357764980046 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_et.tar.gz 1390866 SHA256 c04705d6f410e5966e536c3f4e0c00db667a5cb85c470f9571c67d66254b1aeb SHA512 88a672a6cb3330f5522b5c774a3329361e7ca318bd24a1a0eda613d56d4990c2d39ee7cab05d9411826dd48494d62234b03778f3e13a028521b09f7450b43c98 WHIRLPOOL a14fa643993be7c0194686305eb35435d9744438ad25b2fbdd2cc12d780c26ecd95f2e0d1d23526ed81422c178c6e6d0b825f0a4d935462d9ac1251e76b4f0d3 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_eu.tar.gz 489377 SHA256 16023593962dd371a1fb0cd246713cf708e778f339e74bdcb684239a2e407f61 SHA512 2aaf922ceac6e2479e91b3fac5cac0011c47d4d37d9c8b97258ac9b2042146daac58e5b328b9a5d9a8c255cc262083c8a495332b4f954f5050c19a9a0237d312 WHIRLPOOL 0f2f2128811098a789c3ebf6edf1591365a999272d8a41448748eed1097301aaf376c84ad9417471bec96ed379e7d7c38657c1b124ccf59e0d250b561177acaf +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fa.tar.gz 512676 SHA256 8e29023c1834d09348eef336aa0ca26d11552eaaee646880457d22b40d72cab9 SHA512 14a132f05150a80c445ece3d2fd5472703a357c238e7738a7a011984dfc25ea61fbc037023fb2d52f7eacc2fdcf298a14f6cad222d7dd92858acad09e4d61599 WHIRLPOOL f642dc6e5c0cfd7203883839fd70e782c8369b94ea60c4b29463ea6a5979b30959ec32307c9f746c99339e2c6b4331d6eb9a1025d8aed72d80849b14fd039635 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fi.tar.gz 497318 SHA256 aa9ff65726b7e85b02ff3e5fdf13f8c3fbc3dc6c9e9258d9f19a22dccf6804f2 SHA512 4250f0904a3101e2a96ca826d8fad4944d6f525688210a304e01f5b0666db933af0b3a067f831dfbf241ecd477061fd4df38eb0486377700ec6c85f500a62ec3 WHIRLPOOL 124fdb2752c5e5a95afe1ab89d036274aed9054a8b6f54434f5cf20c144eb3ea73ff0c176f13a95eabe6902a6393b0107e8aa1b4e66431b930904ca208ef8009 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_fr.tar.gz 2821358 SHA256 531a8f6f16787c0a9ea97329554a158b3ee7dea8f8ba348e9884a523f8bf7e36 SHA512 410a5dea0b8d48f082c978dcbf40e8d90b9a49a9c6db66524d2f1f990711ee327f02469d0d67b6952f090564605a590312386ebf398cdad9f09e05f970203848 WHIRLPOOL 30ec9c8a274aaad1b2dd79787659fa10428f98388ad15ef06dcd7810887c9dbcba2d2b0f7d2bbdc7534db7e4111449db33afb0385903baea195094ca7d8328d6 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ga.tar.gz 506997 SHA256 ec1fcf57effd0f107d7718384e0ecab62c24ee682ea55a2be3de8a307a75db03 SHA512 9fbd56b782d0022bc67da0eae0015f063aaa89f312c620cc2f4735dbf2c3304cde815f0de5a1a741ef232a2a6a21e625e9199bed73e80d6985a33445ee27c837 WHIRLPOOL 3c63d2a0b8c8ab398639825410778fc3378dcf193eef59a58839ae47e047a7288d027cf3a351c46b6be6e224f7fa1f656c7e727e0bce9727d43d0b7f260594dc +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gd.tar.gz 1086536 SHA256 a164ac036c25352259328f5f441efded27f491520daa34c1724c24b021877739 SHA512 b42f0971c2545de2ebf221d58b3e6448ab020df6c51a286baadc0196289a2623abfb1de63eb7d78a5b39f9643d28a6d16c68daeb82b5a22b05c29f655d1f66a7 WHIRLPOOL c93ec60e6736e9a274f335effa3b5eae5b5207a758f477192e04e2d4f77433571369f8d94f5960efb25f3afa8b08de83e7477d02b4cf00f7b789c5d3269a611f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gl.tar.gz 1055767 SHA256 66a617221311ca2d3bf80db3fc90eb48f7e3ed01454b75d1768adc75b880f62c SHA512 c57e68b41c47c272b08b22b76ee7d0f8ebce06b0df786a38f1338f73bdef54017cd9b906c827df481236740d67ca670d7cdde7be16b2121c10cef32a6f4be530 WHIRLPOOL 492920b012eeff16c4f7eee1e5d1113b94204a4007ee838219bf353b4db179afdd5df7480905d58e6adffce26a77a9e6be024b956759d3a470dd69a9204ee29d +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gu.tar.gz 1193592 SHA256 b444ab513bf42da37b70a72660c5f889c48a913c5cfa95a551c7b9b4cda77c2f SHA512 63249a1dc7ffec54eaee64b9c310c753daee4ffbd39adf7084c703ec0b664b2fbb9860d4d07db91a9af57d54d8ef751ae727d1326f580e92df3579f2b61d60b8 WHIRLPOOL fca557f7c9820e905d4c68e929eb54f950bbf1bea2200254e2b1f5cfc31bebd742519e6cce6165b85c3d4c8afa16fc0f92f444f859b368d58dfab32fa9a0910f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_gug.tar.gz 503818 SHA256 10d2c68d10b54d8b820e7c9227c8872868aaf718890be91b0327aa7a016285d8 SHA512 92d4ba4c520c6769622067298b57537b510eeab9944a7c063038be256462cc3c77b21a175d132b6013273c5bdd3dffdd2f7c7265c91418007a6e6a5069487626 WHIRLPOOL 754df0699cf0cf4a4b349a8da5549f0604ff2930ee34358eadabd36db198f8281907a3e9f3162c7cfd6cc436e5d9e44284d6e1f92b50e604c89caf852f4965ef +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_he.tar.gz 1584411 SHA256 f850a6f79b6dcee69609a75f7c03adb2211304f257609d34c05c21a1cad662ab SHA512 0b8531f98cf194267814c871f5a4e3221501c451c109294d7e229a73f0518b89faa83f24aeb83558f18498e01317aad4b282dbe1970ac485a0ed692e9602fb28 WHIRLPOOL deed62486c10c53a211326913e251bea35c47e0d7033379d30b49604cc70daba612c9a06e358b6a3c6ee648031d2107bf033c9599c02e4d5785e0115675df18f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hi.tar.gz 613687 SHA256 be80e7d82c0e4503790a921cb0d24abafe4b1ae0b0c4fc98aa93ea7b51a9e5fe SHA512 cfba2f2c1bcc455c451a43f735d0692729f93a5cdfee34706a5f58dc585498a63b1fcfc98759208debf1ffd1e10a2650df7089b1fad865e352890ccfd9f8437b WHIRLPOOL f351a1cd8545b87b8cef875ef73c2933727f7ab69075df3b422e2f540327110dbddec8af7881203707b93cbd31fddeff1a5929abc18029b985390d00a8d27156 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hr.tar.gz 1258975 SHA256 84296c3c8acec5660618cc03f1ec528b582b20a6c3fe18a109ac912ea1ff3ae2 SHA512 8c937fb551a845ebfcaaad8ddc34a4e0d59085656d5b6f345f69ed26820b11f7bfe5c3ae5c34ade63f33f08c5707ccd8145afd623cc49ca85c30166e1d7abd06 WHIRLPOOL 0b593a122b8dfa9bd9f56e629a86b66a1099e3656499a2b3e9c63bcb55f7dc96b369b598be60ebbbd0f7a8cf703112881d87398fd95cfe6a7b837f22db77ff00 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_hu.tar.gz 2718810 SHA256 f4bde6df6505ba52563d13c7cf5b93c8ddc87676d8f1a6f47f26d3b3d7f102e4 SHA512 820132b7cf3e63b55001f49f6a92e9d1f7e238f58477f45ec718091ebc66425199439448883c070b2bf2b23ac71907ef88e4489a6004c1f2f41753e1c2282b18 WHIRLPOOL b20e97207a33b96334d7dd1ad284e37358bde871367bf6587df237f957bf366f626c50e885d69a5db84c6f3acd5afe5f304d2929366c5864c2683fefc193147c +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_id.tar.gz 483543 SHA256 f96db79b76182bd90bfe9e3da919bc5431a484bc2dd34f282635c93ab50d816c SHA512 b6bb1a245a663ad6eb7a14ad2238ee983d3cc8b99bb7ebc6c92a0cd24313ebbd74158059820b64f4b90d9788c061c65be31699465553563443f9306d26276353 WHIRLPOOL d244ba80565899bbe056a9af77e32c57b9c63a6b02dfb1a9dc99084a357e68b844068ce6c0d55792f29a0e80fcdb6628bb7d6ac4900cecd43e8eba37ed41227f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_is.tar.gz 1224728 SHA256 a8c647167af6f371f97268bcc9c6faf1f7f716424bf067123db311f5a440e49e SHA512 e46cb453f6dedf4e877af8ae8b2d03cdaae84ef24e0e0630ff2a593f37534ffcca89ddeb3c2c4c30c30f16ecf7ee13ffe60b087d4ea77d69c0fec444724e2312 WHIRLPOOL c7a63d36c625ca7563a971c18292af3b10b17942f5e1fdca74f009381268aea39dc186bbf5b7cc2dd5bad7df34afa781914d1b3dcf9aa1b431db7fb490321f20 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_it.tar.gz 1828660 SHA256 093357081d71618a7524dcda9ab36228cfff780700c3285f5f2c80565a492cf8 SHA512 5e1ae08f594622a4e43668a6d8079b6692665949ca6adda64cbd0d10acc74c7753dfcd14438b39e8e1b8cee5add31e9e70197169259a77faab9bc54e5d4dc370 WHIRLPOOL 45bd89a350a24db62b17b4b95f61c1203cd78d2495a53a375afb159812b668d72596c15cfbe7d889997a825fd82bbeb6c3554153c4b996a74b325c3bec0fffc9 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ja.tar.gz 592080 SHA256 3811b5a06b350b6afcd332685b98e1a1d3cc7d4d4985fb6f815fc3822bc8b1ec SHA512 706e6ed934af87276f4bc1d4c620fac76cdea8c018c1dc2569d8fad0dc5d211ba31ebd8159389e4426aeeb2a2439ba3fd1e4458f0842f9e19e5f7e31f561e8cd WHIRLPOOL 39f3a4efee8c470ce5d7d8a100f7aa981c4dcf2fc2e7d78a92f0e64d46fe4b2257843e3ac80bb0847928c2a1a2bcc08617f54d8928cc0e6d67492ee3a3ec3dae +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ka.tar.gz 526878 SHA256 302533f6fdfdbe83725aaeff253c1e9c10073a561cfda544aac785196331b3e1 SHA512 21548e344afa5fb10a28bbae8b2f304f7681b9fb713a6ca0040ecf07c39858abd0cb34ecc83ff8fc3af9b62eec6c86e187409d2fb35acd2f62e37b7f4e8fec55 WHIRLPOOL 116573f5deb82a3a2d91ba576fa4e960a6633cddc81b6efa9634035e1eb41850b51fa25341b9f9e4e93a4e5b218a22ddf6cbe621bd5fb6beb8f3fd61286bad3e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kk.tar.gz 538732 SHA256 c7243bb433ff3d0c3b4c7464e19f0d3dc3b06003c363bf31c7277d9bd9fc6916 SHA512 b1bdec2afee78f1a0ae69b4ad9b8da908589d3925b53c2f8ee05cf3227a5346d842de8c4b544f1424bd683b56f76c0336030ba5d12dbf5b531d86583f0e4b34a WHIRLPOOL d8ca5451934baa22f079421831d44dbc1f04e18a4442f724db09a96685cee16293681f180566b9fe62235b28d591c59752a2a4d23c0b8c380f1419700b2db72a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_km.tar.gz 645400 SHA256 74117b35c868586bb8b2f18a31eef2b991c3ab75f65cf02cec6f821b798eedd5 SHA512 8fab5efb7cbd8e767f8b8829bbd6672aab502762aa1214a2802470f9a7dc5c039d91b74be585a90c3a9c4c235417681603972c582bfa000207c47c7b8af8228e WHIRLPOOL 4a137d9b7cf12804b20a73ed94ea81b8ca407f76281a17a0435d5d6fcc09e490a0f9b630cbf4201b131ccbc8a3edde8f6d19660e44b94b80b7df86b40a05530b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kmr-Latn.tar.gz 500298 SHA256 ad42c4f7e7e47bf041c34b3d2debf529a7c510be85cea4796f23e58a73433e53 SHA512 681717e9fa555b6488d13b3f7303f38a97a8142235af23abc6f1846cb988f718da762f064d585c0098f47cda2be4b25003ac801c0672c17a85b99450eb414f28 WHIRLPOOL ff94d91e57f49b53045ce44162baad2934a087e824dab0a17af73ff536310649b7912831438df4cc4637fdd986c46ebf018425d8e131fb0e515d259f34e0f48e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kn.tar.gz 557640 SHA256 6e98a1ad25857bd60c3086596fbf1f08cb2d3f7394d25ca74076e5b7e00ae50c SHA512 1af5bec2029fd666b3af31f5af7480d58816bfc3122bdd1533ea7cc53ce461654f1093d943145d2d06d96ba4ec60f7f3d0a76cca5a2fe96e62e07d69133aa9b0 WHIRLPOOL fd62258c12d8d25715e5940fdcdcbde710f07128c27d0548bb1e487c087c8420f8da62602c30e020377069c1246485a2e517b5a4ce43f6dd3ae6762b13bbdd45 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ko.tar.gz 584356 SHA256 b5f544e771d29388169b11b8f2dd070a2de298f5160b754019c3cee891269e45 SHA512 801d11adcfc9d8ca3723798daaa06f1a019bb46c87a75a8300f6fed0462e75593c9196d210b4c3a610222c1332ae54612f53e47d6fd02e2e1f24e695bbd71b12 WHIRLPOOL ff1fc4b5e595b01f83bb94c87b1202ceb4263f65f99b1c79148a9650d94ab88b248bf292cc040cefa98f820d7a7319dc491f5d575048e18e7497b4d1d59d0b6f +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_kok.tar.gz 541535 SHA256 7fdfa61846e4df6664a1edd178c1582b866415e5059f981ee0f6b24de4dc2a4e SHA512 7ae36192cd99cbf9f2197d538803ede85ab24664bb75eb5f11351f38194dcbccee9f0e1491ec5b946c2aaa133207e7c24732a3c3a08a6340e3e915484fabbb8b WHIRLPOOL c36b4daf981d069a38051414f6b48df1c86e1fe3c64a5fe66788f0eb3dddb43ab38f7a79ba08e9567a27365eab8333566b78ba448578c9bb50d281bf30bac0fd +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ks.tar.gz 520141 SHA256 ef5562fe5c6731945bd22c5312203ac99c178e1379422c481d7525a3466a7b72 SHA512 17f4e332638221c5bd49585be85a5a67a9f5134e562cf1096e741a4699ecaf5eee635706e62f94c34a653111036ddcb77c25ad432d22b64467dec7ff2c9f18cd WHIRLPOOL aeccf9c08a6e0edc0cca9a30298fc4b7e9742b9fb1fba3cd69e0d4bf43fa754bdc0916e4f2b47cf5fb54ae51574a3b1a6e2e976a0133dd4669f0ff8c415f44a3 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lb.tar.gz 469948 SHA256 7ade5d839b5535134aa198647f60b1716947c96fdf7608218a98e90323fa8977 SHA512 1256bdace1a6cf435ce3bf41bcb4a2b34e163d0b1f03aa85541e3e3db4582c0295796cb2d492d22931efee87c71ea1cd010a2411fc355894d4072460a5dcf637 WHIRLPOOL 039d0588aede9519f35acf2014fb8f65a808765af1ade6ee733bad22a2e5a881fab808d0cc3e15984a4324148753de7ffd1b75136978bc2f22cc84eead7d51f7 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lo.tar.gz 562714 SHA256 d0e4056b239d53c7c1167c50c92134d7d2aa390d378d2d7dc63a829dca69d5ec SHA512 b3eadf07d488d96e3ef120ef6b59adb24cadf77f6d088f76e52bfda9cff39906b6b6bf12217d694c4365b2e4f7a5dbf128fb28adda25ee561be98c0541e39b17 WHIRLPOOL 379bd65a8f3103c3397b8a8fdee26ab0218c8dabbd8e796ea2df32498e9efe090061cae2ed9550dd635b3db83428107da6ea6042696ee35c6de1cb28550727c8 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lt.tar.gz 838444 SHA256 bb74c95f560fde614922ba07c432dac2ebaa1fb4be51086cda06ce82be889686 SHA512 d3cdba5c35633630deb2f30fe0a6dc57bbda017b417f51e060cbf611ecbe5c7b5f230aefe0a9a46045789f0db302fe1e5e26828805c21227dfd71373c1083e83 WHIRLPOOL 690342e4ea099693dc3925cfb5f5e30fbc8fa84778d28fca3ed20960fb1239301f2199efe248bf993ef2b361192ea6538706e702546b3caafe803fb3a2d84ac5 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_lv.tar.gz 1253848 SHA256 083ec96c6079d055affd3301b741414db3186f7c3b0a26b5705379392baf9d0c SHA512 d2ad3915b91fa94692a32d4251933a4bc173e51bed4f74f8f36ea1234ad84bf571e9e98e6d3a8ed8b1037809822a183cca8d50c4e2cb78d313031ff96a91f02d WHIRLPOOL 0f691cf7a5e5da07fc66d76b8e1c71c4fa3ea7d6232ec6cbebae4e4aee927cf652b06de4a2be7733bc6338a5ffb3839b1a91192f04427489d8ee8157ae6a9779 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mai.tar.gz 523193 SHA256 f1998ce07ab814dabb36a9cbf053c07c5f7b5a75d36d9f49460078f9ba0ba430 SHA512 7546f7fd8071af4ee4c8359c0912b5292c772351007fe8fde04e91291a54e05f3c9fa36e90360d100ed5c5075b02c008653009fed3a479bdb7fb9e2c430b0474 WHIRLPOOL 0b81c5f903df9ac26ee986b2c67931a2d539757a01951456728bb54df4445194b4c02b8c7d38757f72b58319506f2a2d3014b0e8bd2da5b70ff3398959692eba +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mk.tar.gz 521419 SHA256 b3d305f9ef6439b33736eb92792da4741fc64f50abbbbe0a874dee01017b0c27 SHA512 16afdb37f51ae43245f4c1aeced46d2370857c78ec8e44dbb24fd9b301a0e48c812c273bace3e6421f88a4db3a13d104ec5d128847bee15d1219cc010520386c WHIRLPOOL 3d0b33051429b5958aa275539853ef0765201fd1fda397965fe7ffc78c4bfd61599e6de793fbbc58e80964b09323e91d8a733de7058c2fb9693310c206bf18fe +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ml.tar.gz 564134 SHA256 e9d88f6c72806fef775e66a9a2576bc965384f6ba2923bcda9c46dea6f6c0dd2 SHA512 71b64ed70b2ebe7ae1185a39f598d9b196b4c9f174eadd16a871f2e3bbe7cd7c365f9c6e7ac3be336cf00be29c6d7dce93dee74ed8bfb37c74a1bdaca5a214ad WHIRLPOOL bc3ec3cc4d6f87600d6b7b35de287b1ba9d48dea0b32042a0ecb81dcf41f3614b4cd6c08ca2acc9b2072fbaaf988058b5cad9f87c5d39d9351f6a6af70ec9ba8 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mn.tar.gz 610738 SHA256 c9260efca0eab884b9737c1cd04621f7a53ee3cfef6adea9642a61da83f3b82f SHA512 1afe1ba10cad41cbb30f26b6e79d93283bd3a9ba0f1da4b85d47a5d8235e45fccc1a8fa69d898636cb84d37ea284d48a9b9d58b1f5aba3e3f8b1945b6ebacf18 WHIRLPOOL f9e9b4a1e53137668b33644daa06f8e90ee29d8e4a9bba4d38ab41ef6cb3d19fd8a16adc9897b99157fef40e37a0da11467960152a4d666c60a17d8f2fbafb2d +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mni.tar.gz 534278 SHA256 b88bdde76dede107561b2bee2da332026ffa730a85a4ebadd214ff983cb4b697 SHA512 ffe7af779281928f14e07b58d5eda23d7c20e99ff920be2c4c1374c2f1a72bcf377eaac768109fdf76b4f14775af0aac45e266c6202f5887d909bd7d94837de6 WHIRLPOOL 850407d24da44494d6b9c439f738eb12b2933dc111012df89b723f4654090fbb1a38255f9508b98cda9e5416a88bb34627bd5471660574765ad826550f21c4e0 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_mr.tar.gz 557093 SHA256 bf3630e6dcd0d058bed16c208bc98812899cfd2d22aaa17adbfa28be9b21cf7c SHA512 a4243b0737eae1ef7b18d9335b6255e1a768402469fac7026b64a109381674dc96b184a0e9b32676a0bf328808452430df855f2b17dcb0bdeb756c141a80669d WHIRLPOOL 0556a97dd2296230fb263ea1c478023280293f7024f13bbc9542ed5397d539c1cb6308beb941ed6e3fa77ef715b8cf962c071b47da902ed7a9be3021a520fe10 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_my.tar.gz 555062 SHA256 7554a8e7fda5e12aadbaf84f65a3ceef9aaaf88a9269ad1cb3c717930722effc SHA512 181835918f7c93783dea406bcdd5803f34402e34a1c7e61e8377792b08d2702ce69388ce390d3e8b0a2fa45cb89008485f01761bd4dabf0e23a8d784c2654f2d WHIRLPOOL 07bbb4feb3517bf945af91c9a2c86d1c68f181b2c49a630092588c93e9564597645dccbd8f52775f2b09fad81a0cd8fb1c35629de155e0348952b8f477c7709d +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nb.tar.gz 3488676 SHA256 ab716c613914bba643aa6a75ea43b89ef2a658c7a78d66f15f665dc6b4462892 SHA512 e9980126f73df9a0334f8c6c3982379feb63f2a3672a27b482d5f20d9cec3a845eabac4ec0731bd0d150240229aba124d4fced9c0d1c4b59155c2deb8572fb6e WHIRLPOOL 9efef7b55ea4d9774a04774c8dd2a3eed9acc08aa002a37228f2d22dadb6136c15e3c00018badd9d65f53c6eb0e0af283a45d0cf073b226b0522ae7a6a3b4cfd +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ne.tar.gz 923157 SHA256 403f6fb98a57ab9b8c96b922f556be618f0bc84ace48d3850dc6abd2495f7ed5 SHA512 a64c1190f7312664a4aff44356668012c4827a192c9ca285a566b41d8d24810f551df01b41b4f1c502f6e84d9b7ee5f6098a0a3a9cbc4cdcbd441e3107261c54 WHIRLPOOL 53c2a787c8f7763bf1fe1059bdcd62aaa98e9c189ebd4ece14eba39885fa9831b09158c5b685feb3b11367dfb456bde6eff0aaf1bdff58e729ae2ff1dbba6c35 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nl.tar.gz 1285652 SHA256 18311df69f0d93b25d537b3705bf149ca257220f36ad2a5ad2f26f05094c0e73 SHA512 63a71adeab3030a26426db9c8644aa58e178b66523d43d08ad34517a6d6be917530dfaaf633a585d6d8497063f4cee34b4a5ecd0773fe9d38d84df8fd86345ca WHIRLPOOL 1402d610832dd9d42f826fe331851d8a1418ad95fff63755888388fabf49f3ee1108fc666154736ec64cf9d8397c10c46c883ae396de8df30676278b699d3f75 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nn.tar.gz 3484722 SHA256 8a31eb2d4fa2c351497ff046a6d1e1bcd801cd5c9aa417e473d07f4bb1587081 SHA512 38894bd7adf6b1a56f3886ea55b92cdfca064fd20d636c4d52039a0958dc5e8eb53927905bfe81044480ed87b9c4f535df349610cccb23326fa39d7995262608 WHIRLPOOL 56a526ede8eddb27bcd649538a6c54ef19ddefd403b620e842210a7b1479d2b1508c77afdcf298d3fc68e585077ac380dee76764088f9f9f3897b28d3f532958 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nr.tar.gz 498886 SHA256 5347d5c3e3e55b2a52d9d6207c700ba2f7a3ef83b0acab24749b29c3809bfa79 SHA512 4f911a8dfe1293ceaf59e61cfaf3a0b51a9b6d4b2c39948a7ab2f28e8c70ac4ee9533469ab8ea5cf87e8f4c6f7f8bf8559cdcf33a9763b44cde3ebd06f0dfdb4 WHIRLPOOL 107bf199588abf19f538cf98955e5c861977935138f08cf37aaa2ce67ea88eb0981c3ef1ba326b5aff4b4359d698830bb7250699d64a453d42033a90a5979d52 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_nso.tar.gz 496117 SHA256 ab89cea04a5b408bbef6974b60127b6d53603b5ef98603331f5f35810801489a SHA512 80aaa284585fe7474501a4a65894d40abd5b4026585e66c6ba167731f7bb719cd65b68acc930359b64ba2b7a5acceee2d3affb4def291f931e871b67a05053bc WHIRLPOOL 047e6a8762f7a902aa2ccdc62f188f960bb23485d123abc840e8522700f5651ae6cfe6876022f69f823b3aa64b5de5a5354ba5157a0eb885fee10531ea7ffef3 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_oc.tar.gz 698666 SHA256 8f42d9f8f99bc6060f299aba9576e338c227a0be7dde4148ae4456120db159e1 SHA512 414db01ed14ba1d2d10e9213d81b08eb326024a6935cd7f48e9ed2c32d1776874dafd5a2eb00f7ebaf9370c19ec54b144e296f23265c60967ae6dcece6fb9806 WHIRLPOOL d649d612dc3f88497d13fca059a6c30ce13bde08b80fa715e1bf84d0c1ca9eea596b4b6d144f68bba0e3626246738cf87a837f59a145176a9042f8c0157c50a7 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_om.tar.gz 488145 SHA256 586b189591d9baa69ac7418103b39037bb15e87a239b85410092f523f888c17f SHA512 bbe4ed94eca0303bf07e9f6b5dfe9229fe9d5c13bad07208d8a625efc535ffffe72072e945af71ba231b04dd750e6ef55be0b772c3706bca082f40cf3f930158 WHIRLPOOL 18ef88b4ddf17b47719884918ed78d26d0303ab2ac74b374bc04b21d24a188c85210406937e73a60719ef29d045728f81c94323439afe394bdb1be5f66e1b8c0 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_or.tar.gz 556825 SHA256 0bf8d6dad3c195d6913777392ed7816ee4bdfe344471f0da3a1c1f9006dc8535 SHA512 4f20c94771a9ae17703ad43ec85b260edf6943ca1cfe248c16eab5cda7a8650f1c4900f8a70619e5c1b016624eb7cc244b3a8c2ee8431db9874314b55f157e91 WHIRLPOOL 25a5b6900c02084eb1b6a8de4d8a4c68a292bbba33d01821373bba41a98dd9a89b1537edaa0b96c7600376ad2cce383b633c22bdb44c9bcc204fcdc2f9e332e6 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pa-IN.tar.gz 526743 SHA256 ed363f559c960a4b7c6123fc84634c90f7819db7b8de32582ef3163d8ed219ed SHA512 36a8ce65eb4e205806fd49a70294ffc2aec599a314490f068254b55178a892627260b1f8c16bb2e2411e2e1cf44fb0317af1ac1917bc0cbaa56cc87b3c8fc142 WHIRLPOOL 7d1d7abad271e4a8b7eef1d48ee31aa1e28db89ada306f165d6e9c7dec43a4febfc4b65e6dfb2d8f93352c88cb48475e710aa82b960aea466fec69c4f22bad9e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pl.tar.gz 3279959 SHA256 f907a63cd62c513ae2264a7557026787ef16bb3e42085b1b27d54adedee1c213 SHA512 64afa320d960a3b3270fd479e6a46ca59c88364cb784f8b5fe8279cf38b69e6680ee287bbec098a5481ed98b401bb1186171cff327bb03bf6a8376fbbf0c2db0 WHIRLPOOL 323e254103b877166d1f2dd04fa3cc89e2e95cea53eb4c1a5250c50abbf9b5c7c96bd3f9ccc1e80368c663c65fa1de4912e9e75f4a3ef32107f1d64dcac1fef1 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt-BR.tar.gz 2578269 SHA256 0a6376081a40fe3da05ed579a3e4082bdca7418be275ceaa4252e406f3f8d9f2 SHA512 b4ecf21591b9a24723e8aa76ea91a27ef3300bbedd81829fd593654b3caa9e997cbb2e91744ba85c27365af11615d2098a38b2c641258f2f785dee12a1a95d2c WHIRLPOOL cf541a81ce8576cbec3125d0e71c0070164ec31494c131af738a20c3b574187bc8d7bea7b2f206b76c95e2fe56d5c571b1b00a63704c89a78daa8d305214507b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_pt.tar.gz 1131175 SHA256 385f06ca4160961c82573867bda9a9d129c3714447cd7c699d952081e77e3842 SHA512 8edc633f1ca1fa099d919dd4a784227da7119e72a79e5bb8ce8b17801e57751648ad58c15a12b1a2b1868e4d7acf319662cc331d92820a81b79e94c395c7c541 WHIRLPOOL 81a24a6b9be4845ef3b23f235db0e8b79bf8f4d3195616fb4d970b128cd1166f3a99c6820adad86cb6738d462171ffb97005bc9c27f7d981d545c06e2a99e5f0 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ro.tar.gz 2365168 SHA256 84fa05a1234c2509b1a41276106555ab15a88d3d65f21cdd687321114b7453c2 SHA512 02ebda48a77cd48371a5c83d9b6d28f4a0b661e99a75509f4ca5741bdff9617f8f6d4fcd2c7e211697919ad0ab638225dd881a7b108ad4e138ca59c9e3051f2a WHIRLPOOL c8ff15fadefb73aa2a05bf2be90fe9bcc12f265ff648f9a0afcaecc068349c1c142c4db6d3b9f633f9b6deb70a071fade137ff2557fb390774c508f1e53cfd3b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ru.tar.gz 1653921 SHA256 dace8c3104f78aaed69d08b86cd18b03b400d909aa2fe86fc4faf2b4c8cf5495 SHA512 eeb0d54dc22aa7a7d6e342d1875608595dc9c3cfca6be779fbfc1e2cc6e848d6e44f74d806e49ee1afa971c7ab3d380b90df4f97a720d114342a28a5e6e16796 WHIRLPOOL ecfab408f4a0e8472227077bdcbea2f843820772430b993b19cfa1418265464868b2de770ad3084c4a73d55e18b40a5a7b5350ae3c1edcba9d4905d3d828b4db +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_rw.tar.gz 491579 SHA256 dec102a84b934ed7ff46fda872ca84a81641fa0768452bb1d511ed70e02dfc5c SHA512 2b964c6465d0aa940a710720481cc07c442016e0cef71e60450f3e03a59e8a7dd1e614931171172bfeaaac99e6e1c4bce5c727c6058d8813b6cc0740e4cab1ea WHIRLPOOL da3db1cbedcdd4c55c04a2621988feebb585d14c80eca7aff62e4deeaa947eac69b254bb8d874dcc15be7f50518b190f3ab265920381615a2cff9f2cb4f25441 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sa-IN.tar.gz 542701 SHA256 184557215db5f58cd12f61da183e31ab4f2f3763cab4293ce4c8da5120d13486 SHA512 35ef6c48289f42c2cbd0fda0596fa584e4436a0a1c1375dc560236f39abba5da4966f0618ede3fde5158f0865c895cc4ea96e0307440e246469386cff4ae1c13 WHIRLPOOL f1792245e583a2bc95fa7e91133609329d0480a1042c93b6fe2e0658e01dcd523f5e67b1d80fc5f5fc378f74ba63a5a6362a0b6ec1d2761386153b0c82f73bbd +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sat.tar.gz 583603 SHA256 cfc8c0a00a83d23ab7e55e543828cfc4e969e2f78cc3180992dad1a9aa313c23 SHA512 0030938094cbedf7e0b806afb4da08e01edde85b5b2da6fb6f1203bec1a2baaf8153c63668d2d27d35909716e864652aca2171776afb6911756cf1f457eda0fc WHIRLPOOL c84d4cfb160c1e34ef6bc4c025f14207b4870aa1c17a1e1aef068acba1b50efe50533a5fc605e1798c28b22796c81c38377553ecbb9174a8fd14fe9ea2b858ec +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sd.tar.gz 534415 SHA256 f702e094f147df234c7c8bb3fabffb446176698f848121c8699d01974aafe890 SHA512 5574b764c3ef7ac9c676308161bce38963d62e1edc9e8d8d01d2e336c7486b8510d6e47563e815241d0d01ef40565de9abadfbca4cc2a55042498115d97b1852 WHIRLPOOL b908447a14e2ef660fcadcb997084136efc13ee9f525acd31e38be3bf489d6d5503f7d947c9f659ec1f00f9553df8f5145e5d1fb927fa16d4487f9af485c3d3a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_si.tar.gz 825088 SHA256 831530e9a1b61c6e56fe1934b4c4d955da6d6b2a1771beb947272cddfe720738 SHA512 ed17d0ed6446e4a10bf4cce4d24178ca68a35489587c44b851a21db53de897a1834a1b8e4083bde1dc732a17c6dcc8e17e3587d6414cae53abde5ff98c601981 WHIRLPOOL a4b182d1b9b4e12890c3c050ef0977fc84d35ca16d1a9939a500485a217ab1de2e0f0a93538d48809175f9d2699298a30f761a67ff26e6f02927dd835bd36916 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sid.tar.gz 495466 SHA256 2b04a70fa81f752126b0983a31e9617396ee31cf72abc3994b400a968959f29d SHA512 4b28d2d7830b9d0a880ad0a3b2fd98fde722fee0a07277d97c4ef358e54f0a2e4b0c9f3aa0a066960fb1a6d308e8d42d11119dc1e2034fa163d7efde0dd93f34 WHIRLPOOL b2a7472427d1339ee7e6441c8ab6896c281e5d1504602a3230de0919f2b0893950a711e47e3093284ded1039321ddd2abd5767b8f456f89030ad9a6bffce327e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sk.tar.gz 1785397 SHA256 59df1ee412349ec08eb5028e17122a21529e9c4e066e94475d486d39196eab62 SHA512 b5e8a88a0c56df7c468ff9b0baac68bf3b72c34f0e3f8782d48ceb9c787249f6aac31397a8fba02dcf2f534427e27624fd4045b0ed4eea9ce86ffd5bffaa2538 WHIRLPOOL 2721a2c660597fb41e66569df5e861ccb4a5ca1070a73daee95538f3266dcbf94134a41731c80937789bc122f69b2cdcee8767008ef02b6e98f78e0e11f7b47e +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sl.tar.gz 2164238 SHA256 2a96515ec51a5d2bc673ba054d84ba57f4f4826a4a6fffad0fea5cf62b64f692 SHA512 79168347e98d1eb739cc4a17a8b22e5cbfa5e50cd59db923d90ef4a8d415b9fe497728b789cf45fa41cd8619ce0af354beaa28ebf1f427fa29ed652a5417975b WHIRLPOOL 8c5459bafa30337caba17a93dcf6d9f1711a644369f335e4946d80a5898d95581d78dfccee281dfe1acb6b674cf5f2be9cf543d0f234e65c49b603f922232607 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sq.tar.gz 510434 SHA256 493697c793e1c3a06b413d3521f4dd39d0411ab3ad8ae65ff512a5bd9a0d44ae SHA512 ae31726ebe1c099339a2be31e2ff6c89762083998eae77e1d8bf698c5b9f37420aeda6ce09d824680c8079b7e659cf5ecdde385765205651a3549bd11c95e9bc WHIRLPOOL a754402d6905e9423903cb5599ab6c2aa45f37ae9c240049648eae42d2fbac0258a90a85ec6d060fdfd5383fd81b6ee8d6851255205a0528126bdf413d6165bb +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr-Latn.tar.gz 1686972 SHA256 9463b7f5a742aa4773281028a878c800402c234ad9da8546ee29f7c0f58c5362 SHA512 c393345665560aa88440a4eee774aef2586218bbbd011dd3a002be60edfdd86c76828f73a16cf63848c9e10b9ac8cfd9af3b9aead82a01f141831edb3e457394 WHIRLPOOL 93916055ba456d3e9c51f0db5b8e5f3da8726b5b3e0fe4a960e168501dae3575f4f6d3454c263ae2cfb8e9f90a353cea21348edfb53922aa0326d8ed915bbd22 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sr.tar.gz 1714813 SHA256 6e9fb46bdeb6cf4ccf8564c1458106ed00fa476607b546252ec9825ffc0ffebb SHA512 08e1688d5f110f21d387481662c091496cb3e6d4cc75e29c3430e71ed1b621698f542d80cacd867526a124ebe1edc1fe95d52c3c515fa1468b73acab64c59078 WHIRLPOOL a28c44de575e4bdcf944b1d1a53632abeb06f5e2b772884d70508a0be577e58dc6d11536a325c8f708d36710466740452b7bd142bac1767cc9fe62670c3c1e4d +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ss.tar.gz 496288 SHA256 d7739fc2110e3bc90ce4bc201c3d5bb48e905facb6df0bd60867b92798b58870 SHA512 46d2f8ddbb6ef96e51cb2b8e8a1a326a996adc9d8e4b8e991f4926cc8cb0e332689280f312e360a293c6c26f13c7645b41087ce75b92a99fb34563356711ec7b WHIRLPOOL 04f59e3bb8d18b0645b9f593f7defd1eaf630f6f5b77d3ee094c203a6b3920d5358f1bc6b96cdeecb735ba60381b385393f668423ac771a8a9b7e2c939b8de6d +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_st.tar.gz 494970 SHA256 25619f7c096b8165cc505d6eac9df03bb23375e70d99a60f18bafa10070ff2b1 SHA512 dfde10db36f5e506c26dbe28471a544b2b0bdb48d9d36f4b698b827334ded5640c2d59ff679d1a7ca877d2f57fca957b20a5ea8186b659983e9ddc1396a95fdf WHIRLPOOL 51d86c30e7c3d07f0a49344b5e7261e286c7f90b3796534002c0c83b2ce5e13887f8fcea706e8cb34b7d6d4756e3f6cd8c07b02fcf27895ae80f754972eca712 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sv.tar.gz 2367055 SHA256 572c0c7ff726c621d6128cb0d5d8d681b9bce4ffe7325d6e0aed26e6f2845b95 SHA512 ac647a19d9ebbed394dffd3529064210adc1513fc33577ea9f8c3b5a357a8b59d1d29478c3598c03cba4207e2bca2c6febd2387d45ba106488a8801ce4124ecf WHIRLPOOL 6ca4e7badf956694b5d48da3473beac1fd06247398d2de74c3e0d28caf293615d0c21e839ec591de8b44d5891182724297e4d72104e5ebfbbb245078907183ed +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_sw-TZ.tar.gz 482977 SHA256 c267696a5521781fc8612ac36f63723023ddc07c4740f2f5c08e2784fb7c265d SHA512 4b1c80434a4b5042bd00af5a1716fd0604e360563638affac6d3835837c12dd531f190e041d01471e62348bd8312a0a2916ee7a2d0fdf27e87fe05f71b091f2b WHIRLPOOL 0f733fdbbd7d7b2192ccec896115b0c593921305ff3e7b99785225b68f3fa99a04f3837251432f4de572976e37259c3d2c363fee952acb09e55bd9f2b1bce785 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ta.tar.gz 550867 SHA256 7097d1e86d66ab84575bdef0cdf7463bacb938b7df1853850f7c7e22f3c34f44 SHA512 9066b37f016947b015a4f67ca67e165870a286fe3a43d79d9c6d2105c79a1336d351001f6b860f00c16461d741d766d32b69202d6aca0f386cebf19bfe639c21 WHIRLPOOL d243ef4f9e7cb2751b61d8ff7ad554ba1b89ba45ff7da2033fa4081ee0eb87deaf2a50b7eb88dc77044e10bda114173649626c716452637223dedbe225b2c557 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_te.tar.gz 1108686 SHA256 56c6d0900dfb2d660bfbe5e65d992e4cb4fc1813c0828f3d5fbe9304cb9bd971 SHA512 66aa1a13ee63d6a127d286fc671739998504592976252b43ad85573536267d4ea831252432cb0af06f927b7a8fcb19c2c0e98c72dbe3ca00c9886546c20d80fd WHIRLPOOL 3b509fbe8d38826f57a188a8025898c6312abe685bab26b112821ea6e9eb50a4ec007642e1d0b1ba9c2fd99f7822814e4274fbffa8d6f0ebb7ea3d5c61df95c2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tg.tar.gz 513738 SHA256 83bf798d510b569492d24f62ec74d9c2981d0aa7b278f8e150002682e97d5d1b SHA512 41129a9dafc9a2a6d79d9a49d86cc78bddfd480bf6e4391ea70449610d79a8dcc950c66c1d167f7fffd9ffd9cc744d16a54b8c4f6260538778cbcafe8100b34a WHIRLPOOL 4961b486ccbd7b966651ace65263bb98f0fd3d6e17758653c353388852904809ecaad920a672c8b87177075facd80de18c9b17029f29c5110dbcdb018d88c864 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_th.tar.gz 694236 SHA256 2d1a67065ad2650ce3de9068b61f4d3fc63d6089c20f63272ae3d15511d4c82c SHA512 5f613de5c281abeea4caefc3c5b8537dc18efe1ba1eba3cb5dd9d915a71c13e56d2322025c3506da4906f8db3f3f8a21a504d6e162008c17ca13d7680fc40c7c WHIRLPOOL 9be9220f6f2c9a56398d5cf8ddb14fa490988f5efeb72ebe221a151645cf5268c36d4ebcd21cc5464d046501b36b2a06372e6cd2c4f2c58fa792b51c3f376338 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tn.tar.gz 487358 SHA256 30da2da6118ff962d730269bfd70a2c5bab1ee5b388977b8ca9be9e1338b0619 SHA512 f74188912b43d67b81a78dd533f48432d3b044bfae73fc1000d84d19af8d0f903bf8e656b39e07a0ebec6bb2a3058114d74ae5c1f603fd1ff4976d4dc2f3e680 WHIRLPOOL 03699c4bf8f0c025a267a5b45e9813ac602d34adff9a73c5c13a64357c4edc14b7d24d67f78a8e65e361c3fc4c71c6809c425d284db5ca7087ce8f5817d4acfd +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tr.tar.gz 536244 SHA256 d8ec55a7a2c1a2d44fe95e85fd33f6825606b8115da139c414b23c29f0debc42 SHA512 9c0b5444848f925722c8547196a12da764bd8a6232af151ed70696c7b323e702acc1b16083b68dea09f22ffab2034d46653dad55645b03688b90179154515a8a WHIRLPOOL adeaa5903e99602525ab7f412bba6e972a67fb951316a59e003c197833f6c5bf373670a4a16a23a53fe5a0ce391d17ba56f9c924a1a48a4586e75646837a05c4 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ts.tar.gz 497443 SHA256 be05666c9c1259a38f9dd86eb7e6b6d72738899dae47084df4cd0e5cfee44d89 SHA512 d4d296841ea80b1d24c1b20a0351e3124ac2e603bb7bb518553eee5d74b461077d44aca673b31548d81a136bcd7694f3b9b2a6257c404c128d891b2b4350ea6a WHIRLPOOL f81e507ce2ab03783eccbb3bf9c0f6e38b7863124e405d9c84bab935f7d2595cfbf43c41036170a60188bbe2b1655decdc73cf2be8417c4df9a6c8fe1987168c +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_tt.tar.gz 487962 SHA256 89a0659793f49d011ddbcc69ee50408a21967e2a2ab5594f9ae419c7ca4236bb SHA512 c810df70155caceae411940c9895a8035c9b8f414137b2090746773a7328953e0d749e02d9534da33a3e8f9bfc2003f8be2ac715db35aff7d5b85a90b26d0d02 WHIRLPOOL b992e4c707586740018c59a3969b187eec0b69cc2e787efa6dc46670437f8f4baffbea860cd89c4a1678213c8779b2f8c8aaeb168667fd9d9ad94e1ed0325e8a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ug.tar.gz 526902 SHA256 799b05e5cf3ba4ea8914340ab87b46a70e376160832b9baac45d663039591631 SHA512 abf5ee5a02e82c19850e84eca47cea9835b25a60d660711728fa4e91726bea84f485e8a54d04a50f52f41d614da1af738dc206e5a9bc7b71466296c324f5c133 WHIRLPOOL 478766319751965bd8c70f5eb3ab93856c77849f03c578c9b8d70c7bde05e4531a76b2b1ef532b2bd175ebcbc59cfdc93c0e747e4534261dd9c8b8d78cbc21cd +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uk.tar.gz 1376217 SHA256 4a78877ef18fbb3b704e35bdc972204e4d33264bb823daced0552fd40e373d12 SHA512 54c24f2d80050db823da5b167c3096967cddf02c98bc70df90ac69208c32fab1392a4481b50f7271fd23e89cb80e5f601d06f8f20248efd04c315692b7e06982 WHIRLPOOL 349e9c28e22b7612b7e1deb018f03fda9da328d60bf86566cb379b76c5f4c8f782dc0bd1ac34e8386f1c34fcfe0954bfb713276055aae5d74e2a228b03c2f9b2 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_uz.tar.gz 488003 SHA256 07251f7bfb90c67a6dd338989c7d2956cc81a830e2a04a19e15a4c0bdbc43f8e SHA512 9e25644dd8f436a2d4f5edbe1c099c664fa9dedc888c9d8bdce1f4470666a6bc25cf33000b89817d8c642d88d2d35726e477aa54321ec88be9f6415af1cab86a WHIRLPOOL 9ce80ba2590b7420e0355b9d1e5aa4e67198170a4e5c0f94f18f4d1fb2f2c6dfaf3e14219128d2fb4121de1ac547756a15532b190d50dc073ea2b93a39fb028a +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_ve.tar.gz 498431 SHA256 ad25d8cc8b3b4d5e91754892ea0a3672e2c0e7bc45bbab069522a2fbbdfba078 SHA512 0404ed3894c0a42aebc665ea6a747bfb13e1443149beec9d0ed34bb12c6eec514673b4a326f2e5422c3c93c7c40c9c8b81de21508c5d495be67f4845cf4e7437 WHIRLPOOL 706bdcab2b66155e761cba93285766626834df9563929257dca19999591fc66b3a006f50e2f16aeac0f4713311b75323422108b3c8762af381bbdc229b3e4a14 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_vi.tar.gz 527431 SHA256 7d5ddef3d8a50df34ab2efff4cafd66d7b56cd9307f2b7ac95cb6b635eb54f9b SHA512 65c49f7f08d7b1770c14345f186cd0e3e97425c4aa2b6393d660e7bb289d7b2de9f3aaeb2402d54c448e4c6989dbcec8cde8880cf40bf5f1446afa58c6ab00b6 WHIRLPOOL 6ffd90d85204231440d06cd1620b5cb281b36865f408396febc4cc008b647baecd52605a746691294b06da6d90f4eef3edacaf48054e1341f1ac32863b73f945 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_xh.tar.gz 504315 SHA256 a14952cbe44b23ef03859321e043f13183f2298b1688328c22bd0d7f15f85e09 SHA512 bb968471aaf21835a1f84086df84247fc18fa905b76c7b89a85b4072c53974f1b116cd4dbcfd53dc2be6824940dd5e23f7097bfe10fea614b4288bcfd916236b WHIRLPOOL 73289aeccabd9a2e646cfa27099785700ba1989a4c63ce161a0370702d4d865676d1dcaff8a6ee0caa9c0e6258e80ea42ef013470c72d25e3b4691873fab9b5b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-CN.tar.gz 575863 SHA256 ed83f26fd4264a8a7f6b9ad5200a80df1a35c0022840b881906a20febc1466e7 SHA512 b988069435bd06bb7b85e09de2771ee50a35033873f30ca881a462d339821164db6c33e04d3389cd3a7ab7fe9d2568e49fa013af3791fb9edb163fd465bf21e5 WHIRLPOOL 762f7b429dc9709b63e3b92268b5ee1f2c6a456499a899789eb09cba9a930cdfaa75d90df45eafb3d4bb23256988ba333a8764a826a3260d1ad75267edfb017b +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zh-TW.tar.gz 572775 SHA256 0ccea824f91b2f70b9337eb5b8ab2fcc5264b987f31381a05ac6f1d197693ae2 SHA512 51894f8326e2d21f36c56254c13e007e6e6949f1e7c68b3b71572a5813f8252c1e15721b706ab20a6c0c42d7d913b9e623498eb1c5b7033951dd4be2709c5f71 WHIRLPOOL 3c0b18e0527f1c750ad1befe0a9f3010ebd31aec13390648c7b95ed3abbeb9428316e1393c491182422712afb28085b4be13fedaea8dbe7741269ca82b600b78 +DIST LibreOffice_5.1.1.3_Linux_x86_rpm_langpack_zu.tar.gz 506160 SHA256 b5cbe78cf50776b6e6115b15d1f25f367d49a58b24b077364006089962d182a0 SHA512 e85cc67ca98e537bdae684d19bbfc70d7dda75ba602f57c983aa4ff5e8e39e5c5d9d24cd8f04e7ee07e10b757e74af6db158bcff19b79fab5825ee2c53f4c1c7 WHIRLPOOL 4eedf72373e098d1276382ca9cd2ef18debad2e97faca18de5b4514f4d3c4dda8e3e43d2bd8958dd646f2d36b13bb983cc6b87185b7ad64622cdf30a08b0fb21 diff --git a/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild new file mode 100644 index 000000000000..875cd6b0ad72 --- /dev/null +++ b/app-office/libreoffice-l10n/libreoffice-l10n-5.1.1.3.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit rpm eutils multilib versionator + +MY_PV=$(get_version_component_range 1-3) + +DESCRIPTION="Translations for the Libreoffice suite" +HOMEPAGE="http://www.libreoffice.org" +BASE_SRC_URI_TESTING="http://download.documentfoundation.org/${PN/-l10n/}/testing/${MY_PV}/rpm" +BASE_SRC_URI_STABLE="http://download.documentfoundation.org/${PN/-l10n/}/stable/${MY_PV}/rpm" + +LICENSE="|| ( LGPL-3 MPL-1.1 )" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +IUSE="offlinehelp" + +# +# when changing the language lists, please be careful to preserve the spaces (bug 491728) +# +LANGUAGES_HELP=" am ast bg bn_IN bn bo bs ca_valencia ca cs da de dz el en_GB en en_ZA eo es et eu fi fr gl gu he hi hr hu id is it ja ka km ko mk nb ne nl nn om pl pt_BR pt ru si sk sl sq sv tg tr ug uk vi zh_CN zh_TW " +LANGUAGES="${LANGUAGES_HELP}af ar as be br brx cy dgo fa ga gd gug kk kmr_Latn kn kok ks lb lo lt lv mai ml mn mni mr my nr nso oc or pa_IN ro rw sa_IN sat sd sid sr_Latn sr ss st sw_TZ ta te th tn ts tt uz ve xh zu " + +for lang in ${LANGUAGES_HELP}; do + helppack="" + [[ ${lang} == en ]] && lang2=${lang/en/en_US} || lang2=${lang} + helppack="offlinehelp? ( ${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_helppack_${lang2/_/-}.tar.gz )" + SRC_URI+=" linguas_${lang}? ( ${helppack} )" +done +for lang in ${LANGUAGES}; do + langpack="" + [[ ${lang} == en ]] \ + || langpack="${BASE_SRC_URI_STABLE}/x86/LibreOffice_${MY_PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz -> LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz ${BASE_SRC_URI_TESTING}/x86/LibreOffice_${PV}_Linux_x86_rpm_langpack_${lang/_/-}.tar.gz" + [[ -z ${langpack} ]] || SRC_URI+=" linguas_${lang}? ( ${langpack} )" + IUSE+=" linguas_${lang}" +done +unset lang helppack langpack lang2 + +RDEPEND+="app-text/hunspell" + +RESTRICT="strip" + +S="${WORKDIR}" + +src_prepare() { + default + + local lang dir rpmdir + + # First remove dictionaries, we want to use system ones. + find "${S}" -name *dict*.rpm -delete || die "Failed to remove dictionaries" + + for lang in ${LANGUAGES}; do + # break away if not enabled; paludis support + use_if_iuse linguas_${lang} || continue + + dir=${lang/_/-} + + # for english we provide just helppack, as translation is always there + if [[ ${lang} != en ]]; then + rpmdir="LibreOffice_${PV}_Linux_x86_rpm_langpack_${dir}/RPMS/" + [[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}" + rpm_unpack ./${rpmdir}/*.rpm + fi + if [[ "${LANGUAGES_HELP}" =~ " ${lang} " ]] && use offlinehelp; then + [[ ${lang} == en ]] && dir="en-US" + rpmdir="LibreOffice_${PV}_Linux_x86_rpm_helppack_${dir}/RPMS/" + [[ -d ${rpmdir} ]] || die "Missing directory: ${rpmdir}" + rpm_unpack ./${rpmdir}/*.rpm + fi + done +} + +src_configure() { :; } +src_compile() { :; } + +src_install() { + local dir="${S}"/opt/${PN/-l10n/}$(get_version_component_range 1-2)/ + # Condition required for people that do not install anything eg no linguas + # or just english with no offlinehelp. + if [[ -d "${dir}" ]] ; then + insinto /usr/$(get_libdir)/${PN/-l10n/}/ + doins -r "${dir}"/* + fi + # remove extensions that are in the l10n for some weird reason + rm -rf "${ED}"usr/$(get_libdir)/${PN/-l10n/}/share/extensions/ || \ + die "Failed to remove extensions" +} diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest index 9e10669e35f6..b46329cc0eea 100644 --- a/app-office/libreoffice/Manifest +++ b/app-office/libreoffice/Manifest @@ -1,4 +1,5 @@ DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 SHA256 d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a WHIRLPOOL c4b3b0c3e10171155e1d3431e8ab9b495dbf2fb924882024306bfb53f533f5b0231c06f47e3cfa77052013a816ea4cc5f237cc76fdb44a048fb6d5c177729aec +DIST 17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz 1803092 SHA256 f62df3315b87d61544d7733e99ceccece046c813b60b898109d98808ca8bd88c SHA512 95a7e4b958ae3a4bdb5118d0ca530dacbd371f408657289f23e5e9995ac6032b9b015fae78b2ee746c4cbad3edba8f8be812457a67ec7cabf3b13fac16db4898 WHIRLPOOL 1784d2526587564fbf3bd564ef801c1c0173ee1533fa5ed3406b41e764f256fa36f6ffc3834a1c748fafe4b0fa3bd909ae18befe5b82f409bc358237de82106c DIST 185d60944ea767075d27247c3162b3bc-unowinreg.dll 12288 SHA256 eafde646a7dbe46d20c291685b0beac2382174d78d66ee990e229a1bf6e6cec6 SHA512 854b8ae29b57b40ba6bb6ff66e723a0e8dad053fcc2849f0ad763cd8a31352f4aeba9636fd4e3f0f2a0cd985a6f49b4261b9ace68d6be821ed42cfa7a73eb13c WHIRLPOOL 16eb79e3674250fcb760b9698b4980414052d20f720d946701d1915c9b8915b4af75378668653d29581b77c19fcdba8f51d1f834c286cfcefcf4a420f8fcc1d5 DIST 1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz 1652670 SHA256 390a5085651828b8fe12aa978b200f59b9155eedbb91a4be89bf7cf39eefdd4a SHA512 5664203e6426880041cdb227e91f79f00d2ca7ae28c6997f61b72cc599aac55838d082d2b2b551bd7a228424c350ddea5d41599b8ca58d444a2cd46c9206ea91 WHIRLPOOL 6486c48b73a4f79760b443cfd397b704eca0fd32b72304ae7e7cfa0f43583b0af15c7384548b5215ae57513ed8366c8f3a74630ab466ba19a63b346af8c5eaca DIST 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 9796 SHA256 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 SHA512 4a48f1e32907fb2dee601cda3cd7a0d7198b2d51f2a572b647f1e93f901fd511eef3567676e52dfb1723a2cdfbc01f2015ca0bb22903b0bc1476dd618cc9aa8a WHIRLPOOL a5156d06323699d2cbf539f14f5f44f54ebf33e86c7f14e98acd4c6e29c3e496f91dd6792401148ffa32e3dcb1cd4f087ed804e306b241cef86de0aa347d25d4 diff --git a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch b/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch deleted file mode 100644 index 370b4aaa4e7a..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.3.5.2-remove-bashisms.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f53e79acd0d42f5c41e1104056af9cf23e9e2e2a Mon Sep 17 00:00:00 2001 -From: "Andreas K. Huettel (dilfridge)" -Date: Sun, 4 Jan 2015 15:33:35 +0100 -Subject: [PATCH] Replace bash-specific code from configure.ac, fixes build for - sh=dash users -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Original patch by Rémi Cardona - -Change-Id: I815567df8a868c3997e8ac357b8529fded28c950 -Gentoo-Bug: https://bugs.gentoo.org/show_bug.cgi?id=525454 -Reviewed-on: https://gerrit.libreoffice.org/13731 -Reviewed-by: Caolán McNamara -Tested-by: Caolán McNamara ---- - configure.ac | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8aa33d0..5dbe640 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -11483,9 +11483,8 @@ test_font_map() - FONTFILE_LOWER="$(echo $FONTFILE | $AWK '{print tolower($0)}')" - - TESTEXPR="'${FONTFILE_LOWER}' = '$(echo $FONT | $AWK '{print tolower($0)}').ttf'" -- while true ; do -+ while test "$#" -ge 1 ; do - MAPPING="$(echo $1 | $AWK '{print tolower($0)}')"; shift -- test -n "$MAPPING" || break - TESTEXPR="${TESTEXPR} -o '${FONTFILE_LOWER}' = '$MAPPING-regular.ttf'" - done - if test $TESTEXPR --- -2.3.0 - diff --git a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch b/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch deleted file mode 100644 index 2833385a1adf..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.4.0.3-telepathy-build-fix.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 623b38fa5769f8cdec10b54b2a600bc4c4e077e6 Mon Sep 17 00:00:00 2001 -From: David Tardon -Date: Sun, 11 Jan 2015 13:08:37 +0100 -Subject: OSL_ENSURE was not declared in this scope - -Change-Id: I426c0feee7b76fe02473e07fa209a61967af3e99 - -diff --git a/tubes/source/conference.cxx b/tubes/source/conference.cxx -index 86986fc..df4a63f 100644 ---- a/tubes/source/conference.cxx -+++ b/tubes/source/conference.cxx -@@ -248,7 +248,7 @@ static void channel_closed_cb( TpChannel *channel, gpointer user_data, GObject * - - void TeleConference::setChannel( TpAccount *pAccount, TpDBusTubeChannel* pChannel ) - { -- OSL_ENSURE( !mpChannel, "TeleConference::setChannel: already have channel"); -+ SAL_WARN_IF( mpChannel, "tubes", "TeleConference::setChannel: already have channel"); - if (mpChannel) - g_object_unref( mpChannel); - if (mpAccount) -@@ -297,7 +297,7 @@ bool TeleConference::offerTube() - { - INFO_LOGGER( "TeleConference::offerTube"); - -- OSL_ENSURE( mpChannel, "TeleConference::offerTube: no channel"); -+ SAL_WARN_IF( !mpChannel, "tubes", "TeleConference::offerTube: no channel"); - if (!mpChannel) - return false; - -@@ -319,7 +319,7 @@ bool TeleConference::setTube( GDBusConnection* pTube) - { - INFO_LOGGER( "TeleConference::setTube"); - -- OSL_ENSURE( !pImpl->mpTube, "TeleConference::setTube: already tubed"); -+ SAL_WARN_IF( pImpl->mpTube, "tubes", "TeleConference::setTube: already tubed"); - - pImpl->mpTube = pTube; - --- -cgit v0.10.2 diff --git a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch b/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch deleted file mode 100644 index d4c4d28bbca1..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.4.1.2-add-kde4-open-url-script.patch +++ /dev/null @@ -1,56 +0,0 @@ -From f7db2461292be3e23f5b3af47e488eaa8105d8db Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski -Date: Wed, 26 Nov 2014 13:35:42 +0100 -Subject: Add kde4-open-url script - -Adds a KDE4 specific URL processing script. - -Change-Id: I0116fa95f076a5772e88c616e93de542fe4fe4e4 - -diff --git a/shell/Package_scripts_kde.mk b/shell/Package_scripts_kde.mk -index c5e4978..162bcc5 100644 ---- a/shell/Package_scripts_kde.mk -+++ b/shell/Package_scripts_kde.mk -@@ -9,6 +9,12 @@ - - $(eval $(call gb_Package_Package,shell_scripts_kde,$(SRCDIR)/shell/source/unix/misc)) - -+ifeq ($(ENABLE_KDE),TRUE) - $(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde-open-url,kde-open-url.sh)) -+endif -+ -+ifeq ($(ENABLE_KDE4),TRUE) -+$(eval $(call gb_Package_add_file,shell_scripts_kde,$(LIBO_BIN_FOLDER)/kde4-open-url,kde4-open-url.sh)) -+endif - - # vim: set shiftwidth=4 tabstop=4 noexpandtab: -diff --git a/shell/source/unix/misc/kde4-open-url.sh b/shell/source/unix/misc/kde4-open-url.sh -new file mode 100755 -index 0000000..e5b8125 ---- /dev/null -+++ b/shell/source/unix/misc/kde4-open-url.sh -@@ -0,0 +1,22 @@ -+#!/bin/sh -+# -+# This file is part of the LibreOffice project. -+# -+# This Source Code Form is subject to the terms of the Mozilla Public -+# License, v. 2.0. If a copy of the MPL was not distributed with this -+# file, You can obtain one at http://mozilla.org/MPL/2.0/. -+# -+# This file incorporates work covered by the following license notice: -+# -+# Licensed to the Apache Software Foundation (ASF) under one or more -+# contributor license agreements. See the NOTICE file distributed -+# with this work for additional information regarding copyright -+# ownership. The ASF licenses this file to you under the Apache -+# License, Version 2.0 (the "License"); you may not use this file -+# except in compliance with the License. You may obtain a copy of -+# the License at http://www.apache.org/licenses/LICENSE-2.0 . -+# -+ -+# use kde-open or xdg-open if available, falling back to our own open-url -+kde-open "$1" 2>/dev/null || xdg-open "$1" 2>/dev/null || `dirname "$0"`/open-url "$1" 2>/dev/null -+exit 0 --- -cgit v0.10.2 diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch deleted file mode 100644 index 7cb33b98fd32..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.4.4.3-cleanup-IsNativeControlSupported.patch +++ /dev/null @@ -1,212 +0,0 @@ -Merged upstream commits: - -88e16529fc7b0e312b68e38295348c93b437aad8 "tdf#92110 KDE4: cleanup IsNativeControlSupported" -57792314c7b05f71c66834ee47bfaa09003df765 "tdf#92115 KDE4: better listbox theming" - - -diff -u b/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx ---- b/vcl/unx/kde4/KDESalGraphics.cxx -+++ b/vcl/unx/kde4/KDESalGraphics.cxx -@@ -85,47 +85,43 @@ - - bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart part ) - { -- if (type == CTRL_PUSHBUTTON) return true; -- -- if (type == CTRL_MENUBAR) return true; -- -- if (type == CTRL_MENU_POPUP) return true; -- -- if (type == CTRL_EDITBOX) return true; -- -- if (type == CTRL_COMBOBOX) return true; -- -- if (type == CTRL_TOOLBAR) return true; -- -- if (type == CTRL_CHECKBOX) return true; -- -- if (type == CTRL_LISTBOX) return true; -- -- if (type == CTRL_LISTNODE) return true; -- -- if (type == CTRL_FRAME) return true; -- -- if (type == CTRL_SCROLLBAR) return true; -- -- if (type == CTRL_WINDOW_BACKGROUND) return true; -- -- if (type == CTRL_SPINBOX && (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE) ) return true; -- -- // no spinbuttons for KDE, paint spinbox complete -- //if (type == CTRL_SPINBUTTONS) return true; -- -- if (type == CTRL_GROUPBOX) return true; -- -- if (type == CTRL_FIXEDLINE) return true; -- -- if (type == CTRL_TOOLTIP) return true; -+ switch (type) -+ { -+ case CTRL_PUSHBUTTON: -+ case CTRL_RADIOBUTTON: -+ case CTRL_CHECKBOX: -+ case CTRL_TOOLTIP: -+ case CTRL_PROGRESS: -+ case CTRL_LISTNODE: -+ return (part == PART_ENTIRE_CONTROL); -+ -+ case CTRL_MENUBAR: -+ case CTRL_MENU_POPUP: -+ case CTRL_EDITBOX: -+ case CTRL_COMBOBOX: -+ case CTRL_TOOLBAR: -+ case CTRL_FRAME: -+ case CTRL_SCROLLBAR: -+ case CTRL_WINDOW_BACKGROUND: -+ case CTRL_GROUPBOX: -+ case CTRL_FIXEDLINE: -+ return true; -+ -+ case CTRL_LISTBOX: -+ return (part == PART_ENTIRE_CONTROL -+ || part == PART_SUB_EDIT -+ || part == PART_WINDOW -+ || part == PART_BUTTON_DOWN); - -- if (type == CTRL_RADIOBUTTON) return true; -+ case CTRL_SPINBOX: -+ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE); - -- if (type == CTRL_SLIDER && (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA) ) -- return true; -+ case CTRL_SLIDER: -+ return (part == PART_TRACK_HORZ_AREA || part == PART_TRACK_VERT_AREA); - -- if ( (type == CTRL_PROGRESS) && (part == PART_ENTIRE_CONTROL) ) return true; -+ default: -+ break; -+ } - - return false; - } -@@ -221,15 +217,15 @@ - const ImplControlValue& value, - const OUString& ) - { -- if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM )) -- lastPopupRect = QRect(); -- -- // put not implemented types here -- if (type == CTRL_SPINBUTTONS) -- { -+ bool nativeSupport = IsNativeControlSupported( type, part ); -+ if( ! nativeSupport ) { -+ assert( ! nativeSupport && "drawNativeControl called without native support!" ); - return false; - } - -+ if( lastPopupRect.isValid() && ( type != CTRL_MENU_POPUP || part != PART_MENU_ITEM )) -+ lastPopupRect = QRect(); -+ - bool returnVal = true; - - QRect widgetRect = region2QRect(rControlRegion); -@@ -414,24 +410,26 @@ - } - else if (type == CTRL_LISTBOX) - { -- if( part == PART_WINDOW ) -- { -- lcl_drawFrame( QStyle::PE_Frame, m_image, -- vclStateValue2StateFlag(nControlState, value) ); -- } -- else -- { -- QStyleOptionComboBox option; -- if (part == PART_SUB_EDIT) -- { -+ QStyleOptionComboBox option; -+ switch (part) { -+ case PART_WINDOW: -+ lcl_drawFrame( QStyle::PE_Frame, m_image, -+ vclStateValue2StateFlag(nControlState, value) ); -+ break; -+ case PART_SUB_EDIT: - draw( QStyle::CE_ComboBoxLabel, &option, m_image, - vclStateValue2StateFlag(nControlState, value) ); -- } -- else -- { -+ break; -+ case PART_ENTIRE_CONTROL: -+ draw( QStyle::CC_ComboBox, &option, m_image, -+ vclStateValue2StateFlag(nControlState, value) ); -+ break; -+ case PART_BUTTON_DOWN: -+ m_image->fill( Qt::transparent ); -+ option.subControls = QStyle::SC_ComboBoxArrow; - draw( QStyle::CC_ComboBox, &option, m_image, - vclStateValue2StateFlag(nControlState, value) ); -- } -+ break; - } - } - else if (type == CTRL_LISTNODE) -@@ -652,6 +650,12 @@ - const OUString&, - Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion ) - { -+ bool nativeSupport = IsNativeControlSupported( type, part ); -+ if( ! nativeSupport ) { -+ assert( ! nativeSupport && "drawNativeControl called without native support!" ); -+ return false; -+ } -+ - bool retVal = false; - - QRect boundingRect = region2QRect( controlRegion ); -@@ -733,8 +737,6 @@ - { - case PART_ENTIRE_CONTROL: - { -- int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2; -- - // find out the minimum size that should be used - // assume contents is a text ling - int nHeight = QApplication::fontMetrics().height(); -@@ -747,8 +749,10 @@ - // FIXME: why this difference between comboboxes and listboxes ? - // because a combobox has a sub edit and that is positioned - // inside the outer bordered control ? -- if( type == CTRL_COMBOBOX ) -+ if( type == CTRL_COMBOBOX ) { -+ int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2; - contentRect.adjust(-size,-size,size,size); -+ } - retVal = true; - break; - } -@@ -761,13 +765,22 @@ - retVal = true; - break; - case PART_SUB_EDIT: -+ { - contentRect = QApplication::style()->subControlRect( - QStyle::CC_ComboBox, &cbo, QStyle::SC_ComboBoxEditField ); - -- contentRect.translate( boundingRect.left(), boundingRect.top() ); -+ int hmargin = QApplication::style()->pixelMetric( -+ QStyle::PM_FocusFrameHMargin, &styleOption); -+ int vmargin = QApplication::style()->pixelMetric( -+ QStyle::PM_FocusFrameVMargin, &styleOption); -+ -+ contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin ); -+ contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin ); -+ boundingRect = contentRect; - - retVal = true; - break; -+ } - case PART_WINDOW: - retVal = true; - break; diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch deleted file mode 100644 index 2247781443bd..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.4.4.3-fix-KDE4-FileDialog.patch +++ /dev/null @@ -1,76 +0,0 @@ -From e7352d5ada69f212dc813c4cbd257d036e7a27c8 Mon Sep 17 00:00:00 2001 -From: Juergen Funk -Date: Fri, 3 Jul 2015 08:33:03 +0200 -Subject: tdf#92517 KDE4-FileDialog: "Save as" has wrong Filter -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixing follow - - The order of calling: first should be set the filter, after - that can be set the current filter - - change the function from "setCurrentFilter" to "setCurrentItem" - When you set the filter over "setCurrentFilter" you need the full - search string "extention|description" e.g. "*.docx|Microsoft Word.." - - Not need the escape of slash (with that can not find - "Microsoft Word 2007/2010 XML (.docx))" - -Change-Id: Ie4f7d6fd619b391487ee944c3e745c855600ee54 -Reviewed-on: https://gerrit.libreoffice.org/16721 -Tested-by: Jenkins -Reviewed-by: Katarina Behrens -(cherry picked from commit a93cfd5afb9072de00fc4b2a070f23ebdad6e4fe) -Reviewed-on: https://gerrit.libreoffice.org/16890 -Reviewed-by: Caolán McNamara -Tested-by: Caolán McNamara - -diff --git a/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx -index 4615bd4..a638955 100644 ---- a/vcl/unx/kde4/KDE4FilePicker.cxx -+++ b/vcl/unx/kde4/KDE4FilePicker.cxx -@@ -250,6 +250,10 @@ sal_Int16 SAL_CALL KDE4FilePicker::execute() - - _dialog->clearFilter(); - _dialog->setFilter(_filter); -+ -+ if(!_currentFilter.isNull()) -+ _dialog->filterWidget()->setCurrentItem(_currentFilter); -+ - _dialog->filterWidget()->setEditable(false); - - VCLKDEApplication::preDialogSetup(); -@@ -384,9 +388,7 @@ void SAL_CALL KDE4FilePicker::setCurrentFilter( const OUString &title ) - return Q_EMIT setCurrentFilterSignal( title ); - } - -- QString t = toQString(title); -- t.replace("/", "\\/"); -- _dialog->filterWidget()->setCurrentFilter(t); -+ _currentFilter = toQString(title); - } - - OUString SAL_CALL KDE4FilePicker::getCurrentFilter() -@@ -633,6 +635,7 @@ void SAL_CALL KDE4FilePicker::initialize( const uno::Sequence &args ) - } - - _filter.clear(); -+ _currentFilter.clear(); - - // parameter checking - uno::Any arg; -diff --git a/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx -index 98e9af6..ff3a8602 100644 ---- a/vcl/unx/kde4/KDE4FilePicker.hxx -+++ b/vcl/unx/kde4/KDE4FilePicker.hxx -@@ -66,6 +66,8 @@ protected: - - //running filter string to add to dialog - QString _filter; -+ // string to set the current filter -+ QString _currentFilter; - - //mapping of SAL control ID's to created custom controls - QHash _customWidgets; --- -cgit v0.10.2 - diff --git a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch b/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch deleted file mode 100644 index d0350e489697..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.4.4.3-improve-KDE4FilePicker.patch +++ /dev/null @@ -1,193 +0,0 @@ -Merged upstream commits: - -6fc55b9abd783b624241d56e34751ea495adbd7d "KDE4: actually apply file dialog operation mode" -b613270a730ace29dd1b16b29be2222b34f34a5d "KDE4: improve default load and save dialog titles" -2b999dd6da5a90db66afe852a007fab8c62ffaec "vcl: kde4: loplugin:staticmethods" -3e8c14df67a43d3088ed7df0a2b0d96a4bc42d57 "tdf#92353 FileSave: Not confirmed for overwrite a file (unix)" - - -diff -u b/vcl/unx/kde4/KDE4FilePicker.cxx b/vcl/unx/kde4/KDE4FilePicker.cxx ---- b/vcl/unx/kde4/KDE4FilePicker.cxx -+++ b/vcl/unx/kde4/KDE4FilePicker.cxx -@@ -58,6 +58,8 @@ - - #include "generic/geninst.h" - -+#include "svids.hrc" -+ - using namespace ::com::sun::star; - using namespace ::com::sun::star::ui::dialogs; - using namespace ::com::sun::star::ui::dialogs::TemplateDescription; -@@ -109,7 +111,6 @@ - - KDE4FilePicker::KDE4FilePicker( const uno::Reference& ) - : KDE4FilePicker_Base(_helperMutex) -- , _resMgr( ResMgr::CreateResMgr("fps_office") ) - , allowRemoteUrls( false ) - { - _extraControls = new QWidget(); -@@ -128,8 +129,6 @@ - #endif - - setMultiSelectionMode( false ); -- //default mode -- _dialog->setOperationMode(KFileDialog::Opening); - - // XExecutableDialog functions - connect( this, SIGNAL( setTitleSignal( const OUString & ) ), -@@ -202,7 +201,6 @@ - SalYieldMutexReleaser aReleaser; - return Q_EMIT cleanupProxySignal(); - } -- delete _resMgr; - delete _dialog; - } - -@@ -524,6 +522,24 @@ - return toOUString(label); - } - -+QString KDE4FilePicker::getResString( sal_Int16 aRedId ) -+{ -+ QString aResString; -+ -+ if( aRedId < 0 ) -+ return aResString; -+ -+ try -+ { -+ aResString = toQString(ResId(aRedId, *ImplGetResMgr()).toString()); -+ } -+ catch(...) -+ { -+ } -+ -+ return aResString.replace('~', '&'); -+} -+ - void KDE4FilePicker::addCustomControl(sal_Int16 controlId) - { - QWidget* widget = 0; -@@ -532,37 +548,37 @@ - switch (controlId) - { - case CHECKBOX_AUTOEXTENSION: -- resId = STR_SVT_FILEPICKER_AUTO_EXTENSION; -+ resId = STR_FPICKER_AUTO_EXTENSION; - break; - case CHECKBOX_PASSWORD: -- resId = STR_SVT_FILEPICKER_PASSWORD; -+ resId = STR_FPICKER_PASSWORD; - break; - case CHECKBOX_FILTEROPTIONS: -- resId = STR_SVT_FILEPICKER_FILTER_OPTIONS; -+ resId = STR_FPICKER_FILTER_OPTIONS; - break; - case CHECKBOX_READONLY: -- resId = STR_SVT_FILEPICKER_READONLY; -+ resId = STR_FPICKER_READONLY; - break; - case CHECKBOX_LINK: -- resId = STR_SVT_FILEPICKER_INSERT_AS_LINK; -+ resId = STR_FPICKER_INSERT_AS_LINK; - break; - case CHECKBOX_PREVIEW: -- resId = STR_SVT_FILEPICKER_SHOW_PREVIEW; -+ resId = STR_FPICKER_SHOW_PREVIEW; - break; - case CHECKBOX_SELECTION: -- resId = STR_SVT_FILEPICKER_SELECTION; -+ resId = STR_FPICKER_SELECTION; - break; - case PUSHBUTTON_PLAY: -- resId = STR_SVT_FILEPICKER_PLAY; -+ resId = STR_FPICKER_PLAY; - break; - case LISTBOX_VERSION: -- resId = STR_SVT_FILEPICKER_VERSION; -+ resId = STR_FPICKER_VERSION; - break; - case LISTBOX_TEMPLATE: -- resId = STR_SVT_FILEPICKER_TEMPLATES; -+ resId = STR_FPICKER_TEMPLATES; - break; - case LISTBOX_IMAGE_TEMPLATE: -- resId = STR_SVT_FILEPICKER_IMAGE_TEMPLATE; -+ resId = STR_FPICKER_IMAGE_TEMPLATE; - break; - case LISTBOX_VERSION_LABEL: - case LISTBOX_TEMPLATE_LABEL: -@@ -581,16 +597,7 @@ - case CHECKBOX_PREVIEW: - case CHECKBOX_SELECTION: - { -- QString label; -- -- if (_resMgr && resId != -1) -- { -- OUString s(ResId(resId, *_resMgr).toString()); -- label = toQString(s); -- label.replace("~", "&"); -- } -- -- widget = new QCheckBox(label, _extraControls); -+ widget = new QCheckBox(getResString(resId), _extraControls); - - // the checkbox is created even for CHECKBOX_AUTOEXTENSION to simplify - // code, but the checkbox is hidden and ignored -@@ -719,8 +726,23 @@ - 1 ); - } - -- _dialog->setOperationMode(operationMode); -- _dialog->setConfirmOverwrite(true); -+ _dialog->setOperationMode( operationMode ); -+ -+ sal_Int16 resId = -1; -+ switch (_dialog->operationMode()) -+ { -+ case KFileDialog::Opening: -+ resId = STR_FPICKER_OPEN; -+ break; -+ case KFileDialog::Saving: -+ resId = STR_FPICKER_SAVE; -+ _dialog->setConfirmOverwrite( true ); -+ break; -+ default: -+ break; -+ } -+ -+ _dialog->setCaption(getResString(resId)); - } - - void SAL_CALL KDE4FilePicker::cancel() -diff -u b/vcl/unx/kde4/KDE4FilePicker.hxx b/vcl/unx/kde4/KDE4FilePicker.hxx ---- b/vcl/unx/kde4/KDE4FilePicker.hxx -+++ b/vcl/unx/kde4/KDE4FilePicker.hxx -@@ -41,8 +41,6 @@ - class QWidget; - class QLayout; - --class ResMgr; -- - typedef ::cppu::WeakComponentImplHelper5 - < ::com::sun::star::ui::dialogs::XFilePicker2 - , ::com::sun::star::ui::dialogs::XFilePicker3 -@@ -61,8 +59,6 @@ - - ::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFilePickerListener > m_xListener; - -- ResMgr *_resMgr; -- - //the dialog to display - KFileDialog* _dialog; - -@@ -225,6 +221,8 @@ - //add a custom control widget to the file dialog - void addCustomControl(sal_Int16 controlId); - -+ static QString getResString( sal_Int16 aRedId ); -+ - private Q_SLOTS: - void cleanupProxy(); - void checkProtocol(); diff --git a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch b/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch deleted file mode 100644 index f4ee9859c2b3..000000000000 --- a/app-office/libreoffice/files/libreoffice-4.4.5.2-fix-KDE4-listbox-regression.patch +++ /dev/null @@ -1,80 +0,0 @@ -From ef126328c3ad35d51395abc461c3d64429f91c26 Mon Sep 17 00:00:00 2001 -From: Jan-Marek Glogowski -Date: Thu, 30 Jul 2015 18:10:03 +0200 -Subject: tdf#92903 KDE4: fix listbox regression from 92115 - -So at least in case of the CTRL_LISTBOX, getNativeControlRegion is -called for a type and part unsupported by IsNativeControlSupported. - -For whatever reason, this results in broken listboxes drawn in -Base's "Table Design" dialog, when selecting "field type", which -draws the listbox on top of the cell. - -To make it worse, it seems the listbox is actually drawn to a -smaller space then the actual requirement. Appearently it seems to -use the content rect, instead of the bounding rect. - -So in addition to fixing the drawing, this patch increases the -listbox bounding rect, which looks too large in normal dialogs, but -makes the Base's listbox better readable. - -Change-Id: I112ec038fd20ad33facd260d16b5d68b508d2bd0 -Reviewed-on: https://gerrit.libreoffice.org/17438 -Reviewed-by: Katarina Behrens -Tested-by: Katarina Behrens - -diff --git a/vcl/unx/kde4/KDESalGraphics.cxx b/vcl/unx/kde4/KDESalGraphics.cxx -index 3e79e1e..eeb741f 100644 ---- a/vcl/unx/kde4/KDESalGraphics.cxx -+++ b/vcl/unx/kde4/KDESalGraphics.cxx -@@ -108,10 +108,7 @@ bool KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par - return true; - - case CTRL_LISTBOX: -- return (part == PART_ENTIRE_CONTROL -- || part == PART_SUB_EDIT -- || part == PART_WINDOW -- || part == PART_BUTTON_DOWN); -+ return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE); - - case CTRL_SPINBOX: - return (part == PART_ENTIRE_CONTROL || part == HAS_BACKGROUND_TEXTURE); -@@ -650,12 +647,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, - const OUString&, - Rectangle &nativeBoundingRegion, Rectangle &nativeContentRegion ) - { -- bool nativeSupport = IsNativeControlSupported( type, part ); -- if( ! nativeSupport ) { -- assert( ! nativeSupport && "drawNativeControl called without native support!" ); -- return false; -- } -- - bool retVal = false; - - QRect boundingRect = region2QRect( controlRegion ); -@@ -753,6 +744,14 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, - int size = QApplication::style()->pixelMetric(QStyle::PM_ComboBoxFrameWidth) - 2; - contentRect.adjust(-size,-size,size,size); - } -+ else { -+ int hmargin = QApplication::style()->pixelMetric( -+ QStyle::PM_FocusFrameHMargin, &styleOption); -+ int vmargin = QApplication::style()->pixelMetric( -+ QStyle::PM_FocusFrameVMargin, &styleOption); -+ boundingRect.translate( -hmargin, -vmargin ); -+ boundingRect.adjust( -hmargin, -vmargin, 2 * hmargin, 2 * vmargin ); -+ } - retVal = true; - break; - } -@@ -776,7 +775,6 @@ bool KDESalGraphics::getNativeControlRegion( ControlType type, ControlPart part, - - contentRect.translate( boundingRect.left() + hmargin, boundingRect.top() + vmargin ); - contentRect.adjust( 0, 0, -2 * hmargin, -2 * vmargin ); -- boundingRect = contentRect; - - retVal = true; - break; --- -cgit v0.10.2 - diff --git a/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch new file mode 100644 index 000000000000..539ef7e1f3fe --- /dev/null +++ b/app-office/libreoffice/files/libreoffice-5.1.1.3-gtk3.patch @@ -0,0 +1,30 @@ +From e451b03e8c21ad23cb1abfd6dd68b6d1e8188121 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Mon, 7 Mar 2016 13:19:55 +0000 +Subject: gtktiledviewer needs gtk3 not gtk2 + +Change-Id: Iede2008139cb570ff65202762e92f6694548a065 + +diff --git a/Repository.mk b/Repository.mk +index e9cd89a..423d58b 100644 +--- a/Repository.mk ++++ b/Repository.mk +@@ -68,13 +68,13 @@ $(eval $(call gb_Helper_register_executables,NONE, \ + svptest \ + svpclient \ + pixelctl ) \ +- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \ ++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), tilebench) \ + $(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest \ + outdevgrind) \ + vcldemo \ + tiledrendering \ + mtfdemo \ +- $(if $(and $(ENABLE_GTK), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \ ++ $(if $(and $(ENABLE_GTK3), $(filter LINUX %BSD SOLARIS,$(OS))), gtktiledviewer) \ + )) + + $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \ +-- +cgit v0.10.2 + diff --git a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild index 903ff349d6fb..56ec41944e48 100644 --- a/app-office/libreoffice/libreoffice-5.1.1.3.ebuild +++ b/app-office/libreoffice/libreoffice-5.1.1.3.ebuild @@ -96,8 +96,7 @@ unset lo_xt LICENSE="|| ( LGPL-3 MPL-1.1 )" SLOT="0" [[ ${PV} == *9999* ]] || \ -KEYWORDS="" -# KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" COMMON_DEPEND=" ${PYTHON_DEPS} @@ -259,6 +258,9 @@ PATCHES=( # submitted upstream "${FILESDIR}/${PN}-5.1.0.3-isnan.patch" + # taken from 5.1 branch + "${FILESDIR}/${PN}-5.1.1.3-gtk3.patch" # Gentoo bug 575732 + # not upstreamable stuff "${FILESDIR}/${PN}-4.4-system-pyuno.patch" ) diff --git a/app-office/libreoffice/libreoffice-9999.ebuild b/app-office/libreoffice/libreoffice-9999.ebuild index 9593c326797c..4686600c380e 100644 --- a/app-office/libreoffice/libreoffice-9999.ebuild +++ b/app-office/libreoffice/libreoffice-9999.ebuild @@ -59,7 +59,7 @@ unset DEV_URI # These are bundles that can't be removed for now due to huge patchsets. # If you want them gone, patches are welcome. ADDONS_SRC=( - "${ADDONS_URI}/1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz" # modifies source code + "${ADDONS_URI}/17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz" # modifies source code "collada? ( ${ADDONS_URI}/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2 )" "java? ( ${ADDONS_URI}/17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip )" # no release for 8 years, should we package it? @@ -122,7 +122,7 @@ COMMON_DEPEND=" dev-libs/expat >=dev-libs/hyphen-2.7.1 >=dev-libs/icu-4.8.1.1:= - >=dev-libs/liborcus-0.9.0 + >=dev-libs/liborcus-0.11.1 >=dev-libs/librevenge-0.0.1 >=dev-libs/nspr-4.8.8 >=dev-libs/nss-3.12.9 @@ -529,11 +529,10 @@ src_install() { make DESTDIR="${D}" distro-pack-install -o build -o check || die # Fix bash completion placement - newbashcomp "${ED}"etc/bash_completion.d/libreoffice.sh ${PN} + newbashcomp "${ED}"usr/share/bash-completion/completions/libreoffice.sh ${PN} bashcomp_alias \ libreoffice \ unopkg loimpress lobase localc lodraw lomath lowriter lofromtemplate loweb loffice - rm -rf "${ED}"etc/ || die if use branding; then insinto /usr/$(get_libdir)/${PN}/program diff --git a/app-portage/gentoopm/gentoopm-9999.ebuild b/app-portage/gentoopm/gentoopm-9999.ebuild index 7a48874d4177..c8c4b3fb4f50 100644 --- a/app-portage/gentoopm/gentoopm-9999.ebuild +++ b/app-portage/gentoopm/gentoopm-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -8,9 +8,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} pypy ) inherit distutils-r1 #if LIVE -EGIT_REPO_URI="git://anongit.gentoo.org/proj/${PN}.git - https://anongit.gentoo.org/git/proj/${PN}.git - https://bitbucket.org/mgorny/${PN}.git" +EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git" inherit git-r3 #endif diff --git a/app-text/bdf2psf/bdf2psf-1.104.ebuild b/app-text/bdf2psf/bdf2psf-1.104.ebuild index 479205d49599..a52e99262ff7 100644 --- a/app-text/bdf2psf/bdf2psf-1.104.ebuild +++ b/app-text/bdf2psf/bdf2psf-1.104.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://debian/pool/main/c/console-setup/console-setup_${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" IUSE="" DEPEND="" diff --git a/app-text/poppler/Manifest b/app-text/poppler/Manifest index 7bb337be4d1f..6cb9ef3193b5 100644 --- a/app-text/poppler/Manifest +++ b/app-text/poppler/Manifest @@ -1,5 +1,4 @@ DIST poppler-0.32.0.tar.xz 1609624 SHA256 4963e31ba5e17530a87b16588e22928bc044e8d28d02303dded981bff6725b98 SHA512 f68355a0242ce467b9d7d7f47cc0c3b08f015c38b147eaeddc392e693239bce2b1b3832bd5e5411f25edddab6d3cea8ca0be151372a86963610a4eae3ea50eee WHIRLPOOL bb56d497f435ccb78dfeb0125ca5d003d08769fe74e11da940f6f5399194698e1908c22d815129e6d1f1a7a9855a68ad7043a3bdd4779045fcf64dd97ade3d22 DIST poppler-0.38.0.tar.xz 1637772 SHA256 6f0c0d49c8346d7c0cfe6348124e7f19cc901b5d35c9cd89944aac6e454e8a8b SHA512 1b8643c0f58eb1e1c3d98266c38d311c66458168188146af72c99c9f374882bdc616aa3febd8833538b286652c21a567e6240aa590111bcebcba5ee845e6bad9 WHIRLPOOL 05a75ca4ed3741273eefe003026caa1f9bb1e3d9f08d1e3885d2fddd7704349434b6deb1f9e755312d7a5b040e85435b0baa92f4934c4d220b1ea8625ebff4f5 -DIST poppler-0.40.0.tar.xz 1642708 SHA256 bc0da278d6038ffc9cd2b8c1bba530a6ec7c072a593219a48f0a52a600ee6ead SHA512 0f26f342a4f70ebc65848c61e5eb1a182d539a8e4cdc5fa499c52765d15867e13ee7c595773d2e8d6f2eb3e83e1c19f35cc6bb47f8aeb87a8ad92e45ecff50cd WHIRLPOOL 00d887401f8438718fcee34e326c7a71970ce7e1c3071a142cef365bdd77301d77b1c9488fa80a58a0baca8fb0c8a2fb0a327867b8b8381b8eecb5f14609bec2 DIST poppler-0.41.0.tar.xz 1655448 SHA256 420abaab63caed9e1ee28964a0ba216d1979506726164bc99ad5ade289192a1b SHA512 b2b99ac056efaae26f0bffc20756f17524011b7718a554ff48901422e7ab8caa4f879b800eacce1af5ae468346fa0beb569a4378f028a7d7cf0c9cc45f0d2402 WHIRLPOOL 565bc504b5b02ac612b267bb5d5746dc9d90b2c7f8959e2fecc58bdcc4c588f8f234d4bc9cc8086846c23643fa0abc8dba352c8a083056b95d58056281a5bc7a DIST poppler-0.42.0.tar.xz 1674024 SHA256 9fef076ffe2a4f18a4e0da547d814ef5c5e6f8a283afe3387504a0bb1a418010 SHA512 ab8c86c28a2ac848bf118de7f20f57576ed4faa4ad06ae7d58590b951fb2b0ee8a728919ce2417592b467af7322c57ed0bff0288eced042fcf94a50d89c73c19 WHIRLPOOL 095986b44875847d471ecda35194eeb894051b689a754dc8ae55caa04100b4e2ebd57fe868008972502d27346eeb98699fa9660b414ececef4d0eafe53265736 diff --git a/app-text/poppler/poppler-0.40.0-r1.ebuild b/app-text/poppler/poppler-0.40.0-r1.ebuild deleted file mode 100644 index 0346703d54ab..000000000000 --- a/app-text/poppler/poppler-0.40.0-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit cmake-utils toolchain-funcs - -if [[ "${PV}" == "9999" ]] ; then - inherit git-r3 - EGIT_REPO_URI="git://git.freedesktop.org/git/${PN}/${PN}" - SLOT="0/9999" -else - SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/58" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION -fi - -DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE="http://poppler.freedesktop.org/" - -LICENSE="GPL-2" -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils" - -# No test data provided -RESTRICT="test" - -COMMON_DEPEND=" - >=media-libs/fontconfig-2.6.0 - >=media-libs/freetype-2.3.9 - sys-libs/zlib - cairo? ( - dev-libs/glib:2 - >=x11-libs/cairo-1.10.0 - introspection? ( >=dev-libs/gobject-introspection-1.32.1 ) - ) - curl? ( net-misc/curl ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/openjpeg:2= ) - lcms? ( media-libs/lcms:2 ) - png? ( media-libs/libpng:0= ) - qt4? ( - dev-qt/qtcore:4 - dev-qt/qtgui:4 - ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtxml:5 - ) - tiff? ( media-libs/tiff:0 ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig -" -RDEPEND="${COMMON_DEPEND} - cjk? ( >=app-text/poppler-data-0.4.4 ) -" - -DOCS=(AUTHORS NEWS README README-XPDF TODO) - -PATCHES=( - "${FILESDIR}/${PN}-0.26.0-qt5-dependencies.patch" - "${FILESDIR}/${PN}-0.28.1-fix-multilib-configuration.patch" - "${FILESDIR}/${PN}-0.28.1-respect-cflags.patch" - "${FILESDIR}/${PN}-0.33.0-openjpeg2.patch" - "${FILESDIR}/${PN}-0.40-FindQt4.patch" -) - -src_prepare() { - cmake-utils_src_prepare - - # Clang doesn't grok this flag, the configure nicely tests that, but - # cmake just uses it, so remove it if we use clang - if [[ ${CC} == clang ]] ; then - sed -i -e 's/-fno-check-new//' cmake/modules/PopplerMacros.cmake || die - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_GTK_TESTS=OFF - -DBUILD_QT4_TESTS=OFF - -DBUILD_QT5_TESTS=OFF - -DBUILD_CPP_TESTS=OFF - -DENABLE_SPLASH=ON - -DENABLE_ZLIB=ON - -DENABLE_XPDF_HEADERS=ON - $(cmake-utils_use_enable curl LIBCURL) - $(cmake-utils_use_enable cxx CPP) - $(cmake-utils_use_enable utils) - $(cmake-utils_use_with cairo) - $(cmake-utils_use_with introspection GObjectIntrospection) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4) - $(cmake-utils_use_find_package qt5 Qt5Core) - $(cmake-utils_use_with tiff) - ) - if use jpeg2k; then - mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) - else - mycmakeargs+=(-DENABLE_LIBOPENJPEG=) - fi - if use lcms; then - mycmakeargs+=(-DENABLE_CMS=lcms2) - else - mycmakeargs+=(-DENABLE_CMS=) - fi - - cmake-utils_src_configure -} - -src_install() { - cmake-utils_src_install - - # live version doesn't provide html documentation - if use cairo && use doc && [[ ${PV} != 9999 ]]; then - # For now install gtk-doc there - insinto /usr/share/gtk-doc/html/poppler - doins -r "${S}"/glib/reference/html/* - fi -} diff --git a/app-text/poppler/poppler-9999.ebuild b/app-text/poppler/poppler-9999.ebuild index b10c1df28bc2..d7c5ef7461db 100644 --- a/app-text/poppler/poppler-9999.ebuild +++ b/app-text/poppler/poppler-9999.ebuild @@ -2,8 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 +CMAKE_WARN_UNUSED_CLI=1 inherit cmake-utils toolchain-funcs xdg-utils if [[ "${PV}" == "9999" ]] ; then @@ -13,14 +14,14 @@ if [[ "${PV}" == "9999" ]] ; then else SRC_URI="http://poppler.freedesktop.org/${P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SLOT="0/52" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION + SLOT="0/59" # CHECK THIS WHEN BUMPING!!! SUBSLOT IS libpoppler.so SOVERSION fi DESCRIPTION="PDF rendering library based on the xpdf-3.0 code base" HOMEPAGE="http://poppler.freedesktop.org/" LICENSE="GPL-2" -IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms png qt4 qt5 tiff +utils" +IUSE="cairo cjk curl cxx debug doc +introspection +jpeg +jpeg2k +lcms nss png qt4 qt5 tiff +utils" # No test data provided RESTRICT="test" @@ -38,6 +39,7 @@ COMMON_DEPEND=" jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/openjpeg:2= ) lcms? ( media-libs/lcms:2 ) + nss? ( >=dev-libs/nss-3.19:0 ) png? ( media-libs/libpng:0= ) qt4? ( dev-qt/qtcore:4 @@ -86,17 +88,22 @@ src_configure() { -DBUILD_CPP_TESTS=OFF -DENABLE_SPLASH=ON -DENABLE_ZLIB=ON + -DENABLE_ZLIB_UNCOMPRESS=OFF -DENABLE_XPDF_HEADERS=ON - $(cmake-utils_use_enable curl LIBCURL) - $(cmake-utils_use_enable cxx CPP) - $(cmake-utils_use_enable utils) - $(cmake-utils_use_with cairo) - $(cmake-utils_use_with introspection GObjectIntrospection) - $(cmake-utils_use_with jpeg) - $(cmake-utils_use_with png) - $(cmake-utils_use_with qt4) + -DENABLE_LIBCURL="$(usex curl)" + -DENABLE_CPP="$(usex cxx)" + -DENABLE_UTILS="$(usex utils)" + -DSPLASH_CMYK=OFF + -DUSE_FIXEDPOINT=OFF + -DUSE_FLOAT=OFF + -DWITH_Cairo="$(usex cairo)" + -DWITH_GObjectIntrospection="$(usex introspection)" + -DWITH_JPEG="$(usex jpeg)" + -DWITH_NSS3="$(usex nss)" + -DWITH_PNG="$(usex png)" + -DWITH_Qt4="$(usex qt4)" $(cmake-utils_use_find_package qt5 Qt5Core) - $(cmake-utils_use_with tiff) + -DWITH_TIFF="$(usex tiff)" ) if use jpeg2k; then mycmakeargs+=(-DENABLE_LIBOPENJPEG=openjpeg2) diff --git a/app-text/webgen/webgen-1.3.0.ebuild b/app-text/webgen/webgen-1.3.0.ebuild index 32408b27e5a5..5d53e473db55 100644 --- a/app-text/webgen/webgen-1.3.0.ebuild +++ b/app-text/webgen/webgen-1.3.0.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21" RUBY_FAKEGEM_DOCDIR="htmldoc/rdoc" RUBY_FAKEGEM_EXTRADOC="AUTHORS THANKS" diff --git a/app-text/writerperfect/Manifest b/app-text/writerperfect/Manifest index 83e67dae1ef6..ac68767147d5 100644 --- a/app-text/writerperfect/Manifest +++ b/app-text/writerperfect/Manifest @@ -1,5 +1,5 @@ DIST writerperfect-0.8.1.tar.xz 249728 SHA256 87a4d6a0bf1743557336969c87c1955c7532b6e2fe4cc925653d7e16bae8e327 SHA512 a2df89ffdad454a800b1df28442403802ba67b1a76b5bfacc809f4798501988a1aecf63eccf10d395019021008fa0aad82fba090be06b99c52e5bfa0df21cccc WHIRLPOOL ffaae317a0fcf89f68f9bfce823cbfa4bd70e8426f81a228a129bccd234666eba435be598fc3559bfe303e3473891998fbebfe8d437709ad462b5e2ce5f2129b DIST writerperfect-0.8.2.tar.xz 261984 SHA256 12291dd0c7a77b16544905846ce8d6eb328e728bd5153dbdb6ad3003beb49dbc SHA512 4432e9a7cb78d687fd7b1cf287a88bc752d29b0364f8c2615b2a8b3ca8376437ff44800013646af7d4c8904810145752e9eddc8e01f036041ff4de192348ce0b WHIRLPOOL fa529da7535cd6ec7744137af16fdc9166b9b270af5c75b1a13538f3345c61256035272b310e484ed5070677e28ad8b7871d9eb7f1d0d92d5b2943063f7723c7 DIST writerperfect-0.9.2.tar.xz 274760 SHA256 e4040ec20436d5a763632243787bbb86cffd82ddf0da6aa674827e0401c2b601 SHA512 07679176c9c3f159c177cae65d499550f5cf86b34af26d32fb1d445176a3a8ff773c48b677cbbaa3514b81f5c5e83a358f8ba1ab0b567e182aeb05d8a4fc8bcb WHIRLPOOL 5bee7d9ac16ff74e2c70093a629ae0d417e7e3cd71b7a78bbdb5f62c1d9a7ea46962ba0816742b38937d3b2907d9b7a6f888c95e4da20e7bc4f736702a844dcf -DIST writerperfect-0.9.3.tar.xz 297192 SHA256 1dceacd627459b6375d956a10b3c8ac4c3a8e8f68d36ebc968d26af83d824883 SHA512 2f60ba509e983a79a4c8450bcbffaa93ef59b9f890aa772cc70ce57ccf976b50551c354bab647c5fec11798864d88f12a62fc28e5d109cd9738c4369060e742c WHIRLPOOL edc21b8b281d34116a6b694875034e654c0c187db4c7731a878a8b2c9f383a987d14e4d61ae353b2f82261eb76888deebfa3290bdfeb04a996f02f4eb55a4ced DIST writerperfect-0.9.4.tar.xz 288092 SHA256 6714bf945a657550eb84bd2f1f0b78b894f59536d8302942810134426f7a23ea SHA512 9bb180e9b681687145a129c0abab41d1cbd7db874d393fff2ed3a65f64b94cc3a104c32889fcab2739aaaad791d7f109a48e4b1e7ae0b5577505df7069cefc64 WHIRLPOOL bc56d1a28e2589426fb439feeebf2667b1839fcabf1094ca0dbe5913bd1db80c51f205152151dcf1866a11b3478478b7fabbef10136447126d995222d4019b6b +DIST writerperfect-0.9.5.tar.xz 302176 SHA256 aa01122659482627f9adcff91bb242c37092c7f8537bfa5dc44e1a3c89aad9e2 SHA512 7467a798da362883101780b598e9a673c10f86f29c01ece1438ea524a0413a00928274f87895f3a8ae26f6784cdcc34e0e84039ca591dc3f75b2e25c53744ccc WHIRLPOOL 9034673daad0929348f71fde157245126e73caf46db8279bfddd2b01e4ab5a72e67eb9a6dd34fa13c9f9848a693f2440d33852d51126204c5e8c1fa8dd760031 diff --git a/app-text/writerperfect/writerperfect-0.9.4.ebuild b/app-text/writerperfect/writerperfect-0.9.4.ebuild index 3d748f6a2d13..0c09b53c711e 100644 --- a/app-text/writerperfect/writerperfect-0.9.4.ebuild +++ b/app-text/writerperfect/writerperfect-0.9.4.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0" -# KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris" +KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris" IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps" # FIXME: libepubgen, libeot, librvngabw diff --git a/app-text/writerperfect/writerperfect-0.9.3.ebuild b/app-text/writerperfect/writerperfect-0.9.5.ebuild similarity index 93% rename from app-text/writerperfect/writerperfect-0.9.3.ebuild rename to app-text/writerperfect/writerperfect-0.9.5.ebuild index 3d748f6a2d13..de596c43e51f 100644 --- a/app-text/writerperfect/writerperfect-0.9.3.ebuild +++ b/app-text/writerperfect/writerperfect-0.9.5.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 DESCRIPTION="Various formats to Open document format converter" HOMEPAGE="http://libwpd.sf.net" @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/libwpd/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 MPL-2.0 )" SLOT="0" -# KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris" +KEYWORDS="~amd64 ~x86 ~x86-linux ~x86-solaris" IUSE="abiword +cdr debug ebook freehand gsf keynote +mspub +mwaw pagemaker +visio +wpd +wpg +wps" # FIXME: libepubgen, libeot, librvngabw diff --git a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild index f8f3c617d6df..cd732a4e360f 100644 --- a/app-text/xapian-omega/xapian-omega-1.2.22.ebuild +++ b/app-text/xapian-omega/xapian-omega-1.2.22.ebuild @@ -11,7 +11,7 @@ S="${WORKDIR}/xapian-omega-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" IUSE="" DEPEND="dev-libs/xapian:0/1.2.22 diff --git a/dev-cpp/libcmis/Manifest b/dev-cpp/libcmis/Manifest index cb665989b82d..52162669e9e4 100644 --- a/dev-cpp/libcmis/Manifest +++ b/dev-cpp/libcmis/Manifest @@ -1,2 +1,3 @@ DIST libcmis-0.5.0-gcc5.patch.gz 12452 SHA256 523763acda1de64bb40761fae1ce1b089756fba1bb0390587d6491b75ffafbea SHA512 75423caf195d9b6f2c0752f08fd9950ff1dac67884f7445da2389fb24ad13c2c29fbf73f29f6f60b1b440ad261c32697edf3a2ee9aba779630d40afdbf5d5495 WHIRLPOOL 5cbc92051da8dc99b6d575f13c6d3c853668dd1ce169e0f215f2d20cbaf1d77408d9af0844be5e04c1308e840110a0e5dd49ee86f0207bbead7361962c830cdb DIST libcmis-0.5.0.tar.gz 738119 SHA256 a87e02913dee3ee659db5abf6d7dafcfcd85dd4b24bf4389d8d4afe8c8dcf9b6 SHA512 abfdf5654ef8763c9744587ba831acea93cc0ba7deaa8d807eed2e9077be848db0334430f7c2d6eecefeb90f520abbe81364a86790c0aa4363724816aec4793b WHIRLPOOL 03041a0eb4af8fb515082731c4737f7c153756073464785994c431f54b27130b8407459efb5bcb4a26689a0baa1f5014e48cfa334948fb7d90fe646d5f8f0a02 +DIST libcmis-0.5.1.tar.gz 281863 SHA256 b88851b5e7dfa65b840d403231b38868ba77dae1e7abf2628d7a0dc3cd5a1409 SHA512 fb934c416b8a41714a5424375de507698992a0b014aa52a82a07dde07cba2ffe68a45ed97cfd0aa72b4a28f3697252ea1570a80ef9fa1b2a34af0a9ed865a752 WHIRLPOOL 4e154a417e98bd7e36fa5a4ad65b969e7c6661b6fbd33dc642a5430bda02e218e985b0b50d67f8fd811896c1a40fd4d3b78ae793d6620d8d5f4e92dd013d70d2 diff --git a/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch b/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch deleted file mode 100644 index 0a4741400f6c..000000000000 --- a/dev-cpp/libcmis/files/libcmis-0.2.3-do-not-override-phases.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -urN libcmis-0.2.3.old//Makefile.am libcmis-0.2.3/Makefile.am ---- libcmis-0.2.3.old//Makefile.am 2012-08-09 10:18:22.559384031 +0200 -+++ libcmis-0.2.3/Makefile.am 2012-08-09 10:18:44.797384029 +0200 -@@ -12,11 +12,11 @@ - cmis-client.1: doc/cmis-client.xml - $(DOCBOOK2X) $< - --install-data-am: cmis-client.1 -+install-data-local: cmis-client.1 - mkdir -p $(DESTDIR)$(mandir)/man1/ - $(INSTALL_DATA) cmis-client.1 $(DESTDIR)$(mandir)/man1/ - --uninstall-am: -+uninstall-local: - -rm -rf $(DESTDIR)$(mandir)/man1/ - endif - diff --git a/dev-cpp/libcmis/libcmis-0.5.0.ebuild b/dev-cpp/libcmis/libcmis-0.5.1.ebuild similarity index 75% rename from dev-cpp/libcmis/libcmis-0.5.0.ebuild rename to dev-cpp/libcmis/libcmis-0.5.1.ebuild index d3f9f0342742..854d1a07f7f8 100644 --- a/dev-cpp/libcmis/libcmis-0.5.0.ebuild +++ b/dev-cpp/libcmis/libcmis-0.5.1.ebuild @@ -1,37 +1,33 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 -EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code" +EGIT_REPO_URI="https://github.com/tdf/libcmis.git" [[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3" inherit eutils alternatives autotools ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="C++ client library for the CMIS interface" -HOMEPAGE="https://sourceforge.net/projects/libcmis/" -[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://github.com/tdf/libcmis" +[[ ${PV} == 9999 ]] || SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" SLOT="0.5" # Don't move KEYWORDS on the previous line or ekeyword won't work # 399061 [[ ${PV} == 9999 ]] || \ -KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux" IUSE="static-libs man test" -RDEPEND=" - !dev-cpp/libcmis:0 - !dev-cpp/libcmis:0.2 - !dev-cpp/libcmis:0.3 - !dev-cpp/libcmis:0.4 +COMMON_DEPEND=" dev-libs/boost:= dev-libs/libxml2 net-misc/curl " -DEPEND="${RDEPEND} +DEPEND="${COMMON_DEPEND} virtual/pkgconfig man? ( app-text/docbook2X @@ -42,9 +38,16 @@ DEPEND="${RDEPEND} dev-util/cppunit ) " +RDEPEND="${COMMON_DEPEND} + !dev-cpp/libcmis:0 + !dev-cpp/libcmis:0.2 + !dev-cpp/libcmis:0.3 + !dev-cpp/libcmis:0.4 +" src_prepare() { - [[ ${PV} == 9999 ]] && eautoreconf + eapply_user + eautoreconf } src_configure() { diff --git a/dev-cpp/libcmis/libcmis-9999.ebuild b/dev-cpp/libcmis/libcmis-9999.ebuild index c2086115172d..cf54088f06bc 100644 --- a/dev-cpp/libcmis/libcmis-9999.ebuild +++ b/dev-cpp/libcmis/libcmis-9999.ebuild @@ -4,14 +4,14 @@ EAPI=6 -EGIT_REPO_URI="git://git.code.sf.net/p/libcmis/code" +EGIT_REPO_URI="https://github.com/tdf/libcmis.git" [[ ${PV} == 9999 ]] && SCM_ECLASS="git-r3" inherit eutils alternatives autotools ${SCM_ECLASS} unset SCM_ECLASS DESCRIPTION="C++ client library for the CMIS interface" -HOMEPAGE="https://sourceforge.net/projects/libcmis/" -[[ ${PV} == 9999 ]] || SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" +HOMEPAGE="https://github.com/tdf/libcmis" +[[ ${PV} == 9999 ]] || SRC_URI="https://github.com/tdf/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( GPL-2 LGPL-2 MPL-1.1 )" SLOT="0.5" diff --git a/dev-cpp/libcmis/metadata.xml b/dev-cpp/libcmis/metadata.xml index d2e051d9e747..afb9c075be7a 100644 --- a/dev-cpp/libcmis/metadata.xml +++ b/dev-cpp/libcmis/metadata.xml @@ -9,6 +9,6 @@ Build and install man pages. - libcmis + tdf/libcmis diff --git a/dev-db/cdb/cdb-0.75-r4.ebuild b/dev-db/cdb/cdb-0.75-r4.ebuild index 1eac2cf43eeb..f376006359c9 100644 --- a/dev-db/cdb/cdb-0.75-r4.ebuild +++ b/dev-db/cdb/cdb-0.75-r4.ebuild @@ -5,7 +5,7 @@ EAPI=5 inherit eutils multilib toolchain-funcs -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos" DESCRIPTION="Fast, reliable, simple package for creating and reading constant databases" HOMEPAGE="http://cr.yp.to/cdb.html" diff --git a/dev-db/lmdb/lmdb-0.9.18.ebuild b/dev-db/lmdb/lmdb-0.9.18.ebuild index 5859cd31cae8..8c73c79d04d6 100644 --- a/dev-db/lmdb/lmdb-0.9.18.ebuild +++ b/dev-db/lmdb/lmdb-0.9.18.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/LMDB/lmdb/archive/LMDB_${PV}.tar.gz" LICENSE="OPENLDAP" SLOT="0/${PV}" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="static-libs" DEPEND="" diff --git a/dev-db/mariadb/Manifest b/dev-db/mariadb/Manifest index abd735b5fe8a..0e4119a3ca38 100644 --- a/dev-db/mariadb/Manifest +++ b/dev-db/mariadb/Manifest @@ -1,14 +1,10 @@ -DIST mariadb-10.0.22.tar.gz 56252325 SHA256 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b SHA512 68e30de616c83be5fbcfb3c5777c1ec888d8ada0c83c5de2a49d209eb6d27931c87be82096f73372da1ebcf48eafd294f94bece039caa73c1ee6cbf26718673d WHIRLPOOL 84e08c1d336fb64dcb6bc823a465950999d395ed2a85ecf0b6cc0b4095fbb2f919f70670ec9e30fb5494ef0309966ebf2a115e4c781f0917c16806aad4b2695d DIST mariadb-10.0.23.tar.gz 57394548 SHA256 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274 SHA512 c3b6d33efeb720bcffc3c20191726671c5c9ec96da0539d9a4df34051a16770e8fef07ee43efdd79e76be50b0e007519325d39b000de3843a8c6af3671e989a3 WHIRLPOOL 2de6816353c4d0873a038255dadd296433709b55cf794021f5107e8e5657afb98dadebc89e8d93747a105d70b03b9c02edae47be8986d206240d2d894fd83c8e DIST mariadb-10.0.24.tar.gz 57438082 SHA256 65de16f5f9b1696e2a537bc7a99d122bc38fa77941ba2e65d8cdf363c8449094 SHA512 57c91edd45e779401f934b18364bce3b933fc096647727e586c2fc6543ddcec60662b46ffaa4f950a84e927dac38f55547117761d9bd7a29e5c38abed7164482 WHIRLPOOL 1753a7fb407e4e39ceedb57fb7d22a19e64b586e675db03ed0449e119e2c314a13344714853d12f194306a9fa9496bd1e2a79fc1245fd0dd4eb607a0edf62d64 DIST mariadb-10.1.10.tar.gz 55158771 SHA256 d2c26fc76ff7397bdf25924161174c30a2b7fbd59893048f50145fc0a8278f76 SHA512 a33f813bf90380ce480cf5cb909032536629f7c06b68e90ceb061e13606a93824511196736ecf1149a15017026c098edfc4ce540d0e30f8ec2c69c7b0350c1b3 WHIRLPOOL 72110267deae404762756c500719f0bd6aaa648451bde3d83db869ed40ab402c71463044d52092dc8dbc031a808a50dc30fc13be37b16974294f8f94d780dbb8 DIST mariadb-10.1.11.tar.gz 55184229 SHA256 cd32927370343b4f14bcc6073bca163623c27843ae7bc59c8c6a9ebeda0325ce SHA512 5963aa4a7ce468ae46296cd4f83ed5922b1c00274a5d678ad6d0c36754c6e3edb3adc7286d398aac31a5652fca6c5d5480320e4ebae5b4a78619b4bd358bd80b WHIRLPOOL 2021b0457e296b8e20f4b2c1721bcc65383fd491ef8e90cb080dc1ef00ebfe054be32efaca829dec134fed78fd35b5283315ff1080ec9cf5e596efbe76290c54 DIST mariadb-10.1.12.tar.gz 55254244 SHA256 795f466ac0e4df148981b85df735855d41614abaedcda51520a513a4ad60f4e7 SHA512 c0f28de80e22b7fc1f74946f309c364601036aefeea2bb464b11e3658e102dd80ef0d6d156d0af67af76e54741e60334be8c48630766141b01b885d53068b659 WHIRLPOOL 28ceaa2445a89c82c91ca4f6806fb78fd40705b823b95817625e6fc97112f9a5eddfd4e1d1527c5ad588a9fec33353e4f88174272409637090d8495175a8cd3d -DIST mariadb-10.1.9.tar.gz 53998448 SHA256 8e9c5826722cedb4209bf06ae61069664513149479a6634e3d8115961edfe110 SHA512 0a271f2b169c569f65c222e83fcfeebc621c73ade76af4293ca4739f51c2fee2e34b1128d18339e6f1864dee7b9aed83ac15085325d477dc412e3fb2a4716b55 WHIRLPOOL be48eda5e8b2d711a711c77912e9b9b81ad343a4ec9a96f81a48ac9e35ebe001bcabc4ea3074ccfa418f35767b89aeb3f8037b5a15c006699384e80bb8eb89c5 DIST mariadb-5.5.47.tar.gz 45705343 SHA256 62b9378677433461d2a79b1ebe3182ba249994eb0cff2054ae8de8f646364209 SHA512 76359229448abec40100c916d69eab0d8e37bd480025edbacb70b7bfe965151953bfc8c9b36f6645e9c4b5ede8d970886373b6a069abf8e0026059cac1b09d76 WHIRLPOOL ce3548d2eec369be96ea373438c1cf586bdff536e8b61116b110ccc39ab412a46423353f4cddd6d816e93b43c707f40a3bb5b97349fa709fe2c86f484f54f62a DIST mariadb-5.5.48.tar.gz 45727158 SHA256 50f753e003af6bd9c50b6257cca9d0cced5c877690824eac05f8d54fb9f6b421 SHA512 e4485a17589aad77e8d375d1c72065ea0d84da5954af029099dab19ffa852b4e3541ad13a77179e5c4722afc0574f2998a4f854b2b08a0689bb1428deb7de171 WHIRLPOOL d9c15aae23d2104eb15a8003810b2e11618ee159cda923bf5e521eace635c6a2731ccb292d73425f0346fd88ff382c6dbfb686996118f84fccdcfb89504e729b -DIST mysql-extras-20141215-0144Z.tar.bz2 1494767 SHA256 4757043858110654d52b0e6dccab064987ab5db8ae4ae99863cf86df0b90f947 SHA512 7a9b733d09f44b1faff19a496a3e820e444b339838665e6f37c4fddc8f2ad67e805082d598c4edc06fda9364f9906e4cf95520552f72d6b6df34413f38e7a2ed WHIRLPOOL 99ea6890a5faf097b941707538b68f62390e1a49ee662a87c27435a317a9a3f37f00802e72f86b52993b3d1674b57645db0f7e73379ab88fbc1d0ef791cf4326 DIST mysql-extras-20150509-1847Z.tar.bz2 1494301 SHA256 de9c9fbb67998604cb3c0409842e4601646c8ad17f2aa301f55ffd4aed7a483d SHA512 f87d96ab8c35236d4453182c49f87f6e703af9dc217916546e4dd7368caa18a2340c9063decd96c22251d1097d7e2cac58bef30e6ff75c23aedf8926dbc3d3b4 WHIRLPOOL f60297c8ee1dfd9867ed6b29a8b04a002f23bc36b1e8d9b5db30e1e454a49fe06ffc37b10d934b11235364eecdc62beb50ce24690ab3d07a50056357906fa0fa -DIST mysql-extras-20151123-1643Z.tar.bz2 294038 SHA256 0d923d56370a883c74dcb29638827b938ac10bc10030b3e15e7e9d7947b6a1f4 SHA512 9346f32c1ea8f8e675da2551141cb8c88cd90c735a0895bf0029220b8b96a753d4954be549383ef8050f37b15ab51788885c7334d0851658d6ae620c9bf45392 WHIRLPOOL 83a31f48c671cd4e7907d6c3eb79e2f7b1aab1554e92adb843db0cdcc9f8e4891f5be5c570939de59677bab0456415ab0920d1d12f7b1ef30731d3775d1b84de DIST mysql-extras-20151223-1501Z.tar.bz2 295335 SHA256 8b5100aef8e0f8f6302bb389555dc7c91dd78ac1e4eb39bfd4f9d9d0b2321971 SHA512 84dc1dab6651aea51b4b2bad4304ae19dbedbda6e9c8f49377d01adb9d42fed7ce0018951a6694fd09f316ce99816c0269f2787b490cad6838d729f365ad4a6d WHIRLPOOL 30ec83b7054eaa711cfbb57b39c0696a028aee862ed2ca5dfe2515ab1bd625a28175e4d789d9ba2c67692a1b1429e08cc50d72132ac002ccb2be2d26c91cfdfb DIST mysql-extras-20160131-0252Z.tar.bz2 295849 SHA256 442966972d2f9d9bcc3a27c1df31ed5a5bbcba13fa7ca1254c8964e9d0b7805e SHA512 d8018fd46c94a344fcbcdedfcdee4b3d75878b879b28cd4d07dfb9f29e62df217b243cf43f1e80ebca3507faef9c37c14c21372db84f9ba487c98ed32d7f3c0b WHIRLPOOL 4416bb455ed5862dd1d012ffe6fa6e65d5d24bb60b5b5b71adac2c3ccebb46a3ec75f82a7eef75ff5c37d3a0ab91d191b2395beb643e71a98ee0238b13d4b7fe diff --git a/dev-db/mariadb/mariadb-10.0.22.ebuild b/dev-db/mariadb/mariadb-10.0.22.ebuild deleted file mode 100644 index 8b6b1d6c5138..000000000000 --- a/dev-db/mariadb/mariadb-10.0.22.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -MY_EXTRAS_VER="20141215-0144Z" -SUBSLOT="18" - -inherit toolchain-funcs mysql-multilib -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" -RDEPEND="${RDEPEND}" - -# Official test instructions: -# USE='embedded extraengine perl openssl static-libs' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if ! use "minimal" ; then - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # These are failing in MariaDB 10.0 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql main.bootstrap - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - # - # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # - # archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # fails due to bad cleanup of previous tests when run in parallel - # The tool is deprecated anyway - # Bug 532288 - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help main.bootstrap \ - archive.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-multilib_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" - - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mariadb/mariadb-10.0.23.ebuild b/dev-db/mariadb/mariadb-10.0.23.ebuild index 2a58dacc46e1..eb8f60531a2f 100644 --- a/dev-db/mariadb/mariadb-10.0.23.ebuild +++ b/dev-db/mariadb/mariadb-10.0.23.ebuild @@ -20,7 +20,7 @@ RESTRICT="!bindist? ( bindist )" REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" # When MY_EXTRAS is bumped, the index should be revised to exclude these. EPATCH_EXCLUDE='20004_all_mariadb-filter-tokudb-flags-10.0.7.patch' diff --git a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild b/dev-db/mariadb/mariadb-10.1.9-r1.ebuild deleted file mode 100644 index 5a4832254570..000000000000 --- a/dev-db/mariadb/mariadb-10.1.9-r1.ebuild +++ /dev/null @@ -1,200 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -MY_EXTRAS_VER="20151123-1643Z" -# The wsrep API version must match between upstream WSREP and sys-cluster/galera major number -WSREP_REVISION="25" -SUBSLOT="18" -MYSQL_PV_MAJOR="5.6" - -inherit toolchain-funcs mysql-multilib-r1 - -HOMEPAGE="http://mariadb.org/" -DESCRIPTION="An enhanced, drop-in replacement for MySQL" - -IUSE="bindist cracklib galera innodb-lz4 innodb-lzo innodb-snappy mroonga odbc oqgraph pam sphinx sst-rsync sst-xtrabackup tokudb systemd xml" -RESTRICT="!bindist? ( bindist )" - -REQUIRED_USE="tokudb? ( jemalloc ) static? ( !pam )" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -#EPATCH_EXCLUDE='' - -COMMON_DEPEND=" - mroonga? ( app-text/groonga-normalizer-mysql ) - systemd? ( sys-apps/systemd:= ) - !bindist? ( >=sys-libs/readline-4.1:0= ) - server? ( - cracklib? ( sys-libs/cracklib:0= ) - extraengine? ( - odbc? ( dev-db/unixODBC:0= ) - xml? ( dev-libs/libxml2:2= ) - ) - innodb-lz4? ( app-arch/lz4 ) - innodb-lzo? ( dev-libs/lzo ) - innodb-snappy? ( app-arch/snappy ) - oqgraph? ( >=dev-libs/boost-1.40.0:0= dev-libs/judy:0= ) - pam? ( virtual/pam:0= ) - ) - >=dev-libs/libpcre-8.35:3= -" -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - ${COMMON_DEPEND}" -RDEPEND="${RDEPEND} ${COMMON_DEPEND} - galera? ( - sys-apps/iproute2 - =sys-cluster/galera-${WSREP_REVISION}* - sst-rsync? ( sys-process/lsof ) - sst-xtrabackup? ( net-misc/socat[ssl] ) - ) - perl? ( !dev-db/mytop - virtual/perl-Getopt-Long - dev-perl/TermReadKey - virtual/perl-Term-ANSIColor - virtual/perl-Time-HiRes ) -" -# xtrabackup-bin causes a circular dependency if DBD-mysql is not already installed -PDEPEND="galera? ( sst-xtrabackup? ( >=dev-db/xtrabackup-bin-2.2.4 ) )" - -MULTILIB_WRAPPED_HEADERS+=( /usr/include/mysql/mysql_version.h ) - -src_configure(){ - # bug 508724 mariadb cannot use ld.gold - tc-ld-disable-gold - local MYSQL_CMAKE_NATIVE_DEFINES=( - -DWITH_JEMALLOC=$(usex jemalloc system) - -DWITH_PCRE=system - ) - if use server ; then - # Federated{,X} must be treated special otherwise they will not be built as plugins - if ! use extraengine ; then - MYSQL_CMAKE_NATIVE_DEFINES+=( - -DPLUGIN_FEDERATED=NO - -DPLUGIN_FEDERATEDX=NO ) - fi - - MYSQL_CMAKE_NATIVE_DEFINES+=( - -DPLUGIN_OQGRAPH=$(usex oqgraph YES NO) - -DPLUGIN_SPHINX=$(usex sphinx YES NO) - -DPLUGIN_TOKUDB=$(usex tokudb YES NO) - -DPLUGIN_AUTH_PAM=$(usex pam YES NO) - -DPLUGIN_CRACKLIB_PASSWORD_CHECK=$(usex cracklib YES NO) - -DPLUGIN_CASSANDRA=NO - -DPLUGIN_SEQUENCE=$(usex extraengine YES NO) - -DPLUGIN_SPIDER=$(usex extraengine YES NO) - -DPLUGIN_CONNECT=$(usex extraengine YES NO) - -DCONNECT_WITH_MYSQL=1 - -DCONNECT_WITH_LIBXML2=$(usex xml) - -DCONNECT_WITH_ODBC=$(usex odbc) - -DWITH_WSREP=$(usex galera) - -DWITH_INNODB_LZ4=$(usex innodb-lz4) - -DWITH_INNODB_LZO=$(usex innodb-lzo) - -DWITH_INNODB_SNAPPY=$(usex innodb-snappy) - ) - - use mroonga || MYSQL_CMAKE_NATIVE_DEFINES+=( -DWITHOUT_MROONGA=1 ) - fi - mysql-multilib-r1_src_configure -} - -# Official test instructions: -# USE='embedded extraengine perl server openssl static-libs' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - if use server ; then - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might run out of order - mkdir -p "${T}"/var-tests{,/log} - - # These are failing in MariaDB 10.0 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql main.bootstrap - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - # - # plugins.cracklib_password_check - # Can randomly fail due to cracklib return message - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp main.bootstrap \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help plugins.cracklib_password_check \ - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-multilib-r1_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" || die - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder - - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd || die - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mariadb/mariadb-10.1.9.ebuild b/dev-db/mariadb/mariadb-10.1.9.ebuild deleted file mode 100644 index e4562b09c527..000000000000 --- a/dev-db/mariadb/mariadb-10.1.9.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -MY_EXTRAS_VER="20151123-1643Z" -WSREP_REVISION="25" -SUBSLOT="18" -HAS_TOOLS_PATCH="yes" - -inherit toolchain-funcs mysql-multilib -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE mroonga systemd" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~hppa ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -#EPATCH_EXCLUDE='' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 ) - mroonga? ( app-text/groonga-normalizer-mysql ) - systemd? ( sys-apps/systemd:= )" -RDEPEND="${RDEPEND}" - -# Official test instructions: -# USE='client-libs embedded extraengine perl server openssl static-libs tools' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mariadb-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - if use server ; then - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # Create a symlink to provided binaries so the tests can find them when client-libs is off - if ! use client-libs ; then - ln -srf /usr/bin/my_print_defaults "${BUILD_DIR}/client/my_print_defaults" || die - ln -srf /usr/bin/perror "${BUILD_DIR}/client/perror" || die - mysql-multilib_disable_test main.perror "String mismatch due to not building local perror" - fi - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might run out of order - mkdir -p "${T}"/var-tests{,/log} - - # These are failing in MariaDB 10.0 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # main.mysqld--help, funcs_1.is_triggers, funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql main.bootstrap - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test, main.mysql_client_test_nonblock - # main.mysql_client_test_comp: - # segfaults at random under Portage only, suspect resource limits. - # - # plugins.cracklib_password_check - # Can randomly fail due to cracklib return message - - for t in main.mysql_client_test main.mysql_client_test_nonblock \ - main.mysql_client_test_comp main.bootstrap \ - binlog.binlog_statement_insert_delayed main.information_schema \ - main.mysqld--help plugins.cracklib_password_check \ - funcs_1.is_triggers funcs_1.is_tables_mysql funcs_1.is_columns_mysql ; do - mysql-multilib_disable_test "$t" "False positives in Gentoo" - done - - # Run mysql tests - pushd "${TESTDIR}" - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" --reorder - - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mariadb/metadata.xml b/dev-db/mariadb/metadata.xml index 2d40f48dbbd9..7a49be6c7383 100644 --- a/dev-db/mariadb/metadata.xml +++ b/dev-db/mariadb/metadata.xml @@ -15,7 +15,6 @@ dev-db/mysql dev-db/mariadb --> - Build the libmysqlclient libraries Add support for NDB clustering (deprecated) Enables the community features from upstream. Build embedded server (libmysqld) @@ -39,7 +38,6 @@ dev-db/mariadb Add tools needed to support the rsync SST method Add tools needed to support the xtrabackup and xtrabackup-v2 SST methods Build support for profiling and tracing using dev-util/systemtap - Build the command line tools (mysql, mysqldump, mysqladmin, etc) Install upstream testsuites for end use. Add support for TokuDB storage engine Enable SSL connections and crypto functions using the bundled yaSSL diff --git a/dev-db/mysql/Manifest b/dev-db/mysql/Manifest index 5432ee7043a6..bfa430965625 100644 --- a/dev-db/mysql/Manifest +++ b/dev-db/mysql/Manifest @@ -1,6 +1,5 @@ DIST mysql-5.5.47.tar.gz 21187802 SHA256 77d0997e7ef47885a6682888e6d1282419687d333b2bd2365cb909a089b8db7b SHA512 807d140764ec18f4a7edb8de3ceff24b2003f1b30cf59cce315b6c1f2475a3f3f92bf369e9fe5704611dd45ee5fb676c0c187851230dcb419adde22436678ce3 WHIRLPOOL db188a23b470fc4d556dfeee6feb2a248dcbffe027018c99e28f3a47c2783cfe473378fb96aefbf5a263a6bd4676e62e77f9e6c1e3aac6325f732d9517a4a867 DIST mysql-5.5.48.tar.gz 21201193 SHA256 cc3f8745879eee0508de1a70fc2d267a2d06b7433faa8bb07a787768dcfed781 SHA512 ac13cdfd89dea70f9ffb443affd5b9abf9984c5ea126b58d7833568e985478a667b73b1c9a4c8c80d80ce8da53168ee720191829ed035cff3f9482f58b5510e4 WHIRLPOOL d4d53f00e370c8c54ac42e30bafc2a4e37a24bba16b7f8d000836c50dfded358371c363bee51dd6bea60cbf4eb1cbcf2f32f61c70e908e344fc1dbcf299c0e84 -DIST mysql-5.6.27.tar.gz 33327156 SHA256 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d SHA512 2839a2f481eec52272a7965d1344677c0d0b77d85108e3b4986dc346caebf62d9ef6347756bac156dd943ad57440d6cac9283ee252e30bd3a1e430c492aceb09 WHIRLPOOL 4fdc0db92822809824777c5f712c3e7898af58f178d22ec4ca1a56d9c9b4d782efe47b3b35b7cc9c7b45d31f25f0323cced346e29c24e7bc4e7b9d965c48cfd7 DIST mysql-5.6.28.tar.gz 32182980 SHA256 217cd96921abdd709b9b4ff3ce2af4cbd237de43679cf19385d19df03a037b21 SHA512 f02f91586567cb240ec882108ed5cc9e49a4e96545738cf00d43ba6c1fbe8d08b3726dccbe6f7b2412136a1bd50098543975d68ed2322f4cdeb7cd9572d48fcc WHIRLPOOL 039bb2af811d13c573d1a62cd9c8c043b03fba9a369a6afd30336dcc5ba999e90e2e86f1d1b5d4e5944d76eed1c2893e515705aa384cec98e24e2e8a8f7437c2 DIST mysql-5.6.29.tar.gz 32220131 SHA256 6ac85b75b2dfa8c232725dda25469df37bf4e48b408cc0978d0dfc34c25a817f SHA512 d0efb3a03274639e3e585d8af338f8907094643dfeeee457de99d5cd7feabb6d69a8b884ccf9625b10df7531a76bc36df25a3e8713dcb657b578fac991ade8c5 WHIRLPOOL 808c3beaf3873e5e8a4a50bf94f511e2327daee39dad675f87370174dda51604e46a2d4f09e16e0c651092600165bcb65fba650f835d93a5983bb2fcb19b9c94 DIST mysql-extras-20150127-1351Z.tar.bz2 1494648 SHA256 74497659f1fb3b0cb620e38a911cf2e59a084149dd175199eb7cf4be18b4c328 SHA512 886e42697b3b0a90d8542bafaf3a7ccedf075f9f0065fec995bf58f645edff3a5d62f29be1cfa2e01d002d6382ee02279832cea8c21db6a774c2567c75ab6a35 WHIRLPOOL 9ddb5ccd914a6a6a19741ff93df78534d2273cf918f24af427c018b7c4f424a90d9f57f167633c48e2fa4102a4fae0873fd6dec7529839f229af855cbddf82d4 diff --git a/dev-db/mysql/mysql-5.6.27.ebuild b/dev-db/mysql/mysql-5.6.27.ebuild deleted file mode 100644 index 4e6a699ddd75..000000000000 --- a/dev-db/mysql/mysql-5.6.27.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -MY_EXTRAS_VER="20151105-2051Z" -MY_PV="${PV//_alpha_pre/-m}" -MY_PV="${MY_PV//_/-}" -SUBSLOT="18" - -inherit toolchain-funcs mysql-multilib -# only to make repoman happy. it is really set in the eclass -IUSE="$IUSE" - -# REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" - -# When MY_EXTRAS is bumped, the index should be revised to exclude these. -EPATCH_EXCLUDE='20018_all_mysql-5.6.25-without-clientlibs-tools.patch' - -DEPEND="|| ( >=sys-devel/gcc-3.4.6 >=sys-devel/gcc-apple-4.0 )" -RDEPEND="${RDEPEND}" - -# Please do not add a naive src_unpack to this ebuild -# If you want to add a single patch, copy the ebuild to an overlay -# and create your own mysql-extras tarball, looking at 000_index.txt - -# validate_password plugin uses exceptions when it shouldn't yet (until 5.7) -# disable until we see what happens with it -MYSQL_CMAKE_NATIVE_DEFINES="-DWITHOUT_VALIDATE_PASSWORD=1" - -src_prepare() { - mysql-multilib_src_prepare - if use libressl ; then - sed -i 's/OPENSSL_MAJOR_VERSION STREQUAL "1"/OPENSSL_MAJOR_VERSION STREQUAL "2"/' \ - "${S}/cmake/ssl.cmake" || die - fi -} - -# Official test instructions: -# USE='embedded extraengine perl openssl static-libs' \ -# FEATURES='test userpriv -usersandbox' \ -# ebuild mysql-X.X.XX.ebuild \ -# digest clean package -multilib_src_test() { - - if ! multilib_is_native_abi ; then - einfo "Server tests not available on non-native abi". - return 0; - fi - - local TESTDIR="${BUILD_DIR}/mysql-test" - local retstatus_unit - local retstatus_tests - - # Bug #213475 - MySQL _will_ object strenously if your machine is named - # localhost. Also causes weird failures. - [[ "${HOSTNAME}" == "localhost" ]] && die "Your machine must NOT be named localhost" - - if ! use "minimal" ; then - - if [[ $UID -eq 0 ]]; then - die "Testing with FEATURES=-userpriv is no longer supported by upstream. Tests MUST be run as non-root." - fi - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - einfo ">>> Test phase [test]: ${CATEGORY}/${PF}" - addpredict /this-dir-does-not-exist/t9.MYI - - # Run CTest (test-units) - cmake-utils_src_test - retstatus_unit=$? - [[ $retstatus_unit -eq 0 ]] || eerror "test-unit failed" - - # Ensure that parallel runs don't die - export MTR_BUILD_THREAD="$((${RANDOM} % 100))" - # Enable parallel testing, auto will try to detect number of cores - # You may set this by hand. - # The default maximum is 8 unless MTR_MAX_PARALLEL is increased - export MTR_PARALLEL="${MTR_PARALLEL:-auto}" - - # create directories because mysqladmin might right out of order - mkdir -p "${T}"/var-tests{,/log} - - # create symlink for the tests to find mysql_tzinfo_to_sql - ln -s "${BUILD_DIR}/sql/mysql_tzinfo_to_sql" "${S}/sql/" - - # These are failing in MySQL 5.5/5.6 for now and are believed to be - # false positives: - # - # main.information_schema, binlog.binlog_statement_insert_delayed, - # funcs_1.is_triggers funcs_1.is_tables_mysql, - # funcs_1.is_columns_mysql, binlog.binlog_mysqlbinlog_filter, - # perfschema.binlog_edge_mix, perfschema.binlog_edge_stmt, - # mysqld--help-notwin, funcs_1.is_triggers, funcs_1.is_tables_mysql, funcs_1.is_columns_mysql - # perfschema.binlog_edge_stmt, perfschema.binlog_edge_mix, binlog.binlog_mysqlbinlog_filter - # fails due to USE=-latin1 / utf8 default - # - # main.mysql_client_test: - # segfaults at random under Portage only, suspect resource limits. - # - # rpl.rpl_plugin_load - # fails due to included file not listed in expected result - # appears to be poor planning - # - # main.mysqlhotcopy_archive main.mysqlhotcopy_myisam - # fails due to bad cleanup of previous tests when run in parallel - # The tool is deprecated anyway - # Bug 532288 - for t in \ - binlog.binlog_mysqlbinlog_filter \ - binlog.binlog_statement_insert_delayed \ - funcs_1.is_columns_mysql \ - funcs_1.is_tables_mysql \ - funcs_1.is_triggers \ - main.information_schema \ - main.mysql_client_test \ - main.mysqld--help-notwin \ - perfschema.binlog_edge_mix \ - perfschema.binlog_edge_stmt \ - rpl.rpl_plugin_load \ - main.mysqlhotcopy_archive main.mysqlhotcopy_myisam \ - ; do - mysql-multilib_disable_test "$t" "False positives in Gentoo" - done - - if ! use extraengine ; then - # bug 401673, 530766 - for t in federated.federated_plugin ; do - mysql-multilib_disable_test "$t" "Test $t requires USE=extraengine (Need federated engine)" - done - fi - - # Run mysql tests - pushd "${TESTDIR}" - - # Set file limits higher so tests run - ulimit -n 3000 - - # run mysql-test tests - perl mysql-test-run.pl --force --vardir="${T}/var-tests" \ - --suite-timeout=5000 --reorder - retstatus_tests=$? - [[ $retstatus_tests -eq 0 ]] || eerror "tests failed" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - popd - - # Cleanup is important for these testcases. - pkill -9 -f "${S}/ndb" 2>/dev/null - pkill -9 -f "${S}/sql" 2>/dev/null - - failures="" - [[ $retstatus_unit -eq 0 ]] || failures="${failures} test-unit" - [[ $retstatus_tests -eq 0 ]] || failures="${failures} tests" - has usersandbox $FEATURES && eerror "Some tests may fail with FEATURES=usersandbox" - - [[ -z "$failures" ]] || die "Test failures: $failures" - einfo "Tests successfully completed" - - else - - einfo "Skipping server tests due to minimal build." - fi -} diff --git a/dev-db/mysql/mysql-5.6.28.ebuild b/dev-db/mysql/mysql-5.6.28.ebuild index 71366488aa35..e41cf68b9a84 100644 --- a/dev-db/mysql/mysql-5.6.28.ebuild +++ b/dev-db/mysql/mysql-5.6.28.ebuild @@ -15,7 +15,7 @@ inherit mysql-multilib-r1 IUSE="$IUSE" # REMEMBER: also update eclass/mysql*.eclass before committing! -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" # When MY_EXTRAS is bumped, the index should be revised to exclude these. EPATCH_EXCLUDE='' diff --git a/dev-db/phpmyadmin/Manifest b/dev-db/phpmyadmin/Manifest index a6dd1a83373e..9f59ddd82f87 100644 --- a/dev-db/phpmyadmin/Manifest +++ b/dev-db/phpmyadmin/Manifest @@ -1,4 +1,5 @@ -DIST phpMyAdmin-4.0.10.14-all-languages.tar.xz 4717192 SHA256 1bbd9eeb1d6d939cd31e6b8f8a544ab09fae5f0bc58c47c1bfb3287419a9f577 SHA512 91e1c212b67d90da1f85aea1019fd2ecc02db4bf6c0d5bfea971c2eae343de88c322c6aa2732b70970741ba27a48b790b29185a57cd49b8b3e0e281724ceeab9 WHIRLPOOL 8f53d9d2269545e67081b54af75538a7c2141a3e0ebaacfd9d75267f62f6d4fc0e4300eb9de8208d697ad46a4c64e0bf9a1c55b404ae8dede5dd428d2ec2111e -DIST phpMyAdmin-4.4.15.4-all-languages.tar.xz 5597144 SHA256 692b70dfbf46884ae52d57d43e07809ee2319bfa7321be7ae4b00fe3510a3e37 SHA512 eaeaa7d05d6cc4e4f854592993562cdea1a0349064cc3aa5eff4ac9a1aa5a6cb1cca1392d27fb62b33d85fdf12376abbb4bb9233ff5ec9f0074bfb0430625262 WHIRLPOOL aa5bf8cad6da266e649b355e9d1c65fbf736c60130914328b95cd4d34af55d9d37b1c108bb08753d9d6c621a918d2cef2c3c1eb0eeffc1bd6df061113db30527 -DIST phpMyAdmin-4.5.3.1-all-languages.tar.xz 5757736 SHA256 75be3589b5e4800afb21581761478ddc5b888d6a09d5235a0ba997401d04fc00 SHA512 4a53fbc1facdc1b9ff627d2dc29e948793a1998ebe54f67db666abfda65e1eb43b309d548113bb0a140989bc394e51f19b267f3ea639dbcb0ef40126ab77fe48 WHIRLPOOL 4f4b5a659c241ec1ff7e3179cc6e65a9afe4a5d072ea02ec355e980635041f742edcc7133cd641eb419ede15d24c9821170283f052e603c2e13539e41a086e52 +DIST phpMyAdmin-4.0.10.15-all-languages.tar.xz 4778232 SHA256 f3aea2e7f048b14499912e8ec0f39cff31bcc690480e3bbc773cb56bdeb5e717 SHA512 a1b1305ad1404a8f842155793e1118a24b4f011349d9d35375970d016e9c044529e5b5b207eee7554f515f6be2c008e73f36a21aae5427a9374bfdba55575774 WHIRLPOOL b525f6c402a391f7e1ec4727d284e89de3b8fe6c12f78a37ed1a4448b1ea047a0605677a2d73b00bdefd73270d46dd37b04be90b3357288d3bbcc23b07ca3b75 +DIST phpMyAdmin-4.4.15.5-all-languages.tar.xz 5783216 SHA256 6160724fa90ef5cccb67ad897a83586be28e64f5d6acf9bcb3313bc3d7638d8c SHA512 987d95f8352f58d7081aead10ccc7494b054d4041e0cb7454633e885c3217a7c63778d45c2dbf399e82c76159ab6651efeaf9c3cabc96982de83d5a041065e7a WHIRLPOOL b5fb8365817d1521f9e6ad5c60fa1a1ee941fb77062d63975d9f340c4abc681948fb6cd240c4943714d855f6f113baf46241bacf4d421b78f8f740c8bd9ade73 DIST phpMyAdmin-4.5.4.1-all-languages.tar.xz 5810548 SHA256 4f79a1e3687ed6976903b0fab6a29f960e657e4eb4c9e8a9b92bcf4f1d57194d SHA512 e3e9669c90610a441901854a4c1e91f1312eba55821bd8b73bbfa5589ca321cb4f6c1893a0f62d0a6cc644ff28b6066cd77f2a7f30641afd4f1547bd427403cb WHIRLPOOL d0f60c55b250b7cfd1f3a4f8c0d1e6afc484394687052fe298bf2db897dfedb663566c345ff2ec2f43fd1cddbf1dba85f3521a78b19fab7cb88d7bbf9678a7e4 +DIST phpMyAdmin-4.5.5.1-all-languages.tar.xz 5987876 SHA256 bf8ab258d5c6ce5cfaf7ff330827599c1cfd29b0cc4c9b83f4263ee143c00ef4 SHA512 636d29b9799e6ec0a1484c277187bb1ca24c8cea93c49f30c8c40bf34e4b64ed7e832b5d0e903310e8f08036dbf66724c1b28ab08133cbdf5cec475a430a64d7 WHIRLPOOL b84ae72f306263d36aa700772f47febd1296cad3ccc2b003d551e3b11d0345ff72eeba9af7aca6c54243c3d3c805e035c8a64cfbb7bfe76a3d31d8bcc0980243 +DIST phpMyAdmin-4.6.0-rc1-all-languages.tar.xz 6128788 SHA256 c193a50c01b4c29ce5628581e930798172c9ef683902de302da5fd038e9167f6 SHA512 e52a3cbea1c4684289cb4a4a42f8e0d6ac90138b2d16c0d831ac4df36c4816ea26f98032c1636fe05c59e31ccf658a0fd8593d8fb2ddd7b9d08ce2f33f47346d WHIRLPOOL b52697bb280037da275ee3d6dbd01dcf372838d8f3c5f72cb760f9b590d2e56bea6d7b45a1aa3b1a59acb4e1986631d4df68a7c59d420a74a59c31c1a1a0e580 diff --git a/dev-db/phpmyadmin/phpmyadmin-4.0.10.14.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild similarity index 90% rename from dev-db/phpmyadmin/phpmyadmin-4.0.10.14.ebuild rename to dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild index 96f5cb4b0e22..e247c8169ca7 100644 --- a/dev-db/phpmyadmin/phpmyadmin-4.0.10.14.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-4.0.10.15.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ HOMEPAGE="http://www.phpmyadmin.net/" SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="alpha ~amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" IUSE="setup" RDEPEND=" diff --git a/dev-db/phpmyadmin/phpmyadmin-4.4.15.4.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild similarity index 90% rename from dev-db/phpmyadmin/phpmyadmin-4.4.15.4.ebuild rename to dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild index badd8c65c508..943e93c0cf6f 100644 --- a/dev-db/phpmyadmin/phpmyadmin-4.4.15.4.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-4.4.15.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/" SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="alpha ~amd64 hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" IUSE="setup" RDEPEND=" diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.4.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.4.1.ebuild index 724cb3226593..cae4bbda60d8 100644 --- a/dev-db/phpmyadmin/phpmyadmin-4.5.4.1.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-4.5.4.1.ebuild @@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/" SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" IUSE="setup" RDEPEND=" diff --git a/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.5.5.1.ebuild similarity index 90% rename from dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild rename to dev-db/phpmyadmin/phpmyadmin-4.5.5.1.ebuild index b2377eafb5cf..1f26611da40f 100644 --- a/dev-db/phpmyadmin/phpmyadmin-4.5.3.1.ebuild +++ b/dev-db/phpmyadmin/phpmyadmin-4.5.5.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ HOMEPAGE="https://www.phpmyadmin.net/" SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz" LICENSE="GPL-2" -KEYWORDS="alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" IUSE="setup" RDEPEND=" diff --git a/dev-db/phpmyadmin/phpmyadmin-4.6.0_rc1.ebuild b/dev-db/phpmyadmin/phpmyadmin-4.6.0_rc1.ebuild new file mode 100644 index 000000000000..1f26611da40f --- /dev/null +++ b/dev-db/phpmyadmin/phpmyadmin-4.6.0_rc1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +inherit eutils webapp + +MY_PV=${PV/_/-} +MY_PN="phpMyAdmin" +MY_P="${MY_PN}-${MY_PV}-all-languages" + +DESCRIPTION="Web-based administration for MySQL database in PHP" +HOMEPAGE="https://www.phpmyadmin.net/" +SRC_URI="https://files.phpmyadmin.net/${MY_PN}/${MY_PV}/${MY_P}.tar.xz" + +LICENSE="GPL-2" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos" +IUSE="setup" + +RDEPEND=" + dev-lang/php[crypt,ctype,filter,json,session,unicode] + || ( + dev-lang/php[mysqli] + dev-lang/php[mysql] + ) + virtual/httpd-php:* +" + +need_httpd_cgi + +S="${WORKDIR}"/${MY_P} + +pkg_setup() { + webapp_pkg_setup +} + +src_install() { + webapp_src_preinst + + dodoc README RELEASE-DATE-${MY_PV} ChangeLog || die + rm -f LICENSE README* RELEASE-DATE-${MY_PV} + + if ! use setup; then + rm -rf setup || die "Cannot remove setup utility" + elog "The phpMyAdmin setup utility has been removed." + elog "It is a regular target of various exploits. If you need it, set USE=setup." + else + elog "You should consider disabling the setup USE flag" + elog "to exclude the setup utility if you don't use it." + elog "It regularly is the target of various exploits." + fi + + insinto "${MY_HTDOCSDIR#${EPREFIX}}" + doins -r . + + webapp_configfile "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php + webapp_serverowned "${MY_HTDOCSDIR#${EPREFIX}}"/libraries/config.default.php + + webapp_postinst_txt en "${FILESDIR}"/postinstall-en-3.1.txt + webapp_src_install +} diff --git a/dev-db/postgresql/postgresql-9.1.20.ebuild b/dev-db/postgresql/postgresql-9.1.20.ebuild index ca91483a2a4b..3ad70613b443 100644 --- a/dev-db/postgresql/postgresql-9.1.20.ebuild +++ b/dev-db/postgresql/postgresql-9.1.20.ebuild @@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.2.15.ebuild b/dev-db/postgresql/postgresql-9.2.15.ebuild index bab54b788ae7..1889593643b3 100644 --- a/dev-db/postgresql/postgresql-9.2.15.ebuild +++ b/dev-db/postgresql/postgresql-9.2.15.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.3.11.ebuild b/dev-db/postgresql/postgresql-9.3.11.ebuild index b02d694ef9ed..3fbf3a4506ba 100644 --- a/dev-db/postgresql/postgresql-9.3.11.ebuild +++ b/dev-db/postgresql/postgresql-9.3.11.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.4.6.ebuild b/dev-db/postgresql/postgresql-9.4.6.ebuild index 439510a779e7..930e740afd2d 100644 --- a/dev-db/postgresql/postgresql-9.4.6.ebuild +++ b/dev-db/postgresql/postgresql-9.4.6.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.5.1.ebuild b/dev-db/postgresql/postgresql-9.5.1.ebuild index 671a1b1a930c..6e9530287755 100644 --- a/dev-db/postgresql/postgresql-9.5.1.ebuild +++ b/dev-db/postgresql/postgresql-9.5.1.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/sqlite/sqlite-3.11.1.ebuild b/dev-db/sqlite/sqlite-3.11.1.ebuild index ef731c842e9f..7ebc088cd131 100644 --- a/dev-db/sqlite/sqlite-3.11.1.ebuild +++ b/dev-db/sqlite/sqlite-3.11.1.ebuild @@ -20,7 +20,7 @@ SRC_URI="doc? ( https://sqlite.org/2016/${PN}-doc-${DOC_PV}.zip ) LICENSE="public-domain" SLOT="3" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~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="debug doc icu +readline secure-delete static-libs tcl test tools" RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] ) diff --git a/dev-db/sqlitestudio/Manifest b/dev-db/sqlitestudio/Manifest new file mode 100644 index 000000000000..b2ec9bd85b89 --- /dev/null +++ b/dev-db/sqlitestudio/Manifest @@ -0,0 +1 @@ +DIST sqlitestudio-3.0.7.tar.gz 2551341 SHA256 b5ad7ac22a88eacb9404637ca6257934d0b1b59e16a182099bbdb158a7af55aa SHA512 2171fe26754aed2abe24d73e9ccc2ee1abe5e87228096bc5643c5638ad578dc323b810535f41d0206b3d7a7aa75132bfb578972c7945b962dd593543c7da3270 WHIRLPOOL 6078575b9bf6576d76965b2cf0c7a47a3b56488be8a75dd2df00b58cfab9d29e98ca30d21ac0dd47fe9a6fb0243052107b74686d90b12b9b2fbff05bc205736f diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch new file mode 100644 index 000000000000..558a84231b81 --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-portable.patch @@ -0,0 +1,11 @@ +--- a/SQLiteStudio3/sqlitestudio/sqlitestudio.pro 2015-11-24 20:09:29.000000000 +0100 ++++ b/SQLiteStudio3/sqlitestudio/sqlitestudio.pro 2016-01-20 15:04:46.700926391 +0100 +@@ -25,7 +25,7 @@ + + CONFIG += c++11 + QMAKE_CXXFLAGS += -pedantic +-linux|portable { ++portable { + QMAKE_LFLAGS += -Wl,-rpath,./lib + } + diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch new file mode 100644 index 000000000000..c42160c52f07 --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-3.0.6-qt5_5-QDataStream.patch @@ -0,0 +1,30 @@ +--- a/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2015-05-11 23:22:41.000000000 +0200 ++++ b/SQLiteStudio3/coreSQLiteStudio/db/db.cpp 2016-01-20 02:21:00.350160645 +0100 +@@ -1,6 +1,7 @@ + #include "db.h" + #include + #include ++#include + + Db::Db() + { +--- a/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2015-05-11 23:22:41.000000000 +0200 ++++ b/SQLiteStudio3/coreSQLiteStudio/common/utils.cpp 2016-01-20 01:46:22.113263710 +0100 +@@ -11,6 +11,7 @@ + #include + #include + #include ++#include + + #ifdef Q_OS_LINUX + #include +--- a/SQLiteStudio3/sqlitestudiocli/cli_config.h 2015-05-11 23:22:40.000000000 +0200 ++++ b/SQLiteStudio3/sqlitestudiocli/cli_config.h 2016-01-20 02:45:11.393819294 +0100 +@@ -2,6 +2,7 @@ + #define CLI_CONFIG_H + + #include "config_builder.h" ++#include + + namespace CliResultsDisplay + { diff --git a/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch b/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch new file mode 100644 index 000000000000..59d8c0f187aa --- /dev/null +++ b/dev-db/sqlitestudio/files/sqlitestudio-3.0.7-paths.patch @@ -0,0 +1,22 @@ +--- a/Plugins/DbAndroid/DbAndroid.pro 2015-11-24 20:09:41.000000000 +0100 ++++ a/Plugins/DbAndroid/DbAndroid.pro 2016-01-20 13:39:02.436869035 +0100 +@@ -6,7 +6,7 @@ + + QT += widgets network + +-include($$PWD/../../../sqlitestudio/SQLiteStudio3/plugins.pri) ++include($$PWD/../../SQLiteStudio3/plugins.pri) + + TARGET = DbAndroid + TEMPLATE = lib +--- a/Plugins/ScriptingTcl/ScriptingTcl.pro ++++ b/Plugins/ScriptingTcl/ScriptingTcl.pro +@@ -35,7 +35,7 @@ linux: { + + # Find tclConfig.sh + TCL_CONFIG_DIR = $$system(echo "puts [info library]" | tclsh) +- TCL_CONFIG = $$TCL_CONFIG_DIR/tclConfig.sh ++ TCL_CONFIG = $$TCL_CONFIG_DIR/../tclConfig.sh + message("Looking for $$TCL_CONFIG") + !exists($$TCL_CONFIG) { + # Debian case diff --git a/dev-db/sqlitestudio/metadata.xml b/dev-db/sqlitestudio/metadata.xml new file mode 100644 index 000000000000..1ae11758cb50 --- /dev/null +++ b/dev-db/sqlitestudio/metadata.xml @@ -0,0 +1,16 @@ + + + + + dev.rindeal+bugs.gentoo.org@gmail.com + Jan Chren (rindeal) + Proxied maintainer; set to assignee in all bugs + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Build CLI interface + + diff --git a/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild b/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild new file mode 100644 index 000000000000..b43ef8cbeb74 --- /dev/null +++ b/dev-db/sqlitestudio/sqlitestudio-3.0.7.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +# Upstream guide: http://wiki.sqlitestudio.pl/index.php/Compiling_application_from_sources + +EAPI=6 + +inherit qmake-utils fdo-mime kde5-functions + +DESCRIPTION="SQLiteStudio3 is a powerful cross-platform SQLite database manager" +HOMEPAGE="http://sqlitestudio.pl" +LICENSE="GPL-3" +SRC_URI="${HOMEPAGE}/files/sqlitestudio3/complete/tar/${P}.tar.gz" + +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cli cups tcl test" + +QT_MINIMAL=5.3 + +RDEPEND=" + dev-db/sqlite:3 + $(add_qt_dep qtcore) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtscript) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + $(add_qt_dep designer) + cups? ( $(add_qt_dep qtprintsupport) ) + cli? ( sys-libs/readline:= ) + tcl? ( dev-lang/tcl:= ) +" +DEPEND="${RDEPEND} + >=sys-devel/gcc-4.8:* + test? ( $(add_qt_dep qttest) ) +" + +S="${WORKDIR}" +core_build_dir="${S}/output/build" +core_src_dir="${S}/SQLiteStudio3" +plugins_build_dir="${core_build_dir}/Plugins" +plugins_src_dir="${S}/Plugins" + +src_prepare() { + PATCHES=( + "${FILESDIR}"/${PN}-3.0.6-qt5_5-QDataStream.patch + "${FILESDIR}"/${PN}-3.0.6-portable.patch + "${FILESDIR}"/${PN}-3.0.7-paths.patch + ) + default + + disable_modules() { + [ $# -lt 2 ] && return 0 + local file="$1"; shift + + edos2unix "${file}" + + local regex="" + for m in "$@"; do + regex+="\b${m}\b( \\\\|\$)|" + done + regex="${regex:0:-1}" # last pipe + + elog "Disabling modules: '$*' in '${file#${S}/}'" + sed -i -r -e "/${regex}/d" -- "${file}" || return 1 + } + + ## Core + local disabled_modules=( + $(usex cli '' 'cli') + ) + disable_modules "${core_src_dir}/SQLiteStudio3.pro" "${disabled_modules[@]}" || die + + ## Plugins + local disabled_plugins=( + 'DbSqlite2' + $(usex tcl '' 'ScriptingTcl') + $(usex cups '' 'Printing') + ) + disable_modules "${plugins_src_dir}/Plugins.pro" "${disabled_plugins[@]}" || die +} + +src_configure() { + local qmake_args=( + "LIBDIR=${EROOT}usr/$(get_libdir)" + "BINDIR=${EROOT}usr/bin" + "DEFINES+=PLUGINS_DIR=${EROOT}usr/$(get_libdir)/${PN}" + "DEFINES+=ICONS_DIR=${EROOT}usr/share/${PN}/icons" + "DEFINES+=FORMS_DIR=${EROOT}usr/share/${PN}/forms" + + 'DEFINES+=NO_AUTO_UPDATES' # not strictly needed since 3.0.6, but nevermind + $(usex test 'DEFINES+=tests' '') + ) + + ## Core + mkdir -p "${core_build_dir}" && cd "${core_build_dir}" || die + eqmake5 "${qmake_args[@]}" "${core_src_dir}" + + ## Plugins + mkdir -p "${plugins_build_dir}" && cd "${plugins_build_dir}" || die + eqmake5 "${qmake_args[@]}" "${plugins_src_dir}" +} + +src_compile() { + cd "${core_build_dir}" || die && emake + cd "${plugins_build_dir}" || die && emake +} + +src_install() { + cd "${core_build_dir}" || die && emake INSTALL_ROOT="${ED}" install + cd "${plugins_build_dir}" || die && emake INSTALL_ROOT="${ED}" install + + dodoc "${core_src_dir}/docs/sqlitestudio3_docs.cfg" + doicon -s scalable "${core_src_dir}/guiSQLiteStudio/img/${PN}.svg" + + make_desktop_entry_args=( + "${EROOT}usr/bin/${PN} %F" # exec + 'SQLiteStudio3' # name + "${PN}" # icon + 'Development;Utility' # categories + ) + make_desktop_entry_extras=( 'MimeType=application/x-sqlite3;' ) + make_desktop_entry "${make_desktop_entry_args[@]}" \ + "$( printf '%s\n' "${make_desktop_entry_extras[@]}" )" +} + +pkg_postinst() { + fdo-mime_desktop_database_update +} diff --git a/dev-java/jssc/Manifest b/dev-java/jssc/Manifest index 9a063771358d..b5c168f22332 100644 --- a/dev-java/jssc/Manifest +++ b/dev-java/jssc/Manifest @@ -1 +1,2 @@ DIST jssc-2.8.0.jar 19489 SHA256 b5a9609b99b4543c88d20e0425a83461209d4851ef3ce312349c64b76ce1dc68 SHA512 7f3a8482d0982ed3e604b00217cbfa37ad442b5a2b562ff68805c186ee56423bd82706bbbe3b9f2705c8337009b7c71068ba7ebbb829ea3c96bc61f43b540b9d WHIRLPOOL 4c10ba9b373cb057c50c01564124a2258b15b335a059d2cb195b8d8b14b761cbe98a713020dc21118d17a3274f346357812a3dc64103eb12916052e1a1e37050 +DIST jssc-2.8.0.zip 171914 SHA256 5909c4c2103de81e274c53617cc72c17a5b6fea761b8e06b8cc4006fbd1f893a SHA512 4d767054085a79cff4fe60d96d664918f69a791c8263d96c9d9fd622070f567acacb621079f23d5c54253366beb9d2a01fea7ea48b95f6267bc693a9bacb8466 WHIRLPOOL f9f63980f93698d5d2529e774e3bc855703d363aa17ac505eabb562b648d8c15f392a940d27815ae8f07da2c12946678a75ed35894dba4dadf1ca7db9bc98773 diff --git a/dev-java/jssc/files/jssc-2.8.0-library-load.patch b/dev-java/jssc/files/jssc-2.8.0-library-load.patch new file mode 100644 index 000000000000..829a18af69bd --- /dev/null +++ b/dev-java/jssc/files/jssc-2.8.0-library-load.patch @@ -0,0 +1,117 @@ +--- src/java/jssc/SerialNativeInterface.java.orig 2016-03-13 16:35:20.521644430 -0400 ++++ src/java/jssc/SerialNativeInterface.java 2016-03-13 16:38:00.022571256 -0400 +@@ -44,7 +44,7 @@ + public static final int OS_SOLARIS = 2;//since 0.9.0 + public static final int OS_MAC_OS_X = 3;//since 0.9.0 + +- private static int osType = -1; ++ private static int osType = OS_LINUX; + + /** + * @since 2.3.0 +@@ -77,104 +77,11 @@ + public static final String PROPERTY_JSSC_PARMRK = "JSSC_PARMRK"; + + static { +- String libFolderPath; +- String libName; +- +- String osName = System.getProperty("os.name"); +- String architecture = System.getProperty("os.arch"); +- String userHome = System.getProperty("user.home"); +- String fileSeparator = System.getProperty("file.separator"); +- String tmpFolder = System.getProperty("java.io.tmpdir"); +- +- //since 2.3.0 -> +- String libRootFolder = new File(userHome).canWrite() ? userHome : tmpFolder; +- //<- since 2.3.0 +- +- String javaLibPath = System.getProperty("java.library.path");//since 2.1.0 +- +- if(osName.equals("Linux")){ +- osName = "linux"; +- osType = OS_LINUX; +- } +- else if(osName.startsWith("Win")){ +- osName = "windows"; +- osType = OS_WINDOWS; +- }//since 0.9.0 -> +- else if(osName.equals("SunOS")){ +- osName = "solaris"; +- osType = OS_SOLARIS; +- } +- else if(osName.equals("Mac OS X") || osName.equals("Darwin")){//os.name "Darwin" since 2.6.0 +- osName = "mac_os_x"; +- osType = OS_MAC_OS_X; +- }//<- since 0.9.0 +- +- if(architecture.equals("i386") || architecture.equals("i686")){ +- architecture = "x86"; +- } +- else if(architecture.equals("amd64") || architecture.equals("universal")){//os.arch "universal" since 2.6.0 +- architecture = "x86_64"; +- } +- else if(architecture.equals("arm")) {//since 2.1.0 +- String floatStr = "sf"; +- if(javaLibPath.toLowerCase().contains("gnueabihf") || javaLibPath.toLowerCase().contains("armhf")){ +- floatStr = "hf"; +- } +- else { +- try { +- Process readelfProcess = Runtime.getRuntime().exec("readelf -A /proc/self/exe"); +- BufferedReader reader = new BufferedReader(new InputStreamReader(readelfProcess.getInputStream())); +- String buffer = ""; +- while((buffer = reader.readLine()) != null && !buffer.isEmpty()){ +- if(buffer.toLowerCase().contains("Tag_ABI_VFP_args".toLowerCase())){ +- floatStr = "hf"; +- break; +- } +- } +- reader.close(); +- } +- catch (Exception ex) { +- //Do nothing +- } +- } +- architecture = "arm" + floatStr; +- } +- +- libFolderPath = libRootFolder + fileSeparator + ".jssc" + fileSeparator + osName; +- libName = "jSSC-" + libVersion + "_" + architecture; +- libName = System.mapLibraryName(libName); +- +- if(libName.endsWith(".dylib")){//Since 2.1.0 MacOSX 10.8 fix +- libName = libName.replace(".dylib", ".jnilib"); +- } +- +- boolean loadLib = false; +- +- if(isLibFolderExist(libFolderPath)){ +- if(isLibFileExist(libFolderPath + fileSeparator + libName)){ +- loadLib = true; +- } +- else { +- if(extractLib((libFolderPath + fileSeparator + libName), osName, libName)){ +- loadLib = true; +- } +- } +- } +- else { +- if(new File(libFolderPath).mkdirs()){ +- if(extractLib((libFolderPath + fileSeparator + libName), osName, libName)){ +- loadLib = true; +- } +- } +- } +- +- if (loadLib) { +- System.load(libFolderPath + fileSeparator + libName); ++ System.loadLibrary("jssc"); + String versionBase = getLibraryBaseVersion(); + String versionNative = getNativeLibraryVersion(); + if (!versionBase.equals(versionNative)) { + System.err.println("Warning! jSSC Java and Native versions mismatch (Java: " + versionBase + ", Native: " + versionNative + ")"); +- } + } + } + diff --git a/dev-java/jssc/jssc-2.8.0-r1.ebuild b/dev-java/jssc/jssc-2.8.0-r1.ebuild new file mode 100644 index 000000000000..794058f235f8 --- /dev/null +++ b/dev-java/jssc/jssc-2.8.0-r1.ebuild @@ -0,0 +1,61 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple toolchain-funcs + +MY_PN="java-simple-serial-connector" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Java Simple Serial Connector" +HOMEPAGE="https://github.com/scream3r/java-simple-serial-connector" +SRC_URI="https://github.com/scream3r/${MY_PN}/archive/${PV}.zip -> ${P}.zip" + +LICENSE="GPL-1" +SLOT="0" +KEYWORDS="~amd64 ~ppc64 ~x86" + +IUSE="" + +RDEPEND=" + >=virtual/jre-1.6" + +DEPEND=" + source? ( app-arch/zip ) + >=virtual/jdk-1.6" + +PATCHES=( + "${FILESDIR}/${P}-library-load.patch" +) + +S="${WORKDIR}/${MY_P}" + +java_prepare() { + epatch "${PATCHES[@]}" +} + +src_compile() { + java-pkg-simple_src_compile + $(tc-getCXX) \ + ${CPP_FLAGS} ${CXX_FLAGS} \ + -c -o ${PN}.o \ + -fPIC -Wall \ + -I$(java-config-2 -o)/include \ + -I$(java-config-2 -o)/include/linux \ + "${S}/src/cpp/_nix_based/${PN}.cpp" || die + + $(tc-getCXX) \ + -Wl,-soname,libjssc.so \ + -shared -o "libjssc.so.${PV}" \ + -Wall "${PN}.o" || die +} + +src_install() { + java-pkg-simple_src_install + dolib libjssc* + dosym "libjssc.so.${PV}" /usr/$(get_libdir)/libjssc.so +} diff --git a/dev-java/shared-objects/shared-objects-1.4-r4.ebuild b/dev-java/shared-objects/shared-objects-1.4-r4.ebuild new file mode 100644 index 000000000000..c73058a2582f --- /dev/null +++ b/dev-java/shared-objects/shared-objects-1.4-r4.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-pkg-simple + +DESCRIPTION="A Java Class implementing a core factory for maximal sharing of arbitrary objects" +HOMEPAGE="http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATermLibrary" +SRC_URI="http://www.cwi.nl/projects/MetaEnv/shared-objects/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + >=virtual/jre-1.6" + +DEPEND=" + source? ( app-arch/zip ) + >=virtual/jdk-1.6" + +S="${WORKDIR}/${P}" + +JAVA_SRC_DIR="shared" + +src_configure() { :; } diff --git a/dev-lang/crystal/Manifest b/dev-lang/crystal/Manifest index 7fbeceb55409..a0cee2242487 100644 --- a/dev-lang/crystal/Manifest +++ b/dev-lang/crystal/Manifest @@ -4,6 +4,9 @@ DIST crystal-0.11.1.tar.gz 830437 SHA256 bdff81fcb4f2dfdd50d79abba8a1ed0260bad4c DIST crystal-0.12.0-1-linux-i686.tar.gz 12301739 SHA256 0595aab4336e48d0d04f0a0f172f641ebb1c17ebdb6e2eebbbfa36a650323242 SHA512 b893f1c36f658356b19257c7eb60219d2dd0a20f00d8d27ce4f3136a05153d4e3ded090979623f2895eb7b0070a902b59cdc891aba88515ee6ba9e6cf065351c WHIRLPOOL dc81e6e0ea6619e697ae81a247849bf2bf10b5134f45fd2979a7bbfa7e1be53a5f79890ecebeab9f35c86b58bfca486c0e071c5baee06600c0d76cf1f6db3224 DIST crystal-0.12.0-1-linux-x86_64.tar.gz 11874469 SHA256 ecd444dab34803fd97dcb9f82da47c60fad9de3c2f43d20195108d678e874f16 SHA512 ffea0d3a9864249a91d9a8243ffdb39c8bd54e931479b35414065fe30d5d2d79f5f4b743eaf3f7e8936a183673e2ff3ccb83fa5f2a9e2521443eb0632f5f6723 WHIRLPOOL 3938a93c5647f784e1782e747a432668726bf901f2aa1ac0992ff19ac69a008313d3922e492343deda7ae1786847c4fb2781ac26c34870d3e2aa0f378c38b5bc DIST crystal-0.12.0.tar.gz 851051 SHA256 918bad9b906fe252f3f66685487892ad7c13a31135aa5874ac1e52ea399328e3 SHA512 86ba58e3f69ecada49a8e6596f49cc4e4becb109c2725b9436eb5aa587c247aa4c309242e3fdc5d6a655726595005db4e33fcf868d7c888448c58af74d1b947f WHIRLPOOL 4523f8a1904feade28584ce828fbb96d302f6976f6a0a7836c4b8cc40ac4cc2c28c9b41eb2da6dead314dbaa3422f46727cce2443e10776cd271627fb4c3d2d6 +DIST crystal-0.13.0-1-linux-i686.tar.gz 12337456 SHA256 c99d3513d46a0195625b637d0b3d3ab2b93794575b4cace973ad2f35d9f33105 SHA512 95e0443c1fc363ed065a1f33d62ae2a9ad3be98f46234f2d817e3a295ed1839867942572faa1b5c4b62223feaed2077d800b36225dd3ae01ef7cfb4d3cf1f8b5 WHIRLPOOL 02c153e7911629bf4ddd4e7e81e1a5f31af8dc5e603dc644672baf88cb89867dcab035c746c998f35406fe68fe4875976111f4d3739b31f8f1dcdadeae1ae892 +DIST crystal-0.13.0-1-linux-x86_64.tar.gz 11892025 SHA256 43946bad44378f92dd92edaf0fcb04312755c635dd1670eca8387160dd2cefa0 SHA512 ea2ac7a8b68863f62c377f9be2709299ecb80c128a99b92325fa86560319771531911f97e4e5220964507711d730767d25161eb9aa1f33e346e6c450a380716c WHIRLPOOL 5f5c8f420eb2090c7e9a5c3bb27131b9e36f92a8372da6d188bc100f853d0678e9015da4c6a439738eb366c55a08300fe74c227eec1104edbecb81955f662921 +DIST crystal-0.13.0.tar.gz 857842 SHA256 abada1d7bd411dca52ac0df2124a188d61301bdcd1fc75e8419a24496ee8ff42 SHA512 4834172808f7035c9478aa342b7bc8fe6349844a6a64d4d2d3dd63ed44658edb0a4d115afee586370c00fc169dd42c2ac4c2027e7e96197c8b5594f103bbf1c7 WHIRLPOOL 5861c20372764258275512f901d66fdfe6f92e01ed56ebea09c9225ecc84248083f23ff1b24cdeccc57f3aa02ce15e0922070469207aebc26a54c2067245b649 DIST crystal-0.7.7-1-linux-i686.tar.gz 11289486 SHA256 7a1ccdce29c1437da1cbaafa3fefd5ebc3c4b84b885964a6d4eaf8bfc5922831 SHA512 758e1c6b9a00fca3080abd33adbb995157ad8a335e58899b7c6aba4d9eea5ff4cae27ac1476865b04d6b349dfd2bea0809fea7fcadcd5b08f617f30ec3e809cf WHIRLPOOL 465c3455d5ec1200345e6735e4616269f43e1e31097f22f81d0d3e6e6b3ea18f786e647da9d0d97da73de057a222d8ef234c3dbb4978a3a730ee1b498e709116 DIST crystal-0.7.7-1-linux-x86_64.tar.gz 10907197 SHA256 433acbe8e88fe0c3df67ad64bd436349a6bcfc146284f0a690283ebefb93b5e6 SHA512 c2e895d3bc3c92da49aca6eba3f2cf5cefe5d88cf49c4230f887dd81d094a4a78d67eb10fcec8445fd66e29ad5167108807362ae9257c89859d2aa6c614ab0a9 WHIRLPOOL c1970d4ec8cde2bb181749f1d5d8d80ba4b309f07ce176d5d6312f6e978e0de8db83914e967da9d4995ee243d57cd0bb50739f5b726ff43a2553b65f00112477 DIST crystal-0.7.7.tar.gz 709692 SHA256 5506f69ed59592666aa667a33ba90b07f1de2cc1ebeee25e771715f8521065f8 SHA512 ba0911bec52e82b9768a1535406a62b675bcfb996929d62e86791533847be233cbf3bd8f09dc7803de7b6b9c7d791f7fecaea6d6f3d1425d0c67047d7751322f WHIRLPOOL f70f8e40ff6ad86c4a868984aa2fba12ca31dbb3f8383f1fffa960f8d104fa7af3c253dfd9539691adadfb21c172e5cf4c19b9a06fbdbbbdcbe265021b98b4a2 diff --git a/dev-lang/crystal/crystal-0.13.0.ebuild b/dev-lang/crystal/crystal-0.13.0.ebuild new file mode 100644 index 000000000000..a5efdcd33d26 --- /dev/null +++ b/dev-lang/crystal/crystal-0.13.0.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib + +BV=${PV}-1 +BV_AMD64=${BV}-linux-x86_64 +BV_X86=${BV}-linux-i686 + +DESCRIPTION="The Crystal Programming Language" +HOMEPAGE="http://crystal-lang.org" +SRC_URI="https://github.com/crystal-lang/crystal/archive/${PV}.tar.gz -> ${P}.tar.gz + amd64? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_AMD64}.tar.gz ) + x86? ( https://github.com/crystal-lang/crystal/releases/download/${PV}/crystal-${BV_X86}.tar.gz )" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc examples +xml +yaml" + +# dev-libs/boehm-gc[static-libs] dependency problem, check the issue: https://github.com/manastech/crystal/issues/1382 +DEPEND=" + 99${PN} <<-EOF || die + PATH=${EROOT%/}/opt/${PN}/bin + ROOTPATH=${EROOT%/}/opt/${PN}/bin + LDPATH=${EROOT%/}/opt/${PN}/lib:${EROOT%/}/opt/${PN}/lib/${MY_PV}/x8664/64 + MANPATH=${EROOT%/}/opt/${PN}/docs/man + EOF +} + +src_install() { + # EI_PAX marking is obsolete and PT_PAX breaks the binary. + # We must use XT_PAX to run the installer. + if [[ ${PAX_MARKINGS} == "XT" ]]; then + pax-mark m "${INSTALLER}" + fi + + ./"${INSTALLER}" \ + --prefix "${ED%/}/opt/${MY_P}" \ + --mode unattended || die + + if [[ ! -d ${ED%/}/opt/${MY_P}/lib/${MY_PV} ]]; then + local guess + cd "${ED%/}/opt/${MY_P}/lib" && guess=( * ) + + if [[ ${guess[@]} ]]; then + die "Incorrect release version in PV, guessing it should be: ${guess[*]}" + else + die "No libdir installed" + fi + fi + [[ -x ${ED%}/opt/${MY_P}/bin/pathcc ]] || die "No pathcc executable was installed, your hardware is unsupported most likely" + + rm -r "${ED}/opt/${MY_P}"/uninstall* || die + dosym ${MY_P} /opt/${PN} + doenvd 99${PN} +} diff --git a/dev-lang/php/Manifest b/dev-lang/php/Manifest index 85f52a20c3d3..351daec99678 100644 --- a/dev-lang/php/Manifest +++ b/dev-lang/php/Manifest @@ -1,9 +1,7 @@ DIST php-5.4.45.tar.bz2 12703324 SHA256 4e0d28b1554c95cfaea6fa2b64aac85433f158ce72bb571bcd5574f98f4c6582 SHA512 ba22207da70e5e8ddf9a1f41bbeb54ef4917630006c3412db8f858782baaa3ff49d7e5ca59bed76c37fc11dc518c475b81f33f0f32c533c8f00be338e0b0d9c5 WHIRLPOOL b34e465dd193e9c1f5dedd7c6f279bb10471e31120f2a84246927f160adb1e54ea56563c719e59ed0654e2fd0805cebcc00198d6f6153791edef52fd0f2288a7 -DIST php-5.5.30.tar.bz2 13699702 SHA256 e7332a713cecdd1cb44a1b1336739885c9789f633f0f51236b25e48ab03c3b29 SHA512 9458126f579ace9e2aebdfa7ad7f8d097f1fd502f443d8fd66263ba3c542d579ca9c705e227725fae57e452649a3be7cb717a0330d339b93d3c6c94fa80dbc1f WHIRLPOOL 2aa6c61a48a231d81f6c746f94e42589d87b93d0526f02d6d15f731cbbca4aecdee84b443f7ec1891f2a524939c542ac6f94e15db90a23a8b19523463025d395 DIST php-5.5.31.tar.bz2 13659002 SHA256 fb4a382b9a9dceb749b7ef047d8251320bc8d371c843714e5b4f4b70d61ba277 SHA512 b5b44092636bf26898441cfda4007480dcd0d58b72cd5c53d74ad2926fe54bf7e5db995c8ff598f72f1783ecd02aafad6be7d3bbd35dc83300621c7c37d37eca WHIRLPOOL 4d6a4cce634d30454280b08c30e25fdc6c2d2f37a823123372a4b1bc2b0cc5cdb4e10ccdc73e78cfbf243f83184861c8f79fae023fcf291ee102151a28236052 DIST php-5.5.32.tar.bz2 13685561 SHA256 b0f2c108db8e05db9f6366aaba9a754fd0ee31f3f86ee889561b608dfd6e92ee SHA512 1603864e7a98378bb5a7c1592d81029fd7dfe5d2fa88152a9e29484c3c98cd6126a79741657eea3e3295ed1bdeed47527d33981c9ea0df891f137ee8126cce2b WHIRLPOOL b7b86eec6b03720238bbe698289c6b1aecf920645f166d617fd26166aba8e19a474ff15d482f8f84fd48befc6b6be6c388797bb3f269f5609e71e10be9844759 DIST php-5.5.33.tar.bz2 13686486 SHA256 c490b1ed4df596b48eb68f630d89ca512945e2650840e7dace1119cc7e600aa9 SHA512 a0ac57adcc4b0caec153265a8d1ded8d4d0f71b44f08158feb0add9c8fdd36826767882e85dd03399cf146800eddcb6b6cc1b21051d4fc4371e3f61b1169132b WHIRLPOOL 373c61677adb89506cc4621d1c7a0732f6454a8679a797807631f2286188bb990dfcaf34b4108edf7b1819424100fa0d7060f0f792a65dc5f1c130cfa00e6b45 -DIST php-5.6.14.tar.bz2 14073920 SHA256 36f295f11641c1839a5df00e693f685fd134c65e8a1d46e8ee0abae8662b2eb0 SHA512 af0c7fa5c7be15839b1189b2544ff725b935228030087c206f83727e7885750030b10bf2bfbd27adea6f18af90d4ecd3ced9defec88c5f98f7ed26b4e4c57981 WHIRLPOOL 8e31fc3dbeb22fa2a59112d2dcbe28f8102c8d5a14fd716d17f909399c06d27a10ea32d43ebd1a12cea78d9fd949ae7c7882628ae0c3abd7354d165107fa0c9d DIST php-5.6.17.tar.bz2 14072840 SHA256 77b45f56a1e63e75bb22b42cfb8b438ec4083c59ce774b4d7c1685544b7add3b SHA512 706fd31324c98717d44b4db4440a5eaffe24ad34b346ba95418b33ee072b3ddde5d7429d318f69554b4bfcd7dcc0e9e4b07142b539196e9f0ab7707485ad9dbb WHIRLPOOL 02b7ea265b41e9db94a0087bd5baefdd45f3954df12298f1c50340bee5de1f5ea21ec5e1e039741db5cdd19ffd51518775bc17eff5ad8ad138c71fcaacf80af1 DIST php-5.6.18.tar.bz2 14094993 SHA256 c3cd4a29a9562309d36e2b128407d6eaa5c7dde590d2b1a464457383e517f4ed SHA512 1f0820d829923404ceae287129afa9c7d7d9c83d6fbf148a65a6ac49224f4cb84e743443c4fadb69d959229123ab7e99816aab40f694d808e64b05bb7238f89e WHIRLPOOL f4863256dfe3497276ca07b6f01eb5ec046f377e462b5d7d1d11b1e92e99f087b4c55719dace4d5aca1b30794ddd37c9d81b30deb6a913b7c0eeff67ebd74c13 DIST php-5.6.19.tar.bz2 14100438 SHA256 2a24a3f84971680ac0a4c71050067de4f76ee235aa4a041fae21bfa69975c168 SHA512 c8c2b3bdfc1a8abe834612c33123b4f103e841c230b53934fb7bafe11af7f1175f02ca54c92f33e8e603485e6283897bebb51acc55d1213b7433024684215c14 WHIRLPOOL f026e8779c531f887b1e292e5f1d6eafd0e3ae46f83ae8efb830ad8e0f91d86e5b002dda9e6a02987db6230557ff773d8c52dd2db423d792aed1aca292e5b92b diff --git a/dev-lang/php/php-5.5.30.ebuild b/dev-lang/php/php-5.5.30.ebuild deleted file mode 100644 index aeedfb4d9ba5..000000000000 --- a/dev-lang/php/php-5.5.30.ebuild +++ /dev/null @@ -1,784 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/dsp/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "olemarkus") - echo "https://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_FPM_CONF_VER="1" - -SRC_URI="${PHP_SRC_URI}" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl debug - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -DEPEND=" - >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - =dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - vpx? ( media-libs/libvpx ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - vpx? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -RDEPEND="${RDEPEND} - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -pkg_setup() { - depend.apache_pkg_setup -} - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use_if_iuse opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - - if [[ "${sapi}" == "fpm" ]] ; then - [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - - # Remove bogus /etc/php-fpm.conf.default (bug 359906) - [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" - fi - - # Install PHP ini files into /usr/share/php - - dodoc php.ini-development - dodoc php.ini-production - -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - #Add user patches #357637 - epatch_user - - #force rebuilding aclocal.m4 - rm aclocal.m4 - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - # for --with-libdir see bug #327025 - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - # extension USE flag shared - my_conf+=" - $(use_enable bcmath bcmath ) - $(use_with bzip2 bz2 "${EPREFIX}"/usr) - $(use_enable calendar calendar ) - $(use_enable ctype ctype ) - $(use_with curl curl "${EPREFIX}"/usr) - $(use_enable xml dom ) - $(use_with enchant enchant "${EPREFIX}"/usr) - $(use_enable exif exif ) - $(use_enable fileinfo fileinfo ) - $(use_enable filter filter ) - $(use_enable ftp ftp ) - $(use_with nls gettext "${EPREFIX}"/usr) - $(use_with gmp gmp "${EPREFIX}"/usr) - $(use_enable hash hash ) - $(use_with mhash mhash "${EPREFIX}"/usr) - $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) - $(use_enable intl intl ) - $(use_enable ipv6 ipv6 ) - $(use_enable json json ) - $(use_with kerberos kerberos "${EPREFIX}"/usr) - $(use_enable xml libxml ) - $(use_with xml libxml-dir "${EPREFIX}"/usr) - $(use_enable unicode mbstring ) - $(use_with crypt mcrypt "${EPREFIX}"/usr) - $(use_with mssql mssql "${EPREFIX}"/usr) - $(use_with unicode onig "${EPREFIX}"/usr) - $(use_with ssl openssl "${EPREFIX}"/usr) - $(use_with ssl openssl-dir "${EPREFIX}"/usr) - $(use_enable pcntl pcntl ) - $(use_enable phar phar ) - $(use_enable pdo pdo ) - $(use_enable opcache opcache ) - $(use_with postgres pgsql "${EPREFIX}"/usr) - $(use_enable posix posix ) - $(use_with spell pspell "${EPREFIX}"/usr) - $(use_with recode recode "${EPREFIX}"/usr) - $(use_enable simplexml simplexml ) - $(use_enable sharedmem shmop ) - $(use_with snmp snmp "${EPREFIX}"/usr) - $(use_enable soap soap ) - $(use_enable sockets sockets ) - $(use_with sqlite sqlite3 "${EPREFIX}"/usr) - $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) - $(use_enable sysvipc sysvmsg ) - $(use_enable sysvipc sysvsem ) - $(use_enable sysvipc sysvshm ) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}"/usr) - $(use_enable tokenizer tokenizer ) - $(use_enable wddx wddx ) - $(use_enable xml xml ) - $(use_enable xmlreader xmlreader ) - $(use_enable xmlwriter xmlwriter ) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}"/usr) - $(use_enable zip zip ) - $(use_with zlib zlib "${EPREFIX}"/usr) - $(use_enable debug debug )" - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - my_conf+=" - $(use_with cdb cdb) - $(use_with berkdb db4 ${EPREFIX}/usr) - $(use_enable flatfile flatfile ) - $(use_with gdbm gdbm ${EPREFIX}/usr) - $(use_enable inifile inifile ) - $(use_with qdbm qdbm ${EPREFIX}/usr)" - - # Support for the GD graphics library - my_conf+=" - $(use_with truetype freetype-dir ${EPREFIX}/usr) - $(use_with truetype t1lib ${EPREFIX}/usr) - $(use_enable cjk gd-jis-conv ) - $(use_with gd jpeg-dir ${EPREFIX}/usr) - $(use_with gd png-dir ${EPREFIX}/usr) - $(use_with xpm xpm-dir ${EPREFIX}/usr) - $(use_with vpx vpx-dir ${EPREFIX}/usr)" - # enable gd last, so configure can pick up the previous settings - my_conf+=" - $(use_with gd gd)" - - # IMAP support - if use imap ; then - my_conf+=" - $(use_with imap imap ${EPREFIX}/usr) - $(use_with ssl imap-ssl ${EPREFIX}/usr)" - fi - - # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase ${EPREFIX}/usr)" - fi - - # LDAP support - if use ldap ; then - my_conf+=" - $(use_with ldap ldap ${EPREFIX}/usr) - $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - my_conf+=" $(use_with mysql mysql $mysqllib)" - my_conf+=" $(use_with mysqli mysqli $mysqlilib)" - - local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" - if use mysql ; then - my_conf+="${mysqlsock}" - elif use mysqli ; then - my_conf+="${mysqlsock}" - fi - - # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC ${EPREFIX}/usr)" - fi - - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc ${EPREFIX}/usr)" - fi - - # Oracle support - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client oci8)" - fi - - # PDO support - if use pdo ; then - my_conf+=" - $(use_with mssql pdo-dblib ) - $(use_with mysql pdo-mysql ${mysqllib}) - $(use_with postgres pdo-pgsql ) - $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) - $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client pdo-oci)" - fi - fi - - # readline/libedit support - my_conf+=" - $(use_with readline readline ${EPREFIX}/usr) - $(use_with libedit libedit ${EPREFIX}/usr)" - - # Session support - if use session ; then - my_conf+=" - $(use_with sharedmem mm ${EPREFIX}/usr)" - else - my_conf+=" - $(use_enable session session )" - fi - - # Use pic for shared modules such as apache2's mod_php - my_conf="${my_conf} --with-pic" - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake || die "emake failed" - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs \ - || die "emake install failed" - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" || die "Unable to install ${sapi} sapi" - else - dobin "${source}" || die "Unable to install ${sapi} sapi" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use_if_iuse opcache ; then - dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" \ - "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" - elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" - - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog -} - -pkg_prerm() { - eselect php cleanup -} diff --git a/dev-lang/php/php-5.5.31.ebuild b/dev-lang/php/php-5.5.31.ebuild index 79743c4865c8..192d2f93130d 100644 --- a/dev-lang/php/php-5.5.31.ebuild +++ b/dev-lang/php/php-5.5.31.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.5.32.ebuild b/dev-lang/php/php-5.5.32.ebuild index 22fc86ad4647..d621d8aedc4b 100644 --- a/dev-lang/php/php-5.5.32.ebuild +++ b/dev-lang/php/php-5.5.32.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.5.33.ebuild b/dev-lang/php/php-5.5.33.ebuild index 952b721c9eb1..a5af5ff40e98 100644 --- a/dev-lang/php/php-5.5.33.ebuild +++ b/dev-lang/php/php-5.5.33.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.14.ebuild b/dev-lang/php/php-5.6.14.ebuild deleted file mode 100644 index aeedfb4d9ba5..000000000000 --- a/dev-lang/php/php-5.6.14.ebuild +++ /dev/null @@ -1,784 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools flag-o-matic versionator depend.apache apache-module db-use libtool systemd - -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" - -function php_get_uri () -{ - case "${1}" in - "php-pre") - echo "http://downloads.php.net/dsp/${2}" - ;; - "php") - echo "http://www.php.net/distributions/${2}" - ;; - "olemarkus") - echo "https://dev.gentoo.org/~olemarkus/php/${2}" - ;; - "gentoo") - echo "mirror://gentoo/${2}" - ;; - *) - die "unhandled case in php_get_uri" - ;; - esac -} - -PHP_MV="$(get_major_version)" -SLOT="$(get_version_component_range 1-2)" - -# alias, so we can handle different types of releases (finals, rcs, alphas, -# betas, ...) w/o changing the whole ebuild -PHP_PV="${PV/_rc/RC}" -PHP_PV="${PHP_PV/_alpha/alpha}" -PHP_PV="${PHP_PV/_beta/beta}" -PHP_RELEASE="php" -[[ ${PV} == ${PV/_alpha/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_beta/} ]] || PHP_RELEASE="php-pre" -[[ ${PV} == ${PV/_rc/} ]] || PHP_RELEASE="php-pre" -PHP_P="${PN}-${PHP_PV}" - -PHP_SRC_URI="$(php_get_uri "${PHP_RELEASE}" "${PHP_P}.tar.bz2")" - -PHP_FPM_CONF_VER="1" - -SRC_URI="${PHP_SRC_URI}" - -DESCRIPTION="The PHP language runtime engine: CLI, CGI, FPM/FastCGI, Apache2 and embed SAPIs" -HOMEPAGE="http://php.net/" -LICENSE="PHP-3" - -S="${WORKDIR}/${PHP_P}" - -# We can build the following SAPIs in the given order -SAPIS="embed cli cgi fpm apache2" - -# SAPIs and SAPI-specific USE flags (cli SAPI is default on): -IUSE="${IUSE} - ${SAPIS/cli/+cli} - threads" - -IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk - crypt +ctype curl debug - enchant exif frontbase +fileinfo +filter firebird - flatfile ftp gd gdbm gmp +hash +iconv imap inifile - intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit mhash - mssql mysql libmysqlclient mysqli nls - oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm - readline recode selinux +session sharedmem - +simplexml snmp soap sockets spell sqlite ssl - sybase-ct sysvipc systemd tidy +tokenizer truetype unicode vpx wddx - +xml xmlreader xmlwriter xmlrpc xpm xslt zip zlib" - -DEPEND=" - >=app-eselect/eselect-php-0.7.1-r3[apache2?,fpm?] - >=dev-libs/libpcre-8.32[unicode] - apache2? ( || ( >=www-servers/apache-2.4[apache2_modules_unixd,threads=] - =dev-libs/libmcrypt-2.4 ) - curl? ( >=net-misc/curl-7.10.5 ) - enchant? ( app-text/enchant ) - exif? ( !gd? ( - virtual/jpeg:0 - media-libs/libpng:0= - sys-libs/zlib - ) ) - firebird? ( dev-db/firebird ) - gd? ( virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - gdbm? ( >=sys-libs/gdbm-1.8.0 ) - gmp? ( >=dev-libs/gmp-4.1.2 ) - iconv? ( virtual/libiconv ) - imap? ( virtual/imap-c-client[ssl=] ) - intl? ( dev-libs/icu:= ) - iodbc? ( dev-db/libiodbc ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-1.2.11 ) - ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) - libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) - mssql? ( dev-db/freetds[mssql] ) - libmysqlclient? ( - mysql? ( virtual/mysql ) - mysqli? ( >=virtual/mysql-4.1 ) - ) - nls? ( sys-devel/gettext ) - oci8-instant-client? ( dev-db/oracle-instantclient-basic ) - odbc? ( >=dev-db/unixODBC-1.8.13 ) - postgres? ( dev-db/postgresql ) - qdbm? ( dev-db/qdbm ) - readline? ( sys-libs/readline ) - recode? ( app-text/recode ) - sharedmem? ( dev-libs/mm ) - simplexml? ( >=dev-libs/libxml2-2.6.8 ) - snmp? ( >=net-analyzer/net-snmp-5.2 ) - soap? ( >=dev-libs/libxml2-2.6.8 ) - spell? ( >=app-text/aspell-0.50 ) - sqlite? ( >=dev-db/sqlite-3.7.6.3 ) - ssl? ( >=dev-libs/openssl-0.9.7 ) - sybase-ct? ( dev-db/freetds ) - tidy? ( app-text/htmltidy ) - truetype? ( - =media-libs/freetype-2* - >=media-libs/t1lib-5.0.0 - !gd? ( - virtual/jpeg:0 media-libs/libpng:0= sys-libs/zlib ) - ) - unicode? ( dev-libs/oniguruma ) - vpx? ( media-libs/libvpx ) - wddx? ( >=dev-libs/libxml2-2.6.8 ) - xml? ( >=dev-libs/libxml2-2.6.8 ) - xmlrpc? ( >=dev-libs/libxml2-2.6.8 virtual/libiconv ) - xmlreader? ( >=dev-libs/libxml2-2.6.8 ) - xmlwriter? ( >=dev-libs/libxml2-2.6.8 ) - xpm? ( - x11-libs/libXpm - virtual/jpeg:0 - media-libs/libpng:0= sys-libs/zlib - ) - xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.6.8 ) - zip? ( sys-libs/zlib ) - zlib? ( sys-libs/zlib ) - virtual/mta -" - -php="=${CATEGORY}/${PF}" - -REQUIRED_USE=" - truetype? ( gd ) - vpx? ( gd ) - cjk? ( gd ) - exif? ( gd ) - - xpm? ( gd ) - gd? ( zlib ) - simplexml? ( xml ) - soap? ( xml ) - wddx? ( xml ) - xmlrpc? ( || ( xml iconv ) ) - xmlreader? ( xml ) - xslt? ( xml ) - ldap-sasl? ( ldap ) - mhash? ( hash ) - phar? ( hash ) - libmysqlclient? ( || ( - mysql - mysqli - pdo - ) ) - - qdbm? ( !gdbm ) - readline? ( !libedit ) - recode? ( !imap !mysql !mysqli ) - sharedmem? ( !threads ) - - !cli? ( !cgi? ( !fpm? ( !apache2? ( !embed? ( cli ) ) ) ) )" - -RDEPEND="${DEPEND}" - -RDEPEND="${RDEPEND} - fpm? ( - selinux? ( sec-policy/selinux-phpfpm ) - systemd? ( sys-apps/systemd ) )" - -DEPEND="${DEPEND} - sys-devel/flex - >=sys-devel/m4-1.4.3 - >=sys-devel/libtool-1.5.18" - -# Allow users to install production version if they want to - -case "${PHP_INI_VERSION}" in - production|development) - ;; - *) - PHP_INI_VERSION="development" - ;; -esac - -PHP_INI_UPSTREAM="php.ini-${PHP_INI_VERSION}" -PHP_INI_FILE="php.ini" - -want_apache - -pkg_setup() { - depend.apache_pkg_setup -} - -php_install_ini() { - local phpsapi="${1}" - - # work out where we are installing the ini file - php_set_ini_dir "${phpsapi}" - - local phpinisrc="${PHP_INI_UPSTREAM}-${phpsapi}" - cp "${PHP_INI_UPSTREAM}" "${phpinisrc}" - - # default to /tmp for save_path, bug #282768 - sed -e 's|^;session.save_path .*$|session.save_path = "'"${EPREFIX}"'/tmp"|g' -i "${phpinisrc}" - - # Set the extension dir - sed -e "s|^extension_dir .*$|extension_dir = ${extension_dir}|g" -i "${phpinisrc}" - - # Set the include path to point to where we want to find PEAR packages - sed -e 's|^;include_path = ".:/php/includes".*|include_path = ".:'"${EPREFIX}"'/usr/share/php'${PHP_MV}':'"${EPREFIX}"'/usr/share/php"|' -i "${phpinisrc}" - - dodir "${PHP_INI_DIR#${EPREFIX}}" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${phpinisrc}" "${PHP_INI_FILE}" - - elog "Installing php.ini for ${phpsapi} into ${PHP_INI_DIR#${EPREFIX}}" - elog - - dodir "${PHP_EXT_INI_DIR#${EPREFIX}}" - dodir "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}" - - if use_if_iuse opcache; then - elog "Adding opcache to $PHP_EXT_INI_DIR" - echo "zend_extension=${PHP_DESTDIR}/$(get_libdir)/opcache.so" >> "${D}/${PHP_EXT_INI_DIR}"/opcache.ini - dosym "${PHP_EXT_INI_DIR#${EPREFIX}}/opcache.ini" "${PHP_EXT_INI_DIR_ACTIVE#${EPREFIX}}/opcache.ini" - fi - - # SAPI-specific handling - - if [[ "${sapi}" == "fpm" ]] ; then - [[ -z ${PHP_FPM_CONF_VER} ]] && PHP_FPM_CONF_VER=0 - einfo "Installing FPM CGI config file php-fpm.conf" - insinto "${PHP_INI_DIR#${EPREFIX}}" - newins "${FILESDIR}/php-fpm-r${PHP_FPM_CONF_VER}.conf" php-fpm.conf - - # Remove bogus /etc/php-fpm.conf.default (bug 359906) - [[ -f "${ED}/etc/php-fpm.conf.default" ]] && rm "${ED}/etc/php-fpm.conf.default" - fi - - # Install PHP ini files into /usr/share/php - - dodoc php.ini-development - dodoc php.ini-production - -} - -php_set_ini_dir() { - PHP_INI_DIR="${EPREFIX}/etc/php/${1}-php${SLOT}" - PHP_EXT_INI_DIR="${PHP_INI_DIR}/ext" - PHP_EXT_INI_DIR_ACTIVE="${PHP_INI_DIR}/ext-active" -} - -src_prepare() { - # USE=sharedmem (session/mod_mm to be exact) tries to mmap() this path - # ([empty session.save_path]/session_mm_[sapi][gid].sem) - # there is no easy way to circumvent that, all php calls during - # install use -n, so no php.ini file will be used. - # As such, this is the easiest way to get around - addpredict /session_mm_cli250.sem - addpredict /session_mm_cli0.sem - - # Change PHP branding - # Get the alpha/beta/rc version - sed -re "s|^(PHP_EXTRA_VERSION=\").*(\")|\1-pl${PR/r/}-gentoo\2|g" \ - -i configure.in || die "Unable to change PHP branding" - - # Patch PHP to show Gentoo as the server platform - sed -e 's/PHP_UNAME=`uname -a | xargs`/PHP_UNAME=`uname -s -n -r -v | xargs`/g' \ - -i configure.in || die "Failed to fix server platform name" - - # Prevent PHP from activating the Apache config, - # as we will do that ourselves - sed -i \ - -e "s,-i -a -n php${PHP_MV},-i -n php${PHP_MV},g" \ - -e "s,-i -A -n php${PHP_MV},-i -n php${PHP_MV},g" \ - configure sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 - - # Patch PHP to support heimdal instead of mit-krb5 - if has_version "app-crypt/heimdal" ; then - sed -e 's|gssapi_krb5|gssapi|g' -i acinclude.m4 \ - || die "Failed to fix heimdal libname" - sed -e 's|PHP_ADD_LIBRARY(k5crypto, 1, $1)||g' -i acinclude.m4 \ - || die "Failed to fix heimdal crypt library reference" - fi - - #Add user patches #357637 - epatch_user - - #force rebuilding aclocal.m4 - rm aclocal.m4 - eautoreconf - - if [[ ${CHOST} == *-darwin* ]] ; then - # http://bugs.php.net/bug.php?id=48795, bug #343481 - sed -i -e '/BUILD_CGI="\\$(CC)/s/CC/CXX/' configure || die - fi -} - -src_configure() { - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - PHP_DESTDIR="${EPREFIX}/usr/$(get_libdir)/php${SLOT}" - - # This is a global variable and should be in caps. It isn't because the - # phpconfutils eclass relies on exactly this name... - # for --with-libdir see bug #327025 - my_conf=" - --prefix="${PHP_DESTDIR}" - --mandir="${PHP_DESTDIR}"/man - --infodir="${PHP_DESTDIR}"/info - --libdir="${PHP_DESTDIR}"/lib - --with-libdir=$(get_libdir) - --without-pear - $(use_enable threads maintainer-zts)" - - # extension USE flag shared - my_conf+=" - $(use_enable bcmath bcmath ) - $(use_with bzip2 bz2 "${EPREFIX}"/usr) - $(use_enable calendar calendar ) - $(use_enable ctype ctype ) - $(use_with curl curl "${EPREFIX}"/usr) - $(use_enable xml dom ) - $(use_with enchant enchant "${EPREFIX}"/usr) - $(use_enable exif exif ) - $(use_enable fileinfo fileinfo ) - $(use_enable filter filter ) - $(use_enable ftp ftp ) - $(use_with nls gettext "${EPREFIX}"/usr) - $(use_with gmp gmp "${EPREFIX}"/usr) - $(use_enable hash hash ) - $(use_with mhash mhash "${EPREFIX}"/usr) - $(use_with iconv iconv $(use elibc_glibc || use elibc_musl || echo "${EPREFIX}"/usr)) - $(use_enable intl intl ) - $(use_enable ipv6 ipv6 ) - $(use_enable json json ) - $(use_with kerberos kerberos "${EPREFIX}"/usr) - $(use_enable xml libxml ) - $(use_with xml libxml-dir "${EPREFIX}"/usr) - $(use_enable unicode mbstring ) - $(use_with crypt mcrypt "${EPREFIX}"/usr) - $(use_with mssql mssql "${EPREFIX}"/usr) - $(use_with unicode onig "${EPREFIX}"/usr) - $(use_with ssl openssl "${EPREFIX}"/usr) - $(use_with ssl openssl-dir "${EPREFIX}"/usr) - $(use_enable pcntl pcntl ) - $(use_enable phar phar ) - $(use_enable pdo pdo ) - $(use_enable opcache opcache ) - $(use_with postgres pgsql "${EPREFIX}"/usr) - $(use_enable posix posix ) - $(use_with spell pspell "${EPREFIX}"/usr) - $(use_with recode recode "${EPREFIX}"/usr) - $(use_enable simplexml simplexml ) - $(use_enable sharedmem shmop ) - $(use_with snmp snmp "${EPREFIX}"/usr) - $(use_enable soap soap ) - $(use_enable sockets sockets ) - $(use_with sqlite sqlite3 "${EPREFIX}"/usr) - $(use_with sybase-ct sybase-ct "${EPREFIX}"/usr) - $(use_enable sysvipc sysvmsg ) - $(use_enable sysvipc sysvsem ) - $(use_enable sysvipc sysvshm ) - $(use_with systemd fpm-systemd) - $(use_with tidy tidy "${EPREFIX}"/usr) - $(use_enable tokenizer tokenizer ) - $(use_enable wddx wddx ) - $(use_enable xml xml ) - $(use_enable xmlreader xmlreader ) - $(use_enable xmlwriter xmlwriter ) - $(use_with xmlrpc xmlrpc) - $(use_with xslt xsl "${EPREFIX}"/usr) - $(use_enable zip zip ) - $(use_with zlib zlib "${EPREFIX}"/usr) - $(use_enable debug debug )" - - # DBA support - if use cdb || use berkdb || use flatfile || use gdbm || use inifile \ - || use qdbm ; then - my_conf="${my_conf} --enable-dba${shared}" - fi - - # DBA drivers support - my_conf+=" - $(use_with cdb cdb) - $(use_with berkdb db4 ${EPREFIX}/usr) - $(use_enable flatfile flatfile ) - $(use_with gdbm gdbm ${EPREFIX}/usr) - $(use_enable inifile inifile ) - $(use_with qdbm qdbm ${EPREFIX}/usr)" - - # Support for the GD graphics library - my_conf+=" - $(use_with truetype freetype-dir ${EPREFIX}/usr) - $(use_with truetype t1lib ${EPREFIX}/usr) - $(use_enable cjk gd-jis-conv ) - $(use_with gd jpeg-dir ${EPREFIX}/usr) - $(use_with gd png-dir ${EPREFIX}/usr) - $(use_with xpm xpm-dir ${EPREFIX}/usr) - $(use_with vpx vpx-dir ${EPREFIX}/usr)" - # enable gd last, so configure can pick up the previous settings - my_conf+=" - $(use_with gd gd)" - - # IMAP support - if use imap ; then - my_conf+=" - $(use_with imap imap ${EPREFIX}/usr) - $(use_with ssl imap-ssl ${EPREFIX}/usr)" - fi - - # Interbase/firebird support - - if use firebird ; then - my_conf+=" - $(use_with firebird interbase ${EPREFIX}/usr)" - fi - - # LDAP support - if use ldap ; then - my_conf+=" - $(use_with ldap ldap ${EPREFIX}/usr) - $(use_with ldap-sasl ldap-sasl ${EPREFIX}/usr)" - fi - - # MySQL support - local mysqllib="mysqlnd" - local mysqlilib="mysqlnd" - use libmysqlclient && mysqllib="${EPREFIX}/usr" - use libmysqlclient && mysqlilib="${EPREFIX}/usr/bin/mysql_config" - - my_conf+=" $(use_with mysql mysql $mysqllib)" - my_conf+=" $(use_with mysqli mysqli $mysqlilib)" - - local mysqlsock=" $(use_with mysql mysql-sock ${EPREFIX}/var/run/mysqld/mysqld.sock)" - if use mysql ; then - my_conf+="${mysqlsock}" - elif use mysqli ; then - my_conf+="${mysqlsock}" - fi - - # ODBC support - if use odbc ; then - my_conf+=" - $(use_with odbc unixODBC ${EPREFIX}/usr)" - fi - - if use iodbc ; then - my_conf+=" - $(use_with iodbc iodbc ${EPREFIX}/usr)" - fi - - # Oracle support - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client oci8)" - fi - - # PDO support - if use pdo ; then - my_conf+=" - $(use_with mssql pdo-dblib ) - $(use_with mysql pdo-mysql ${mysqllib}) - $(use_with postgres pdo-pgsql ) - $(use_with sqlite pdo-sqlite ${EPREFIX}/usr) - $(use_with odbc pdo-odbc unixODBC,${EPREFIX}/usr)" - if use oci8-instant-client ; then - my_conf+=" - $(use_with oci8-instant-client pdo-oci)" - fi - fi - - # readline/libedit support - my_conf+=" - $(use_with readline readline ${EPREFIX}/usr) - $(use_with libedit libedit ${EPREFIX}/usr)" - - # Session support - if use session ; then - my_conf+=" - $(use_with sharedmem mm ${EPREFIX}/usr)" - else - my_conf+=" - $(use_enable session session )" - fi - - # Use pic for shared modules such as apache2's mod_php - my_conf="${my_conf} --with-pic" - - # we use the system copy of pcre - # --with-pcre-regex affects ext/pcre - # --with-pcre-dir affects ext/filter and ext/zip - my_conf="${my_conf} --with-pcre-regex=${EPREFIX}/usr --with-pcre-dir=${EPREFIX}/usr" - - # Catch CFLAGS problems - # Fixes bug #14067. - # Changed order to run it in reverse for bug #32022 and #12021. - replace-cpu-flags "k6*" "i586" - - # Support user-passed configuration parameters - my_conf="${my_conf} ${EXTRA_ECONF:-}" - - # Support the Apache2 extras, they must be set globally for all - # SAPIs to work correctly, especially for external PHP extensions - - mkdir -p "${WORKDIR}/sapis-build" - for one_sapi in $SAPIS ; do - use "${one_sapi}" || continue - php_set_ini_dir "${one_sapi}" - - cp -r "${S}" "${WORKDIR}/sapis-build/${one_sapi}" - cd "${WORKDIR}/sapis-build/${one_sapi}" - - sapi_conf="${my_conf} --with-config-file-path=${PHP_INI_DIR} - --with-config-file-scan-dir=${PHP_EXT_INI_DIR_ACTIVE}" - - for sapi in $SAPIS ; do - case "$sapi" in - cli|cgi|embed|fpm) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --enable-${sapi}" - else - sapi_conf="${sapi_conf} --disable-${sapi}" - fi - ;; - - apache2) - if [[ "${one_sapi}" == "${sapi}" ]] ; then - sapi_conf="${sapi_conf} --with-apxs2=${EPREFIX}/usr/sbin/apxs" - else - sapi_conf="${sapi_conf} --without-apxs2" - fi - ;; - esac - done - - econf ${sapi_conf} - done -} - -src_compile() { - # snmp seems to run during src_compile, too (bug #324739) - addpredict /usr/share/snmp/mibs/.index - addpredict /var/lib/net-snmp/mib_indexes - - for sapi in ${SAPIS} ; do - if use "${sapi}"; then - cd "${WORKDIR}/sapis-build/$sapi" || "Failed to change dir to ${WORKDIR}/sapis-build/$1" - emake || die "emake failed" - fi - done -} - -src_install() { - # see bug #324739 for what happens when we don't have that - addpredict /usr/share/snmp/mibs/.index - - # grab the first SAPI that got built and install common files from there - local first_sapi="" - for sapi in $SAPIS ; do - if use $sapi ; then - first_sapi=$sapi - break - fi - done - - # Makefile forgets to create this before trying to write to it... - dodir "${PHP_DESTDIR#${EPREFIX}}/bin" - - # Install php environment (without any sapis) - cd "${WORKDIR}/sapis-build/$first_sapi" - emake INSTALL_ROOT="${D}" \ - install-build install-headers install-programs \ - || die "emake install failed" - - local extension_dir="$("${ED}/${PHP_DESTDIR#${EPREFIX}}/bin/php-config" --extension-dir)" - - # Create the directory where we'll put version-specific php scripts - keepdir /usr/share/php${PHP_MV} - - local sapi="", file="" - local sapi_list="" - - for sapi in ${SAPIS}; do - if use "${sapi}" ; then - einfo "Installing SAPI: ${sapi}" - cd "${WORKDIR}/sapis-build/${sapi}" - - if [[ "${sapi}" == "apache2" ]] ; then - # We're specifically not using emake install-sapi as libtool - # may cause unnecessary relink failures (see bug #351266) - insinto "${PHP_DESTDIR#${EPREFIX}}/apache2/" - newins ".libs/libphp5$(get_libname)" "libphp${PHP_MV}$(get_libname)" - keepdir "/usr/$(get_libdir)/apache2/modules" - else - # needed each time, php_install_ini would reset it - local dest="${PHP_DESTDIR#${EPREFIX}}" - into "${dest}" - case "$sapi" in - cli) - source="sapi/cli/php" - ;; - cgi) - source="sapi/cgi/php-cgi" - ;; - fpm) - source="sapi/fpm/php-fpm" - ;; - embed) - source="libs/libphp${PHP_MV}$(get_libname)" - ;; - *) - die "unhandled sapi in src_install" - ;; - esac - - if [[ "${source}" == *"$(get_libname)" ]]; then - dolib.so "${source}" || die "Unable to install ${sapi} sapi" - else - dobin "${source}" || die "Unable to install ${sapi} sapi" - local name="$(basename ${source})" - dosym "${dest}/bin/${name}" "/usr/bin/${name}${SLOT}" - fi - fi - - php_install_ini "${sapi}" - - # construct correct SAPI string for php-config - # thanks to ferringb for the bash voodoo - if [[ "${sapi}" == "apache2" ]]; then - sapi_list="${sapi_list:+${sapi_list} }apache2handler" - else - sapi_list="${sapi_list:+${sapi_list} }${sapi}" - fi - fi - done - - # Installing opcache module - if use_if_iuse opcache ; then - dolib.so "modules/opcache$(get_libname)" || die "Unable to install opcache module" - fi - - # Install env.d files - newenvd "${FILESDIR}/20php5-envd" \ - "20php${SLOT}" - sed -e "s|/lib/|/$(get_libdir)/|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - sed -e "s|php5|php${SLOT}|g" -i \ - "${ED}/etc/env.d/20php${SLOT}" - - # set php-config variable correctly (bug #278439) - sed -e "s:^\(php_sapis=\)\".*\"$:\1\"${sapi_list}\":" -i \ - "${ED}/usr/$(get_libdir)/php${SLOT}/bin/php-config" - - if use fpm ; then - if use systemd; then - systemd_newunit "${FILESDIR}/php-fpm_at.service" "php-fpm@${SLOT}.service" - else - systemd_newunit "${FILESDIR}/php-fpm_at-simple.service" "php-fpm@${SLOT}.service" - fi - fi -} - -src_test() { - echo ">>> Test phase [test]: ${CATEGORY}/${PF}" - PHP_BIN="${WORKDIR}/sapis-build/cli/sapi/cli/php" - if [[ ! -x "${PHP_BIN}" ]] ; then - ewarn "Test phase requires USE=cli, skipping" - return - else - export TEST_PHP_EXECUTABLE="${PHP_BIN}" - fi - - if [[ -x "${WORKDIR}/sapis/cgi/php-cgi" ]] ; then - export TEST_PHP_CGI_EXECUTABLE="${WORKDIR}/sapis/cgi/php-cgi" - fi - - REPORT_EXIT_STATUS=1 "${TEST_PHP_EXECUTABLE}" -n -d "session.save_path=${T}" \ - "${WORKDIR}/sapis-build/cli/run-tests.php" -n -q -d "session.save_path=${T}" - - for name in ${EXPECTED_TEST_FAILURES}; do - mv "${name}.out" "${name}.out.orig" 2>/dev/null - done - - local failed="$(find -name '*.out')" - if [[ ${failed} != "" ]] ; then - ewarn "The following test cases failed unexpectedly:" - for name in ${failed}; do - ewarn " ${name/.out/}" - done - else - einfo "No unexpected test failures, all fine" - fi - - if [[ ${PHP_SHOW_UNEXPECTED_TEST_PASS} == "1" ]] ; then - local passed="" - for name in ${EXPECTED_TEST_FAILURES}; do - [[ -f "${name}.diff" ]] && continue - passed="${passed} ${name}" - done - if [[ ${passed} != "" ]] ; then - einfo "The following test cases passed unexpectedly:" - for name in ${passed}; do - ewarn " ${passed}" - done - else - einfo "None of the known-to-fail tests passed, all fine" - fi - fi -} - -pkg_postinst() { - # Output some general info to the user - if use apache2 ; then - APACHE2_MOD_DEFINE="PHP5" - APACHE2_MOD_CONF="70_mod_php5" # actually provided by app-eselect/eselect-php - apache-module_pkg_postinst - fi - - # Create the symlinks for php - for m in ${SAPIS}; do - [[ ${m} == 'embed' ]] && continue; - if use $m ; then - local ci=$(eselect php show $m) - if [[ -z $ci ]]; then - eselect php set $m php${SLOT} - einfo "Switched ${m} to use php:${SLOT}" - einfo - elif [[ $ci != "php${SLOT}" ]] ; then - elog "To switch $m to use php:${SLOT}, run" - elog " eselect php set $m php${SLOT}" - elog - fi - fi - done - - elog "Make sure that PHP_TARGETS in ${EPREFIX}/etc/make.conf includes php${SLOT/./-} in order" - elog "to compile extensions for the ${SLOT} ABI" - elog - if ! use readline && use cli ; then - ewarn "Note that in order to use php interactivly, you need to enable" - ewarn "the readline USE flag or php -a will hang" - fi - elog - elog "This ebuild installed a version of php.ini based on php.ini-${PHP_INI_VERSION} version." - elog "You can chose which version of php.ini to install by default by setting PHP_INI_VERSION to either" - elog "'production' or 'development' in ${EPREFIX}/etc/make.conf" - elog "Both versions of php.ini can be found in ${EPREFIX}/usr/share/doc/${PF}" - - elog - elog "For more details on how minor version slotting works (PHP_TARGETS) please read the upgrade guide:" - elog "https://www.gentoo.org/proj/en/php/php-upgrading.xml" - elog -} - -pkg_prerm() { - eselect php cleanup -} diff --git a/dev-lang/php/php-5.6.17.ebuild b/dev-lang/php/php-5.6.17.ebuild index f968777bbc32..444286eb8ea7 100644 --- a/dev-lang/php/php-5.6.17.ebuild +++ b/dev-lang/php/php-5.6.17.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.18.ebuild b/dev-lang/php/php-5.6.18.ebuild index b59323dea4e6..ececa097f92b 100644 --- a/dev-lang/php/php-5.6.18.ebuild +++ b/dev-lang/php/php-5.6.18.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd -KEYWORDS="alpha amd64 ~arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-5.6.19.ebuild b/dev-lang/php/php-5.6.19.ebuild index 9937c67be46a..6380a19902ad 100644 --- a/dev-lang/php/php-5.6.19.ebuild +++ b/dev-lang/php/php-5.6.19.ebuild @@ -6,7 +6,7 @@ EAPI=5 inherit eutils autotools flag-o-matic versionator depend.apache apache-module libtool systemd -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" function php_get_uri () { diff --git a/dev-lang/php/php-7.0.4.ebuild b/dev-lang/php/php-7.0.4-r1.ebuild similarity index 99% rename from dev-lang/php/php-7.0.4.ebuild rename to dev-lang/php/php-7.0.4-r1.ebuild index 6092aca32564..92b65071532e 100644 --- a/dev-lang/php/php-7.0.4.ebuild +++ b/dev-lang/php/php-7.0.4-r1.ebuild @@ -68,7 +68,7 @@ IUSE="${IUSE} bcmath berkdb bzip2 calendar cdb cjk enchant exif frontbase +fileinfo +filter firebird flatfile ftp gd gdbm gmp +hash +iconv imap inifile intl iodbc ipv6 +json kerberos ldap ldap-sasl libedit libressl - mhash mysql mysqli nls + mhash mssql mysql mysqli nls oci8-instant-client odbc +opcache pcntl pdo +phar +posix postgres qdbm readline recode selinux +session sharedmem +simplexml snmp soap sockets spell sqlite ssl @@ -118,6 +118,7 @@ DEPEND="${DEPEND} ldap? ( >=net-nds/openldap-1.2.11 ) ldap-sasl? ( dev-libs/cyrus-sasl >=net-nds/openldap-1.2.11 ) libedit? ( || ( sys-freebsd/freebsd-lib dev-libs/libedit ) ) + mssql? ( dev-db/freetds[mssql] ) nls? ( sys-devel/gettext ) oci8-instant-client? ( dev-db/oracle-instantclient-basic ) odbc? ( >=dev-db/unixODBC-1.8.13 ) @@ -468,6 +469,7 @@ src_configure() { # PDO support if use pdo ; then our_conf+=( + $(use_with mssql pdo-dblib "${EPREFIX}/usr") $(use_with mysql pdo-mysql "${mysqllib}") $(use_with postgres pdo-pgsql) $(use_with sqlite pdo-sqlite "${EPREFIX}/usr") diff --git a/dev-lang/python-exec/python-exec-2.0.2.ebuild b/dev-lang/python-exec/python-exec-2.0.2.ebuild index ec79ee8691cc..6c17713614c6 100644 --- a/dev-lang/python-exec/python-exec-2.0.2.ebuild +++ b/dev-lang/python-exec/python-exec-2.0.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2" LICENSE="BSD-2" SLOT="2" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~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 ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" RDEPEND="! + + + + tomboy64@sina.cn + M.B. + Maintainer, assign bugs to him + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Due to the number of out-of-tree deps, these only get installed as docs + Make use of Boost's ASIO functionality + Build the C Actor Shell for introspection and debugging + Raises log-level to DEBUG, enables runtime checks and address sanitizer + Compiles and installs the documentation as PDF and HTML + Installs the provided example source files + Enables built-in memory management + Nexus is the central component for CAF's runtime inspection + Compiles against the provided opencl implementation + Runtime inspection and configuration + Provides a static build + Builds the provided unit tests + + + actor-framework/actor-framework + + + An implementation of the Actor Model of distributed computation in C++. + + diff --git a/dev-libs/botan/Manifest b/dev-libs/botan/Manifest index 068fc02aa463..7bf8dab38eda 100644 --- a/dev-libs/botan/Manifest +++ b/dev-libs/botan/Manifest @@ -1,8 +1,2 @@ -DIST Botan-1.10.10.tgz 2706592 SHA256 6b67b14746410461fe4a8ce6a625e7eef789243454fe30eab7329d5984be4163 SHA512 8f1aab5dde0191e8347ae98e265ffe799699f9ab6377a81acdb13ddabb8e025ab129b55dbc484796ddcd21c9997dde6e39ec080ad815472cb1e2857007744c9b WHIRLPOOL 3fe729adef417e5cf6af0748985324315d18ec1681ace8c00734c68043682888e29faed1bbd40e68f8f7a923f638f343368c97a89262e649d03360b361a79411 DIST Botan-1.10.12.tgz 2707397 SHA256 affc3a79919577943f896e64d3e4a4dcc4970c5bf80cc98c7f3a3144745eac27 SHA512 074ed9c89d715ada53a3366139da3f0f2fd7ee01941d301b0a9c1a897927ed88c0ade32f66768091664e6b652b7921b3b4c513106ee6ce1942dece3a25216bf5 WHIRLPOOL bfe7029e5ebf660434b14cd49e0c9f4612e9ee88ad50803edfa589754bede01dc39d71542b62eaaa0f7e85dbf623b4b11a90528bcb903c2333103685ce91401f -DIST Botan-1.10.5.tbz 2214817 SHA256 2934c00533847dc93c485081d3ce6aae4a110151a69b587b895241159da77cf3 SHA512 7456eaf2bbdabac9438cdd28dbc0735924480034d848c40039b5b58d52924b4cb065316989d6902201bc62fb5c19cba109b550b6865ca4d11748e3a3a1ececa6 WHIRLPOOL 7fd3de981d55a03925e78a4afcee55c0f3cf7e2dc88bd503f9c5705e5cc73293cf3bdcf3c3fdf54b6d1b77ba7dc32cf6fa46720635b922e368aaf12a39339fcd -DIST Botan-1.11.20.tgz 2916027 SHA256 60a02717983535215822bbb1d6ae3c97cf517874d4e48808c6fbfd5c3b112d9c SHA512 0d8f0b66d1fc753381d141da96f859d30301f5e4ea74e21dbd8a787020c186a814fc485bd5055589a06f6556c860dcd39a9ba3af662b63ccf71b6cf41d805137 WHIRLPOOL 31a7df028405df2b364f47b9f7c28a8408f06d9c3600cbb7fe058bd0f8015929ca2191053a43cd16c4fa8487ff175cc7e1f17dc16f4d8c70655fbaa56b44513c -DIST Botan-1.11.25.tgz 2841455 SHA256 cc18259cef073c4c0514cd41c94c6cd245f2e178334423945ef6fba4becff2ea SHA512 c275c0c0e8a95c1ed38ae2a0ec6daa42730a4b1cd06fc0bb9624c5b1baa43ec10af191cd3dde16a5c106250e39960840a8e2514e2123017c86152812ed27c89e WHIRLPOOL ff6c26fbbc76b78d147d073b021234b54e70acf5b99ba6128c3a407fd0bd5953d981020d67917354a1c59c684cca42a6415bddda310c871901a62378df44807d DIST Botan-1.11.28.tgz 3144767 SHA256 a414c96f45b2707d4750d299ca03ec3fce5ada62ada1ba5cd012a9ace61f5932 SHA512 179e4a05ae073b948523abe13f6f93ec391f3b4585d784349baf9cc0d4152c76bccfde7604a4bf89740b6fc77c7f651c0dd767c39f85f9fab378c7e0e15a442c WHIRLPOOL 0f6f101d9ccbe92a17614f82f13609f2f112ab46a395a195a268b03a95a69d263f2d3d9b88f7092d02ddc74fabeab46057c235383e6b118da08f05870adaa4c1 -DIST Botan-1.11.4.tbz 2346343 SHA256 ebbcc493ef2f13f536597b72e317462e1503c83f7e18e1fe10887f16b5f4da0f SHA512 c5c521a78b50de6c6e2bba912f0697e507a8432bd7f348e3e41856cc2ed60fea5877df4957d74887419208f8df63224a4c6726c94eef58fc1b255133b1f0ee22 WHIRLPOOL 41a024e3698fa2ede2a5124b6c5d2400e969f2cddfec6e7e9e43e549097dd606d105d6e02d6268e322d98e83300c76eb4f7783ee54699a7fa85addcf9adc3aa2 -DIST Botan-1.11.8.tbz 2193897 SHA256 5c3a5485dd8f2b5e690bdc73d5848b1f436a090e7fc521c66920f34d6af68efd SHA512 2d3f5d77687ed56be39c88fe7ffdb27ebda573650f164b8681864cff0ca8b0a0bd56f9749f3695e4240a68bfa1483565c854ff4f9d8a7460de0883255a917e26 WHIRLPOOL c9eaeb2d2da10bc61eb704beb9025fada4f16ec4e82a7845cdc465295d05ad070e73d289abdc30fc96f5b43778c87f31ea4cb66c6706cb822ceb2adba0354d41 diff --git a/dev-libs/botan/botan-1.10.10.ebuild b/dev-libs/botan/botan-1.10.10.ebuild deleted file mode 100644 index 43ef09848939..000000000000 --- a/dev-libs/botan/botan-1.10.10.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) - gmp? ( >=dev-libs/gmp-4.2.2:* ) - ssl? ( >=dev-libs/openssl-0.9.8g:*[bindist=] )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -src_prepare() { - sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed" - sed \ - -e "/DOCDIR/d" \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/unix_shr.in || die "sed failed" - - # Fix ImportError with Python 3. - sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed" - - use python && python_copy_sources -} - -src_configure() { - local disable_modules="proc_walk,unix_procs" - use threads || disable_modules+=",pthreads" - use bindist && disable_modules+=",ecdsa" - elog "Disabling modules: ${disable_modules}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - --with-tr1=system \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with python boost-python) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" - - if use python; then - building() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - cp Makefile.python build/python - sed -i \ - -e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \ - build/python/Makefile.python - emake -f build/python/Makefile.python \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - PYTHON_ROOT="/usr/$(get_libdir)" \ - PYTHON_INC="-I$(python_get_includedir)" - } - python_foreach_impl building - fi - - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - chmod -R ugo+rX "${S}" - emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check - LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install - - if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' - fi - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.10 /usr/bin/botan-config - dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - if use python; then - installation() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - emake -f Makefile.python \ - PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \ - install - } - python_foreach_impl installation - fi - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-1.10.12.ebuild b/dev-libs/botan/botan-1.10.12.ebuild index cc73550b35f2..7433924a7d71 100644 --- a/dev-libs/botan/botan-1.10.12.ebuild +++ b/dev-libs/botan/botan-1.10.12.ebuild @@ -13,7 +13,7 @@ DESCRIPTION="A C++ crypto library" HOMEPAGE="http://botan.randombit.net/" SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz" -KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-macos" +KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos" SLOT="0" LICENSE="BSD" IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib" diff --git a/dev-libs/botan/botan-1.10.5.ebuild b/dev-libs/botan/botan-1.10.5.ebuild deleted file mode 100644 index 3b195c07c126..000000000000 --- a/dev-libs/botan/botan-1.10.5.ebuild +++ /dev/null @@ -1,150 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" - -KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 sparc x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc python bzip2 gmp ssl static-libs threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) - gmp? ( >=dev-libs/gmp-4.2.2 ) - ssl? ( >=dev-libs/openssl-0.9.8g[bindist=] )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -src_prepare() { - epatch "${FILESDIR}/${PN}-1.10-python3.patch" - - sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed" - sed \ - -e "/DOCDIR/d" \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/unix_shr.in || die "sed failed" - - # Fix ImportError with Python 3. - sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed" - - use python && python_copy_sources -} - -src_configure() { - local disable_modules="proc_walk,unix_procs" - use threads || disable_modules+=",pthreads" - use bindist && disable_modules+=",ecdsa" - elog "Disabling modules: ${disable_modules}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - --with-tr1=system \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with python boost-python) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" - - if use python; then - building() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - cp Makefile.python build/python - sed -i \ - -e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \ - build/python/Makefile.python - emake -f build/python/Makefile.python \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - PYTHON_ROOT="/usr/$(get_libdir)" \ - PYTHON_INC="-I$(python_get_includedir)" - } - python_foreach_impl building - fi - - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - chmod -R ugo+rX "${S}" - emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check - LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install - - if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' - fi - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.10 /usr/bin/botan-config - dosym botan-1.10.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - if use python; then - installation() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - emake -f Makefile.python \ - PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \ - install - } - python_foreach_impl installation - fi - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-1.11.20-r1.ebuild b/dev-libs/botan/botan-1.11.20-r1.ebuild deleted file mode 100644 index faf7991b3436..000000000000 --- a/dev-libs/botan/botan-1.11.20-r1.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE="python? ( boost )" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - boost? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python?,${PYTHON_USEDEP}] ) - lzma? ( app-arch/xz-utils ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.8g:0[bindist=] ) - libressl? ( dev-libs/libressl ) - )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -pkg_pretend() { - # Botan 1.11 requires -std=c++11 - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ - && die "Sorry, but gcc 4.7 or higher is required." - fi -} - -src_prepare() { - epatch "${FILESDIR}/${P}-build-python.patch" - sed \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/gmake.in || die "sed failed" - use python && python_copy_sources -} - -src_configure() { - local disable_modules=( proc_walk unix_procs ) - use boost || disable_modules+=( "boost" ) - use bindist && disable_modules+=( "ecdsa" ) - elog "Disabling modules: ${disable_modules[@]}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - local pythonvers=() - if use python; then - append() { - pythonvers+=( ${EPYTHON/python/} ) - } - python_foreach_impl append - fi - - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --destdir="${D}/${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - $(use_with bzip2) \ - $(use_with lzma) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - $(use_with boost) \ - --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ - --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" LIB_OPT="-c ${CXXFLAGS}" - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" -} - -src_install() { - emake install - - if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' - fi - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.11 /usr/bin/botan-config - dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - use python && python_foreach_impl python_optimize - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-1.11.20.ebuild b/dev-libs/botan/botan-1.11.20.ebuild deleted file mode 100644 index 4a5bc47218c6..000000000000 --- a/dev-libs/botan/botan-1.11.20.ebuild +++ /dev/null @@ -1,132 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc boost python bzip2 lzma sqlite ssl static-libs zlib" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE="python? ( boost )" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - boost? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python?,${PYTHON_USEDEP}] ) - lzma? ( app-arch/xz-utils ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( >=dev-libs/openssl-0.9.8g:*[bindist=] )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -pkg_pretend() { - # Botan 1.11 requires -std=c++11 - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ - && die "Sorry, but gcc 4.7 or higher is required." - fi -} - -src_prepare() { - epatch "${FILESDIR}/${P}-build-python.patch" - sed \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/gmake.in || die "sed failed" - use python && python_copy_sources -} - -src_configure() { - local disable_modules=( proc_walk unix_procs ) - use boost || disable_modules+=( "boost" ) - use bindist && disable_modules+=( "ecdsa" ) - elog "Disabling modules: ${disable_modules[@]}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - local pythonvers=() - if use python; then - append() { - pythonvers+=( ${EPYTHON/python/} ) - } - python_foreach_impl append - fi - - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --destdir="${D}/${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - $(use_with bzip2) \ - $(use_with lzma) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - $(use_with boost) \ - --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ - --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" LIB_OPT="-c ${CXXFLAGS}" - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" -} - -src_install() { - emake install - - if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' - fi - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.11 /usr/bin/botan-config - dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - use python && python_foreach_impl python_optimize - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-1.11.25.ebuild b/dev-libs/botan/botan-1.11.25.ebuild deleted file mode 100644 index d1b7d662e008..000000000000 --- a/dev-libs/botan/botan-1.11.25.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://botan.randombit.net/releases/${MY_P}.tgz" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc boost python bzip2 libressl lzma sqlite ssl static-libs zlib" - -S="${WORKDIR}/${MY_P}" - -REQUIRED_USE="python? ( boost )" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - boost? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python?,${PYTHON_USEDEP}] ) - lzma? ( app-arch/xz-utils ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( - !libressl? ( >=dev-libs/openssl-0.9.8g:0[bindist=] ) - libressl? ( dev-libs/libressl ) - )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -pkg_pretend() { - # Botan 1.11 requires -std=c++11 - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ - && die "Sorry, but gcc 4.7 or higher is required." - fi -} - -src_prepare() { - sed \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/gmake.in || die "sed failed" - use python && python_copy_sources -} - -src_configure() { - local disable_modules=( proc_walk unix_procs ) - use boost || disable_modules+=( "boost" ) - use bindist && disable_modules+=( "ecdsa" ) - use python || disable_modules+=( "ffi" ) - elog "Disabling modules: ${disable_modules[@]}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - local pythonvers=() - if use python; then - append() { - pythonvers+=( ${EPYTHON/python/} ) - } - python_foreach_impl append - fi - - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --destdir="${D}/${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - $(use_with bzip2) \ - $(use_with lzma) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - $(use_with boost) \ - --with-python-version=$(IFS=","; echo "${pythonvers[*]}" ) \ - --disable-modules=$(IFS=","; echo "${disable_modules[*]}" ) \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX) -pthread" AR="$(tc-getAR) crs" LIB_OPT="-c ${CXXFLAGS}" - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" -} - -src_install() { - emake install - - if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' - fi - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.11 /usr/bin/botan-config - dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - use python && python_foreach_impl python_optimize - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-1.11.4.ebuild b/dev-libs/botan/botan-1.11.4.ebuild deleted file mode 100644 index 4348f865dd45..000000000000 --- a/dev-libs/botan/botan-1.11.4.ebuild +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc python bzip2 gmp lzma sqlite ssl static-libs threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) - gmp? ( >=dev-libs/gmp-4.2.2 ) - lzma? ( app-arch/xz-utils ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( >=dev-libs/openssl-0.9.8g[bindist=] )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -pkg_pretend() { - # Botan 1.11 requires -std=c++11 - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ - && die "Sorry, but gcc 4.7 or higher is required." - fi -} - -src_prepare() { - sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed" - sed \ - -e "/DOCDIR/d" \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/unix_shr.in || die "sed failed" - - # Fix ImportError with Python 3. - sed -e "s/_botan/.&/" -i src/wrap/python/__init__.py || die "sed failed" - - use python && python_copy_sources -} - -src_configure() { - local disable_modules="proc_walk,unix_procs" - use threads || disable_modules+=",pthreads" - use bindist && disable_modules+=",ecdsa" - elog "Disabling modules: ${disable_modules}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with lzma) \ - $(use_with python boost-python) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" - - if use python; then - building() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - cp Makefile.python build/python - sed -i \ - -e "s/-lboost_python/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \ - build/python/Makefile.python - emake -f build/python/Makefile.python \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - PYTHON_ROOT="/usr/$(get_libdir)" \ - PYTHON_INC="-I$(python_get_includedir)" - } - python_foreach_impl building - fi - - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - chmod -R ugo+rX "${S}" - emake CXX="$(tc-getCXX)" CHECK_OPT="${CXXFLAGS}" check - LD_LIBRARY_PATH="${S}" ./check --validate || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install - - if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' - fi - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.11 /usr/bin/botan-config - dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - if use python; then - installation() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - emake -f Makefile.python \ - PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \ - install - } - python_foreach_impl installation - fi - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/botan/botan-1.11.8.ebuild b/dev-libs/botan/botan-1.11.8.ebuild deleted file mode 100644 index 6fe2b29535dc..000000000000 --- a/dev-libs/botan/botan-1.11.8.ebuild +++ /dev/null @@ -1,161 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -PYTHON_COMPAT=( python{2_7,3_3,3_4} ) - -inherit eutils multilib python-r1 toolchain-funcs - -MY_PN="Botan" -MY_P="${MY_PN}-${PV}" -DESCRIPTION="A C++ crypto library" -HOMEPAGE="http://botan.randombit.net/" -SRC_URI="http://files.randombit.net/botan/${MY_P}.tbz" - -KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos" -SLOT="0" -LICENSE="BSD" -IUSE="bindist doc python bzip2 gmp lzma sqlite ssl static-libs threads zlib" - -S="${WORKDIR}/${MY_P}" - -RDEPEND="bzip2? ( >=app-arch/bzip2-1.0.5 ) - zlib? ( >=sys-libs/zlib-1.2.3 ) - python? ( ${PYTHON_DEPS} >=dev-libs/boost-1.48[python,${PYTHON_USEDEP}] ) - gmp? ( >=dev-libs/gmp-4.2.2 ) - lzma? ( app-arch/xz-utils ) - sqlite? ( dev-db/sqlite:3 ) - ssl? ( >=dev-libs/openssl-0.9.8g[bindist=] )" -DEPEND="${RDEPEND} - doc? ( dev-python/sphinx )" - -pkg_pretend() { - # Botan 1.11 requires -std=c++11 - if [[ ${MERGE_TYPE} != binary ]]; then - [[ $(gcc-major-version) -lt 4 ]] || \ - ( [[ $(gcc-major-version) -eq 4 && $(gcc-minor-version) -lt 7 ]] ) \ - && die "Sorry, but gcc 4.7 or higher is required." - fi -} - -src_prepare() { - sed -e "s/-Wl,-soname,\$@ //" -i src/build-data/makefile/python.in || die "sed failed" - sed \ - -e "/DOCDIR/d" \ - -e "/^install:/s/ docs//" \ - -i src/build-data/makefile/gmake.in || die "sed failed" - - # Fix ImportError with Python 3. - sed -e "s/_botan/.&/" -i src/python/__init__.py || die "sed failed" - - use python && python_copy_sources -} - -src_configure() { - local disable_modules="proc_walk,unix_procs" - use threads || disable_modules+=",pthreads" - use bindist && disable_modules+=",ecdsa" - elog "Disabling modules: ${disable_modules}" - - # Enable v9 instructions for sparc64 - if [[ "${PROFILE_ARCH}" = "sparc64" ]]; then - CHOSTARCH="sparc32-v9" - else - CHOSTARCH="${CHOST%%-*}" - fi - - local myos= - case ${CHOST} in - *-darwin*) myos=darwin ;; - *) myos=linux ;; - esac - - # foobared buildsystem, --prefix translates into DESTDIR, see also make - # install in src_install, we need the correct live-system prefix here on - # Darwin for a shared lib with correct install_name - ./configure.py \ - --prefix="${EPREFIX}/usr" \ - --libdir=$(get_libdir) \ - --docdir=share/doc \ - --cc=gcc \ - --os=${myos} \ - --cpu=${CHOSTARCH} \ - --with-endian="$(tc-endian)" \ - --without-sphinx \ - $(use_with bzip2) \ - $(use_with gmp gnump) \ - $(use_with lzma) \ - $(use_with python boost-python) \ - $(use_with sqlite sqlite3) \ - $(use_with ssl openssl) \ - $(use_with zlib) \ - --disable-modules=${disable_modules} \ - || die "configure.py failed" -} - -src_compile() { - emake CXX="$(tc-getCXX)" AR="$(tc-getAR) crs" LIB_OPT="${CXXFLAGS}" MACH_OPT="" - - if use python; then - building() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - cp Makefile build/python - rm -f build/python/configure.py - sed -i \ - -e "s/-lboost_python-[^[:space:]]*/-lboost_python-$(echo ${EPYTHON} | sed 's/python//')/" \ - build/python/Makefile - emake -f build/python/Makefile \ - CXX="$(tc-getCXX)" \ - CFLAGS="${CXXFLAGS}" \ - LDFLAGS="${LDFLAGS}" \ - PYTHON_ROOT="/usr/$(get_libdir)" \ - PYTHON_INC="-I$(python_get_includedir)" \ - python - } - python_foreach_impl building - fi - - if use doc; then - einfo "Generation of documentation" - sphinx-build doc doc_output - fi -} - -src_test() { - #chmod -R ugo+rX "${S}" - LD_LIBRARY_PATH="${S}" ./botan-test || die "Validation tests failed" -} - -src_install() { - emake DESTDIR="${ED}usr" install - - if ! use static-libs; then - rm "${ED}usr/$(get_libdir)/libbotan"*.a || die 'remove of static libs failed' - fi - - # Add compatibility symlinks. - [[ -e "${ED}usr/bin/botan-config" ]] && die "Compatibility code no longer needed" - [[ -e "${ED}usr/$(get_libdir)/pkgconfig/botan.pc" ]] && die "Compatibility code no longer needed" - dosym botan-config-1.11 /usr/bin/botan-config - dosym botan-1.11.pc /usr/$(get_libdir)/pkgconfig/botan.pc - - if use python; then - installation() { - rm -fr build/python - ln -s "${BUILD_DIR}" build/python - emake -f Makefile \ - PYTHON_SITE_PACKAGE_DIR="${ED}$(python_get_sitedir)" \ - install_python - } - python_foreach_impl installation - fi - - if use doc; then - pushd doc_output > /dev/null - insinto /usr/share/doc/${PF}/html - doins -r [a-z]* _static - popd > /dev/null - fi -} diff --git a/dev-libs/cdk/cdk-5.0.20141106.ebuild b/dev-libs/cdk/cdk-5.0.20141106.ebuild index 85f2e826a8d9..24afb5fdc26b 100644 --- a/dev-libs/cdk/cdk-5.0.20141106.ebuild +++ b/dev-libs/cdk/cdk-5.0.20141106.ebuild @@ -13,7 +13,7 @@ SRC_URI="ftp://invisible-island.net/cdk/${MY_P}.tgz" LICENSE="BSD" SLOT="0/6" # subslot = soname version -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 ~s390 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="~alpha amd64 ~hppa ia64 ppc ppc64 ~s390 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="examples static-libs unicode" DEPEND=">=sys-libs/ncurses-5.2[unicode?]" diff --git a/dev-libs/geoip/geoip-1.6.9.ebuild b/dev-libs/geoip/geoip-1.6.9.ebuild index 8c1bcd7b8091..5dafe60eb9ee 100644 --- a/dev-libs/geoip/geoip-1.6.9.ebuild +++ b/dev-libs/geoip/geoip-1.6.9.ebuild @@ -14,7 +14,7 @@ SRC_URI=" # GPL-2 for md5.c - part of libGeoIPUpdate, MaxMind for GeoLite Country db LICENSE="LGPL-2.1 GPL-2 MaxMind2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos" IUSE="static-libs" RESTRICT="test" diff --git a/dev-libs/json-glib/Manifest b/dev-libs/json-glib/Manifest index 1c1b4c8bdbe6..b169f60b9d29 100644 --- a/dev-libs/json-glib/Manifest +++ b/dev-libs/json-glib/Manifest @@ -1,2 +1,2 @@ -DIST json-glib-1.0.2.tar.xz 550340 SHA256 887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a SHA512 c2934298d146749514706bcafda21e47a815480e2a85ae34560a6e4fd9063be2761786b8f8532965b417ccb18f96d2487ca5118c70d6112b3bbcdfe193bfcefd WHIRLPOOL 67ec22e65b847e7395c3f0a10000191b4d9ea296f24c334b0d1d0f06da4859be7c752a046757c64ec0c07c4c6e314108dc4a5a79f048370bf0682b3bd64af7d1 DIST json-glib-1.0.4.tar.xz 557236 SHA256 80f3593cb6bd13f1465828e46a9f740e2e9bd3cd2257889442b3e62bd6de05cd SHA512 491a2353b7a82015516b5029d400874f35ba9d8ad914eb3f97e6106eaf2daa300147725ffbaaf5a67a6bf0da192beb47cd4edee47ecdb6a4be7dfd5f51463e5b WHIRLPOOL 337bdbd8108c5f94d212c0cb249f514aef10d5cc373ad24687cd52d115fd6c148d50aecfe664423c21f486b8ce2e88d4b8dffd18ac7d3a15332177c5aac88c25 +DIST json-glib-1.1.2.tar.xz 585396 SHA256 e00f84018306e1aa234285d77b6c2b5d57c1e1d4dabc4dfc62d30b9670941bda SHA512 be0503048d64e163e3c4126d8e2088aec8b073e50f77a9c2e84f1a28d1757903a6ae79ae5e4b302e3b9ee9ce9ec2cbf65d2615df7636626af22e8ee4ae60b843 WHIRLPOOL ba365fbe70d869686168ef51529d7476b1ae97135ecfc26f0fc4726023ba25ad24c68574354bb1cb25d2c4c6255e4f80d9ca3b75e3891c254f282d7e9d6fa98f diff --git a/dev-libs/json-glib/json-glib-1.0.2.ebuild b/dev-libs/json-glib/json-glib-1.0.2.ebuild deleted file mode 100644 index 750460dde420..000000000000 --- a/dev-libs/json-glib/json-glib-1.0.2.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format" -HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="debug +introspection" - -RDEPEND=" - >=dev-libs/glib-2.37.6:2 - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) -" -DEPEND="${RDEPEND} - ~app-text/docbook-xml-dtd-4.1.2 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=dev-util/gtk-doc-am-1.20 - >=sys-devel/gettext-0.18 - virtual/pkgconfig -" - -src_prepare() { - # Do not touch CFLAGS - sed -e 's/CFLAGS -g/CFLAGS/' -i "${S}"/configure || die -} - -src_configure() { - # Coverage support is useless, and causes runtime problems - gnome2_src_configure \ - --enable-man \ - --disable-gcov \ - $(usex debug --enable-debug=yes --enable-debug=minimum) \ - $(use_enable introspection) -} diff --git a/dev-libs/json-glib/json-glib-1.0.2-r1.ebuild b/dev-libs/json-glib/json-glib-1.1.2.ebuild similarity index 74% rename from dev-libs/json-glib/json-glib-1.0.2-r1.ebuild rename to dev-libs/json-glib/json-glib-1.1.2.ebuild index e9cf5e883c17..b5433228083c 100644 --- a/dev-libs/json-glib/json-glib-1.0.2-r1.ebuild +++ b/dev-libs/json-glib/json-glib-1.1.2.ebuild @@ -1,18 +1,18 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI="5" +EAPI=5 GCONF_DEBUG="no" inherit gnome2 multilib-minimal -DESCRIPTION="A library providing GLib serialization and deserialization support for the JSON format" +DESCRIPTION="Library providing GLib serialization and deserialization for the JSON format" HOMEPAGE="https://wiki.gnome.org/Projects/JsonGlib" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="debug +introspection" RDEPEND=" @@ -31,6 +31,7 @@ DEPEND="${RDEPEND} src_prepare() { # Do not touch CFLAGS sed -e 's/CFLAGS -g/CFLAGS/' -i "${S}"/configure || die + gnome2_src_prepare } multilib_src_configure() { @@ -47,5 +48,10 @@ multilib_src_configure() { fi } -multilib_src_compile() { gnome2_src_compile; } -multilib_src_install() { gnome2_src_install; } +multilib_src_compile() { + gnome2_src_compile +} + +multilib_src_install() { + gnome2_src_install +} diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest new file mode 100644 index 000000000000..7d6b20304585 --- /dev/null +++ b/dev-libs/leatherman/Manifest @@ -0,0 +1 @@ +DIST leatherman-0.4.2.tar.gz 373142 SHA256 5c1d9af54d803ba8a200004320f55e3ec983265a60f9c8942bf53c745f1f1679 SHA512 c82a3458fe813d0ccd9c5b7539b6d98d28c598be24803062b7a990eadf36fe3b4da70c4253af022bfe9eb4cfdf1d322ed3d04f56021ac09ae10f44fd33467981 WHIRLPOOL afec9a9e773f68d2560f272a5eea11fa601667ccb38bba07f3bdb8e8cb528a6b61ecb35625f633faea6095e63eff172c9018420458d1ed2afeedcb07988962a9 diff --git a/dev-libs/leatherman/leatherman-0.4.2.ebuild b/dev-libs/leatherman/leatherman-0.4.2.ebuild new file mode 100644 index 000000000000..2c1f42cdaf94 --- /dev/null +++ b/dev-libs/leatherman/leatherman-0.4.2.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +USE_RUBY="ruby20 ruby21 ruby22" + +inherit cmake-utils multilib ruby-ng + +DESCRIPTION="A C++ toolkit" +HOMEPAGE="https://github.com/puppetlabs/leatherman" +SRC_URI="https://downloads.puppetlabs.com/facter/${P}.tar.gz" +SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${S}/all/${P}" + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="debug test" +KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" + +CDEPEND=" + >=sys-devel/gcc-4.8:* + >=dev-libs/boost-1.54[nls] + net-misc/curl" + +RDEPEND+=" ${CDEPEND}" +DEPEND+=" test? ( ${CDEPEND} )" + +src_prepare() { + sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die +} + +src_configure() { + local mycmakeargs=( + -DCMAKE_VERBOSE_MAKEFILE=ON + -DCMAKE_BUILD_TYPE=None + -DCMAKE_INSTALL_PREFIX=/usr + -DCMAKE_INSTALL_SYSCONFDIR=/etc + -DCMAKE_INSTALL_LOCALSTATEDIR=/var + ) + if use debug; then + mycmakeargs+=( + -DCMAKE_BUILD_TYPE=Debug + ) + fi + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install +} diff --git a/dev-libs/leatherman/metadata.xml b/dev-libs/leatherman/metadata.xml new file mode 100644 index 000000000000..942d1e749b9c --- /dev/null +++ b/dev-libs/leatherman/metadata.xml @@ -0,0 +1,14 @@ + + + + + prometheanfire@gentoo.org + Matthew Thode + + + puppetlabs/leatherman + + + A set of C++ Libraries. + + diff --git a/dev-libs/libbsd/libbsd-0.8.2.ebuild b/dev-libs/libbsd/libbsd-0.8.2.ebuild index 985233154340..a84bc6016c43 100644 --- a/dev-libs/libbsd/libbsd-0.8.2.ebuild +++ b/dev-libs/libbsd/libbsd-0.8.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://${PN}.freedesktop.org/releases/${P}.tar.xz" LICENSE="BSD BSD-2 BSD-4 ISC" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ppc ppc64 sparc x86" IUSE="static-libs" pkg_setup() { diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild index 51789b09d9c8..d9556a5fdc27 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.5.4-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="0/11" # subslot = soname major version -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] diff --git a/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild index 178c0ddc932d..2081c72f22b6 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.5.5.ebuild @@ -13,7 +13,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="0/11" # subslot = soname major version -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] diff --git a/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild b/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild index 9dc9fc6b0c97..24387f9b4719 100644 --- a/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild +++ b/dev-libs/libgcrypt/libgcrypt-1.6.5.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2" LICENSE="LGPL-2.1 MIT" SLOT="0/20" # subslot = soname major version -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc static-libs +threads" RDEPEND=">=dev-libs/libgpg-error-1.12[${MULTILIB_USEDEP}] diff --git a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild index 725244637d30..b3eabe4179ac 100644 --- a/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild +++ b/dev-libs/libgdata/libgdata-0.17.4-r1.ebuild @@ -19,7 +19,7 @@ REQUIRED_IUSE=" vala? ( introspection ) " -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc x86" # configure checks for gtk:3, but only uses it for demos which are not installed RDEPEND=" diff --git a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild index d8935c7faa21..4e9553cf83c2 100644 --- a/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild +++ b/dev-libs/libindicate/libindicate-12.10.1-r2.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://launchpad.net/${PN}/${PV%.*}/${PV}/+download/${P}.tar.gz" LICENSE="LGPL-2.1 LGPL-3" SLOT="3" -KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ~ppc64 sparc x86" IUSE="gtk +introspection" RESTRICT="test" # consequence of the -no-mono.patch diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest index a8e99bef8a5c..b974d90b2b83 100644 --- a/dev-libs/libinput/Manifest +++ b/dev-libs/libinput/Manifest @@ -4,3 +4,4 @@ DIST libinput-1.1.0.tar.xz 802348 SHA256 673186ea2a0d2b695afaa9758834f9217b17577 DIST libinput-1.1.5.tar.xz 806960 SHA256 5e08c45dbb8bf32490cc6cd626da098564d646d161a07cba2e3adbd9745c0622 SHA512 031663c46b556048224aab018eb8ea76e34aace77508e52e6ef382a452585fafd4c91b427c0892aab3c624c0cfedc15c388922ae7166248e5da65575ff900c31 WHIRLPOOL 760cc1cf0c6657efbdadadd2f50e188d86465e1aa3f287275323d6fad9156b684de0d3b6dbf6e3fd5213018770726087ee282833f25ba5ef67918c0284b885a1 DIST libinput-1.2.0.tar.xz 866284 SHA256 1754b917fe675507ea80445b4f2e91d76cb6a6935508fe37234807affb316e2c SHA512 ab5b534ac5db7d4142e41c61e1f8fbc7f4c9cf89567fa27196fa9300f57db7328d61af25c93126905ad06061e1b2def0abe70654ac3710b6476379f84343cce8 WHIRLPOOL 2f74bcd3ae694db9f52c450c6b96d24fd320da2002e900cf69a3ce2d9c33b00213097c0330867f32b175b5fe80d06099c3bdc461a2001f4eee4f2481ab1e32fc DIST libinput-1.2.1.tar.xz 863660 SHA256 e2db8c5357f8859b33c58e583601f50509f085ae9340a58790bcf44f1480c1c3 SHA512 6dceed081bb0c5374d39be7ce14ccbeb7734c50a648a155ca9d57f7dabde80a35a5b3b4eb15f37ce5c475725a13624d4c7f9ab1147f71af2576fdb746310509c WHIRLPOOL 7748530169b95765f5d8a07191c8e3f8e165d5d778f6f9da8ea4dc10164501e9be4166eecb534b69153cb11d48354663739effbd324107596f496c5d38c6b632 +DIST libinput-1.2.2.tar.xz 857176 SHA256 08ac5b3620d86df1cdb4970c4137c8746c9f4b9f0c8e7dfab49858dbceb8f367 SHA512 d738890b7fc34a66cdb6ebb58f28060ffc81dccda56aa144622f62efc054431d75564d11f6d9a96a2c17032f15093ca98db9f087822977cec9fced428efd2f8b WHIRLPOOL 66128be8bc6019a6c8986fa4ea05041fa75da38fc60232e3d1b12e0e4e90c2d049b622cf3cae7b4107cacbacf6139804693695928d1055a5203c664888d59547 diff --git a/dev-libs/libinput/libinput-1.2.2.ebuild b/dev-libs/libinput/libinput-1.2.2.ebuild new file mode 100644 index 000000000000..3107c89aa9c5 --- /dev/null +++ b/dev-libs/libinput/libinput-1.2.2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +inherit eutils udev + +DESCRIPTION="Library to handle input devices in Wayland" +HOMEPAGE="http://www.freedesktop.org/wiki/Software/libinput/" +SRC_URI="http://www.freedesktop.org/software/${PN}/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/10" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="input_devices_wacom test" +# Tests require write access to udev rules directory which is a no-no for live system. +# Other tests are just about logs, exported symbols and autotest of the test library. +RESTRICT="test" + +RDEPEND=" + input_devices_wacom? ( >=dev-libs/libwacom-0.12 ) + >=dev-libs/libevdev-0.4 + >=sys-libs/mtdev-1.1 + virtual/libudev +" +DEPEND="${RDEPEND} + virtual/pkgconfig" +# test? ( +# >=dev-libs/check-0.9.10 +# dev-util/valgrind +# sys-libs/libunwind ) + +src_prepare() { + # Doc handling in kinda strange but everything + # is available in the tarball already. + sed -e 's/^\(SUBDIRS =.*\)doc\(.*\)$/\1\2/' \ + -i Makefile.am Makefile.in || die +} + +src_configure() { + # gui can be built but will not be installed + # building documentation silently fails with graphviz syntax errors + econf \ + --disable-documentation \ + --disable-event-gui \ + $(use_enable input_devices_wacom libwacom) \ + $(use_enable test tests) \ + --with-udev-dir="$(get_udevdir)" +} + +src_install() { + emake install DESTDIR="${D}" + dodoc -r doc/html + prune_libtool_files +} diff --git a/dev-libs/liboil/liboil-0.3.17-r2.ebuild b/dev-libs/liboil/liboil-0.3.17-r2.ebuild index a56cf8e92aa3..efb42eb1dd9f 100644 --- a/dev-libs/liboil/liboil-0.3.17-r2.ebuild +++ b/dev-libs/liboil/liboil-0.3.17-r2.ebuild @@ -42,6 +42,9 @@ src_configure() { filter-flags -O? append-flags -O2 + # For use with Clang, which is the only compiler on OSX, bug #576646 + [[ ${CHOST} == *-darwin* ]] && append-flags -fheinous-gnu-extensions + autotools-multilib_src_configure } diff --git a/dev-libs/liborcus/Manifest b/dev-libs/liborcus/Manifest index f7f519be4acd..1d9a4c9aa3f4 100644 --- a/dev-libs/liborcus/Manifest +++ b/dev-libs/liborcus/Manifest @@ -1,3 +1,3 @@ -DIST liborcus-0.7.0.tar.bz2 1665988 SHA256 7773a8f5f0b810e0f146dbcf3dbb42e89dd8af0868235e01d9f0cdefde41a8a9 SHA512 63aad5154e25d7d7bfd10f07e614e4c1ed2691a31c61c2b1e7ec029fa4d9168eba5b4303f5164ab29ef92843ce8f8afa9682772515c8b5e8ae65f4561b331db8 WHIRLPOOL b555b005b41fb41571ac7dbc63e32541decd0b79d61435a6730de9438761afe363d063905b671e1b724c02f2846e65e2af7fffca40282d08d35e1c4ff787fc63 +DIST liborcus-0.11.1.tar.xz 1627332 SHA256 02a6251a9b732c2c555c1be083411a2d0383dfd2ebc79f60ac282875b1ada49b SHA512 2a818a8888115281ea9c34d8911df99a2af131991b43de77ddf1182592becc9f77ca0df23aac5f2f92e1bcd732a0f704d15b98c66b308eaa1715f66d78a8ab76 WHIRLPOOL 67c616d3509ec18994dae6e4b718014adc3dd385aa9fa4ed5bf8b099c659f1390b15a7d6307b2a409f66abd2a5041942ee5e17e3cb7843fad49129575a829951 DIST liborcus-0.7.1.tar.xz 1472804 SHA256 04846b64262210a0d4e18d72779c901633e45dc9cca2108235b38d4715266a43 SHA512 30461311b084f3c91ef8cc504ca7adfd212f95d49c0a320958ca203606901ddf84e37d5c95073437bad21af4c6ce71fa606dd7cdb7cc7bd58b2699d8863a318c WHIRLPOOL af6f4ff639851b94298f847437c25962412f37617f82c143b1bf71aa4f27b26003ffb2dad61fdbe9718f9b42a0f11c1dda71825da8b2ee8bf9e9fd727f309134 DIST liborcus-0.9.2.tar.xz 1558072 SHA256 dd49f9f1b8ff8a648434dd5c8b4fe1081d1118d61d0a71d4effee8f32553199c SHA512 1dd847012cf78df962c28408e0b56412a89e1d978d532a17fa92352f6788bbc1a0fe806c2d886ff148a8ee2db54620ce039b1809f347a976dca0078f248fd8ea WHIRLPOOL fe74951704b4cfbdfeeb894be459c4f7046fc23f813c50e43816943d064cbfc4a4f7feebf6a6737cf94d50826ac23796031b7626b89264ee21f42356ffbb44e8 diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch b/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch deleted file mode 100644 index f9cb64d9b7a8..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.5.1-linking.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -urN liborcus-0.5.1/src/parser/Makefile.am liborcus-0.5.1.new/src/parser/Makefile.am ---- liborcus-0.5.1/src/parser/Makefile.am 2013-04-12 16:25:03.000000000 +0200 -+++ liborcus-0.5.1.new/src/parser/Makefile.am 2013-04-23 19:45:47.794480191 +0200 -@@ -20,7 +20,8 @@ - - liborcus_parser_@ORCUS_API_VERSION@_la_LDFLAGS = -no-undefined - liborcus_parser_@ORCUS_API_VERSION@_la_LIBADD = \ -- $(ZLIB_LIBS) -+ $(BOOST_SYSTEM_LIB) \ -+ $(ZLIB_LIBS) - - EXTRA_PROGRAMS = \ - parser-test-string-pool \ diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch b/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch deleted file mode 100644 index 740376b36be1..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.5.1-mdds.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN liborcus-0.5.1.old/src/spreadsheet/sheet.cpp liborcus-0.5.1/src/spreadsheet/sheet.cpp ---- liborcus-0.5.1.old/src/spreadsheet/sheet.cpp 2013-05-27 19:07:41.712302036 +0200 -+++ liborcus-0.5.1/src/spreadsheet/sheet.cpp 2013-05-27 19:08:51.432302028 +0200 -@@ -734,7 +734,7 @@ - con.build_tree(); - - size_t index; -- if (!con.search_tree(col, index)) -+ if (!con.search_tree(col, index).second) - return 0; - - return index; diff --git a/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch b/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch deleted file mode 100644 index c8a669ecaf25..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.5.1-oldnamespace.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -urN liborcus-0.5.1.old/src/orcus_xml_main.cpp liborcus-0.5.1/src/orcus_xml_main.cpp ---- liborcus-0.5.1.old/src/orcus_xml_main.cpp 2013-05-27 19:07:41.713302036 +0200 -+++ liborcus-0.5.1/src/orcus_xml_main.cpp 2013-05-27 20:01:44.007301649 +0200 -@@ -36,6 +36,7 @@ - - #include - #include -+#include - #include - - using namespace orcus; diff --git a/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch b/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch deleted file mode 100644 index f72d66be11af..000000000000 --- a/dev-libs/liborcus/files/liborcus-0.7.0-boost-1.56.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c01874c7770f4f56c031d7463156e03f2945e015 Mon Sep 17 00:00:00 2001 -From: Dmitry Roshchin -Date: Mon, 27 Oct 2014 16:19:32 +0300 -Subject: [PATCH] Fix build with boost 1.56 - ---- - src/parser/string_pool_test.cpp | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) - -diff --git a/src/parser/string_pool_test.cpp b/src/parser/string_pool_test.cpp -index ad7d7c8..0d32c62 100644 ---- a/src/parser/string_pool_test.cpp -+++ b/src/parser/string_pool_test.cpp -@@ -5,6 +5,8 @@ - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - */ - -+#include -+ - #include "orcus/string_pool.hpp" - #include "orcus/pstring.hpp" - --- -1.7.1 - diff --git a/dev-libs/liborcus/liborcus-0.11.1.ebuild b/dev-libs/liborcus/liborcus-0.11.1.ebuild new file mode 100644 index 000000000000..baf9cf6ad062 --- /dev/null +++ b/dev-libs/liborcus/liborcus-0.11.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +EGIT_REPO_URI="https://gitlab.com/orcus/orcus.git" + +PYTHON_COMPAT=( python{3_4,3_5} ) + +[[ ${PV} == 9999 ]] && GITECLASS="git-r3 autotools" +inherit eutils python-single-r1 ${GITECLASS} +unset GITECLASS + +DESCRIPTION="Standalone file import filter library for spreadsheet documents" +HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" +[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.xz" + +LICENSE="MIT" +SLOT="0/0.11" # based on SONAME of liborcus.so +[[ ${PV} == 9999 ]] || \ +KEYWORDS="" +# KEYWORDS="~amd64 ~arm ~ppc ~x86" +IUSE="python +spreadsheet-model static-libs tools" + +RDEPEND=" + >=dev-libs/boost-1.51.0:= + sys-libs/zlib:= + python? ( ${PYTHON_DEPS} ) + spreadsheet-model? ( >=dev-libs/libixion-0.11.0:= ) +" +DEPEND="${RDEPEND} + dev-util/mdds:1 +" + +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_prepare() { + eapply_user + [[ ${PV} == 9999 ]] && eautoreconf +} + +src_configure() { + econf \ + --disable-werror \ + $(use_enable python) \ + $(use_enable spreadsheet-model) \ + $(use_enable static-libs static) \ + $(use_with tools) +} + +src_install() { + default + + prune_libtool_files --all +} diff --git a/dev-libs/liborcus/liborcus-0.7.0.ebuild b/dev-libs/liborcus/liborcus-0.7.0.ebuild deleted file mode 100644 index 5e300e88270a..000000000000 --- a/dev-libs/liborcus/liborcus-0.7.0.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -EGIT_REPO_URI="git://gitorious.org/orcus/orcus.git" - -[[ ${PV} == 9999 ]] && GITECLASS="git-2 autotools" -inherit eutils ${GITECLASS} -unset GITECLASS - -DESCRIPTION="Standalone file import filter library for spreadsheet documents" -HOMEPAGE="https://gitlab.com/orcus/orcus/blob/master/README.md" -[[ ${PV} == 9999 ]] || SRC_URI="http://kohei.us/files/orcus/src/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -[[ ${PV} == 9999 ]] || \ -KEYWORDS="amd64 ~arm ~ppc x86" -IUSE="static-libs" - -RDEPEND=" - >=dev-libs/boost-1.51.0:= - =dev-libs/libixion-0.7* - sys-libs/zlib:= -" -DEPEND="${RDEPEND} - >=dev-util/mdds-0.8.1 -" - -src_prepare() { - epatch "${FILESDIR}/${PN}-0.7.0-boost-1.56.patch" # bug 527242 - - [[ ${PV} == 9999 ]] && eautoreconf -} - -src_configure() { - econf \ - --disable-werror \ - $(use_enable static-libs static) -} - -src_install() { - default - - prune_libtool_files --all -} diff --git a/dev-libs/liborcus/liborcus-9999.ebuild b/dev-libs/liborcus/liborcus-9999.ebuild index 64a4c246dcdb..27045e0cafff 100644 --- a/dev-libs/liborcus/liborcus-9999.ebuild +++ b/dev-libs/liborcus/liborcus-9999.ebuild @@ -26,7 +26,7 @@ RDEPEND=" >=dev-libs/boost-1.51.0:= sys-libs/zlib:= python? ( ${PYTHON_DEPS} ) - spreadsheet-model? ( =dev-libs/libixion-9999:= ) + spreadsheet-model? ( >=dev-libs/libixion-0.11:= ) " DEPEND="${RDEPEND} dev-util/mdds:1 diff --git a/dev-libs/libsecp256k1/Manifest b/dev-libs/libsecp256k1/Manifest index 108c5631a446..86c170d29938 100644 --- a/dev-libs/libsecp256k1/Manifest +++ b/dev-libs/libsecp256k1/Manifest @@ -1,2 +1,3 @@ DIST secp256k1-v0.0.0_pre20141212.tgz 60007 SHA256 f5d3a7cac425caf64040395d99c1a91ab2ca1c973b228a66772ba4a290f355ce SHA512 ab2a211c1bf882ebb62e78891e4e12c3ed7244d46d532e37ff2a669ba08db8dcafec7b4c57c073310e463957fd2fa0dffb940c4f35b61890cb8ce86d4283f0f6 WHIRLPOOL 3aa8b7545ca24028ceb17e770fdbf997e2895212ec25a193fcd926660e78f16d704bf27a5b1aa7cf3cabe643c33b128bf0b0568172c15833eb82fcc58e5941c1 DIST secp256k1-v0.0.0_pre20150423.tgz 77451 SHA256 7e4e78d5ded245b59dbe8abc9804fdf7ba41d9030936fb39766d5f2bd7e29b2e SHA512 a640188d83e9aa5a4292900c211e29815f2f1b57db4fbccfb8a3bf770bb52f0232d405044f317a3b6b6ea4d5a5107180dc4e374cf7ab06eb79676c270061c3b7 WHIRLPOOL 5796d32cd8f578ef28f6e79ced53fa505519273af39bdeaa413e9b48669ce7945d12437c6093f3aa0b3db9412dac50638c335a3f4f8cf0d4ffa8c94665a85f72 +DIST secp256k1-v0.0.0_pre20151118.tgz 125884 SHA256 75549cea9b22affda02d6731385a7184b60703f1ca0a4f098fec8c702a20f7b0 SHA512 3cc0a4973acf7936a7c6dc0abc37ee43ecd69e835069ed40765595d36ca597b43837b5d6f90499455599de03abfc775d7c9d019d26216b79b03dd6dc53a73e19 WHIRLPOOL 61eb9a709e8986db9113d305a989d44700f5e53143471485935bed0f79d18c745cb78f2b4b5e55614b6ca80a6bd29830b52108797bc21bc792789a7590597fed diff --git a/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild new file mode 100644 index 000000000000..133da8bb8752 --- /dev/null +++ b/dev-libs/libsecp256k1/libsecp256k1-0.0.0_pre20151118.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools eutils + +MyPN=secp256k1 +DESCRIPTION="Optimized C library for EC operations on curve secp256k1" +HOMEPAGE="https://github.com/bitcoin/${MyPN}" +COMMITHASH="6c527eceee7f5105c33c98dfae24ffeffd71f7cf" +SRC_URI="https://github.com/bitcoin/${MyPN}/archive/${COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tgz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" +IUSE="asm doc ecdh endomorphism experimental gmp +recovery schnorr test" + +REQUIRED_USE=" + asm? ( amd64 ) + ecdh? ( experimental ) + schnorr? ( experimental ) +" +RDEPEND=" + gmp? ( dev-libs/gmp:0 ) +" +DEPEND="${RDEPEND} + virtual/pkgconfig + test? ( dev-libs/openssl:0 ) +" + +S="${WORKDIR}/${MyPN}-${COMMITHASH}" + +src_prepare() { + eautoreconf +} + +src_configure() { + econf \ + --disable-benchmark \ + $(use_enable test tests) \ + $(use_enable ecdh module-ecdh) \ + $(use_enable endomorphism) \ + --with-asm=$(usex asm auto no) \ + --with-bignum=$(usex gmp gmp no) \ + $(use_enable recovery module-recovery) \ + $(use_enable schnorr module-schnorr) \ + --disable-static +} + +src_install() { + if use doc; then + dodoc README.md + fi + + emake DESTDIR="${D}" install + prune_libtool_files +} diff --git a/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild b/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild index b0a109807c08..9a1a1de7de33 100644 --- a/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild +++ b/dev-libs/libsecp256k1/libsecp256k1-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,10 +14,12 @@ HOMEPAGE="https://github.com/bitcoin/${MyPN}" LICENSE="MIT" SLOT="0" KEYWORDS="" -IUSE="asm doc endomorphism gmp test" +IUSE="asm doc ecdh endomorphism experimental gmp +recovery schnorr test" REQUIRED_USE=" asm? ( amd64 ) + ecdh? ( experimental ) + schnorr? ( experimental ) " RDEPEND=" gmp? ( dev-libs/gmp:0 ) @@ -34,10 +36,14 @@ src_prepare() { src_configure() { econf \ --disable-benchmark \ + $(use_enable experimental) \ $(use_enable test tests) \ + $(use_enable ecdh module-ecdh) \ $(use_enable endomorphism) \ --with-asm=$(usex asm auto no) \ --with-bignum=$(usex gmp gmp no) \ + $(use_enable recovery module-recovery) \ + $(use_enable schnorr module-schnorr) \ --disable-static } diff --git a/dev-libs/libsecp256k1/metadata.xml b/dev-libs/libsecp256k1/metadata.xml index df5fa5e2ed6b..fe33e1405a94 100644 --- a/dev-libs/libsecp256k1/metadata.xml +++ b/dev-libs/libsecp256k1/metadata.xml @@ -9,13 +9,13 @@ luke-jr+gentoobugs@utopios.org Luke Dashjr - - proxy-maint@gentoo.org - Proxy Maintainers - Enable x86_64 assembly optimisation + Enable ECDH shared secret computation Enable endomorphism + Allow experimental USE flags + Enable ECDSA pubkey recovery module + Enable Schnorr signature module bitcoin/secp256k1 diff --git a/dev-libs/nettle/nettle-3.2.ebuild b/dev-libs/nettle/nettle-3.2.ebuild index b6ac450b4b59..4f14d6db7233 100644 --- a/dev-libs/nettle/nettle-3.2.ebuild +++ b/dev-libs/nettle/nettle-3.2.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="|| ( LGPL-3 LGPL-2.1 )" SLOT="0/6" # subslot = libnettle soname version -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes" DEPEND="gmp? ( dev-libs/gmp:0[${MULTILIB_USEDEP}] )" diff --git a/dev-libs/nspr/nspr-4.12.ebuild b/dev-libs/nspr/nspr-4.12.ebuild index 5d3a5580660e..f8914e645004 100644 --- a/dev-libs/nspr/nspr-4.12.ebuild +++ b/dev-libs/nspr/nspr-4.12.ebuild @@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/nspr/releases/v${PV}/src/${P}.tar.gz" LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="debug" RDEPEND=" diff --git a/dev-libs/nss/nss-3.21-r2.ebuild b/dev-libs/nss/nss-3.21-r2.ebuild index de2104eec7d7..2b9842ec0020 100644 --- a/dev-libs/nss/nss-3.21-r2.ebuild +++ b/dev-libs/nss/nss-3.21-r2.ebuild @@ -20,7 +20,7 @@ SRC_URI="http://archive.mozilla.org/pub/mozilla.org/security/nss/releases/${RTM_ LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cacert +nss-pem utils" CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" diff --git a/dev-libs/nss/nss-3.22.2.ebuild b/dev-libs/nss/nss-3.22.2.ebuild index 1c7d0e3b02e3..3cc54a58a540 100644 --- a/dev-libs/nss/nss-3.22.2.ebuild +++ b/dev-libs/nss/nss-3.22.2.ebuild @@ -20,7 +20,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$ LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="+cacert +nss-pem utils" CDEPEND=">=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]" diff --git a/dev-libs/openssl/openssl-1.0.2g-r2.ebuild b/dev-libs/openssl/openssl-1.0.2g-r2.ebuild index b4745fbd2436..a69dae46b108 100644 --- a/dev-libs/openssl/openssl-1.0.2g-r2.ebuild +++ b/dev-libs/openssl/openssl-1.0.2g-r2.ebuild @@ -15,23 +15,14 @@ LICENSE="openssl" # subslot set to 1.0.2g version as this is the first release without SSLv2 # support and thus breaks nearly every openssl consumer (see bug #575548) SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux" IUSE="+asm bindist gmp kerberos rfc3779 sctp cpu_flags_x86_sse2 static-libs test +tls-heartbeat vanilla zlib" RESTRICT="!bindist? ( bindist )" -# The blocks are temporary just to make sure people upgrade to a -# version that lack runtime version checking. We'll drop them in -# the future. RDEPEND=">=app-misc/c_rehash-1.7-r1 gmp? ( >=dev-libs/gmp-5.1.3-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) - kerberos? ( >=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140508 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] - ) - !=app-crypt/mit-krb5-1.11.4[${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND} >=dev-lang/perl-5 sctp? ( >=net-misc/lksctp-tools-1.0.12 ) diff --git a/dev-libs/univalue/Manifest b/dev-libs/univalue/Manifest new file mode 100644 index 000000000000..5bb667351b5f --- /dev/null +++ b/dev-libs/univalue/Manifest @@ -0,0 +1 @@ +DIST univalue-1.0.2.tgz 14201 SHA256 685ca5d2db9c0475d88bfd0a444a90ade770f7e98dacfed55921775c36d28e51 SHA512 727096735dbad082741fb863c9066936a80d7337b1d7c4c289107d240b7f695756a8720f5db320f0c7521b523e299829bd49833b6a31969d8aa43267653a4f2f WHIRLPOOL a801c578c8ac48ebb8febf22b5c808b5728a7af7eff2af4717d7c6fa5208d2d2758b07eee7acc56d153cf98ddd0aa1b350a4b66155dd49cf87d515644054a0f3 diff --git a/dev-libs/univalue/metadata.xml b/dev-libs/univalue/metadata.xml new file mode 100644 index 000000000000..d8cb585d306d --- /dev/null +++ b/dev-libs/univalue/metadata.xml @@ -0,0 +1,15 @@ + + + + + blueness@gentoo.org + Anthony G. Basile + + + luke-jr+gentoobugs@utopios.org + Luke Dashjr + + + jgarzik/univalue + + diff --git a/dev-libs/univalue/univalue-1.0.2.ebuild b/dev-libs/univalue/univalue-1.0.2.ebuild new file mode 100644 index 000000000000..29eec3575b6b --- /dev/null +++ b/dev-libs/univalue/univalue-1.0.2.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +DESCRIPTION="C++ universal value object and JSON library" +HOMEPAGE="https://github.com/jgarzik/univalue" +LICENSE="MIT" + +SRC_URI="https://codeload.github.com/jgarzik/${PN}/tar.gz/v${PV} -> ${P}.tgz" +SLOT="0/0" + +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" + +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND}" + +src_prepare() { + ./autogen.sh || die +} + +src_configure() { + econf --disable-static +} + +src_install() { + default_src_install + prune_libtool_files +} \ No newline at end of file diff --git a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild b/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild index a06b692de84f..f61c4e1d258d 100644 --- a/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild +++ b/dev-libs/xapian-bindings/xapian-bindings-1.2.22.ebuild @@ -23,7 +23,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${P}.tar.xz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" #IUSE="java lua mono perl php python ruby tcl" #REQUIRED_USE="|| ( java lua mono perl php python ruby tcl )" IUSE="java lua perl php python ruby tcl" diff --git a/dev-libs/xapian/xapian-1.2.22.ebuild b/dev-libs/xapian/xapian-1.2.22.ebuild index 073c7fa40099..f3622788c856 100644 --- a/dev-libs/xapian/xapian-1.2.22.ebuild +++ b/dev-libs/xapian/xapian-1.2.22.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://oligarchy.co.uk/xapian/${PV}/${MY_P}.tar.xz" LICENSE="GPL-2" SLOT="0/1.2.22" # ABI version of libxapian.so, prefixed with 1.2. -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86" IUSE="doc static-libs -cpu_flags_x86_sse +cpu_flags_x86_sse2 +brass +chert +inmemory" DEPEND="sys-libs/zlib" diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest index c83ef40d36fe..939a3b0d3c28 100644 --- a/dev-lisp/sbcl/Manifest +++ b/dev-lisp/sbcl/Manifest @@ -7,16 +7,7 @@ DIST sbcl-1.0.58-x86-linux-binary.tar.bz2 9313124 SHA256 a2195fce096fd7c64acef60 DIST sbcl-1.1.18-source.tar.bz2 4272315 SHA256 933238392a2a3533b4088b86c4fbd0704a5573c1c66987a603eec4afa782c7d0 SHA512 48501a670c7e1ea9ab5a03514e8b49b93d1dcbdb7712da8b38496a2d51a604fe30e2785a5e5e8aa40032ede5ee11a75f63ae1919ccd7316089a74486177ad417 WHIRLPOOL a7285ee77753bc1f14755425e232e6ffcff159be883bad779585cb247ff47b904b4fcab99e8fc2e33644764c602409c6e9bbd28588d3d639431650ea9d31c5f5 DIST sbcl-1.1.18-x86-64-linux-binary.tar.bz2 9196684 SHA256 c945406f9421736982efc4eaaeb376b19331422f5b5a349382ed53c742d6cb0a SHA512 d63a33532ae6390c00d789c22c4a504b621e707b8aa5f72d12b497be8a590a75604a18f384fa2d27df3a4a0ef3ecd4c27e7bfc4f74fde3a014df1aad5dd8ff0c WHIRLPOOL 980726e0dd182c2b29c5ac4deab994d028e0003a3e2ac3e38a0c052f6607fc75f6b298fb60c99ff9f373c9ba1f243d6bd97de2cb765aad559867598affd510ab DIST sbcl-1.1.6-x86-darwin-binary.tar.bz2 9091955 SHA256 5801c60e2a875d263fccde446308b613c0253a84a61ab63569be62eb086718b3 SHA512 5b9d58ba1a7bcf3aa5011ac5ba1c8dba65e44b2c3f8a31b15db54de6b34ea0f7482c45f1cc4e1323e154ce79fbba030112df3795cb323bca46bac50f15d2a138 WHIRLPOOL 673e84bbf685e07568530ccb2c3822dbfffd6226d3de90bfef13078466ae245f63dd2fc4ac48b4d64ca1453cc831ad6913af21540bd3b35fe51700161ca26086 -DIST sbcl-1.1.8-x86-64-darwin-binary.tar.bz2 9045228 SHA256 729054dc27d6b53bd734eac4dffeaa9e231e97bdbe4927d7a68c8f0210cad700 SHA512 d29cf032dd52b014fcc5c48fc5dd0a1f8065838cd9078d129742302c64263b7d630232d1f9c051b56b8b2b34f1bef338aeaf81ff827799032e44ca6165483e34 WHIRLPOOL f44112707f000a46d26a6af65e651868639beddab4be9c84c8f2bc8488f198ab661cb6aa62f1d38fbcbe48f259c0c2e54d255ae45db22f648b56aaaa4f104984 DIST sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 10038928 SHA256 057d3a1c033fb53deee994c0135110636a04f92d2f88919679864214f77d0452 SHA512 c271796f854fe884e0d8aa6504bbe2e6c078de1555fc9a823463640cfd8c793dbddcb3f32932788d84a41e2b8a085b95c97c13a15c43fc909dcaad18ce25f215 WHIRLPOOL 2c39d1ac1490693b758b54b473970deaa9078f00bc579745fbbed169e696846fda888f105bc77d610a8cb1c0f995c6e6ad572b9163d55b3701db02f7f68824b8 -DIST sbcl-1.2.13-source.tar.bz2 5567609 SHA256 e6d93a94cbf821b2c500a9440ca640588e9ac6914dba2f6b5445a5e14eeb1205 SHA512 f5f7bfb9e8c6a3dcf8c1bac62dba9ca1385b9689141c24951bec95ee5383f53e4279dd5c3fb382a79b06ef113d3d4aaa3b05fff69f8a819a0988ba03983c0c48 WHIRLPOOL 260de2f717544f4e9678b3e40bf59b16d83e3cdfad681c4a9e94fba9ec312a7647243a41076a9e64caa9ebfe33515561c854b939561019f14a3d07faf2425197 -DIST sbcl-1.2.13-x86-64-linux-binary.tar.bz2 10154344 SHA256 900e58adb9a449e3b5177207908a361de71be1e3aec712aff731ba9a9903f3ab SHA512 483aafc9b38cf317ea764d66e1faf70560cca4c04355ae0a0669692c985034335ec155fc9557acab8cc5f2ee668615985950b2fa96d0acc900b74aceeeafb64c WHIRLPOOL bc9218f7a32194a19b12cd218b2ebfb1dbce01717289241ba62a1b39a424fc2d0620c80b536d1c0a605322e99c52ae0f01d943bd93b7e4c1388ae9b7ab7464bc -DIST sbcl-1.2.14-source.tar.bz2 5565538 SHA256 b9146dd6460c05bca508f6dda83003580911833eedd51dbc09d8eca80b0f5c06 SHA512 471b215419f9303e010cbfb99866e09a43cc68a63680b5267662a12585b145b9f520592c37c81eabfe81b102255cd82fabb74cca731d8c3eed50747df34a6e2c WHIRLPOOL e89cd4c2ff1b2716c0ba62aed6d2107f05094c053c91db8a14638a80a5b63f83102fc1c125164edf251ed2ca507e00c298a9278efe83ad5f3b27ab53ddd48131 -DIST sbcl-1.2.14-x86-64-linux-binary.tar.bz2 9723047 SHA256 e06a43a3490a2d9239b55a0e64b8c46d285ea509a940456013bfe90ba6a2dd2c SHA512 7c079c68104a44fd004b371f533502f478a7294b5577c7fd900adcdf22be1a18bdedeab3be259606c059d14c38c639f061866969ccd56e24fe64198dd96bf20c WHIRLPOOL 738f20eeeb50aef368c7fcdb7979a4c10f72f5889a9e7e0220a48be54d57f141ea0b2b59e10422878b227d5bdfe57eecaacdd6b3936a30535453c96925099806 -DIST sbcl-1.2.15-source.tar.bz2 5585753 SHA256 d95a6e8a4b658f9973825f8d44d6195a645b0d6a33d865324c0c658b8bcb1651 SHA512 a34947cff6d8e54068942df307a84a755d2ddb549d2da394545d3d37a821a8cccc3f4cab30741948e000c06bb3e422963e29a349007143a64bb97cc013c45771 WHIRLPOOL 13b413327525961f29dac6f91fb100383a3be515abc1db0255d94b5c1448b0f749defa5a36033883b57747412f5ec4646e303260f39ce7caa4f73dbea82ff231 -DIST sbcl-1.2.15-x86-64-linux-binary.tar.bz2 9799234 SHA256 5c1db23dfa6b8d2c0a66fe0b08928dd7dc50499be022388587e370d1d377ebae SHA512 15d4173d80b38f3dc32445a605e95618dd02386ca007e162b36a2f5808ab7f925f8246ccb4a68b02ec5d09af74919818ca2254e6593862b074f4b715796fc8ca WHIRLPOOL 29d40cb1c7c2af4a4b4666dacb373fc8af82fe95f058ca54d9232e75c957803d5b20338d74f37b87de05ce395b8954c2c89ed90d95a29570b40fcd76df4b634b -DIST sbcl-1.2.16-source.tar.bz2 5592726 SHA256 8ea9adaa04385aeeac219273a79bd662b9cc2662662af2dc886e5f095b4a6f21 SHA512 f65f87dec66067c57d04ea1d01d60e3906d27b739365cd31d63c14df2745019d327040951c24751893f0eb26d120774b009da340863ee40de6427ac791007d29 WHIRLPOOL d118ecc182b53179c14962e5e2802569764ea2a8540b7080ad7faa5cea13c22fa42fa411e3e052a46fe5aa7f2000987c5c672e16423d2a529069df9ed308c191 -DIST sbcl-1.2.16-x86-64-linux-binary.tar.bz2 9779671 SHA256 e1745b4f5403bfa301c02109e51dd0607ce0326c660444aeff989f55cb84d9ed SHA512 efd3120a9c9c205464471f70f2202fe7ebe657fe5f16fadb70c6354083fa539f3c89c0b1d4d58b6a4f58720d54304128f9408c7619dd039230d5f5232f1d6321 WHIRLPOOL e34c2dc41c86afd2a11c0761b93543c6ddf46141580030f77070d92ba9b57fff92938b156f98df444b485e44bed300c366db91e970f4d3f30fc9ed19e6eee67c DIST sbcl-1.2.7-armhf-linux-binary.tar.bz2 9914851 SHA256 5e75a328882b739befcf5c38e8039b830668a8ca7bafe56a9e13ef23f39eb253 SHA512 2c82bdfe4f070a43964e694f81ccdbb84f8dd3bf77c807343daadff877b518fcd52e05513691543ca076c2b6de8bcf8b2e672b31f5ed3f545bedb02bbf7cd868 WHIRLPOOL 8e0eab53a9bfe10a1ccaa5c950e9fe045aeaa23f9f66ca98badd5a0fce3ad5828c0059904c73584dd4591fb3f9b2eefb5210a19f2de9fd8d699d48b0cee3bbef DIST sbcl-1.2.7-powerpc-linux-binary.tar.bz2 9884585 SHA256 d2f86db4f6fe2b6e6bbc6353ce28dead1b142ed36885080b97304db55aae2861 SHA512 7b9fef12d3d6397adec6a0c26d1431a18b8d91b5bf009034eb2501de9fd60dc04dd2e3cd2d9feb9204d4631360aea88ba07a9ad75dad0767b5dcc5e62e84e790 WHIRLPOOL 4b884ab946e8c54775970aa502054f42a92d01257449796c7d1a6bd1ff5835ddae1c94aa5d936a7a5b115183c6cee5251034646559e4435a6663896fa302c4be DIST sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 10438955 SHA256 a0a13e83b35dbac36284459747a03c6db20cd089864e16a6380a12a6aa138115 SHA512 9566cebf8fc29ead1f919309e3f98aeb618e97b34c80f53d1f739f1a3f4ef4cbaebd1c67f0b32172a0cdf14dc405eb75d0e916dedf3b8a758cdec2368d25f5c1 WHIRLPOOL 4946b9a4463c92517233298f898510ca57b4127da93d7d42cf28005bbd96b8d1eba7472f73029f45d6c0e75f3de5b893a34f33feee92a60cef8ae4f2b4d4fa0e @@ -24,7 +15,5 @@ DIST sbcl-1.2.7-x86-linux-binary.tar.bz2 10516485 SHA256 724425fe0d28747c7d31c66 DIST sbcl-1.2.7-x86-solaris-binary.tar.bz2 10351529 SHA256 a198df14f45cdf302017116744c8946a8b4143291efe1799553554133c22b46a SHA512 b30d40f0095bb43719ba2e1a619f53fe5f0bccaa08a35481bc5feeb0dd5b540018a9ec9f61799de89991a85750577922cb4e56db4d7dab8f07e18bbc643bdad1 WHIRLPOOL 05ad3606b23e6196d443328f367b7351612d0f4991d71a5a04f1f45b5bb604809d6ed11c8cf62bc639d6f9dd8e5704b52a050603d4745713c5818fcbd36852bf DIST sbcl-1.3.0-source.tar.bz2 5722767 SHA256 d60caf6a0a495e41fc9e7f6a797e7c4188cef1f9de84ca263ff654d4d7ae99b3 SHA512 4bcdc3e4d101ec64b6af2db8101e3b18b298c343d7928984604dc17d531b986787ba84ce1276c41066a9a2c06270d2aeb26870ba7b18ecb7daaa6b3a6c7f6450 WHIRLPOOL e635064fad32556ce0017c3cf27bfda02581dc627b0884d3dc0b1bc44c62cd4a0ea6690997b53414ddd7355cc06647f2952ccf3c2d329baa0e137b5fd992ea3b DIST sbcl-1.3.0-x86-64-linux-binary.tar.bz2 9830954 SHA256 e6e801f0cc31fd6a14cf20b983c6ef2be5750225fad221bf9621788c0a0a90c5 SHA512 916fdd1627903b7227a6d5962a2534fa2cd9003f832b975c96d0e11c301d73c7c3225cfd4121f10cbcdde87dcac9079b9a48e6737ba9a3d2c18c484bae3c371d WHIRLPOOL a4372dd59df03e0e0e8d2359799e0580b6829e001c219ef28504cc7db8b3a8ad7429ecdcd36bb72ed5196192d9f66b2854c5b6960cd5f97c31afd758a17c6a67 -DIST sbcl-1.3.2-source.tar.bz2 5739508 SHA256 d382f196ea7795c3541bcda433e0bb8b5610a62bb9f83309fe20629e6090afa2 SHA512 c0f34a5475707706f949ba5a4eca7097fc198ec973e729772b3c4a852b8a56508184f99e77c98db3bf6fdeaa2ebd3c01169c1c4b1d4750a81301ca2727b8e638 WHIRLPOOL 37ddcba9b782ee3677665c44cb8cf1c164125a48421529b6d5e3b46e0395be039610604809442a601471bf00bbe7916c3d27e9d90f9328e5fe1c70a7aa43c139 -DIST sbcl-1.3.2-x86-64-linux-binary.tar.bz2 9724466 SHA256 5331056a6c7cd638d3d815458180a457d098e85c1e3821af055b9998670fe2ed SHA512 192bc19d372d39049c93aff57ae07531264a3595c1cb4553511d69771010901dce25b1403825b75c147eb121f90aa7f230814861fd948f9b916d6254ecba2ad2 WHIRLPOOL 667e305844b6982b23f3c486dd1356731721f0a62da3c4ccb8fce538d43ed9044af150a1a4c0b507f511a5a85fde2efbecc80ba25b843b5c3859aa772b202bb6 DIST sbcl-1.3.3-source.tar.bz2 5740904 SHA256 db38f600f2db5511566cbb53c3e6ac70b2576a09d5210ac44f9a9b14fee7fb4f SHA512 a8c6176089716cb1f84beca407e17f148a706991f6f74b51543295e6fdc9308a424933e69bd1beb7815d5c47d5ea735b9c8f717dc3934b4ab3a188f8cc1420a8 WHIRLPOOL 0ca1e1be4e16670daf80eb07dc9239ccf66c42b4b1b06bf1c9fd90f78f7bd0ea93c61964a8263f5a4e39b9a17900f2eea3daa0ad4ffaf3786bb0dd1591f13a77 DIST sbcl-1.3.3-x86-64-linux-binary.tar.bz2 9475261 SHA256 e8b1730c42e4a702f9b4437d9842e91cb680b7246f88118c7443d7753e61da65 SHA512 00800945d736180a7fee6d693162add6c7dbab576bc9918ee4dfecbeaa5223a9ef6e34d20b1118851f450703350b5547250ad9cf55431a03d9299d09277e6306 WHIRLPOOL 51f3f5c7280788b303b783b583cd81a02ded60ef2b157cdd0fd951efbf470f4e4e8336eab69b25a96998c850d83b706806aaf9b76a25599df597c6df66ad92bf diff --git a/dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch b/dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch new file mode 100644 index 000000000000..b784c31a5bd4 --- /dev/null +++ b/dev-lisp/sbcl/files/sbcl-1.1.18-graphiz-2.38.patch @@ -0,0 +1,19 @@ +--- sbcl-1.1.18/doc/internals/discriminating-functions.dot.old 2016-03-18 18:40:54.297597061 -0700 ++++ sbcl-1.1.18/doc/internals/discriminating-functions.dot 2016-03-18 18:41:29.912053235 -0700 +@@ -33,13 +33,13 @@ + // oneindex -> dispatch + // nn -> caching + // nn -> checking + // nn -> dispatch + +-subgraph class -> caching +-subgraph class -> checking +-subgraph class -> dispatch ++subgraph { class -> caching } ++subgraph { class -> checking } ++subgraph { class -> dispatch } + + initial -> oneclass + + initial -> default + initial -> nomethods diff --git a/dev-lisp/sbcl/sbcl-1.2.13.ebuild b/dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild similarity index 66% rename from dev-lisp/sbcl/sbcl-1.2.13.ebuild rename to dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild index c1cd8c033b00..f3cdce6f6058 100644 --- a/dev-lisp/sbcl/sbcl-1.2.13.ebuild +++ b/dev-lisp/sbcl/sbcl-1.1.18-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,18 +6,11 @@ EAPI=5 inherit multilib eutils flag-o-matic pax-utils #same order as http://www.sbcl.org/platform-table.html -BV_X86=1.2.7 -BV_AMD64=1.2.13 -BV_PPC=1.2.7 +BV_X86=1.0.58 +BV_AMD64=1.1.18 +BV_PPC=1.0.28 BV_SPARC=1.0.28 BV_ALPHA=1.0.28 -BV_ARM=1.2.7 -BV_PPC_MACOS=1.0.47 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.1.8 -BV_SPARC_SOLARIS=1.0.23 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" HOMEPAGE="http://sbcl.sourceforge.net/" @@ -26,26 +19,19 @@ SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )" + alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 )" LICENSE="MIT" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="debug doc source +threads +unicode pax_kernel zlib" -CDEPEND=">=dev-lisp/asdf-3.1:=" +CDEPEND="=dev-lisp/asdf-3.0*:=" DEPEND="${CDEPEND} doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) pax_kernel? ( sys-apps/paxctl sys-apps/elfix )" RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" + elibc_glibc? ( >=sys-libs/glibc-2.6 )" # Disable warnings about executable stacks, as this won't be fixed soon by upstream QA_EXECSTACK="usr/bin/sbcl" @@ -88,19 +74,19 @@ sbcl_apply_features() { src_unpack() { unpack ${A} - mv sbcl-*-* sbcl-binary || die + mv sbcl-*-linux sbcl-binary || die cd "${S}" } src_prepare() { epatch "${FILESDIR}"/gentoo-fix_install_man.patch + epatch "${FILESDIR}"/gentoo-fix_linux-os-c.patch # bug #468482 - epatch "${FILESDIR}"/concurrency-test-1.2.6.patch - # bugs #486552, #527666, #517004 - epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch - - epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch - epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch + epatch "${FILESDIR}"/concurrency-test.patch + # bug #486552 + epatch "${FILESDIR}"/bsd-sockets-test.patch + # bug #577514 + epatch "${FILESDIR}"/sbcl-1.1.18-graphiz-2.38.patch # To make the hardened compiler NOT compile with -fPIE -pie if gcc-specs-pie ; then @@ -109,14 +95,11 @@ src_prepare() { fi # bug #526194 - sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ - -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ + sed -e "s@CFLAGS =@CFLAGS = ${CFLAGS}@" \ + -e "s@LINKFLAGS =@LINKFLAGS = ${LDFLAGS}@" \ -i src/runtime/GNUmakefile || die - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die + cp /usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk @@ -125,9 +108,11 @@ src_prepare() { sed "s,^time ,," -i make.sh || die sed "s,/lib,/$(get_libdir),g" -i install.sh || die # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die + sed "s,/usr/local/lib,/usr/$(get_libdir),g" -i src/runtime/runtime.c || die + + # Avoid sandbox violation, bug #572478 + sed -i -e "/(sb-posix:rmdir /s%\"/\"%\"${WORKDIR}\"%" \ + contrib/sb-posix/posix-tests.lisp || die find . -type f -name .cvsignore -delete } @@ -151,13 +136,13 @@ src_compile() { pax-mark -mr "${bindir}"/src/runtime/sbcl # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ + sed -i -e '/^echo \/\/doing warm init - compilation phase$/a\paxmark.sh -mr \.\/src\/runtime\/sbcl' \ "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" fi # clear the environment to get rid of non-ASCII strings, see bug 174702 # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ + env - HOME="${T}" \ CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ GNUMAKE=make ./make.sh \ @@ -166,11 +151,11 @@ src_compile() { # need to set HOME because libpango(used by graphviz) complains about it if use doc; then - env - HOME="${T}" PATH="${PATH}" \ + env - HOME="${T}" \ CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ + env - HOME="${T}" \ CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ make -C doc/internals info html || die "Cannot build internal docs" @@ -188,28 +173,25 @@ src_test() { src_install() { # install system-wide initfile dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF + sed 's/^X//' > "${D}"/etc/sbclrc <<-EOF ;;; The following is required if you want source location functions to ;;; work in SLIME, for example. X (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) + X '(("SYS:SRC;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/src/**/*.*") + X ("SYS:CONTRIB;**;*.*.*" #p"/usr/$(get_libdir)/sbcl/**/*.*"))) X ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") + (load "/etc/common-lisp/gentoo-init.lisp") EOF # Install documentation unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ + INSTALL_ROOT="${D}/usr" LIB_DIR="/usr/$(get_libdir)" DOC_DIR="${D}/usr/share/doc/${PF}" \ sh install.sh || die "install.sh failed" - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + + find "${D}" -empty -type d -exec rmdir -v {} + if use doc; then dohtml -r doc/manual/ @@ -218,7 +200,7 @@ src_install() { doinfo doc/internals/sbcl-internals.info docinto internals-notes && dodoc doc/internals-notes/* else - rm -Rv "${ED}/usr/share/doc/${PF}" || die + rm -Rv "${D}/usr/share/doc/${PF}" || die fi dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO @@ -226,11 +208,11 @@ src_install() { # install the SBCL source if use source; then ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die + cp -av src "${D}/usr/$(get_libdir)/sbcl/" || die fi # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" + echo "SBCL_HOME=/usr/$(get_libdir)/${PN}" > "${ENVD}" + echo "SBCL_SOURCE_ROOT=/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" doenvd "${ENVD}" } diff --git a/dev-lisp/sbcl/sbcl-1.2.14.ebuild b/dev-lisp/sbcl/sbcl-1.2.14.ebuild deleted file mode 100644 index d7c47b1ddbbc..000000000000 --- a/dev-lisp/sbcl/sbcl-1.2.14.ebuild +++ /dev/null @@ -1,236 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit multilib eutils flag-o-matic pax-utils - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.2.7 -BV_AMD64=1.2.14 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.2.7 -BV_PPC_MACOS=1.0.47 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.1.8 -BV_SPARC_SOLARIS=1.0.23 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/paxctl sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - epatch "${FILESDIR}"/gentoo-fix_install_man.patch - # bug #468482 - epatch "${FILESDIR}"/concurrency-test-1.2.6.patch - # bugs #486552, #527666, #517004 - epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch - - epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch - epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch - - # To make the hardened compiler NOT compile with -fPIE -pie - if gcc-specs-pie ; then - einfo "Disabling PIE..." - epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch - fi - - # bug #526194 - sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ - -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - strip-unsupported-flags ; filter-flags -fomit-frame-pointer - - if host-is-pax ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug 174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dohtml -r doc/manual/ - doinfo doc/manual/*.info* - dohtml -r doc/internals/sbcl-internals - doinfo doc/internals/sbcl-internals.info - docinto internals-notes && dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.2.15.ebuild b/dev-lisp/sbcl/sbcl-1.2.15.ebuild deleted file mode 100644 index bc2ac4d3c116..000000000000 --- a/dev-lisp/sbcl/sbcl-1.2.15.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit multilib eutils flag-o-matic pax-utils - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.2.7 -BV_AMD64=1.2.15 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.2.7 -BV_PPC_MACOS=1.0.47 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.1.8 -BV_SPARC_SOLARIS=1.0.23 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/paxctl sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - epatch "${FILESDIR}"/gentoo-fix_install_man.patch - # bug #468482 - epatch "${FILESDIR}"/concurrency-test-1.2.6.patch - # bugs #486552, #527666, #517004 - epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch - # bugs #560276, #561018 - epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch - - epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch - epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch - - # To make the hardened compiler NOT compile with -fPIE -pie - if gcc-specs-pie ; then - einfo "Disabling PIE..." - epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch - fi - - # bug #526194 - sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ - -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - strip-unsupported-flags ; filter-flags -fomit-frame-pointer - - if host-is-pax ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug 174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dohtml -r doc/manual/ - doinfo doc/manual/*.info* - dohtml -r doc/internals/sbcl-internals - doinfo doc/internals/sbcl-internals.info - docinto internals-notes && dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.2.16.ebuild b/dev-lisp/sbcl/sbcl-1.2.16.ebuild deleted file mode 100644 index ff5148f63e13..000000000000 --- a/dev-lisp/sbcl/sbcl-1.2.16.ebuild +++ /dev/null @@ -1,238 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit multilib eutils flag-o-matic pax-utils - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.2.7 -BV_AMD64=1.2.16 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.2.7 -BV_PPC_MACOS=1.0.47 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_SPARC_SOLARIS=1.0.23 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - epatch "${FILESDIR}"/gentoo-fix_install_man.patch - # bug #468482 - epatch "${FILESDIR}"/concurrency-test-1.2.6.patch - # bugs #486552, #527666, #517004 - epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch - # bugs #560276, #561018 - epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch - - epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch - epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch - - # To make the hardened compiler NOT compile with -fPIE -pie - if gcc-specs-pie ; then - einfo "Disabling PIE..." - epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch - fi - - # bug #526194 - sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ - -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - strip-unsupported-flags ; filter-flags -fomit-frame-pointer - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug 174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dohtml -r doc/manual/ - doinfo doc/manual/*.info* - dohtml -r doc/internals/sbcl-internals - doinfo doc/internals/sbcl-internals.info - docinto internals-notes && dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.3.0.ebuild b/dev-lisp/sbcl/sbcl-1.3.0.ebuild index a39481add765..c1b1a164f1f7 100644 --- a/dev-lisp/sbcl/sbcl-1.3.0.ebuild +++ b/dev-lisp/sbcl/sbcl-1.3.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit multilib eutils flag-o-matic pax-utils #same order as http://www.sbcl.org/platform-table.html @@ -94,23 +94,25 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/gentoo-fix_install_man.patch + eapply "${FILESDIR}"/gentoo-fix_install_man.patch # bug #468482 - epatch "${FILESDIR}"/concurrency-test-1.2.6.patch + eapply "${FILESDIR}"/concurrency-test-1.2.6.patch # bugs #486552, #527666, #517004 - epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch + eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch # bugs #560276, #561018 - epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch + eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch - epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch + eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch + eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch # To make the hardened compiler NOT compile with -fPIE -pie if gcc-specs-pie ; then einfo "Disabling PIE..." - epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch + eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch fi + eapply_user + # bug #526194 sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ @@ -215,11 +217,15 @@ src_install() { find "${ED}" -empty -type d -exec rmdir -v {} + if use doc; then - dohtml -r doc/manual/ + docinto html + dodoc -r doc/manual/ + dodoc -r doc/internals/sbcl-internals + doinfo doc/manual/*.info* - dohtml -r doc/internals/sbcl-internals doinfo doc/internals/sbcl-internals.info - docinto internals-notes && dodoc doc/internals-notes/* + + docinto internals-notes + dodoc doc/internals-notes/* else rm -Rv "${ED}/usr/share/doc/${PF}" || die fi diff --git a/dev-lisp/sbcl/sbcl-1.3.2.ebuild b/dev-lisp/sbcl/sbcl-1.3.2.ebuild deleted file mode 100644 index ce385f2b6733..000000000000 --- a/dev-lisp/sbcl/sbcl-1.3.2.ebuild +++ /dev/null @@ -1,239 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit multilib eutils flag-o-matic pax-utils - -#same order as http://www.sbcl.org/platform-table.html -BV_X86=1.2.7 -BV_AMD64=1.3.2 -BV_PPC=1.2.7 -BV_SPARC=1.0.28 -BV_ALPHA=1.0.28 -BV_ARM=1.2.7 -BV_ARM64=1.3.2 -BV_PPC_MACOS=1.0.47 -BV_X86_MACOS=1.1.6 -BV_X64_MACOS=1.2.11 -BV_SPARC_SOLARIS=1.0.23 -BV_X86_SOLARIS=1.2.7 -BV_X64_SOLARIS=1.2.7 - -DESCRIPTION="Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp" -HOMEPAGE="http://sbcl.sourceforge.net/" -SRC_URI="mirror://sourceforge/sbcl/${P}-source.tar.bz2 - x86? ( mirror://sourceforge/sbcl/${PN}-${BV_X86}-x86-linux-binary.tar.bz2 ) - amd64? ( mirror://sourceforge/sbcl/${PN}-${BV_AMD64}-x86-64-linux-binary.tar.bz2 ) - ppc? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC}-powerpc-linux-binary.tar.bz2 ) - sparc? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC}-sparc-linux-binary.tar.bz2 ) - alpha? ( mirror://sourceforge/sbcl/${PN}-${BV_ALPHA}-alpha-linux-binary.tar.bz2 ) - arm? ( mirror://sourceforge/sbcl/${PN}-${BV_ARM}-armhf-linux-binary.tar.bz2 ) - ppc-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_PPC_MACOS}-powerpc-darwin-binary.tar.bz2 ) - x86-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_MACOS}-x86-darwin-binary.tar.bz2 ) - x64-macos? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_MACOS}-x86-64-darwin-binary.tar.bz2 ) - sparc-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_SPARC_SOLARIS}-sparc-solaris-binary.tar.bz2 ) - x86-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X86_SOLARIS}-x86-solaris-binary.tar.bz2 ) - x64-solaris? ( mirror://sourceforge/sbcl/${PN}-${BV_X64_SOLARIS}-x86-64-solaris-binary.tar.bz2 )" - -LICENSE="MIT" -SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~x86-solaris" -IUSE="debug doc source +threads +unicode pax_kernel zlib" - -CDEPEND=">=dev-lisp/asdf-3.1:=" -DEPEND="${CDEPEND} - doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 ) - pax_kernel? ( sys-apps/elfix )" -RDEPEND="${CDEPEND} - !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )" - -# Disable warnings about executable stacks, as this won't be fixed soon by upstream -QA_EXECSTACK="usr/bin/sbcl" - -CONFIG="${S}/customize-target-features.lisp" -ENVD="${T}/50sbcl" - -# Prevent ASDF from using the system libraries -CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" -ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" - -usep() { - use ${1} && echo "true" || echo "false" -} - -sbcl_feature() { - echo "$( [[ ${1} == "true" ]] && echo "(enable ${2})" || echo "(disable ${2})")" >> "${CONFIG}" -} - -sbcl_apply_features() { - sed 's/^X//' > "${CONFIG}" <<-'EOF' - (lambda (list) - X (flet ((enable (x) (pushnew x list)) - X (disable (x) (setf list (remove x list)))) - EOF - if use x86 || use amd64; then - sbcl_feature "$(usep threads)" ":sb-thread" - fi - sbcl_feature "true" ":sb-ldb" - sbcl_feature "false" ":sb-test" - sbcl_feature "$(usep unicode)" ":sb-unicode" - sbcl_feature "$(usep zlib)" ":sb-core-compression" - sbcl_feature "$(usep debug)" ":sb-xref-for-internals" - sed 's/^X//' >> "${CONFIG}" <<-'EOF' - X ) - X list) - EOF - cat "${CONFIG}" -} - -src_unpack() { - unpack ${A} - mv sbcl-*-* sbcl-binary || die - cd "${S}" -} - -src_prepare() { - epatch "${FILESDIR}"/gentoo-fix_install_man.patch - # bug #468482 - epatch "${FILESDIR}"/concurrency-test-1.2.6.patch - # bugs #486552, #527666, #517004 - epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch - # bugs #560276, #561018 - epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch - - epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch - epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch - - # To make the hardened compiler NOT compile with -fPIE -pie - if gcc-specs-pie ; then - einfo "Disabling PIE..." - epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch - fi - - # bug #526194 - sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ - -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ - -i src/runtime/GNUmakefile || die - - sed -e "s@SBCL_PREFIX=\"/usr/local\"@SBCL_PREFIX=\"${EPREFIX}/usr\"@" \ - -i make-config.sh || die - - cp "${EPREFIX}"/usr/share/common-lisp/source/asdf/build/asdf.lisp contrib/asdf/ || die - - use source && sed 's%"$(BUILD_ROOT)%$(MODULE).lisp "$(BUILD_ROOT)%' -i contrib/vanilla-module.mk - - # Some shells(such as dash) don't have "time" as builtin - # and we don't want to DEPEND on sys-process/time - sed "s,^time ,," -i make.sh || die - sed "s,/lib,/$(get_libdir),g" -i install.sh || die - # #define SBCL_HOME ... - sed "s,/usr/local/lib,${EPREFIX}/usr/$(get_libdir),g" -i src/runtime/runtime.c || die - # change location of /etc/sbclrc ... - sed "s,/etc/sbclrc,${EPREFIX}/etc/sbclrc,g" -i src/code/toplevel.lisp || die - - find . -type f -name .cvsignore -delete -} - -src_configure() { - # customizing SBCL version as per - # http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup - echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr - - # applying customizations - sbcl_apply_features -} - -src_compile() { - local bindir="${WORKDIR}"/sbcl-binary - - strip-unsupported-flags ; filter-flags -fomit-frame-pointer - - if use pax_kernel ; then - # To disable PaX on hardened systems - pax-mark -mr "${bindir}"/src/runtime/sbcl - - # Hack to disable PaX on second GENESIS stage - sed -i -e '/^[ \t]*echo \/\/doing warm init - compilation phase$/a\ paxmark.sh -mr \.\/src\/runtime\/sbcl' \ - "${S}"/make-target-2.sh || die "Cannot disable PaX on second GENESIS runtime" - fi - - # clear the environment to get rid of non-ASCII strings, see bug 174702 - # set HOME for paludis - env - HOME="${T}" PATH="${PATH}" \ - CC="$(tc-getCC)" AS="$(tc-getAS)" LD="$(tc-getLD)" \ - CPPFLAGS="${CPPFLAGS}" CFLAGS="${CFLAGS}" ASFLAGS="${ASFLAGS}" LDFLAGS="${LDFLAGS}" \ - GNUMAKE=make ./make.sh \ - "sh ${bindir}/run-sbcl.sh --no-sysinit --no-userinit --disable-debugger" \ - || die "make failed" - - # need to set HOME because libpango(used by graphviz) complains about it - if use doc; then - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/manual info html || die "Cannot build manual" - env - HOME="${T}" PATH="${PATH}" \ - CL_SOURCE_REGISTRY="(:source-registry :ignore-inherited-configuration)" \ - ASDF_OUTPUT_TRANSLATIONS="(:output-translations :ignore-inherited-configuration)" \ - make -C doc/internals info html || die "Cannot build internal docs" - fi -} - -src_test() { - ewarn "Unfortunately, it is known that some tests fail eg." - ewarn "run-program.impure.lisp. This is an issue of the upstream's" - ewarn "development and not of Gentoo's side. Please, before filing" - ewarn "any bug(s) search for older submissions. Thank you." - time ( cd tests && sh run-tests.sh ) -} - -src_install() { - # install system-wide initfile - dodir /etc/ - sed 's/^X//' > "${ED}"/etc/sbclrc <<-EOF - ;;; The following is required if you want source location functions to - ;;; work in SLIME, for example. - X - (setf (logical-pathname-translations "SYS") - X '(("SYS:SRC;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/src/**/*.*") - X ("SYS:CONTRIB;**;*.*.*" #p"${EPREFIX}/usr/$(get_libdir)/sbcl/**/*.*"))) - X - ;;; Setup ASDF2 - (load "${EPREFIX}/etc/common-lisp/gentoo-init.lisp") - EOF - - # Install documentation - unset SBCL_HOME - INSTALL_ROOT="${ED}/usr" LIB_DIR="${EPREFIX}/usr/$(get_libdir)" DOC_DIR="${ED}/usr/share/doc/${PF}" \ - sh install.sh || die "install.sh failed" - - # bug #517008 - pax-mark -mr "${D}"/usr/bin/sbcl - - # rm empty directories lest paludis complain about this - find "${ED}" -empty -type d -exec rmdir -v {} + - - if use doc; then - dohtml -r doc/manual/ - doinfo doc/manual/*.info* - dohtml -r doc/internals/sbcl-internals - doinfo doc/internals/sbcl-internals.info - docinto internals-notes && dodoc doc/internals-notes/* - else - rm -Rv "${ED}/usr/share/doc/${PF}" || die - fi - - dodoc BUGS CREDITS INSTALL NEWS OPTIMIZATIONS PRINCIPLES README TLA TODO - - # install the SBCL source - if use source; then - ./clean.sh - cp -av src "${ED}/usr/$(get_libdir)/sbcl/" || die - fi - - # necessary for running newly-saved images - echo "SBCL_HOME=${EPREFIX}/usr/$(get_libdir)/${PN}" > "${ENVD}" - echo "SBCL_SOURCE_ROOT=${EPREFIX}/usr/$(get_libdir)/${PN}/src" >> "${ENVD}" - doenvd "${ENVD}" -} diff --git a/dev-lisp/sbcl/sbcl-1.3.3.ebuild b/dev-lisp/sbcl/sbcl-1.3.3.ebuild index edd65ba3fe68..b6f12913dab4 100644 --- a/dev-lisp/sbcl/sbcl-1.3.3.ebuild +++ b/dev-lisp/sbcl/sbcl-1.3.3.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit multilib eutils flag-o-matic pax-utils #same order as http://www.sbcl.org/platform-table.html @@ -94,23 +94,25 @@ src_unpack() { } src_prepare() { - epatch "${FILESDIR}"/gentoo-fix_install_man.patch + eapply "${FILESDIR}"/gentoo-fix_install_man.patch # bug #468482 - epatch "${FILESDIR}"/concurrency-test-1.2.6.patch + eapply "${FILESDIR}"/concurrency-test-1.2.6.patch # bugs #486552, #527666, #517004 - epatch "${FILESDIR}"/bsd-sockets-test-1.2.11.patch + eapply "${FILESDIR}"/bsd-sockets-test-1.2.11.patch # bugs #560276, #561018 - epatch "${FILESDIR}"/sb-posix-test-1.2.15.patch + eapply "${FILESDIR}"/sb-posix-test-1.2.15.patch - epatch "${FILESDIR}"/${PN}-1.2.11-solaris.patch - epatch "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch + eapply "${FILESDIR}"/${PN}-1.2.11-solaris.patch + eapply "${FILESDIR}"/${PN}-1.2.13-verbose-build.patch # To make the hardened compiler NOT compile with -fPIE -pie if gcc-specs-pie ; then einfo "Disabling PIE..." - epatch "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch + eapply "${FILESDIR}"/${PN}-1.1.17-gentoo-fix_nopie_for_hardened_toolchain.patch fi + eapply_user + # bug #526194 sed -e "s@CFLAGS =.*\$@CFLAGS = ${CFLAGS} -g -Wall -Wsign-compare@" \ -e "s@LINKFLAGS =.*\$@LINKFLAGS = ${LDFLAGS} -g@" \ @@ -215,11 +217,15 @@ src_install() { find "${ED}" -empty -type d -exec rmdir -v {} + if use doc; then - dohtml -r doc/manual/ + docinto html + dodoc -r doc/manual/ + dodoc -r doc/internals/sbcl-internals + doinfo doc/manual/*.info* - dohtml -r doc/internals/sbcl-internals doinfo doc/internals/sbcl-internals.info - docinto internals-notes && dodoc doc/internals-notes/* + + docinto internals-notes + dodoc doc/internals-notes/* else rm -Rv "${ED}/usr/share/doc/${PF}" || die fi diff --git a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild index cc5f54e900df..7e3133fbb1b3 100644 --- a/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild +++ b/dev-perl/Data-Structure-Util/Data-Structure-Util-0.150.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Change nature of data within a structure" SLOT="0" -KEYWORDS="alpha amd64 ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" IUSE="" RDEPEND=" diff --git a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild index 58c7b0e95ec1..c17dc64a0114 100644 --- a/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild +++ b/dev-perl/Eval-Closure/Eval-Closure-0.130.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,7 +22,7 @@ RDEPEND=" dev-perl/Try-Tiny !minimal? ( >=dev-perl/Devel-LexAlias-0.50.0 - dev-perl/perltidy + dev-perl/Perl-Tidy ) " DEPEND="${RDEPEND} diff --git a/dev-perl/File-Flock/File-Flock-2008.10.0-r1.ebuild b/dev-perl/File-Flock/File-Flock-2008.10.0-r1.ebuild deleted file mode 100644 index e540461db783..000000000000 --- a/dev-perl/File-Flock/File-Flock-2008.10.0-r1.ebuild +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=MUIR -MODULE_VERSION=2008.01 -MODULE_SECTION=modules -inherit perl-module - -DESCRIPTION="flock() wrapper. Auto-create locks" - -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="" - -SRC_TEST="do" diff --git a/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild b/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild index 3f24a999f1d1..e07fbea98ffb 100644 --- a/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild +++ b/dev-perl/File-Flock/File-Flock-2014.10.0.ebuild @@ -12,7 +12,7 @@ inherit perl-module DESCRIPTION="flock() wrapper. Auto-create locks" SLOT="0" -KEYWORDS="alpha amd64 ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" IUSE="test" SRC_TEST="do" diff --git a/dev-perl/File-Flock/Manifest b/dev-perl/File-Flock/Manifest index 0472c4f45e47..2236c47f1895 100644 --- a/dev-perl/File-Flock/Manifest +++ b/dev-perl/File-Flock/Manifest @@ -1,2 +1 @@ -DIST File-Flock-2008.01.tar.gz 5622 SHA256 016e6a5a49db81bac4b5dad0bec4806786d24fcb18c304d8b3a70bc17d93feb0 SHA512 f0045e6640387cf06bab0bb5e197cb735239faee4ff2883855d8014c8ac3456d9a4abf650ee8c9b2d56544251bc2fe8ef6dbd800564d0043ac3800d6a41f79c8 WHIRLPOOL d1c2ebb722a76793bbbd50b9cb731d4f9d4c5bdd0ac9f8e816e4ed34b5d1eb7d5e32498105edc9f55aee89a0977baa96546b54952ca6a05453c627e89d63ecaf DIST File-Flock-2014.01.tar.gz 12790 SHA256 5dc5d7890dbeb4f8261f1e47820492a238f56f38c793a8b453d06515f7f241d2 SHA512 3892d9c126c809709e690391396bc349b95b790b2d1be34bf1d24d728dbbe8b9e5dc7a35f5bf17b420b5912aa6b1e2ef1aa6c6b60b48c4e17685eade7b3fae16 WHIRLPOOL 244ba184434b749b9f03c2cfe8e75a69e9780583e748e874cc1407457be610d322d4ec4fb41a464fda4757521555e1538207f01efc425913252525c531d1f8ed diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.700.0.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.700.0.ebuild deleted file mode 100644 index 1eae3979a5e5..000000000000 --- a/dev-perl/File-RsyncP/File-RsyncP-0.700.0.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=CBARRATT -MODULE_VERSION=0.70 -inherit perl-module - -DESCRIPTION="An rsync perl module" -HOMEPAGE="http://perlrsync.sourceforge.net/ ${HOMEPAGE}" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ia64 ~ppc ~ppc64 sparc x86" -IUSE="" - -RDEPEND="net-misc/rsync" - -PATCHES=( "${FILESDIR}/${P}-make.patch" ) - -src_prepare() { - perl-module_src_prepare - tc-export CC -} diff --git a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild index fc3ee7ed3f0c..9698b9e89cd6 100644 --- a/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild +++ b/dev-perl/File-RsyncP/File-RsyncP-0.740.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://perlrsync.sourceforge.net/ ${HOMEPAGE}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="amd64 ~arm ia64 ~ppc ~ppc64 sparc x86" IUSE="" RDEPEND="net-misc/rsync" diff --git a/dev-perl/File-RsyncP/Manifest b/dev-perl/File-RsyncP/Manifest index 34c602b7ced3..c2773cadfb3f 100644 --- a/dev-perl/File-RsyncP/Manifest +++ b/dev-perl/File-RsyncP/Manifest @@ -1,2 +1 @@ -DIST File-RsyncP-0.70.tar.gz 160281 SHA256 d4f6127650393a65ed7d66d14b3a126827c99e8422c3cf205481a9f7ebce9994 SHA512 fdc04e2e9280be26578ff6bb7ca80f43408dd6709297ab138ca708f79282e6b9bc3433c35f0841c5dab42302403262c67b177cc4889b85a3c5417a295c047dc0 WHIRLPOOL ab3f0a1d4da81379c6fe24b7e38061ac80d0a74284954bfe0dcd947e88f0eac363db31041b6101fbab7f9634cf8ea7c1213707f2618124ed9f0e14b87737e981 DIST File-RsyncP-0.74.tar.gz 167122 SHA256 ba4df5f9b0db6c9d86a6c5cf9861cf00d17b18e77cfa028e7a9157c0015a5aa3 SHA512 0585c2f0b145875e9a13523d829b2ed9907e1e38c526f630a79a5b5dab36b6a9012375620ae92292e5977735c106bfab905bb121f56df5ca4494e1efcbd02cb6 WHIRLPOOL e19ab2e7f84351c12dbcd35d615ea58acb2fa2560a31120ed5b49e376fe1f111121654f0a9ae4212dda5c10811a3918d0a4f0c99a14812450e9104bb1a6a280c diff --git a/dev-perl/Filter/Filter-1.490.0.ebuild b/dev-perl/Filter/Filter-1.490.0.ebuild deleted file mode 100644 index 047d713b5395..000000000000 --- a/dev-perl/Filter/Filter-1.490.0.ebuild +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=RURBAN -MODULE_VERSION=1.49 -inherit perl-module - -DESCRIPTION="Interface for creation of Perl Filters" - -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="" - -SRC_TEST=do diff --git a/dev-perl/Filter/Filter-1.540.0.ebuild b/dev-perl/Filter/Filter-1.540.0.ebuild index d2b923a48cbc..d1838ce3a576 100644 --- a/dev-perl/Filter/Filter-1.540.0.ebuild +++ b/dev-perl/Filter/Filter-1.540.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Interface for creation of Perl Filters" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND=" diff --git a/dev-perl/Filter/Manifest b/dev-perl/Filter/Manifest index af2b9e720cf7..c86a9d30bd04 100644 --- a/dev-perl/Filter/Manifest +++ b/dev-perl/Filter/Manifest @@ -1,3 +1,2 @@ -DIST Filter-1.49.tar.gz 85905 SHA256 9bc5398ec7128b5f42aeae33f2c76e847b1ade7561e21b72d565563f2e1234a1 SHA512 edf23ad58d66e5a97f88befbd87c8c755f99fdeac0390d53dc5c28dd88d0c4c9582adac0febb9bd12955fac72ac9a7baade74768c632c2199e9ecf92a117b98f WHIRLPOOL 138499c207a730f55b6b2ef046b0b6e88b49cc62fc32e253851a5b581fda077b65bc7b8469fdc8149b18c30c1600fa923cbe146b24e7854266191e4b8e21e6e9 DIST Filter-1.54.tar.gz 88008 SHA256 20bcd823c1739ccd3cb5b0170206b9804737cc2bb366a221a62f9d7810aa80d5 SHA512 57913e4a025709c8a12281a49dfe48dec81e5dec1af114ee885e983e86a622e456f49420aad02d55e8f9c93551208d442d90c0fe2de12722df9db820ed9a14bb WHIRLPOOL c9e1fe250819c587aa7d09dd2055c54067627ec5ab0b2a9d7bdc569f5df63c8e1d031ca071abac118df4083296f206ecb18b9f5f830f2ccde8c490cd55882622 DIST Filter-1.55.tar.gz 89901 SHA256 7855f5f5f16777c14614b5d907794a170ed4cdeb4382bf03ffca825c8c6bc4a0 SHA512 df1a558fe10cbdc416a55961502332bf68e1b5bf97ce1f5080d1fe627c7f438c1a6bc0a06b21eaff2e3ea66b6c2595c81b418b4bee6eca1e306d2fc06a99446e WHIRLPOOL e016a0fceebc7468b7627916480c4eb2c1fcb7dcae2dc00cf7e3b5f1c31a3bf0f1937de1dd4659cdc0e1d4e8cb253fb8b759a42128a550f24825405a694f29ca diff --git a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0-r1.ebuild b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0-r1.ebuild deleted file mode 100644 index 32e594452825..000000000000 --- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.6.0-r1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=KENTNL -MODULE_VERSION=0.6.0 -inherit perl-module - -DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions" - -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" -IUSE="test" - -RDEPEND=" - dev-perl/List-MoreUtils - dev-perl/Sub-Exporter - >=virtual/perl-version-0.770.0 -" -DEPEND="${RDEPEND} - >=dev-perl/Module-Build-0.400.300 - test? ( - dev-perl/Test-Fatal - >=virtual/perl-Test-Simple-0.980.0 - ) -" - -SRC_TEST="do" diff --git a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild deleted file mode 100644 index af94f42de069..000000000000 --- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.7.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=KENTNL -inherit perl-module - -DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" - -RDEPEND=" - virtual/perl-Carp - virtual/perl-Data-Dumper - dev-perl/List-MoreUtils - dev-perl/Sub-Exporter-Progressive - >=virtual/perl-version-0.770.0 -" -DEPEND="${RDEPEND} - virtual/perl-ExtUtils-MakeMaker - test? ( - dev-perl/Test-Fatal - virtual/perl-File-Spec - virtual/perl-Scalar-List-Utils - >=virtual/perl-Test-Simple-0.960.0 - ) -" - -SRC_TEST="do" diff --git a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild index 585bbb7e08fc..9e720cb3b62f 100644 --- a/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild +++ b/dev-perl/Gentoo-PerlMod-Version/Gentoo-PerlMod-Version-0.8.0.ebuild @@ -10,7 +10,7 @@ inherit perl-module DESCRIPTION="Convert arbitrary Perl Modules' versions into normalised Gentoo versions" SLOT="0" -KEYWORDS="alpha amd64 arm ~ia64 ~mips ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sparc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/Gentoo-PerlMod-Version/Manifest b/dev-perl/Gentoo-PerlMod-Version/Manifest index ece38786c664..8e638aacea53 100644 --- a/dev-perl/Gentoo-PerlMod-Version/Manifest +++ b/dev-perl/Gentoo-PerlMod-Version/Manifest @@ -1,3 +1 @@ -DIST Gentoo-PerlMod-Version-0.6.0.tar.gz 24943 SHA256 a424fe8de9fa02a48ce71d9a5d164073f981992e634843cf6863ad08b3ca129b SHA512 eb42e2f09ca06e2263524ca6ee1a0dc8d0ac4c301c50f622e77920f72459b65f22f6476dd0be72a071977090c017165fcbd55143238217d6d0d3a3bf34c552fe WHIRLPOOL e73f23a27076dc1472efac9acb592dd3216ad65d059dc5bd7ba6b410ae73566e5cb6ffbbb99f5328bafb0834b1d930eb23e59389f9d7f87821dd9c3356f769cd -DIST Gentoo-PerlMod-Version-0.7.0.tar.gz 37150 SHA256 c7dd137f327af412ed03ebf1106086886830c8df0844f44941a72bb99a9712bb SHA512 d2dd671580798867ec6a0a9e44fef9cfaf8acef52dffe2d63165161bb785435fad37f6f2c0c86a224708a043e415e7bf06b4b5e679a30c0507b92919e604bcb0 WHIRLPOOL 2b2ee4a3c1eb5ebf0b8b72701641cf1a38e9bf5bb5acb499cad24b287bbae80c6d6113d89bc38eae9868a6fc42007d25c75550e51924c4782bd93c7292f12bb0 DIST Gentoo-PerlMod-Version-0.8.0.tar.gz 40297 SHA256 ada634de6c467f61269652c9ef88e8e1e4cf1f1b79927677ccdd8257f3868ae3 SHA512 417066431bc475550d4a8376220f5cacf0013b1e8f1287b3e12afc9cb0473982fb2cbe3429414088f9ce3f41c80e67215b55d5cd9369a1f6611ae6658cb90678 WHIRLPOOL d4baa4cbf4278b102c7d3adbd77b11012cd03103aacaf08d2f038cca1fc86b2ec2dc1c20414291231ed76077097a191eea745261b064127829ac289803f88f9b diff --git a/dev-perl/HTML-Strip/HTML-Strip-1.60.0-r1.ebuild b/dev-perl/HTML-Strip/HTML-Strip-1.60.0-r1.ebuild deleted file mode 100644 index e31940867a72..000000000000 --- a/dev-perl/HTML-Strip/HTML-Strip-1.60.0-r1.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=KILINRAX -MODULE_VERSION=1.06 -inherit perl-module - -DESCRIPTION="Extension for stripping HTML markup from text" - -SLOT="0" -KEYWORDS="amd64 ia64 ~ppc ppc64 sparc x86" -IUSE="" diff --git a/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild b/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild index 947503235579..01c39e78d76e 100644 --- a/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild +++ b/dev-perl/HTML-Strip/HTML-Strip-2.90.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Extension for stripping HTML markup from text" SLOT="0" -KEYWORDS="amd64 ~ia64 ~ppc ppc64 ~sparc x86" +KEYWORDS="amd64 ia64 ~ppc ppc64 sparc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/HTML-Strip/Manifest b/dev-perl/HTML-Strip/Manifest index 39a3946a2336..a67aa0efe147 100644 --- a/dev-perl/HTML-Strip/Manifest +++ b/dev-perl/HTML-Strip/Manifest @@ -1,2 +1 @@ -DIST HTML-Strip-1.06.tar.gz 7764 SHA256 51d14e786066804764d6e12d262447b4472a2c36c663ea2c89a3c4ec1435c1ab SHA512 5be8afcae09e427af04b99d9f3fb5a664ea2c84a7cb5fb672d164fe5e991aaeaf7f811b8fd195c404da67a996dd6fdb51ab1e37745a6f7f548e05222ffb73747 WHIRLPOOL 801ac579715ff653cfb4b7a415bca82d684fd285f29464898b6a3eab847f8d26e7a1e7c4773f98db3a63243d51ea0d6329e2203e0aae7d3097cdb07f7e9d4d09 DIST HTML-Strip-2.09.tar.gz 15040 SHA256 3f310370d0a677d17ca539508afb054be869b68acaec9aea239a057aa04d81d7 SHA512 8dc1935b401a60b4ae510cfd492b103471d197f0820fb17bd37f5e5f30b0f110f99bc196c53bdfed65ebc3ba5068d4c8e4871020e6e97015a60b64ea38aecd5d WHIRLPOOL 3610570ba02744b0edc2107bda680f498b3d3af7a21eb0215e798d032a59f54793c09d9cc7d01f0c5ed22378601a6940e791723a6db4358f7531c957fb979b73 diff --git a/dev-perl/IO-Event/IO-Event-0.813.0.ebuild b/dev-perl/IO-Event/IO-Event-0.813.0.ebuild index 401fda0a0a2d..75c2e6e8b972 100644 --- a/dev-perl/IO-Event/IO-Event-0.813.0.ebuild +++ b/dev-perl/IO-Event/IO-Event-0.813.0.ebuild @@ -12,7 +12,7 @@ inherit perl-module DESCRIPTION="Tied Filehandles for Nonblocking IO with Object Callbacks" SLOT="0" -KEYWORDS="alpha amd64 ~ia64 ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" IUSE="" RDEPEND=" diff --git a/dev-perl/Mon/Mon-0.110.0-r1.ebuild b/dev-perl/Mon/Mon-0.110.0-r1.ebuild index 60defa049fdf..fc0e3e837f2c 100644 --- a/dev-perl/Mon/Mon-0.110.0-r1.ebuild +++ b/dev-perl/Mon/Mon-0.110.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -18,7 +18,7 @@ IUSE="" RDEPEND=">=net-analyzer/fping-2.2_beta1 >=dev-perl/Convert-BER-1.31 >=dev-perl/Net-Telnet-3.02 - >=dev-perl/Period-1.20" + >=dev-perl/Time-Period-1.20" DEPEND="${RDEPEND}" mydoc="COPYING COPYRIGHT VERSION" diff --git a/dev-perl/PDF-Create/Manifest b/dev-perl/PDF-Create/Manifest index 669be9d4c5b0..d7a820714932 100644 --- a/dev-perl/PDF-Create/Manifest +++ b/dev-perl/PDF-Create/Manifest @@ -1 +1,2 @@ DIST PDF-Create-1.06.tar.gz 75847 SHA256 5343cf48b7e81e2743eaddba9040329a2ea0332833b11f2ce41932175c654ab0 SHA512 e775fe0bdf5d534e8621a2f45c85bdd68ff7730fb2931c9f90e9236d8e2b8cb3cd9110aabe776afcc380f56df12c33155b5d30dee405015b632fc039e9e016bb WHIRLPOOL 6494952123be7ce01d9ea95d6d43cf10b799d73ea1bc3b13a01b3de18a2d24dc81e608357cfc1fd781178be04bc8fd97da52123e02cabdff2b9dfe893490f4e8 +DIST PDF-Create-1.29.tar.gz 103868 SHA256 7adc48a56786e2b15147e94d9474cfaabc652f83def13491d699ae19dda6d592 SHA512 82939b22163c448de67565ff0997021c2df2345a1af443e7b9e00fdb299108cea71c9157a945881314742167cefa55b57909e28905e29bb743aa3448b33dbb4d WHIRLPOOL a688cfe61f18ee6c32392b04549240e5ad7c7110244a0884f475219cd1e1ab44112bb0d3d40e5f751c2da4c4da5cb5a82ad8357830debbb03acccadda9b60ded diff --git a/dev-perl/PDF-Create/PDF-Create-1.290.0.ebuild b/dev-perl/PDF-Create/PDF-Create-1.290.0.ebuild new file mode 100644 index 000000000000..d12878012ee3 --- /dev/null +++ b/dev-perl/PDF-Create/PDF-Create-1.290.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=MANWAR +DIST_VERSION=1.29 +inherit perl-module + +DESCRIPTION="Create PDF documents in Perl" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86" +IUSE="test examples" + +RDEPEND=" + virtual/perl-Carp + virtual/perl-Data-Dumper + virtual/perl-Scalar-List-Utils +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker + test? ( + >=dev-perl/Test-LeakTrace-0.140.0 + >=virtual/perl-Test-Simple-1.0.0 + ) +" +src_test() { + perl_rm_files "t/changes.t" "t/meta-json.t" "t/meta-yml.t" "t/pod.t" "t/manifest.t" + perl-module_src_test +} +src_install() { + perl-module_src_install + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + docinto examples/ + dodoc -r eg/* + fi +} diff --git a/dev-perl/Passwd-Unix/Manifest b/dev-perl/Passwd-Unix/Manifest new file mode 100644 index 000000000000..deb84c4a3402 --- /dev/null +++ b/dev-perl/Passwd-Unix/Manifest @@ -0,0 +1 @@ +DIST Passwd-Unix-0.71.tar.gz 12220 SHA256 9f45986f440032d38a61a322fd117c626be4e48d64b18930c3c678d498910975 SHA512 5ab487d8e6aa9caff32ed6e78182a5d397ee20eb115cc836eafca0b6588fe3b17b3900f910d39d187c4cbc228981a4f4af07708c4f8d33a6b784692c900ffcf8 WHIRLPOOL 68b0fb565853c218e1a09b7601b73e1773c5ccb78378e2d7dc5d0f2a429f4b0259ecfa6360b3483a0e859b867abbe0b31cfd9420cdd25e9722ed599b84b3ca49 diff --git a/dev-perl/Passwd-Unix/Passwd-Unix-0.710.0.ebuild b/dev-perl/Passwd-Unix/Passwd-Unix-0.710.0.ebuild new file mode 100644 index 000000000000..eeb38e51d0b6 --- /dev/null +++ b/dev-perl/Passwd-Unix/Passwd-Unix-0.710.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=STRZELEC +DIST_VERSION=0.71 +inherit perl-module + +DESCRIPTION="access to standard unix passwd files" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + virtual/perl-Carp + dev-perl/Crypt-PasswdMD5 + virtual/perl-Exporter + virtual/perl-File-Path + virtual/perl-File-Spec + >=virtual/perl-IO-Compress-2.15.0 + dev-perl/Struct-Compare +" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" +src_prepare() { + mkdir t/ + mv test.pl t/test.t + sed -i 's|test\.pl$|t/test.t|' MANIFEST + perl-module_src_prepare +} diff --git a/dev-perl/Passwd-Unix/metadata.xml b/dev-perl/Passwd-Unix/metadata.xml new file mode 100644 index 000000000000..caca694d6f1c --- /dev/null +++ b/dev-perl/Passwd-Unix/metadata.xml @@ -0,0 +1,12 @@ + + + + + perl@gentoo.org + Gentoo Perl Project + + + Passwd-Unix + Passwd::Unix + + diff --git a/dev-perl/Perl-Critic-Deprecated/Manifest b/dev-perl/Perl-Critic-Deprecated/Manifest index fd5d59ce2a27..ce338408bab0 100644 --- a/dev-perl/Perl-Critic-Deprecated/Manifest +++ b/dev-perl/Perl-Critic-Deprecated/Manifest @@ -1 +1,2 @@ DIST Perl-Critic-Deprecated-1.108.tar.gz 15074 SHA256 24beef4270a40887cd1b4e080c83553a3eddfd34702c454da5adbe27b14625df SHA512 6751f2c39976dbc66c7b1b5fa5c2612b53004567dad6a4e8b7f85416363324d354198e8130609892c4a7f3e96e823e93dd91080133b43079e4b10f19346b845e WHIRLPOOL c39efdc4b1cd9d3b9e56bd6805a8f34649a468dc7238cc70aaf4331ee3c305589ab0876681a865496f0a54e141af9bf0095f03e5f9f0b24d28342e811ea0a313 +DIST Perl-Critic-Deprecated-1.119.tar.gz 27706 SHA256 160970c29a72afbe412fa4ce1d14ce662ee271ea6fd1754ee62f00f89f62aac2 SHA512 314ca325d860a7e5d46514b254bee65371c715688c5c247ac4f64a1c3bf0dd9ecc447ce6f48be9f3797348465ccd8c7baa528a6a9bb269eb8850dd2d34e91b79 WHIRLPOOL 40efc2a8f7728ac5d67b2de6722e896d8084c184f73260014f52c47f6a129fc32b9c2869062afdee92f35207d941d7c410de8b3bf6602014300b5f3c67bfc322 diff --git a/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0.ebuild b/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0.ebuild new file mode 100644 index 000000000000..797aa4fd1b0c --- /dev/null +++ b/dev-perl/Perl-Critic-Deprecated/Perl-Critic-Deprecated-1.119.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=THALJEF +DIST_VERSION=1.119 +inherit perl-module + +DESCRIPTION="Perl::Critic policies which have been superseded by others" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="test" + +RDEPEND=" + virtual/perl-Carp + >=dev-perl/Perl-Critic-1.118.0 + dev-perl/Readonly +" +DEPEND="${RDEPEND} + >=dev-perl/Module-Build-0.400.0 + test? ( virtual/perl-Test-Simple ) +" diff --git a/dev-perl/Perl-Critic-Deprecated/metadata.xml b/dev-perl/Perl-Critic-Deprecated/metadata.xml index 7c4663f0fe81..22b802770980 100644 --- a/dev-perl/Perl-Critic-Deprecated/metadata.xml +++ b/dev-perl/Perl-Critic-Deprecated/metadata.xml @@ -8,6 +8,7 @@ Perl-Critic-Deprecated Perl::Critic::Deprecated + Perl::Critic::Policy::Miscellanea::RequireRcsKeywords Perl::Critic::Policy::NamingConventions::ProhibitMixedCaseSubs Perl::Critic::Policy::NamingConventions::ProhibitMixedCaseVars Perl::Critic::Utils::PPIRegexp diff --git a/dev-perl/Perl-Critic/Manifest b/dev-perl/Perl-Critic/Manifest index 012eb344ecad..3cf3bb79e606 100644 --- a/dev-perl/Perl-Critic/Manifest +++ b/dev-perl/Perl-Critic/Manifest @@ -1,2 +1,3 @@ DIST Perl-Critic-1.118.tar.gz 645371 SHA256 666d2bef3ac924598c06a05277680da5910e10d94c5ec161336f6509c11155e8 SHA512 d5a66826524ae2c70050bd82e715b97be2704042e477c832669c5c4443b61b3f54ddd7cd246808c1397572f299dcc42c36ab6eece5041a29bcfcd76deb7b9074 WHIRLPOOL 82516f565c28ce86884ff6575a0732c55545da6919a5503518fd3a581cc989aa55b11fe82d0f82770c904cf32cf0b1e959e9dabd6a69c1a3cb30c0d105007f8c DIST Perl-Critic-1.123.tar.gz 631981 SHA256 16a182e48068f75199fdf37e3188dd3985045ca134ab1df1d0922e90e30ac19c SHA512 732ba39d69c64ca7ff047bbd998e2dcc5f5486bd02ba7ea8135f4ac9c69ef8443bd248e4411da9ad0d4db7dfc0e5c700f92111e0b8d9962b6ed71dd2c0ff94a1 WHIRLPOOL 1edd106f32949e54fd2e78bd8402e2fdc8b54501b6ebbd9c300ed7b9760104b9a0af599f351c30d9084ec031007fd3711778a29ae5ba254da86aa2c1f4e223e9 +DIST Perl-Critic-1.126.tar.gz 646552 SHA256 b1a6151cb3603aef8555195b807e831655c83003b81e2f64fff095ff7114f5af SHA512 9427447893eabc83cafd5126d015aa29d9694a83fdd01dd45f5156af9c672a955e0ec6c0ebdddc2ab3ed2d22bdbf14cc016ce474c24fd18d8046bc2889ca33d2 WHIRLPOOL b89ed14331a5fc37f4268ec46e1045e1563bbf61335deef51b480adff3ecadb82bf36ab7dd16a45db865d8beaf86c5e8f4470556c3513cf987c4eed66a0d3a91 diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild index 21855423b7d3..7b093394b486 100644 --- a/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild +++ b/dev-perl/Perl-Critic/Perl-Critic-1.118.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,7 +19,7 @@ RDEPEND=">=dev-perl/Module-Pluggable-3.1 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String - dev-perl/perltidy + dev-perl/Perl-Tidy >=dev-perl/PPI-1.215 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.27.0 diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild index 47a7b7cc89ac..49704ea23e85 100644 --- a/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild +++ b/dev-perl/Perl-Critic/Perl-Critic-1.123.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -19,7 +19,7 @@ RDEPEND=">=dev-perl/Module-Pluggable-3.1 >=dev-perl/Email-Address-1.88.9 dev-perl/List-MoreUtils dev-perl/IO-String - dev-perl/perltidy + dev-perl/Perl-Tidy >=dev-perl/PPI-1.220 dev-perl/PPIx-Utilities >=dev-perl/PPIx-Regexp-0.27.0 diff --git a/dev-perl/Perl-Critic/Perl-Critic-1.126.0.ebuild b/dev-perl/Perl-Critic/Perl-Critic-1.126.0.ebuild new file mode 100644 index 000000000000..c2287c033bd4 --- /dev/null +++ b/dev-perl/Perl-Critic/Perl-Critic-1.126.0.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=THALJEF +DIST_VERSION=1.126 +inherit perl-module elisp-common + +DESCRIPTION="Critique Perl source code for best-practices" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +IUSE="test minimal examples emacs" +SITEFILE="50${PN}-gentoo.el" +RDEPEND=" + >=dev-perl/B-Keywords-1.50.0 + virtual/perl-Carp + >=dev-perl/Config-Tiny-2 + >=dev-perl/Email-Address-1.889.0 + >=dev-perl/Exception-Class-1.230.0 + >=virtual/perl-Exporter-5.630.0 + dev-perl/File-HomeDir + virtual/perl-File-Path + virtual/perl-File-Spec + virtual/perl-File-Temp + dev-perl/File-Which + virtual/perl-Getopt-Long + dev-perl/IO-String + >=dev-perl/List-MoreUtils-0.190.0 + >=dev-perl/Module-Pluggable-3.100.0 + >=dev-perl/PPI-1.220 + >=dev-perl/PPIx-Regexp-0.27.0 + >=dev-perl/PPIx-Utilities-1.1.0 + virtual/perl-Pod-Parser + >=dev-perl/Pod-Spell-1 + >=dev-perl/Readonly-2 + virtual/perl-Scalar-List-Utils + >=dev-perl/String-Format-1.130.0 + dev-perl/Task-Weaken + >=virtual/perl-Term-ANSIColor-2.20.0 + >=virtual/perl-Test-Simple-0.920.0 + >=virtual/perl-Text-ParseWords-3 + dev-perl/Perl-Tidy + >=virtual/perl-version-0.770.0 + emacs? ( virtual/emacs ) +" +DEPEND="${RDEPEND} + >=dev-perl/Module-Build-0.402.400 + test? ( + dev-perl/Test-Deep + !minimal? ( + dev-perl/Test-Memory-Cycle + ) + )" + +src_compile() { + perl-module_src_compile + if use emacs; then + elisp-compile extras/perlcritic.el + fi +} +src_install() { + perl-module_src_install + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + docinto examples/ + dodoc -r examples/* + fi + if use emacs; then + ewarn "USE=emacs: perlcritic-mode is broken upstream, but is installed anyway" + ewarn " https://github.com/Perl-Critic/Perl-Critic/issues/682" + elisp-install ${PN} extras/perlcritic.{el,elc} + elisp-site-file-install "${FILESDIR}/${SITEFILE}" + fi +} +pkg_postinst() { + use emacs && elisp-site-regen +} +pkg_postrm() { + use emacs && elisp-site-regen +} diff --git a/dev-perl/Perl-Critic/files/50Perl-Critic-gentoo.el b/dev-perl/Perl-Critic/files/50Perl-Critic-gentoo.el new file mode 100644 index 000000000000..ade0206ae77c --- /dev/null +++ b/dev-perl/Perl-Critic/files/50Perl-Critic-gentoo.el @@ -0,0 +1,13 @@ +;;; dev-perl/Perl-Critic site-lisp configuration +(add-to-list 'load-path "@SITELISP@") + +(autoload 'perlcritic "perlcritic" "" t) +(autoload 'perlcritic-region "perlcritic" "" t) +(autoload 'perlcritic-mode "perlcritic" "" t) + +;;; auto-run for cperl-mode and perl-mode +;; +;; (eval-after-load "cperl-mode" +;; '(add-hook 'cperl-mode-hook 'perlcritic-mode)) +;; (eval-after-load "perl-mode" +;; '(add-hook 'perl-mode-hook 'perlcritic-mode)) diff --git a/dev-perl/Perl-Critic/metadata.xml b/dev-perl/Perl-Critic/metadata.xml index d56e10591fd0..ae0ee55207d8 100644 --- a/dev-perl/Perl-Critic/metadata.xml +++ b/dev-perl/Perl-Critic/metadata.xml @@ -41,6 +41,7 @@ Perl::Critic::Policy::BuiltinFunctions::ProhibitStringySplit Perl::Critic::Policy::BuiltinFunctions::ProhibitUniversalCan Perl::Critic::Policy::BuiltinFunctions::ProhibitUniversalIsa + Perl::Critic::Policy::BuiltinFunctions::ProhibitUselessTopic Perl::Critic::Policy::BuiltinFunctions::ProhibitVoidGrep Perl::Critic::Policy::BuiltinFunctions::ProhibitVoidMap Perl::Critic::Policy::BuiltinFunctions::RequireBlockGrep @@ -67,6 +68,7 @@ Perl::Critic::Policy::ControlStructures::ProhibitUnlessBlocks Perl::Critic::Policy::ControlStructures::ProhibitUnreachableCode Perl::Critic::Policy::ControlStructures::ProhibitUntilBlocks + Perl::Critic::Policy::ControlStructures::ProhibitYadaOperator Perl::Critic::Policy::Documentation::PodSpelling Perl::Critic::Policy::Documentation::RequirePackageMatchesPodName Perl::Critic::Policy::Documentation::RequirePodAtEnd @@ -115,6 +117,7 @@ Perl::Critic::Policy::RegularExpressions::ProhibitSingleCharAlternation Perl::Critic::Policy::RegularExpressions::ProhibitUnusedCapture Perl::Critic::Policy::RegularExpressions::ProhibitUnusualDelimiters + Perl::Critic::Policy::RegularExpressions::ProhibitUselessTopic Perl::Critic::Policy::RegularExpressions::RequireBracesForMultiline Perl::Critic::Policy::RegularExpressions::RequireDotMatchAnything Perl::Critic::Policy::RegularExpressions::RequireExtendedFormatting diff --git a/dev-perl/Perl-Tags/Manifest b/dev-perl/Perl-Tags/Manifest index cead9787354b..0432f7bf193d 100644 --- a/dev-perl/Perl-Tags/Manifest +++ b/dev-perl/Perl-Tags/Manifest @@ -1 +1,2 @@ DIST Perl-Tags-0.28.tar.gz 34599 SHA256 f5859dc4772cc6bbb164cbd2eb07a6879050c301a32ef8e81ce1be848f8f6611 SHA512 2f194c3ffb629029f954069bb56835fb3d38303a560b28fabd295fe52fd854510637443eae991c1942cefeef140f16a6a6f27b2cafb27664d6aa620e3ccd164c WHIRLPOOL 7c96bf270059543c8a4436cd0302ee4d675dc55b08ac388646623321a9a5df034fd36e2d8e486fb938d6a238af5b2a8d8eaf51a798a6d1900d040770321f38ba +DIST Perl-Tags-0.32.tar.gz 73099 SHA256 0230551d9379f857f596c149190c5f35422dfd6df24ce104ec070c287daf5741 SHA512 e2042b6c0e54a4c296f182446a1de21d5a1da367bc5f9d0362f4b133e226624b81eed85fd27cdd4bd618349bf447893a1c96a6aede2e22b5db234d67d20fb0fc WHIRLPOOL 211420f5cb550a8f25871dcc7d0e4c6a5b19601b98286f342ec77d356efd6d6d5d24ff50ee3b027fa0528c983b57e25a053d20cb3b10103b12b4aadbb7386c48 diff --git a/dev-perl/Perl-Tags/Perl-Tags-0.320.0.ebuild b/dev-perl/Perl-Tags/Perl-Tags-0.320.0.ebuild new file mode 100644 index 000000000000..b568528b20d0 --- /dev/null +++ b/dev-perl/Perl-Tags/Perl-Tags-0.320.0.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=OSFAMERON +DIST_VERSION=0.32 +inherit perl-module + +DESCRIPTION="Generate (possibly exuberant) Ctags style tags for Perl sourcecode" + +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="test minimal" + +PATCHES=( + "${FILESDIR}/vim_noplugin.patch" # https://rt.cpan.org/Ticket/Display.html?id=105899 +) +PERL_RM_FILES=( + "README.pod" # https://rt.cpan.org/Ticket/Display.html?id=113166 +) +RDEPEND=" + dev-perl/File-Find-Rule + virtual/perl-Data-Dumper + virtual/perl-File-Spec + virtual/perl-File-Temp + dev-perl/Module-Locate + dev-perl/Path-Tiny + virtual/perl-parent + !minimal? ( + dev-perl/PPI + ) +" +DEPEND="${RDEPEND} + >=virtual/perl-ExtUtils-MakeMaker-6.360.0 + test? ( + dev-perl/Capture-Tiny + dev-perl/Test-Exception + dev-perl/Test-LongString + >=virtual/perl-Test-Simple-0.420.0 + !minimal? ( + app-editors/vim[perl] + ) + ) +" diff --git a/dev-perl/Perl-Tags/files/vim_noplugin.patch b/dev-perl/Perl-Tags/files/vim_noplugin.patch new file mode 100644 index 000000000000..fa0d553386ea --- /dev/null +++ b/dev-perl/Perl-Tags/files/vim_noplugin.patch @@ -0,0 +1,11 @@ +diff -Naur Perl-Tags-0.32/t/05_vim.t Perl-Tags-0.32b/t/05_vim.t +--- Perl-Tags-0.32/t/05_vim.t 2014-05-11 12:11:34.000000000 +0000 ++++ Perl-Tags-0.32b/t/05_vim.t 2016-03-19 04:25:04.831985917 +0000 +@@ -37,6 +37,7 @@ + system vim => + -u => 't/_vimrc', # use our vimrc to add Perl::Tags settings etc. + -S => 't/session.vim', # use our session file to make modfications to file ++ '--noplugin', # Don't load 3rd party plugins which can break + '-n', # don't use swapfile + $temp; + diff --git a/dev-perl/perltidy/Manifest b/dev-perl/Perl-Tidy/Manifest similarity index 66% rename from dev-perl/perltidy/Manifest rename to dev-perl/Perl-Tidy/Manifest index 96abffd8609e..834625eca923 100644 --- a/dev-perl/perltidy/Manifest +++ b/dev-perl/Perl-Tidy/Manifest @@ -1,2 +1,3 @@ DIST Perl-Tidy-20130922.tar.gz 422005 SHA256 e58cd6f00067dc814d2cecab209087d3b282648371b5a2ebd6f48484c030b762 SHA512 8c8d0cc388f0f74fdbd86238cf0b50c84619102a0dd6ffb0176b05877c7bef616d7f11104294246b7275e526dde29d1f0bb146a36b7234222fb462097976409b WHIRLPOOL 11338dafe884b67884ef73495379ecb1ffbba636de93b224716c353439cf1f1e78ed03baace9bf46daf898025e807706bb4bcc7efb99a7052b0926642c1eae67 DIST Perl-Tidy-20140711.tar.gz 422397 SHA256 1576ceb3fd9f592d0285affbe7192685963dc1d0411968cc0587d6ac0d7b3ad8 SHA512 2e4f22f02f13a119569afcb9a6a4583257a2edb6aee1c69e6bae9c83a263eb282f2f8492bf89903387ec24219e38c3ed5ddb12024ea6c6f7b17331710eb6f693 WHIRLPOOL 4437494a9ac1ef1136fb3df8b737baed13724a19075046f913bdcda085e8d04b1b198899e15d053a598968c50155cc364d5a425442ff45927e08d8422663dfd5 +DIST Perl-Tidy-20160302.tar.gz 428484 SHA256 6dd04ed8c315bcfea8fe713de8f9de68955795b6864f3be6c177e802fd30dca7 SHA512 68c7cef5723df717b5b314bee2bd76f29f49194479da993764cd127ced750d5cd8193b0c6c71c19c627687385d20d3e51ea01fcd81ec69374c7edb253bcac4f1 WHIRLPOOL 0997e0aa6c808dc27be099484a7b4fee51b3a817317c107fac323c2c9eeb7fe6df252f7c0d6083dfa17690d022c746feda903f976e48e1da2e6d82b3f8ca3be2 diff --git a/dev-perl/perltidy/perltidy-20130922.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20130922.0.0.ebuild similarity index 90% rename from dev-perl/perltidy/perltidy-20130922.0.0.ebuild rename to dev-perl/Perl-Tidy/Perl-Tidy-20130922.0.0.ebuild index c00486b8a60c..9c2a1a8d5bf9 100644 --- a/dev-perl/perltidy/perltidy-20130922.0.0.ebuild +++ b/dev-perl/Perl-Tidy/Perl-Tidy-20130922.0.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Perl-Tidy MODULE_AUTHOR=SHANCOCK MODULE_VERSION=20130922 inherit perl-module diff --git a/dev-perl/perltidy/perltidy-20140711.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20140711.0.0.ebuild similarity index 90% rename from dev-perl/perltidy/perltidy-20140711.0.0.ebuild rename to dev-perl/Perl-Tidy/Perl-Tidy-20140711.0.0.ebuild index 85d97b4b57ce..59b16bfb7233 100644 --- a/dev-perl/perltidy/perltidy-20140711.0.0.ebuild +++ b/dev-perl/Perl-Tidy/Perl-Tidy-20140711.0.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Perl-Tidy MODULE_AUTHOR=SHANCOCK MODULE_VERSION=20140711 inherit perl-module diff --git a/dev-perl/Perl-Tidy/Perl-Tidy-20160302.0.0.ebuild b/dev-perl/Perl-Tidy/Perl-Tidy-20160302.0.0.ebuild new file mode 100644 index 000000000000..1149c66c4d11 --- /dev/null +++ b/dev-perl/Perl-Tidy/Perl-Tidy-20160302.0.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=SHANCOCK +DIST_VERSION=20160302 +inherit perl-module + +DESCRIPTION="Perl script indenter and beautifier" +HOMEPAGE="http://perltidy.sourceforge.net/ ${HOMEPAGE}" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris" +IUSE="examples" + +RDEPEND="" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" + +src_install() { + perl-module_src_install + + # Compressing pod is bad because perldoc can't decompress + # bzip2 automatically, and `less` can't render perldoc + docompress -x /usr/share/doc/${PF}/stylekey.pod + docompress -x /usr/share/doc/${PF}/tutorial + + dodoc docs/stylekey.pod + + docinto tutorial + dodoc docs/tutorial.pod docs/testfile.pl + + if use examples; then + docompress -x /usr/share/doc/${PF}/examples + docinto examples + dodoc -r "${S}"/examples/* + fi +} diff --git a/dev-perl/perltidy/files/perltidy-20130922.0.0-CVE-2014-2277.patch b/dev-perl/Perl-Tidy/files/Perl-Tidy-20130922.0.0-CVE-2014-2277.patch similarity index 100% rename from dev-perl/perltidy/files/perltidy-20130922.0.0-CVE-2014-2277.patch rename to dev-perl/Perl-Tidy/files/Perl-Tidy-20130922.0.0-CVE-2014-2277.patch diff --git a/dev-perl/perltidy/metadata.xml b/dev-perl/Perl-Tidy/metadata.xml similarity index 100% rename from dev-perl/perltidy/metadata.xml rename to dev-perl/Perl-Tidy/metadata.xml diff --git a/dev-perl/PerlIO-gzip/Manifest b/dev-perl/PerlIO-gzip/Manifest index 03d1d37226c9..477a769f33d1 100644 --- a/dev-perl/PerlIO-gzip/Manifest +++ b/dev-perl/PerlIO-gzip/Manifest @@ -1 +1,2 @@ DIST PerlIO-gzip-0.18.tar.gz 19179 SHA256 67b20e7e4dcc4230a44500dbbc63c6a267b09fdf4d4465275cc98a3f9f31bcf3 SHA512 b2f8cc1f00654ae40625cb8dfd1d529c48fad1578290a307a1dd51b4b57737d6476bdf7a122501984d047b3d01f5f0d49ab3bdd6f2e45f8435fce86eae0aa8f8 WHIRLPOOL 031219d2dbea6fa7e8e6a7b1054f4d8c937b652ff5eaa85f27246b8cd68dfb4683b4a5fa2c48d40de2d4cd789617cbf2a9391de10e41bba52ff9b939078146e4 +DIST PerlIO-gzip-0.19.tar.gz 18956 SHA256 d2e9351d58b8a93c86811e25a898ee651fc393a157413652bf42f9aada2eb284 SHA512 514b4e224bb66f00c1e7e4678ede625b6fd0ce0c2687bb7bf662d8ffe942c6a711426f27399343a9c02b0313dae8aa41a7e4551f7d9e59a178cc1a6d067d8608 WHIRLPOOL 910c067368608062b8a40540f6781f5564c5892525be019c60488d8398494493913aa45842c3a289085ac248c27706b334dba7df1d56314ab03ed361b0ab1493 diff --git a/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild new file mode 100644 index 000000000000..2d3ac4c803e8 --- /dev/null +++ b/dev-perl/PerlIO-gzip/PerlIO-gzip-0.190.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=NWCLARK +DIST_VERSION=0.19 +inherit perl-module + +DESCRIPTION="PerlIO layer to gzip/gunzip" + +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +IUSE="" + +DEPEND="sys-libs/zlib" +RDEPEND="${DEPEND} + virtual/perl-ExtUtils-MakeMaker +" diff --git a/dev-perl/Struct-Compare/Manifest b/dev-perl/Struct-Compare/Manifest new file mode 100644 index 000000000000..0c952476c971 --- /dev/null +++ b/dev-perl/Struct-Compare/Manifest @@ -0,0 +1 @@ +DIST Struct-Compare-1.0.1.tar.gz 3340 SHA256 f2edb625f223060d519f381d8d9643b98fd7aa0b13069762a6bd095f4a2382c2 SHA512 8a28f54476cf6d59193938ff48521fa147a7581787a8f6c61a4c0f7cc01622d5c6ec6aee63fed11af9f54e4bf496e0b20e1751400f645b518e05b61ec2b288a1 WHIRLPOOL 3d5b97d3c30274e0bb4e2d4877adb913b6a6ae8fda5f83f0a15a132d2b55dd3458f482a3c93c2362efac670f3632a20bbdc401284ff33515d6421d46e684714f diff --git a/dev-perl/Struct-Compare/Struct-Compare-1.0.1.ebuild b/dev-perl/Struct-Compare/Struct-Compare-1.0.1.ebuild new file mode 100644 index 000000000000..2b378908e091 --- /dev/null +++ b/dev-perl/Struct-Compare/Struct-Compare-1.0.1.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DIST_AUTHOR=ZENSPIDER +inherit perl-module + +DESCRIPTION="Recursive diff for perl structures" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + virtual/perl-ExtUtils-MakeMaker +" diff --git a/dev-perl/Struct-Compare/metadata.xml b/dev-perl/Struct-Compare/metadata.xml new file mode 100644 index 000000000000..a5372fcd02dc --- /dev/null +++ b/dev-perl/Struct-Compare/metadata.xml @@ -0,0 +1,12 @@ + + + + + perl@gentoo.org + Gentoo Perl Project + + + Struct-Compare + Struct::Compare + + diff --git a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild index d2ceaab0bdca..332e66acf747 100644 --- a/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild +++ b/dev-perl/Sub-Exporter-Progressive/Sub-Exporter-Progressive-0.1.11.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="Only use Sub::Exporter if you need it" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~ppc-aix ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="" RDEPEND=" diff --git a/dev-perl/Test-SharedFork/Manifest b/dev-perl/Test-SharedFork/Manifest index e534225ef3a3..ed700041bcc1 100644 --- a/dev-perl/Test-SharedFork/Manifest +++ b/dev-perl/Test-SharedFork/Manifest @@ -1,3 +1,2 @@ DIST Test-SharedFork-0.21.tar.gz 28865 SHA256 c118ca297cf9c877c625f12d2a2f916f6f425c203755f59712d63213e7811b21 SHA512 8259c0b99e90bf7b68c1c4cc32a491540b7a6b7a27f91defa2ab11c1263edf6e9f354d5adc4abf435246f15e1b03dab4d97a01a919dfd8db564c9baf19e3017e WHIRLPOOL 36d39809d3d4c88c341bc19386e3e6c900dc68afbace0c6fcbf4ecf1555bcb8620adc8a504e29eaf480def477c0ca80f60adddbe484166021f6f26511ef3c859 -DIST Test-SharedFork-0.29.tar.gz 15449 SHA256 63af7788cc35b9b7e6fa37c61220ca66abd6364d8bb90c20038e3d8241988a6e SHA512 ef392d615bc0be2fb04f27f0f1dcbaf8041a52242131c62d00357228b532087a50beae44bdb3d94f883a009741847641fed87665198b624139c762dcba5488ec WHIRLPOOL 9ebc04cde5459d973199c3511025135b398a0f19bd61d6f97cc575eac51ead451b1135de3233ed51c00eb820ad5df02a5296415f4e6e3b82402e8c84fecd2473 DIST Test-SharedFork-0.33.tar.gz 15404 SHA256 16238d4343083e1466d52e4d8876b8bd2d6fbb26136ba5e0e9d62babebac5c8a SHA512 3218023d48b05c31bfba8d9629f8acb1379c91efa7713187741fd9851c8c645ec62143025d7c0038e5d52a3fbd21cac6030e15c816745de5461a40529ceb4bf3 WHIRLPOOL 21b983505ca70b093b9c33359104817c657fb252dd40737983514fa5c9f1e6973ea796e9e692b28e281977f908d440af11b0715ee69158f7d5fcbf6d8b850148 diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.290.0.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.290.0.ebuild deleted file mode 100644 index 7fad6c7f6295..000000000000 --- a/dev-perl/Test-SharedFork/Test-SharedFork-0.290.0.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -MODULE_AUTHOR=EXODIST -MODULE_VERSION=0.29 -inherit perl-module - -DESCRIPTION="fork test" - -SLOT="0" -KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" -IUSE="test" - -RDEPEND=" - virtual/perl-File-Temp - >=virtual/perl-Test-Simple-0.880.0 -" -DEPEND="${RDEPEND} - >=virtual/perl-ExtUtils-MakeMaker-6.640.0 - test? ( - virtual/perl-Test-Harness - virtual/perl-Test-Simple - dev-perl/Test-Requires - virtual/perl-Time-HiRes - ) -" - -SRC_TEST=do diff --git a/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild b/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild index 734e9227fd4b..070ef01faa6b 100644 --- a/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild +++ b/dev-perl/Test-SharedFork/Test-SharedFork-0.330.0.ebuild @@ -11,7 +11,7 @@ inherit perl-module DESCRIPTION="fork test" SLOT="0" -KEYWORDS="alpha amd64 ~hppa ~ia64 ppc ~ppc64 ~sparc x86" +KEYWORDS="alpha amd64 ~hppa ia64 ppc ~ppc64 sparc x86" IUSE="test" RDEPEND=" diff --git a/dev-perl/Period/Manifest b/dev-perl/Time-Period/Manifest similarity index 100% rename from dev-perl/Period/Manifest rename to dev-perl/Time-Period/Manifest diff --git a/dev-perl/Period/Period-1.240.0-r1.ebuild b/dev-perl/Time-Period/Time-Period-1.240.0-r1.ebuild similarity index 80% rename from dev-perl/Period/Period-1.240.0-r1.ebuild rename to dev-perl/Time-Period/Time-Period-1.240.0-r1.ebuild index fe2d52c36c21..8af93c6a22c9 100644 --- a/dev-perl/Period/Period-1.240.0-r1.ebuild +++ b/dev-perl/Time-Period/Time-Period-1.240.0-r1.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Time-Period MODULE_AUTHOR=PBOYD MODULE_VERSION=1.24 inherit perl-module diff --git a/dev-perl/Period/Period-1.250.0.ebuild b/dev-perl/Time-Period/Time-Period-1.250.0.ebuild similarity index 80% rename from dev-perl/Period/Period-1.250.0.ebuild rename to dev-perl/Time-Period/Time-Period-1.250.0.ebuild index ba2d7636c908..fd0b3c180edb 100644 --- a/dev-perl/Period/Period-1.250.0.ebuild +++ b/dev-perl/Time-Period/Time-Period-1.250.0.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -MY_PN=Time-Period MODULE_AUTHOR=PBOYD MODULE_VERSION=1.25 inherit perl-module diff --git a/dev-perl/Period/metadata.xml b/dev-perl/Time-Period/metadata.xml similarity index 100% rename from dev-perl/Period/metadata.xml rename to dev-perl/Time-Period/metadata.xml diff --git a/dev-perl/glib-perl/glib-perl-1.314.0.ebuild b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild index aa7d931a78d4..feeccc4a4f4e 100644 --- a/dev-perl/glib-perl/glib-perl-1.314.0.ebuild +++ b/dev-perl/glib-perl/glib-perl-1.314.0.ebuild @@ -14,7 +14,7 @@ HOMEPAGE="http://gtk2-perl.sf.net/ ${HOMEPAGE}" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" RDEPEND=" diff --git a/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild b/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild index cb586d40255e..ff301d407273 100644 --- a/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild +++ b/dev-perl/gtk2-perl/gtk2-perl-1.249.500.ebuild @@ -14,7 +14,7 @@ DESCRIPTION="Perl bindings for GTK2" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~x86-solaris" IUSE="" RDEPEND=" diff --git a/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild b/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild index ff3781eb6f68..929f63093ded 100644 --- a/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild +++ b/dev-perl/libintl-perl/libintl-perl-1.240.0.ebuild @@ -13,7 +13,7 @@ HOMEPAGE="http://guido-flohr.net/projects/libintl-perl ${HOMEPAGE}" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="virtual/libintl" diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest index 7d848a4e04d5..a793dd633faa 100644 --- a/dev-python/botocore/Manifest +++ b/dev-python/botocore/Manifest @@ -2,3 +2,4 @@ DIST botocore-1.2.10.tar.gz 2202147 SHA256 8541895aa2abe2183fa15efe33794db7428fe DIST botocore-1.3.14.tar.gz 2289202 SHA256 44904496f26370f47469327e5df10e439aa07aaf1c0516c7c67352337eeeb729 SHA512 7cf1a342271b02842c5d989fa4ac2bb02074f8ff18dda70c751857f44b83e2ce02c904f0484a05f274bcb9459bf580e0456b72554e87509b2f2529170a239362 WHIRLPOOL efa0d700bdd7e9803be63fc3a54fffb4234356769b1dea69bf93c974deb9a3a3438d88de004dce6a0c83390042fb8f2b822d9204f6727eceb5aee657c22c6a98 DIST botocore-1.3.20.tar.gz 2326244 SHA256 9760d883611110a05f5f8346c7b2198aef87be9117d4cbe1e4ee6608a560c4a2 SHA512 bd8d80598631610da4f05c8cc735affef31c726dc30512e358950e967efefbe63455bc63dccbb180f059a3f9da6c0004edfafc9bf99198732708c1ef141f0b06 WHIRLPOOL 18ba18fa6d62b10d7547f58bf6e8d26cab8564f4e8a229dd6f939db6b4f4d05edda4a239811067443d14edcfe2b293acdb449fc809f551f99b4ff37e4fb70fbd DIST botocore-1.3.22.tar.gz 2349601 SHA256 02a6d320b09179bc5dcbafd4be732d9431bfebf5bed6d6b6508eca96b599a399 SHA512 7b349a78c83051a29993ce00a11ecfa4734425c3ed27ce3e405140e19017b5c670d857ea489ea1f6f3ec767b3e4704547565b2ec67f5d7001a0cc30ff2a39de7 WHIRLPOOL 98c5e7488c6d1fe5c3e3484c770f8b346508359c5d174e5660f10ea62b054f442e3d15cc716ddd5acc42f1af0a10463c1923de138338175f1dcba9ced283c8ee +DIST botocore-1.4.5.tar.gz 2415867 SHA256 d83d6623d9eba2d2e2474c35b6180809d3f4c36321006a49a8d1dd6f652a93c3 SHA512 275d9a44128137e387955a374af53227262c3faa6327bd93f58c7884666a05b44b90a9e8a06bdcfacd656a30a3694d337a09fc22ea623d7519a6f15ff047f705 WHIRLPOOL 3ad0898b872bd0f99293e36bffffe3e514da608c480eb068d9e098fa76ff68897088865249d143b82df021c71b00a63305bf017703cedd52a2665864487d6c2d diff --git a/dev-python/botocore/botocore-1.4.5.ebuild b/dev-python/botocore/botocore-1.4.5.ebuild new file mode 100644 index 000000000000..f3ea5ec44a17 --- /dev/null +++ b/dev-python/botocore/botocore-1.4.5.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="Low-level, data-driven core of boto 3." +HOMEPAGE="https://github.com/boto/botocore" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="doc test" + +CDEPEND=" + >=dev-python/docutils-0.10[${PYTHON_USEDEP}] + >=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}] + =dev-python/python-dateutil-2.1[${PYTHON_USEDEP}] + /dev/null 2>&1 - RUN_FEATURES+=$? - - ewarn "${PN} tests require a running docker service!" - which docker 1>/dev/null 2>&1 && docker info 1>/dev/null 2>&1 - RUN_FEATURES+=$? - - if [[ ${RUN_FEATURES} -eq 0 ]]; then - behave || die "Feature tests failed under ${EPYTHON}" - - fi - - py.test tests || die "Tests failed under ${EPYTHON}" -} diff --git a/dev-python/dockerpty/dockerpty-0.4.1.ebuild b/dev-python/dockerpty/dockerpty-0.4.1.ebuild new file mode 100644 index 000000000000..02e2d29db7bb --- /dev/null +++ b/dev-python/dockerpty/dockerpty-0.4.1.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) + +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Python library to use the pseudo-tty of a docker container" +HOMEPAGE="https://github.com/d11wtq/dockerpty" +SRC_URI="https://github.com/d11wtq/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( + >=dev-python/docker-py-0.7.0_rc2[${PYTHON_USEDEP}] + >=dev-python/expects-0.4[${PYTHON_USEDEP}] + >=dev-python/pytest-2.5.2[${PYTHON_USEDEP}] + ) +" +RDEPEND=">=dev-python/six-1.3.0[${PYTHON_USEDEP}]" + +python_test() { + py.test tests || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-python/glance_store/Manifest b/dev-python/glance_store/Manifest index 4b3734ebaffe..397625eab3ea 100644 --- a/dev-python/glance_store/Manifest +++ b/dev-python/glance_store/Manifest @@ -3,3 +3,4 @@ DIST glance_store-0.4.0.tar.gz 103982 SHA256 cd15e9f9a08dc8d3eeaa452682c8e53423f DIST glance_store-0.5.0.tar.gz 106922 SHA256 bb088cea0f83d3335191174b3fbdd5f5b2a39ae4f6e0739b9159e883658657db SHA512 e9f036c9f19ca2f3b8ba82a288a6402c91d849409f4594c61c59c14c8575b5827cf8e072c4772f5ef610fd186037b2d3c5cbc5fb032ca02c025e58a6a59a2dfa WHIRLPOOL 1943b6a26e96a9043b99d6d9b8c9af78468d05f825812250f7c7c396977d4e76d9370fe0c3fd2043d67d519c53c5e11c7541ae4f0389179b61e083f059cc5aea DIST glance_store-0.6.0.tar.gz 106047 SHA256 249c99818f7ebd1b3aea6c96a66e4e17351a1d9befaef885dada0483be6ee818 SHA512 065c3d68b67ce38a82f8eba29630f368bc723f2c6a34ed1c7adb2ab90f5d24c1b7f32a55c200e5b45167b26bd4d3dae5194484e9de17286cdd91685898276388 WHIRLPOOL c4553654288dc2f3f823a7fbde4ff4c2f1c97b704ff3f55069153819da64ffeb06380975a80db08a1dd33cbbc25418e233b1eadc2aee5569d125223efde69e4c DIST glance_store-0.9.1.tar.gz 110360 SHA256 29eb70a36b18cd9dce1f9f58b8a3c7dd69626b13a8e5a46c8f807e9d301d5f99 SHA512 60880a25cb4918ed8b4a9ee81bf6bc4b5732332dad48807b687c26917b4271d47f65dbbc3b1879db48f17efa4afe605d151a23aec7f3525621d61ee4a9751146 WHIRLPOOL c34e3aee26b7fe70ce68310a3a190f18670d266ba9942eccf3a87238dbe85063fb59935e4c9cee58d1fd88c22a918b76773994b33142fe6e0bf9e61e2fd4affc +DIST glance_store-0.9.2.tar.gz 111529 SHA256 01e5225ff4147b54a46bb7b66a508cdb9702fc22a86f79a3b36ef067e87e7e4d SHA512 059fd3589085e98855b0baaf42f33814c921ea1eea84663c19fae076a28ba5286a3869b9e0087040df100aa72156c416b09ddd2fe343f9dbc7726814b0f4361e WHIRLPOOL 962eca6aeaf3c68b8dd5b26805fc2a0a46a00b114daaadca8798eb35ea918a3c87283203179cd4a6d46c903e32e618251715b19fd813a7fad662e1871e86fdbd diff --git a/dev-python/glance_store/glance_store-0.9.2.ebuild b/dev-python/glance_store/glance_store-0.9.2.ebuild new file mode 100644 index 000000000000..a9c32eac3d02 --- /dev/null +++ b/dev-python/glance_store/glance_store-0.9.2.ebuild @@ -0,0 +1,49 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_4 ) + +inherit distutils-r1 + +DESCRIPTION="A connection pool for python-ldap" +HOMEPAGE="https://launchpad.net/oslo" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="+cinder +swift" + +CDEPEND=">=dev-python/pbr-1.3[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + ${CDEPEND} +" +RDEPEND=" + ${CDEPEND} + >=dev-python/oslo-config-2.3.0[${PYTHON_USEDEP}] + >=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}] + >=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}] + >=dev-python/oslo-utils-2.0.0[${PYTHON_USEDEP}] + !~dev-python/oslo-utils-2.6.0[${PYTHON_USEDEP}] + >=dev-python/oslo-concurrency-2.3.0[${PYTHON_USEDEP}] + >=dev-python/stevedore-1.5.0[${PYTHON_USEDEP}] + dev-python/enum34[$(python_gen_usedep 'python2*')] + >=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}] + >=dev-python/six-1.9.0[${PYTHON_USEDEP}] + cinder? ( >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] ) + swift? ( + >=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}] + >=dev-python/python-cinderclient-1.2.1[${PYTHON_USEDEP}] + ) + >=dev-python/jsonschema-2.0.0[${PYTHON_USEDEP}] + !~dev-python/jsonschema-2.5.0[${PYTHON_USEDEP}] + =1.3.1) and dev-python/beanstalkc +PY27_GEN_USEDEP=$(python_gen_usedep python2_7) +PYPY_GEN_USEDEP=$(python_gen_usedep python2_7 pypy) +RDEPEND=" + >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}] + >=dev-python/py-amqp-1.4.9[${PYTHON_USEDEP}] + =dev-python/pyzmq-13.1.0[${PYTHON_USEDEP}]' 'python*') + amqplib? ( >=dev-python/amqplib-1.0.2[${PYTHON_USEDEP}] ) + sqs? ( >=dev-python/boto-2.13.3[${PY27_GEN_USEDEP}] ) + msgpack? ( >=dev-python/msgpack-0.3.0[${PYTHON_USEDEP}] )" +# Fix to https://github.com/celery/kombu/issues/474 obliges dev-python/pymongo to >=-3.0.2 +DEPEND="${RDEPEND} + >=dev-python/setuptools-0.7[${PYTHON_USEDEP}] + test? ( + >=dev-python/unittest2-0.5.0[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-python/nose-cover3[${PYTHON_USEDEP}] + >=dev-python/coverage-3.0[${PYTHON_USEDEP}] + >=dev-python/mock-0.7.0[${PYPY_GEN_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] + >=dev-python/redis-py-2.10.3[${PYTHON_USEDEP}] + >=dev-python/pymongo-3.0.2[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] ) + doc? ( + dev-python/sphinx[${PYTHON_USEDEP}] + dev-python/django[${PYTHON_USEDEP}] + dev-python/beanstalkc[${PY27_GEN_USEDEP}] + dev-python/couchdb-python[${PYTHON_USEDEP}] + >=dev-python/sphinxcontrib-issuetracker-0.9[${PYTHON_USEDEP}] )" + +# kazoo and sqlalchemy are optional packages for tests. +# Refrain for now, no established demand for it from users + +# Req'd for test phase +DISTUTILS_IN_SOURCE_BUILD=1 + +PY27_REQUSE="$(python_gen_useflags 'python2.7')" +REQUIRED_USE=" + sqs? ( ${PY27_REQUSE} ) + doc? ( ${PY27_REQUSE} amqplib sqs )" # 2 deps in doc build are py2 capable only + +PATCHES=( + "${FILESDIR}"/${PN}-NA-tests-fix.patch + ) + +pkg_setup() { + use doc && DISTUTILS_ALL_SUBPHASE_IMPLS=( python2.7 ) +} + +python_prepare_all() { + # https://github.com/celery/kombu/issues/246 + sed -e 's:kombu.transports:kombu.transport:' -i funtests/tests/test_django.py + distutils-r1_python_prepare_all +} + +python_compile_all() { + # Doc build must be done by py2.7 + # Doc build misses and skips only content re librabbitmq which is not in portage + if use doc; then + emake -C docs html || die "kombu docs failed installation" + fi +} + +python_test() { + export DJANGO_SETTINGS_MODULE="django.conf" + # https://github.com/celery/kombu/issues/474 + # tests need =dev-python/pymongo-3.0.2 +# if [[ "${EPYTHON}" == python2.7 ]]; then +# pushd funtests > /dev/null +# esetup.py test +# popd > /dev/null +# fi + fi +} + +python_install_all() { + use examples && local EXAMPLES=( examples/. ) + use doc && local HTML_DOCS=( docs/.build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/lxml/lxml-3.5.0.ebuild b/dev-python/lxml/lxml-3.5.0.ebuild index e3fb85678127..dfff1fc1b0f5 100644 --- a/dev-python/lxml/lxml-3.5.0.ebuild +++ b/dev-python/lxml/lxml-3.5.0.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="BSD ElementTree GPL-2 PSF-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples +threads test" # Note: lib{xml2,xslt} are used as C libraries, not Python modules. diff --git a/dev-python/mkdocs/Manifest b/dev-python/mkdocs/Manifest index 5e5c66e965c8..7a0e7afef3b1 100644 --- a/dev-python/mkdocs/Manifest +++ b/dev-python/mkdocs/Manifest @@ -1,3 +1,3 @@ -DIST mkdocs-0.11.1.tar.gz 3688578 SHA256 dced877e483bf38bc0842ff656ad88196142252597c5e5bfd40973042d179bfe SHA512 dff3040be2b032447c500a9037876c446d7f208773f33a078ed93fc63f9c564f7ba382916d7879ae4d3f61300fdec1185d9f6a2d53cfb918fd5cfdf8e47c67b9 WHIRLPOOL c040e7725cac975b363e2ad110394d3b68e381fae6ff830bba7bb07d8d8262361ad0853db99e8133a8fed17a5a45761129fb48c59111a5dd6b0ea4b76006588b DIST mkdocs-0.12.2.tar.gz 6042907 SHA256 3d96844b742c00e7466d63a713a3b6b01575aa71f6ae7214dd12797d48df38b8 SHA512 149d8e27df8474ade24e4cbff1b8eef1d7a7549997499c7df774afdb89bc9fe0d8de7d869d8b29aba883d1672032c76e8dbdb7e8982da6f94e2145d0b554e677 WHIRLPOOL c476ff900c94cf880c7f5c5f8edb615f11e4f169bae0b696a217de0c7384c7fb4818b5f9afdfb8a6f7c5c77877ada518f938a1b0b756703b5866f82b6a240262 DIST mkdocs-0.14.0.tar.gz 6248506 SHA256 fd3e1623dcd7027dbac55f4d8c4f1c1b990e87588ee463999e717b5083556b73 SHA512 47c95f258362df8b124a9689a79a9927d26b1f7816b027fd14d193c79bb5340bdea8770c47566e00452edcdf801fe858569f4c76aa9d3f1799e6e7100bb916ff WHIRLPOOL be64596ebbd3c206ce805fa268719db49ff16272d63562c80664d9515f3a164304db80b680dcae7ff1a50a61cc42aa8a47c2df9ff6be270788eae36b5fb1e78d +DIST mkdocs-0.15.3.tar.gz 1805972 SHA256 a5442ae24fd9e6f9daeefaf354c960e5dac27ff388f63e1bb324ed8a1b7edaa9 SHA512 e5b72eb56dcc2fe2be154155af15845a7d0fc06d6176f1c6b2bb54e8673d207146bdd92b37a709d72c1d59fcc76a793e6fed5d7fb6d9008f28d43baa17e446f8 WHIRLPOOL 35bf8e111ad66e22edb3ad2d9e9ec993da0d866621a2a97eff6779ac8c2f20a20a644ee49c7255bddde3e5db4321881c831bf7491d7313b70b4a3e3c483ade87 diff --git a/dev-python/mkdocs/mkdocs-0.11.1-r1.ebuild b/dev-python/mkdocs/mkdocs-0.11.1-r1.ebuild deleted file mode 100644 index fed5d4d0089e..000000000000 --- a/dev-python/mkdocs/mkdocs-0.11.1-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) - -inherit distutils-r1 vcs-snapshot - -DESCRIPTION="Project documentation with Markdown." -HOMEPAGE="http://www.mkdocs.org" -SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="doc test" - -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/nose[${PYTHON_USEDEP}] ) -" - -RDEPEND=" - >=dev-python/jinja-2.7.1[${PYTHON_USEDEP}] - >=dev-python/markdown-2.3.1[${PYTHON_USEDEP}] - >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] - >=dev-python/watchdog-0.7.0[${PYTHON_USEDEP}] - >=dev-python/ghp-import-0.4.1[${PYTHON_USEDEP}] -" - -python_prepare_all() { - ebegin 'patching setup.py' - sed \ - -e "20s/,[^']*//" \ - -i setup.py - STATUS=${?} - eend ${STATUS} - [[ ${STATUS} -gt 0 ]] && die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - "${PYTHON}" -m mkdocs.main build || die "failed to build documentation" - fi -} - -python_test() { - nosetests mkdocs/test.py || die "tests failed under ${EPYTHON}" -} - -python_install_all() { - use doc && local HTML_DOCS=( site/. ) - - distutils-r1_python_install_all -} diff --git a/dev-python/mkdocs/mkdocs-0.15.3.ebuild b/dev-python/mkdocs/mkdocs-0.15.3.ebuild new file mode 100644 index 000000000000..2f570d19f64e --- /dev/null +++ b/dev-python/mkdocs/mkdocs-0.15.3.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +PYTHON_COMPAT=( python2_7 python3_3 python3_4 ) + +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Project documentation with Markdown." +HOMEPAGE="http://www.mkdocs.org" +SRC_URI="https://github.com/tomchristie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="BSD" +SLOT="0" +KEYWORDS="~amd64" +IUSE="test" + +CDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" +DEPEND=" + ${CDEPEND} + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + ) +" +RDEPEND=" + ${CDEPEND} + >=dev-python/click-3.3[${PYTHON_USEDEP}] + >=dev-python/jinja-2.7.1[${PYTHON_USEDEP}] + >=dev-python/livereload-2.3.2[${PYTHON_USEDEP}] + >=dev-python/markdown-2.3.1[${PYTHON_USEDEP}] + >=dev-python/mkdocs-bootstrap-0.1.1[${PYTHON_USEDEP}] + >=dev-python/mkdocs-bootswatch-0.1.0[${PYTHON_USEDEP}] + >=dev-python/pyyaml-3.10[${PYTHON_USEDEP}] + >=www-servers/tornado-4.1[${PYTHON_USEDEP}] +" + +python_test() { + nosetests mkdocs/tests || die "tests failed under ${EPYTHON}" +} diff --git a/dev-python/pillow/pillow-3.1.1.ebuild b/dev-python/pillow/pillow-3.1.1.ebuild index 004f727df3b3..10ca13426caf 100644 --- a/dev-python/pillow/pillow-3.1.1.ebuild +++ b/dev-python/pillow/pillow-3.1.1.ebuild @@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.zip" LICENSE="HPND" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris" IUSE="doc examples jpeg jpeg2k lcms test tiff tk truetype webp zlib" REQUIRED_USE="test? ( jpeg tiff )" diff --git a/dev-python/pip/Manifest b/dev-python/pip/Manifest index 2e5b2bc9c9ee..4442d75234c2 100644 --- a/dev-python/pip/Manifest +++ b/dev-python/pip/Manifest @@ -1,3 +1,4 @@ DIST pip-7.1.2.tar.gz 1049170 SHA256 ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477 SHA512 78082afe6b559bf87f91ae9b6d304cfbfce00206e09be42fdae9d449a55cd8d968df6873e834191d0b0e6baae29e72eb3eee42386ff7c5dc9c29b6c28b754449 WHIRLPOOL 953fdc9104f3ac34c9104ec93948f58c4b0e193f18da60d3247d801c283c574490f8b91146e4278888c0b920090f537095c1a1693ca352d062dd98473390fdc9 DIST pip-8.0.2.tar.gz 1130183 SHA256 46f4bd0d8dfd51125a554568d646fe4200a3c2c6c36b9f2d06d2212148439521 SHA512 f2660725da4efa156c6c0f6cb9ba3f10e8b6dd2fc9113e9a8754a59f38ee6161e5a648f9dbcf8853ef85a85d3164bcaac3a7032ac2057e92f331a337cacfc5d9 WHIRLPOOL abc88372746193686910ee127ac3f6f4bb7f3a5d7f897f705c2e43ea91d60c55ed26faf5e6acddd1d7e01772cbff4836195dcf22f9fc9dec30ad8c89986db778 DIST pip-8.0.3.tar.gz 1131758 SHA256 30f98b66f3fe1069c529a491597d34a1c224a68640c82caf2ade5f88aa1405e8 SHA512 744111288dd86580e55a4eaeebcaab7b5fdd9e2ea47500e3febe2ce0a282b074f0c687d40a764b98bc54e0bf50748506eb8a5e220a095f2fe655f5cb42ba47c1 WHIRLPOOL 5bd7824ae4a311d98e47ccbf5fcc65b06579d30c0baa58357838935fd2646e87a610e76b22704b20d0c9379c321b878b409639e3604e725f2f08f83a8d7f1dda +DIST pip-8.1.1.tar.gz 1139175 SHA256 3e78d3066aaeb633d185a57afdccf700aa2e660436b4af618bcb6ff0fa511798 SHA512 3b8f629ca19bff627317415ca681a5ea12171be57a04347e83dcee4a4d013ff9db47beddd56bded1856d4f0ae1a075d901140fe04f544df8018f066d812c0f28 WHIRLPOOL f5ae76d3e2b6807aee5c2af03a2c83a18ae12182a8a533bc50e16ca07eb5efa1f7181d90ffcab171a687ace6880ddd8149b95a003ba749d21ae00ce1b0601891 diff --git a/dev-python/pip/pip-8.1.1.ebuild b/dev-python/pip/pip-8.1.1.ebuild new file mode 100644 index 000000000000..7a028386fed1 --- /dev/null +++ b/dev-python/pip/pip-8.1.1.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) +PYTHON_REQ_USE="threads(+)" + +inherit bash-completion-r1 distutils-r1 + +DESCRIPTION="Installs python packages -- replacement for easy_install" +HOMEPAGE="https://pip.pypa.io/ https://pypi.python.org/pypi/pip/ https://github.com/pypa/pip/" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +SLOT="0" + +# Check pip/_vendor/vendor.txt for this +#VENDOR_DEPEND=" +# >=dev-python/distlib-0.2.2[${PYTHON_USEDEP}] +# >=dev-python/html5lib-1.0b8[${PYTHON_USEDEP}] +# >=dev-python/six-1.10.0${PYTHON_USEDEP}] +# >=dev-python/colorama-0.3.6[${PYTHON_USEDEP}] +# >=dev-python/requests-2.9.1-r2[${PYTHON_USEDEP}] +# >=dev-python/CacheControl-0.11.6[${PYTHON_USEDEP}] +# >=dev-python/lockfile-0.12.2[${PYTHON_USEDEP}] +# >=dev-python/progress-1.2[${PYTHON_USEDEP}] +# >=dev-python/packaging-16.5[${PYTHON_USEDEP}] +# >=dev-python/retrying-1.3.3[${PYTHON_USEDEP}] +# >=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}] +# virtual/python-ipaddress[${PYTHON_USEDEP}] +#" +# https://github.com/pypa/pip/issues/3057 +#RDEPEND="${VENDOR_DEPEND} +# >=dev-python/setuptools-19.2[${PYTHON_USEDEP}] +# "${COMPLETION}" || die + newbashcomp "${COMPLETION}" ${PN} + + "${PYTHON}" -m pip completion --zsh > "${COMPLETION}" || die + insinto /usr/share/zsh/site-functions + newins "${COMPLETION}" _pip +} diff --git a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild index fb86310adec6..ca9369fbf93d 100644 --- a/dev-python/pycairo/pycairo-1.10.0-r5.ebuild +++ b/dev-python/pycairo/pycairo-1.10.0-r5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -22,7 +22,7 @@ SRC_URI=" # || ( LGPL-2.1 MPL-1.1 ) for pycairo 1.8.10. LICENSE="LGPL-3 || ( LGPL-2.1 MPL-1.1 )" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc examples +svg test xcb" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -133,8 +133,10 @@ src_install() { # calling them .bundle, it also has no idea what it should do to create # proper ones (dylibs) fix_darwin_install_names() { - local x="$(python_get_sitedir)/cairo/_cairo.bundle" - install_name_tool -id "${x}" "${ED}${x}" + local suffix=$("${PYTHON}" -c 'import sysconfig; print(sysconfig.get_config_var("EXT_SUFFIX"))') + [[ -z ${suffix} || ${suffix} == "None" ]] && suffix=".bundle" + local x="$(python_get_sitedir)/cairo/_cairo${suffix}" + install_name_tool -id "${x}" "${D}${x}" } python_foreach_impl fix_darwin_install_names fi diff --git a/dev-python/pygments/pygments-2.1.1.ebuild b/dev-python/pygments/pygments-2.1.1.ebuild index 4929502260e6..e02c7dbdde22 100644 --- a/dev-python/pygments/pygments-2.1.1.ebuild +++ b/dev-python/pygments/pygments-2.1.1.ebuild @@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]" diff --git a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild index 01c5f60590e7..f5b292abf0e0 100644 --- a/dev-python/pygobject/pygobject-2.28.6-r55.ebuild +++ b/dev-python/pygobject/pygobject-2.28.6-r55.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/" LICENSE="LGPL-2.1+" SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="examples libffi test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" diff --git a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild index be7a881c59d4..a9cb04be0f91 100644 --- a/dev-python/pygtk/pygtk-2.24.0-r4.ebuild +++ b/dev-python/pygtk/pygtk-2.24.0-r4.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -14,7 +14,7 @@ HOMEPAGE="http://www.pygtk.org/" LICENSE="LGPL-2.1" SLOT="2" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="doc examples test" RDEPEND=" diff --git a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild index f6a7d5feecc3..7eaeedd1ae97 100644 --- a/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild +++ b/dev-python/pygtksourceview/pygtksourceview-2.10.1-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -15,7 +15,7 @@ HOMEPAGE="http://www.pygtk.org/" LICENSE="LGPL-2.1" SLOT="2" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" +KEYWORDS="alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~x86-solaris" IUSE="doc" RDEPEND=" diff --git a/dev-python/pyopenssl/Manifest b/dev-python/pyopenssl/Manifest index 0304496b56cb..beecbe9ffb9c 100644 --- a/dev-python/pyopenssl/Manifest +++ b/dev-python/pyopenssl/Manifest @@ -1,2 +1,3 @@ DIST pyOpenSSL-0.14.tar.gz 128005 SHA256 a99db8e59c120138ad8a72eecedcc24b4510d2eed3ce48213b7e32f22cc4ee6e SHA512 afd14aad8f7313425b9f0d79d80fbc17feaf128204cbda21db4116c8ce6e08e77e865110971c02bdc99b27a2d43402cc87f04586375167f41c61d0f474109512 WHIRLPOOL 6d73c560fb2f9adcdf12d92c4d1f20ef62a0284bd8cb3598e48f539cc4c4ee557215251d13f97cda3acc468b89c10e206cd1484eee582b46dca9fc0f6c6b110f DIST pyOpenSSL-0.15.1.tar.gz 149887 SHA256 f0a26070d6db0881de8bcc7846934b7c3c930d8f9c79d45883ee48984bc0d672 SHA512 bd204f40c9583a8580cff28b061f02ea772fdda3965dab6ac9e3f8c3b98792bea87b6de76494f7ce81e1ddcc76019432a9ffa3bcd55c5adb063bb639efe62e51 WHIRLPOOL 34badbf11b49cb65019cb55da7c6d6a539971392741d14ea1408c56dc0564d52ffeb947d86549fed17762474d863d59a406cde86daa75a329bd5b6411a77702b +DIST pyOpenSSL-16.0.0.tar.gz 171929 SHA256 363d10ee43d062285facf4e465f4f5163f9f702f9134f0a5896f134cbb92d17d SHA512 ba67a34e04e383ab42b619c5d9e73206672d584b0795e1d09c5de7e624bff0e3bd9f9e69d51a92d6a40e4000408ae21d5d2ac281f22aeca2e8681e6fa762a081 WHIRLPOOL c650d798a8d80fc7d026163cb81b6d6e44154e1f4d21748b2c3218e4385bf83e53eaf0e62bedaebac6fe39f3c1c6f01a725c00dcc2cd315ca8854cf820e58c49 diff --git a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild index a5fe8621b7e6..e5918644e453 100644 --- a/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild +++ b/dev-python/pyopenssl/pyopenssl-0.15.1-r1.ebuild @@ -22,7 +22,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="Apache-2.0" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" IUSE="doc examples" RDEPEND=" diff --git a/dev-python/pyopenssl/pyopenssl-16.0.0.ebuild b/dev-python/pyopenssl/pyopenssl-16.0.0.ebuild new file mode 100644 index 000000000000..b8200835010d --- /dev/null +++ b/dev-python/pyopenssl/pyopenssl-16.0.0.ebuild @@ -0,0 +1,51 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) +PYTHON_REQ_USE="threads(+)" + +inherit distutils-r1 flag-o-matic + +MY_PN=pyOpenSSL +MY_P=${MY_PN}-${PV} + +DESCRIPTION="Python interface to the OpenSSL library" +HOMEPAGE=" + http://pyopenssl.sourceforge.net/ + https://launchpad.net/pyopenssl + https://pypi.python.org/pypi/pyOpenSSL +" +SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris" +IUSE="doc examples" +RESTRICT="test" # currently pretty broken + +RDEPEND=" + >=dev-python/six-1.5.2[${PYTHON_USEDEP}] + >=dev-python/cryptography-0.7[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )" + +S=${WORKDIR}/${MY_P} + +python_compile_all() { + use doc && emake -C doc html +} + +python_test() { + tox + # https://bugs.launchpad.net/pyopenssl/+bug/1237953 + rm -rf tmp* *.key *.pem || die +} + +python_install_all() { + use doc && local HTML_DOCS=( doc/_build/html/. ) + use examples && local EXAMPLES=( examples/. ) + distutils-r1_python_install_all +} diff --git a/dev-python/pytest-raisesregexp/Manifest b/dev-python/pytest-raisesregexp/Manifest index fabbe5359a62..903dac6329c5 100644 --- a/dev-python/pytest-raisesregexp/Manifest +++ b/dev-python/pytest-raisesregexp/Manifest @@ -1 +1,2 @@ DIST pytest-raisesregexp-2.0.tar.gz 2474 SHA256 0fde8aac1a54f9b56e5f9c61fda76727542ed24968c27c6e3688c6f1885f1e61 SHA512 790de1dd7d8c11455829a1c5b19b93bd1108626b539cb539466f262702ebc3e0cdd954f47c6a3210f3b127870ea86ce47ab2c25814d62d503508f3ac96b1bbc0 WHIRLPOOL 0f7eca4584bc9a61fae8324635ee4be2575530c97ad7413ee090e76658ba358a6c44461f66afc905e29c1f52cad9169d4cdb15e78f7a3d19a978f97d157b9d1a +DIST pytest-raisesregexp-2.1.tar.gz 3159 SHA256 06fffc525bb688e0823d0db8fd7d87f885067f5b08b8f1ab2e337a8f45a39978 SHA512 2d54413c3e5e1aa203738d5b1ad67cc478a0e57a5d5340908bee7d1da23702f52de45e6b7503b7122075733bde2b83080b20d563d4a485688dd889c7e1421130 WHIRLPOOL 70426c760060d4e10defab2694ae5dd5b6d229cad2919e487a72588b72438ce47c6c5098b3ada7570ca5d440be7d9a4c20b882e88068b6406e349daef2a176e5 diff --git a/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild new file mode 100644 index 000000000000..6f09d3b561b9 --- /dev/null +++ b/dev-python/pytest-raisesregexp/pytest-raisesregexp-2.1.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +PYTHON_COMPAT=( python3_4 python3_5 ) + +inherit distutils-r1 vcs-snapshot + +DESCRIPTION="Simple pytest plugin to look for regex in Exceptions" +HOMEPAGE="https://github.com/Walkman/pytest_raisesregexp" +SRC_URI="https://github.com/kissgyorgy/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +CDEPEND="dev-python/pytest[${PYTHON_USEDEP}]" +DEPEND=" + dev-python/setuptools[${PYTHON_USEDEP}] + test? ( ${CDEPEND} ) +" +RDEPEND=" + ${CDEPEND} + dev-python/py[${PYTHON_USEDEP}] +" + +python_test() { + distutils_install_for_testing + ${PYTHON} -m pytest || die "Tests failed under ${EPYTHON}" +} diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest index acd5abdcd478..702720036f35 100644 --- a/dev-python/pytest/Manifest +++ b/dev-python/pytest/Manifest @@ -1,6 +1,3 @@ DIST pytest-2.7.2.tar.gz 532836 SHA256 b30457f735420d0000d10a44bbd478cf03f8bf20e25bd77248f9bab40f4fd6a4 SHA512 5474a4fe58437a4971fb21b1b37dad3c08e18e5d154931ff23e597f881100a3515bf0cf71d06b143465594ad2a91a96f84f4836d84c39691143c8d88ca7a4360 WHIRLPOOL 6ab7371f952109ac476774222883e1381fe5ee6a54d967f2d90765f6c59c90634a16c42e8e2e1661169db6a9cb1327242ff2281cf1caeabd86a4dacd24f4bb06 DIST pytest-2.8.2.tar.gz 563955 SHA256 da2fc57320dd11f621d166634c52b989aa2291af1296c32a27a11777aa4128b9 SHA512 0df6e0421d1575e1efc0bb0550c5993f802777cb616ab1514bf12ed11eb5ec35a142dd837ff65659989268c36e441e18108369991cd3d458d357aac6ba433991 WHIRLPOOL ea917f4aaec444d6edc830b4ec66f7adb305031f11328e47d12a609ec92368a5c56e9cf8e24bd1a9a4a6a0746b43133f0d9821cf27d74c15ed2a83a705ee6030 -DIST pytest-2.8.3.tar.gz 880441 SHA256 37d950e93c1fd7e04d816a3ca4a5226ea2531c6d531c8284ad9b88848417e720 SHA512 04dd9041729d83b98a15cef22aac65dfb95cd3bf6b71a580ff91e8738f9a1ad5ee46fae45c950342e4a0162e38c875299a46fc69ec74702f36a1e36ef76dc0d6 WHIRLPOOL 78149cdcc25dc478ae004b0a54b333edcad0268ce5e66efe9878b0bcaff0e33d227513f84040f3aa53967afa5ffc51ecef0e6003814c09925fdf9e6a4921d88a -DIST pytest-2.8.4.tar.gz 568888 SHA256 ca8afa5e216acfba6df7f26f2ef8a45baedf6a952e6b2f033ab55ec7e0a679eb SHA512 42e2949b66184cf2cecb7c803871639c1a3c887a48fc43580fe87f432507b9457c3a7c0b3bb620060e3eeb2db2178dfc35aba19022812497a917fdfa2ce5fd45 WHIRLPOOL 7ee539c61216463ccdaf5e09581cc1de82ffc6f6fb99dba04fa7d4eefb628c457c828ce9f8307477b5f95b997a4fd917f4818262ef4e1867cf0c10f9d2467bc2 -DIST pytest-2.8.5.zip 664063 SHA256 44bb32fb3925b5a284ceee1af55e0a63d25436ec415232089403eed3a347667e SHA512 6489225732aa3b2130d5e533f9e013fc7cfeb820d43c341e0adefa2b397713366787d68461805b368a7c04dfeb421b5195ff96a44a9d10377b1da8b9760bdc8f WHIRLPOOL cd264e72db332163570641d7b7c5def59d0f3357697168a3418c50f0eb5461d5abdb17a7164bcd35c285a1221e4f51619029253c4eea18b327c45d2213ebcaad DIST pytest-2.8.7.tar.gz 564943 SHA256 fc4c86be54fce08e4b85b646a736efa18c6cde7599c1d2919f4f74629e018baf SHA512 c7f626ceb599811caeab4646389a2c489dd22d766c772d6ca686098cef9a11dca47ef41a4a4b811110f358bca1f1a678b549b2adfea48317ae70cf166289b371 WHIRLPOOL c3849f1a9f62c05c1ce20593f32ee513aee87853914be4099503cd47b068732df99605a0a4db9a3a7add4ef2a85f4d5376acf1a2e3f48f5d438433f200cb6196 diff --git a/dev-python/pytest/files/pytest-2.8.5-skip-test-on-pypy.patch b/dev-python/pytest/files/pytest-2.8.5-skip-test-on-pypy.patch deleted file mode 100644 index ecf79352328c..000000000000 --- a/dev-python/pytest/files/pytest-2.8.5-skip-test-on-pypy.patch +++ /dev/null @@ -1,602 +0,0 @@ - testing/acceptance_test.py | 5 +++++ - testing/python/collect.py | 3 +++ - testing/python/fixture.py | 14 ++++++++++++++ - testing/python/integration.py | 1 + - testing/python/metafunc.py | 3 +++ - testing/test_assertion.py | 5 +++++ - testing/test_assertrewrite.py | 3 +++ - testing/test_capture.py | 6 ++++++ - testing/test_collection.py | 1 + - testing/test_config.py | 3 +++ - testing/test_conftest.py | 3 +++ - testing/test_doctest.py | 7 ++++++- - testing/test_helpconfig.py | 1 + - testing/test_junitxml.py | 1 + - testing/test_mark.py | 1 + - testing/test_monkeypatch.py | 1 + - testing/test_skipping.py | 3 +++ - testing/test_terminal.py | 2 ++ - testing/test_unittest.py | 3 +++ - 19 files changed, 65 insertions(+), 1 deletion(-) - -diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py -index c9e8fbf..0815a01 100644 ---- a/testing/acceptance_test.py -+++ b/testing/acceptance_test.py -@@ -127,6 +127,7 @@ class TestGeneralUsage: - "*ERROR: not found:*%s" %(p2.basename,) - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_issue486_better_reporting_on_conftest_load_failure(self, testdir): - testdir.makepyfile("") - testdir.makeconftest("import qwerty") -@@ -209,6 +210,8 @@ class TestGeneralUsage: - result = testdir.runpython(p) - assert not result.ret - -+ # https://github.com/pytest-dev/pytest/issues/1162 -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_issue109_sibling_conftests_not_loaded(self, testdir): - sub1 = testdir.tmpdir.mkdir("sub1") - sub2 = testdir.tmpdir.mkdir("sub2") -@@ -350,6 +353,7 @@ class TestGeneralUsage: - res = testdir.runpytest(p.basename) - assert res.ret == 0 - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_unknown_option(self, testdir): - result = testdir.runpytest("--qwlkej") - result.stderr.fnmatch_lines(""" -@@ -657,6 +661,7 @@ class TestDurations: - ]) - - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - class TestDurationWithFixture: - source = """ - import time -diff --git a/testing/python/collect.py b/testing/python/collect.py -index df4ecc2..9458971 100644 ---- a/testing/python/collect.py -+++ b/testing/python/collect.py -@@ -27,6 +27,7 @@ class TestModule: - "*HINT*", - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_import_prepend_append(self, testdir, monkeypatch): - syspath = list(sys.path) - monkeypatch.setattr(sys, "path", syspath) -@@ -57,6 +58,7 @@ class TestModule: - pytest.raises(ImportError, lambda: modcol.obj) - - class TestClass: -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_class_with_init_warning(self, testdir): - testdir.makepyfile(""" - class TestClass1: -@@ -659,6 +661,7 @@ class TestConftestCustomization: - l = modcol.collect() - assert '_hello' not in l - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_setup_only_available_in_subdir(testdir): - sub1 = testdir.mkpydir("sub1") - sub2 = testdir.mkpydir("sub2") -diff --git a/testing/python/fixture.py b/testing/python/fixture.py -index 9f14a23..6d09271 100644 ---- a/testing/python/fixture.py -+++ b/testing/python/fixture.py -@@ -83,6 +83,7 @@ class TestFillFixtures: - "*1 passed*" - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_conftest_funcargs_only_available_in_subdir(self, testdir): - sub1 = testdir.mkpydir("sub1") - sub2 = testdir.mkpydir("sub2") -@@ -606,6 +607,7 @@ class TestRequestBasic: - reprec = testdir.inline_run("-v") - reprec.assertoutcome(passed=3) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_fixtures_sub_subdir_normalize_sep(self, testdir): - # this tests that normalization of nodeids takes place - b = testdir.mkdir("tests").mkdir("unit") -@@ -953,6 +955,7 @@ class TestFixtureUsages: - "*2 passed*" - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_factory_uses_unknown_funcarg_as_dependency_error(self, testdir): - testdir.makepyfile(""" - import pytest -@@ -1049,6 +1052,7 @@ class TestFixtureUsages: - reprec = testdir.inline_run() - reprec.assertoutcome(passed=2) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_usefixtures_seen_in_showmarkers(self, testdir): - result = testdir.runpytest("--markers") - result.stdout.fnmatch_lines(""" -@@ -1157,6 +1161,7 @@ class TestFixtureManagerParseFactories: - reprec = testdir.inline_run("-s") - reprec.assertoutcome(passed=1) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_parsefactories_relative_node_ids(self, testdir): - # example mostly taken from: - # https://mail.python.org/pipermail/pytest-dev/2014-September/002617.html -@@ -1305,6 +1310,7 @@ class TestAutouseDiscovery: - reprec = testdir.inline_run("-s") - reprec.assertoutcome(failed=0, passed=0) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_autouse_in_conftests(self, testdir): - a = testdir.mkdir("a") - b = testdir.mkdir("a1") -@@ -1890,6 +1896,7 @@ class TestFixtureMarker: - l = reprec.getcalls("pytest_runtest_call")[0].item.module.l - assert l == [1,1,2,2] - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_module_parametrized_ordering(self, testdir): - testdir.makeconftest(""" - import pytest -@@ -1936,6 +1943,7 @@ class TestFixtureMarker: - test_mod1.py::test_func1[m2] PASSED - """) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_class_ordering(self, testdir): - testdir.makeconftest(""" - import pytest -@@ -1984,6 +1992,7 @@ class TestFixtureMarker: - test_class_ordering.py::TestClass::test_3[2-b] PASSED - """) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_parametrize_separated_order_higher_scope_first(self, testdir): - testdir.makepyfile(""" - import pytest -@@ -2028,6 +2037,7 @@ class TestFixtureMarker: - pprint.pprint(list(zip(l, expected))) - assert l == expected - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_parametrized_fixture_teardown_order(self, testdir): - testdir.makepyfile(""" - import pytest -@@ -2065,6 +2075,7 @@ class TestFixtureMarker: - """) - assert "error" not in result.stdout.str() - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_fixture_finalizer(self, testdir): - testdir.makeconftest(""" - import pytest -@@ -2385,6 +2396,7 @@ class TestErrors: - "*1 error*", - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_issue498_fixture_finalizer_failing(self, testdir): - testdir.makepyfile(""" - import pytest -@@ -2431,6 +2443,7 @@ class TestErrors: - "*1 error*", - ]) - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - class TestShowFixtures: - def test_funcarg_compat(self, testdir): - config = testdir.parseconfigure("--funcargs") -@@ -2561,6 +2574,7 @@ class TestShowFixtures: - """) - - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - class TestContextManagerFixtureFuncs: - def test_simple(self, testdir): - testdir.makepyfile(""" -diff --git a/testing/python/integration.py b/testing/python/integration.py -index 33ea26d..fe43016 100644 ---- a/testing/python/integration.py -+++ b/testing/python/integration.py -@@ -202,6 +202,7 @@ class TestMockDecoration: - - - class TestReRunTests: -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_rerun(self, testdir): - testdir.makeconftest(""" - from _pytest.runner import runtestprotocol -diff --git a/testing/python/metafunc.py b/testing/python/metafunc.py -index 38629c7..8e74bce 100644 ---- a/testing/python/metafunc.py -+++ b/testing/python/metafunc.py -@@ -475,6 +475,7 @@ class TestMetafunc: - reprec = testdir.inline_run() - reprec.assertoutcome(passed=2) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_parametrize_class_scenarios(self, testdir): - testdir.makepyfile(""" - # same as doc/en/example/parametrize scenario example -@@ -766,6 +767,7 @@ class TestMetafuncFunctional: - "*test_function*advanced*FAILED", - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_parametrize_without_ids(self, testdir): - testdir.makepyfile(""" - import pytest -@@ -835,6 +837,7 @@ class TestMetafuncFunctional: - reprec = testdir.runpytest() - reprec.assert_outcomes(passed=1) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_generate_tests_only_done_in_subdir(self, testdir): - sub1 = testdir.mkpydir("sub1") - sub2 = testdir.mkpydir("sub2") -diff --git a/testing/test_assertion.py b/testing/test_assertion.py -index 96da579..c1f270c 100644 ---- a/testing/test_assertion.py -+++ b/testing/test_assertion.py -@@ -120,6 +120,7 @@ class TestAssert_reprcompare: - """) - ] - ) -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_iterable_full_diff(self, left, right, expected): - """Test the full diff assertion failure explanation. - -@@ -348,6 +349,7 @@ class TestFormatExplanation: - assert util.format_explanation(expl) == res - - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_python25_compile_issue257(testdir): - testdir.makepyfile(""" - def test_rewritten(): -@@ -559,6 +561,7 @@ def test_warn_missing(testdir): - "*WARNING*assert statements are not executed*", - ]) - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_recursion_source_decode(testdir): - testdir.makepyfile(""" - def test_something(): -@@ -573,6 +576,7 @@ def test_recursion_source_decode(testdir): - - """) - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_AssertionError_message(testdir): - testdir.makepyfile(""" - def test_hello(): -@@ -587,6 +591,7 @@ def test_AssertionError_message(testdir): - """) - - @pytest.mark.skipif(PY3, reason='This bug does not exist on PY3') -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_set_with_unsortable_elements(): - # issue #718 - class UnsortableKey(object): -diff --git a/testing/test_assertrewrite.py b/testing/test_assertrewrite.py -index e690e34..56d17d5 100644 ---- a/testing/test_assertrewrite.py -+++ b/testing/test_assertrewrite.py -@@ -307,6 +307,7 @@ class TestAssertionRewrite: - assert g(**{x : 2}) - assert getmsg(f, ns) == """assert g(**{'a': 2})""" - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_attribute(self): - class X(object): - g = 3 -@@ -343,6 +344,7 @@ class TestAssertionRewrite: - assert b < c - getmsg(f, must_pass=True) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_len(self): - def f(): - l = list(range(10)) -@@ -641,6 +643,7 @@ class TestAssertionRewriteHookDetails(object): - - assert _read_pyc(source, str(pyc)) is None # no error - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_reload_is_same(self, testdir): - # A file that will be picked up during collecting. - testdir.tmpdir.join("file.py").ensure() -diff --git a/testing/test_capture.py b/testing/test_capture.py -index 66dff1e..5c914ac 100644 ---- a/testing/test_capture.py -+++ b/testing/test_capture.py -@@ -479,6 +479,8 @@ class TestCaptureFixture: - assert 'closed' not in result.stderr.str() - - -+# https://github.com/pytest-dev/pytest/issues/1162 -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_setup_failure_does_not_kill_capturing(testdir): - sub1 = testdir.mkpydir("sub1") - sub1.join("conftest.py").write(py.code.Source(""" -@@ -518,6 +520,7 @@ def test_capture_conftest_runtest_setup(testdir): - assert 'hello19' not in result.stdout.str() - - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_capture_badoutput_issue412(testdir): - testdir.makepyfile(""" - import os -@@ -897,6 +900,7 @@ class TestStdCaptureFD(TestStdCapture): - pytestmark = needsosdup - captureclass = staticmethod(StdCaptureFD) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_simple_only_fd(self, testdir): - testdir.makepyfile(""" - import os -@@ -981,6 +985,7 @@ def test_fdcapture_tmpfile_remains_the_same(tmpfile, use): - assert capfile2 == capfile - - @needsosdup -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_close_and_capture_again(testdir): - testdir.makepyfile(""" - import os -@@ -1001,6 +1006,7 @@ def test_close_and_capture_again(testdir): - - - @pytest.mark.parametrize('method', ['SysCapture', 'FDCapture']) -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_capturing_and_logging_fundamentals(testdir, method): - if method == "StdCaptureFD" and not hasattr(os, 'dup'): - pytest.skip("need os.dup") -diff --git a/testing/test_collection.py b/testing/test_collection.py -index 4e4609e..eb731fb 100644 ---- a/testing/test_collection.py -+++ b/testing/test_collection.py -@@ -287,6 +287,7 @@ class TestCustomConftests: - "*test_x*" - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_pytest_collect_file_from_sister_dir(self, testdir): - sub1 = testdir.mkpydir("sub1") - sub2 = testdir.mkpydir("sub2") -diff --git a/testing/test_config.py b/testing/test_config.py -index 2e53776..7729717 100644 ---- a/testing/test_config.py -+++ b/testing/test_config.py -@@ -47,6 +47,7 @@ class TestParseIni: - ]) - - @pytest.mark.parametrize("name", "setup.cfg tox.ini pytest.ini".split()) -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_ini_names(self, testdir, name): - testdir.tmpdir.join(name).write(py.std.textwrap.dedent(""" - [pytest] -@@ -55,6 +56,7 @@ class TestParseIni: - config = testdir.parseconfig() - assert config.getini("minversion") == "1.0" - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_toxini_before_lower_pytestini(self, testdir): - sub = testdir.tmpdir.mkdir("sub") - sub.join("tox.ini").write(py.std.textwrap.dedent(""" -@@ -418,6 +420,7 @@ class TestWarning: - reprec = testdir.inline_run() - reprec.assertoutcome(passed=1) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_warn_on_test_item_from_request(self, testdir): - testdir.makepyfile(""" - import pytest -diff --git a/testing/test_conftest.py b/testing/test_conftest.py -index 2be942e..72308b7 100644 ---- a/testing/test_conftest.py -+++ b/testing/test_conftest.py -@@ -204,6 +204,7 @@ def test_conftest_import_order(testdir, monkeypatch): - assert conftest._getconftestmodules(sub) == [ct1, ct2] - - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_fixture_dependency(testdir, monkeypatch): - ct1 = testdir.makeconftest("") - ct1 = testdir.makepyfile("__init__.py") -@@ -241,6 +242,7 @@ def test_fixture_dependency(testdir, monkeypatch): - result.stdout.fnmatch_lines(["*1 passed*"]) - - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_conftest_found_with_double_dash(testdir): - sub = testdir.mkdir("sub") - sub.join("conftest.py").write(py.std.textwrap.dedent(""" -@@ -259,6 +261,7 @@ def test_conftest_found_with_double_dash(testdir): - """) - - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - class TestConftestVisibility: - def _setup_tree(self, testdir): # for issue616 - # example mostly taken from: -diff --git a/testing/test_doctest.py b/testing/test_doctest.py -index 7fcdf22..fba5685 100644 ---- a/testing/test_doctest.py -+++ b/testing/test_doctest.py -@@ -224,6 +224,7 @@ class TestDoctests: - reprec = testdir.inline_run(p, ) - reprec.assertoutcome(passed=1) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_doctestmodule_with_fixtures(self, testdir): - p = testdir.makepyfile(""" - ''' -@@ -235,6 +236,7 @@ class TestDoctests: - reprec = testdir.inline_run(p, "--doctest-modules") - reprec.assertoutcome(passed=1) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_doctestmodule_three_tests(self, testdir): - p = testdir.makepyfile(""" - ''' -@@ -260,6 +262,7 @@ class TestDoctests: - reprec = testdir.inline_run(p, "--doctest-modules") - reprec.assertoutcome(passed=3) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_doctestmodule_two_tests_one_fail(self, testdir): - p = testdir.makepyfile(""" - class MyClass: -@@ -432,6 +435,7 @@ class TestDoctestSkips: - - return makeit - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_one_skipped(self, testdir, makedoctest): - makedoctest(""" - >>> 1 + 1 # doctest: +SKIP -@@ -501,6 +505,7 @@ class TestDoctestAutoUseFixtures: - - @pytest.mark.parametrize('scope', SCOPES) - @pytest.mark.parametrize('enable_doctest', [True, False]) -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_fixture_scopes(self, testdir, scope, enable_doctest): - """Test that auto-use fixtures work properly with doctest modules. - See #1057 and #1100. -@@ -579,4 +584,4 @@ class TestDoctestAutoUseFixtures: - """) - result = testdir.runpytest('--doctest-modules') - assert 'FAILURES' not in str(result.stdout.str()) -- result.stdout.fnmatch_lines(['*=== 1 passed in *']) -\ No newline at end of file -+ result.stdout.fnmatch_lines(['*=== 1 passed in *']) -diff --git a/testing/test_helpconfig.py b/testing/test_helpconfig.py -index 3f03c05..442b2ba 100644 ---- a/testing/test_helpconfig.py -+++ b/testing/test_helpconfig.py -@@ -14,6 +14,7 @@ def test_version(testdir, pytestconfig): - "*at*", - ]) - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_help(testdir): - result = testdir.runpytest("--help") - assert result.ret == 0 -diff --git a/testing/test_junitxml.py b/testing/test_junitxml.py -index 7a03b5a..0650f77 100644 ---- a/testing/test_junitxml.py -+++ b/testing/test_junitxml.py -@@ -174,6 +174,7 @@ class TestPython: - classname="test_classname_instance.TestClass", - name="test_method") - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_classname_nested_dir(self, testdir): - p = testdir.tmpdir.ensure("sub", "test_hello.py") - p.write("def test_func(): 0/0") -diff --git a/testing/test_mark.py b/testing/test_mark.py -index 5cb66e7..93d8c1b 100644 ---- a/testing/test_mark.py -+++ b/testing/test_mark.py -@@ -133,6 +133,7 @@ def test_markers_option(testdir): - "*a1some*another marker", - ]) - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_markers_option_with_plugin_in_current_dir(testdir): - testdir.makeconftest('pytest_plugins = "flip_flop"') - testdir.makepyfile(flip_flop="""\ -diff --git a/testing/test_monkeypatch.py b/testing/test_monkeypatch.py -index e55aae3..14791d8 100644 ---- a/testing/test_monkeypatch.py -+++ b/testing/test_monkeypatch.py -@@ -232,6 +232,7 @@ def test_chdir_double_undo(mp, tmpdir): - mp.undo() - assert os.getcwd() == tmpdir.strpath - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_issue185_time_breaks(testdir): - testdir.makepyfile(""" - import time -diff --git a/testing/test_skipping.py b/testing/test_skipping.py -index 93adf6e..4740bf6 100644 ---- a/testing/test_skipping.py -+++ b/testing/test_skipping.py -@@ -263,6 +263,7 @@ class TestXFail: - result = testdir.runpytest(p, "--runxfail") - result.stdout.fnmatch_lines("*1 pass*") - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_xfail_imperative_in_setup_function(self, testdir): - p = testdir.makepyfile(""" - import pytest -@@ -671,6 +672,7 @@ def test_xfail_test_setup_exception(testdir): - assert 'xfailed' in result.stdout.str() - assert 'xpassed' not in result.stdout.str() - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_imperativeskip_on_xfail_test(testdir): - testdir.makepyfile(""" - import pytest -@@ -694,6 +696,7 @@ def test_imperativeskip_on_xfail_test(testdir): - *2 skipped* - """) - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - class TestBooleanCondition: - def test_skipif(self, testdir): - testdir.makepyfile(""" -diff --git a/testing/test_terminal.py b/testing/test_terminal.py -index 2c7437c..6f2d6e4 100644 ---- a/testing/test_terminal.py -+++ b/testing/test_terminal.py -@@ -264,6 +264,7 @@ class TestCollectonly: - "* ", - ]) - -+ @pytest.mark.skipif('"__pypy__" in sys.modules') - def test_collectonly_error(self, testdir): - p = testdir.makepyfile("import Errlkjqweqwe") - result = testdir.runpytest("--collect-only", p) -@@ -726,6 +727,7 @@ def test_tbstyle_native_setup_error(testdir): - '*File *test_tbstyle_native_setup_error.py", line *, in setup_error_fixture*' - ]) - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_terminal_summary(testdir): - testdir.makeconftest(""" - def pytest_terminal_summary(terminalreporter): -diff --git a/testing/test_unittest.py b/testing/test_unittest.py -index d7b862e..90e3e1f 100644 ---- a/testing/test_unittest.py -+++ b/testing/test_unittest.py -@@ -14,6 +14,7 @@ def test_simple_unittest(testdir): - assert reprec.matchreport("testpassing").passed - assert reprec.matchreport("test_failing").failed - -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_runTest_method(testdir): - testdir.makepyfile(""" - import unittest -@@ -705,6 +706,7 @@ def test_issue333_result_clearing(testdir): - reprec.assertoutcome(failed=1) - - @pytest.mark.skipif("sys.version_info < (2,7)") -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_unittest_raise_skip_issue748(testdir): - testdir.makepyfile(test_foo=""" - import unittest -@@ -720,6 +722,7 @@ def test_unittest_raise_skip_issue748(testdir): - """) - - @pytest.mark.skipif("sys.version_info < (2,7)") -+@pytest.mark.skipif('"__pypy__" in sys.modules') - def test_unittest_skip_issue1169(testdir): - testdir.makepyfile(test_foo=""" - import unittest diff --git a/dev-python/pytest/pytest-2.8.3.ebuild b/dev-python/pytest/pytest-2.8.3.ebuild deleted file mode 100644 index 2237c97018d5..000000000000 --- a/dev-python/pytest/pytest-2.8.3.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="simple powerful testing with Python" -HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -# When bumping, please check setup.py for the proper py version -PY_VER="1.4.29" -RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]" - -# dev-python/pluggy -# https://github.com/hpk42/pluggy -# See https://github.com/pytest-dev/pytest/issues/944 -# for why not now - -#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30 -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pexpect[${PYTHON_USEDEP}] ) - doc? ( - >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regendoc[${PYTHON_USEDEP}] - )" - -PATCHES=( "${FILESDIR}"/${P}-skip-test-on-pypy.patch ) - -python_prepare_all() { - chmod o-w *egg*/* || die - # Disable versioning of py.test script to avoid collision with - # versioning performed by the eclass. - sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" - grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" - - # Prevent un-needed d'loading - sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die - - # https://github.com/pytest-dev/pytest/issues/1162 - # https://github.com/pytest-dev/pytest/issues/1163 - sed \ - -e 's:test_logging_initialized_in_test:_&:g' \ - -i testing/test_capture.py || die - - find \( -name __pycache__ -o -name "*.pyc" -o -name "*.pyo" \) \ - -exec rm -rvf '{}' + || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - mkdir doc/en/.build || die - emake -C doc/en html - fi -} - -python_test() { - # test_nose.py not written to suit py3.2 in pypy3 - if [[ "${EPYTHON}" == pypy3 ]]; then - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \ - --ignore=testing/BUILD_nose.py \ - || die "tests failed with ${EPYTHON}" - else - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \ - || die "tests failed with ${EPYTHON}" - fi -} - -python_install_all() { - use doc && HTML_DOCS=( doc/en/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pytest/pytest-2.8.4.ebuild b/dev-python/pytest/pytest-2.8.4.ebuild deleted file mode 100644 index f8a1f8a714c6..000000000000 --- a/dev-python/pytest/pytest-2.8.4.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="simple powerful testing with Python" -HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -# When bumping, please check setup.py for the proper py version -PY_VER="1.4.29" -RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]" - -# dev-python/pluggy -# https://github.com/hpk42/pluggy -# See https://github.com/pytest-dev/pytest/issues/944 -# for why not now - -#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30 -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pexpect[${PYTHON_USEDEP}] ) - doc? ( - >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regendoc[${PYTHON_USEDEP}] - )" - -PATCHES=( "${FILESDIR}"/${PN}-2.8.3-skip-test-on-pypy.patch ) - -python_prepare_all() { - chmod o-w *egg*/* || die - # Disable versioning of py.test script to avoid collision with - # versioning performed by the eclass. - sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" - grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" - - # Prevent un-needed d'loading - sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die - - # https://github.com/pytest-dev/pytest/issues/1162 - # https://github.com/pytest-dev/pytest/issues/1163 - sed \ - -e 's:test_logging_initialized_in_test:_&:g' \ - -i testing/test_capture.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - mkdir doc/en/.build || die - emake -C doc/en html - fi -} - -python_test() { - # test_nose.py not written to suit py3.2 in pypy3 - if [[ "${EPYTHON}" == pypy3 ]]; then - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \ - --ignore=testing/BUILD_nose.py \ - || die "tests failed with ${EPYTHON}" - else - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \ - || die "tests failed with ${EPYTHON}" - fi -} - -python_install_all() { - use doc && HTML_DOCS=( doc/en/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pytest/pytest-2.8.5.ebuild b/dev-python/pytest/pytest-2.8.5.ebuild deleted file mode 100644 index f3d7777ceb66..000000000000 --- a/dev-python/pytest/pytest-2.8.5.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="simple powerful testing with Python" -HOMEPAGE="http://pytest.org/ https://pypi.python.org/pypi/pytest" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" -IUSE="doc test" - -# When bumping, please check setup.py for the proper py version -PY_VER="1.4.29" -RDEPEND=">=dev-python/py-${PY_VER}[${PYTHON_USEDEP}]" - -# dev-python/pluggy -# https://github.com/hpk42/pluggy -# See https://github.com/pytest-dev/pytest/issues/944 -# for why not now - -#pexpect dep based on https://bitbucket.org/hpk42/pytest/issue/386/tests-fail-with-pexpect-30 -DEPEND="${RDEPEND} - dev-python/setuptools[${PYTHON_USEDEP}] - test? ( dev-python/pexpect[${PYTHON_USEDEP}] ) - doc? ( - >=dev-python/sphinx-1.2.3[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP}] - dev-python/regendoc[${PYTHON_USEDEP}] - )" - -PATCHES=( "${FILESDIR}"/${P}-skip-test-on-pypy.patch ) - -python_prepare_all() { - chmod o-w *egg*/* || die - # Disable versioning of py.test script to avoid collision with - # versioning performed by the eclass. - sed -e "s/return points/return {'py.test': target}/" -i setup.py || die "sed failed" - grep -qF "py>=${PY_VER}" setup.py || die "Incorrect dev-python/py dependency" - - # Prevent un-needed d'loading - sed -e "s/'sphinx.ext.intersphinx', //" -i doc/en/conf.py || die - - # https://github.com/pytest-dev/pytest/issues/1162 - # https://github.com/pytest-dev/pytest/issues/1163 - sed \ - -e 's:test_logging_initialized_in_test:_&:g' \ - -i testing/test_capture.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - if use doc; then - mkdir doc/en/.build || die - emake -C doc/en html - fi -} - -python_test() { - # test_nose.py not written to suit py3.2 in pypy3 - if [[ "${EPYTHON}" == pypy3 ]]; then - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v \ - --ignore=testing/BUILD_nose.py \ - || die "tests failed with ${EPYTHON}" - else - "${PYTHON}" "${BUILD_DIR}"/lib/pytest.py -x -v --runpytest=subprocess \ - || die "tests failed with ${EPYTHON}" - fi -} - -python_install_all() { - use doc && HTML_DOCS=( doc/en/_build/html/. ) - distutils-r1_python_install_all -} diff --git a/dev-python/pytest/pytest-2.8.7.ebuild b/dev-python/pytest/pytest-2.8.7.ebuild index a8487c5541f2..361cd82ca3c4 100644 --- a/dev-python/pytest/pytest-2.8.7.ebuild +++ b/dev-python/pytest/pytest-2.8.7.ebuild @@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="doc test" # When bumping, please check setup.py for the proper py version diff --git a/dev-python/setuptools/Manifest b/dev-python/setuptools/Manifest index dc96f03aba0a..ec1c92b4aee7 100644 --- a/dev-python/setuptools/Manifest +++ b/dev-python/setuptools/Manifest @@ -2,16 +2,13 @@ DIST setuptools-18.4.tar.gz 626632 SHA256 cdea5098e60b4ad83453d58723a61dc481ca8e DIST setuptools-18.5.tar.gz 626892 SHA256 4846755f18c0528d87583342d5e1221052858ce9922c5c38acbadd5015bd683d SHA512 d902b7e35c99d21e243168072bc96c07f88a7463e50035ba72d7e10818777e83ce534e4dab2ae0425620791f95f3d8cb2f9d9142be1ea24f05100d85d0d44835 WHIRLPOOL f3cabbc4bda9964bc00eba392e04605c99c1927fa96482ac55e21b1af7271b8a1c102017dea0b615ab02ca0f7219d9a8eab3b83eef6895d8b35f6bcbe4ed7747 DIST setuptools-18.6.1.tar.gz 627042 SHA256 ddb0f4bdd1ac0ceb41abfe561d6196a840abb76371551dbf0c3e59d8d5cde99a SHA512 50752fc55fe70c1fe7c84d27d6dd046da376e0656c957e36709923ed129dcecf09637e35d64cc677d1e75612b2fc53f3213c97e8bed816dff5248085756a1882 WHIRLPOOL b6ba95bd18db05867a94b756ab1ec71a0861096ffa8ae9bf2dd1410e1465df71a10e52af527b5f72bd685da5ccbfa795b6e1855a0d11aa54e8f28287fa54236e DIST setuptools-18.7.1.tar.gz 628906 SHA256 aff36c95035e0b311eacb1434e3f7e85f5ccaad477773847e582978f8f45bd74 SHA512 b72b7feeee50c7bf794449cdb2253977689a02046d9d076a57e3788d963a2b433c3c21a3c3f14db3ca6254bf851a11cce1066d94147718e62b8cc7baf416d12f WHIRLPOOL 979784b2507632493738667a5bd83438bd68874c5d78d51a62093e8450aa9752ff32790e0b16e76681b13e588eced92a62a51e6e28aa0ad69e11f7a4284cc892 -DIST setuptools-18.7.tar.gz 628702 SHA256 c57c1f5aa3b83e4c5e0ce5b144a7f96eea1dab873f35d5aaa3c2a2d960674353 SHA512 7e00cd0148aee0435e571347db1d2dae9fa194fe3bdd5d1fc561bb353ce4272869355a5e8f9a1ed99136df43f9d7848d57d2cd46c920040673bfdc05e189d050 WHIRLPOOL c50e83fb91ed7cd08e9f3538fb8425adcc1d5eb3a8be072914e73d2e765888f71c6fd891c821c96c21ad24728f7381c5b5a4b01c23887550877a0931b5ad7d86 DIST setuptools-18.8.1.tar.gz 629889 SHA256 ac472c7c4752e8cd44d646fcb4f15d13e72a4ae20e4d853c61adba3b9cabe1d5 SHA512 4ebb36cb54a1c581e3b06ce224fdd97211da9b93962eeae0151b064ac107244dab9111dd1441e76997275f9c559dca2cf0c480544f526c8643bf21beda30bf14 WHIRLPOOL a82fba00a874de1b1cc832f062ed27dae17d34e2782a6353ad980884f6b839990acf3f8f1b00066e14ddc96b3ea35e9dc2ed27cda52ef792f6227db03283cf82 -DIST setuptools-18.8.tar.gz 629367 SHA256 04180e33a40a114ff9b458f31786d885964612af2b2111c3d0efdc9a1ac76c4d SHA512 718f8ef19e639450f62e1751715bac65ce2bd218b81614d07c9283a01be3a085ec5422ff9d96a54e74c05135a1a4bb167ece6d4ecece588716d05982c9f25811 WHIRLPOOL 412545b8b2625675612c9d79b366c7b5287e0f6f48596a49fdbd1b358a4efefcd4cbf8993ff42ad7d7f14868fc86e5136c7af650dfe954ab015060ea57268523 DIST setuptools-19.1.1.tar.gz 640997 SHA256 32ebb08b72aee11fefa6907ddf5db5a81e0eef9cf62c7fa6b58d8e32da249960 SHA512 480aaed577ab9bc4d3cae71d957407ecb71e743dab7fb06f165b76683445f356ce141e1057b5a057101f9546df8c62e2abc2c35ebd751e4bb3febb846a71ac41 WHIRLPOOL 608af5cb22e9b87de3cb0181519058cc7437b7e74b7be4774337d18a562e869cb361edf17f0488c2594039e87dcdc1f201723520568490b0e0be105992abeb37 DIST setuptools-19.2.tar.gz 641777 SHA256 f90ed8eb70b14b0594ba74e9de4ffca040c0ec8ee505cbf3570499467859f71a SHA512 2494606930d6d422e8c105e8e5b40a07b23709f361164c5df40ff24c80328b861179652c7212fa38137534206c187bc4de42d249bc686d43fad18f23d0a26126 WHIRLPOOL ee861dc97a48ec7a07eadc3ceb42077b396a14c1448f0c3d8c6edf2266f4da241bb0e9f31922bc687b6e943802b95b440aea9f2e5d60b8d338c8392102353100 DIST setuptools-19.4.tar.gz 641797 SHA256 214bf29933f47cf25e6faa569f710731728a07a19cae91ea64f826051f68a8cf SHA512 463a2b00193b972e684569dce1527b34d7be9a9d0f866fd8a0c2c1a475558c539148841ca117b0a9c5507d8344dfd5ca515bc6beee59b44c6e8bf05771bc448a WHIRLPOOL 37bdb6592e63c8594051ddfa1df4295dc3417e29b338f66a44270619bf30c6e87b12a7086a8f337f3497bd036cbacc10ab2f179c2768af685b6ee5d93a747897 -DIST setuptools-19.6.1.tar.gz 637780 SHA256 d7fd89a4bbd89ea51aaf18100b50411cc881866f3456f11a8732f1c957f3d7da SHA512 542c41aafdeca3e7658650dfb1c2f5209eb89ae17586cddf1a57316b987507c1263648c93d4177d8d1f775c0ce60c0849b9f4639e395b364ddfe4d92f019be0c WHIRLPOOL 597ed23c4fed9e61f3e8dadfe405fc0cb6be8ccc34c38b3933f69da08452ac53c2ce9e743555544209dd7e55a57fd327bcd7060eb6d0367f869288945dda1a96 DIST setuptools-19.6.2.tar.gz 641373 SHA256 69261eefdb21057cfbe92ba8032b923d6363d6682967d42cf46388090d0f1a15 SHA512 c00ef832fd4d1514e440c36d90691e48aa179b14d24021dd7a0149dbb0ae8efb801327025a7e1911a29cef63eec7c5cbadfa78c832beb316b8a4391b4ff053fe WHIRLPOOL 3cbc2a1c29050a86a323a0271f4e17adda0df2f99620e54fdaf9038ca9f4e1bb0801fdd309be274c655aaf6fb7c6c77b4babb5cd721c09d9e6904235077b3736 -DIST setuptools-19.6.tar.gz 641502 SHA256 ecd48d753c1a8ecc6a2826b863a6defaafbfd4ceafc0c1d62e5362f5a86912e9 SHA512 79b9a0f595bda16f18997d9937c6bc2e21bb2bb23fcca4be29df2fb71649c5ba973428472e3c795f2a5d6fbcccf1d5f29096a0fb593a4c52fa87b1d003e474da WHIRLPOOL 391f3e20739c717cc42613e099b867ee01cd8a1f3623f31062dee23131c3b1bad2e34345348f76e44ff2b92652cf65931b3fd8b6a7663b9c135a7c03b6954405 DIST setuptools-19.7.tar.gz 641634 SHA256 9e0783f3e6b736530a84980dce99fb0f01dafcd31b3f600cde2aa446f6f77cc0 SHA512 fe74b10eb1afef5d78cc5cd4d6dbd53ed16f975c693c138181dfb1661276255d214037eb036186d0cdc9dd31d636f9f1067d67bf591542e8ef933afca267ee4c WHIRLPOOL e1ee325d3de9a6b0dfd49fc68129271faeaccf5ffb77a750f553986fc47b75a5003c17a3f00d76be15eb3808d04e7060f5ccddb9ca9c804fbb68ad54c01453f4 DIST setuptools-20.0.tar.gz 641692 SHA256 a6f7b295f399fed3de918c4bea9e2053a5fbd9e3a55a6fef7aafe9d1f474866d SHA512 c77b8f963c1c2735014f344cb3fba6ab88fc034ea32e52501a19430538db4bc6217706532ac3427f928d55b9a2321a0948f57aca5c7a01020868efc9231dd174 WHIRLPOOL 2d2a1bb7c5ea4ace4da1ddceb6f03605858be10f8c835f8aee9be896041c3c84680f6f09edc4cbcefc99a209d6b3a9ca50f2413a8e226861ceee135543e409d3 DIST setuptools-20.1.1.tar.gz 641777 SHA256 2663ce0b0e742ee27c3a06b2da14563e4f6f713eaf5509b932a31793f9dea9a3 SHA512 72da2f5a4e07c14975b3e13246264cb4b9eb52bd6da22fce0ef0f0bb8d902249067e6c23bf263cda45de92a0cdb794f454dff95e52505045e03c7a6ab28cb2ca WHIRLPOOL d2f3f0fd31f4b7d35178c14cd411dae0b011c3f9efd8a7dea4cde24bee1e462758a9662e989ddea7777b111c6162e7d035cf924517e7e6bdcab0b3277d7765e1 DIST setuptools-20.2.2.tar.gz 676284 SHA256 24fcfc15364a9fe09a220f37d2dcedc849795e3de3e4b393ee988e66a9cbd85a SHA512 e74004e5755e1abd9e6efb94887c9124a36e67651e6e626424e96575cf8e84a258d48ee6fa8f0389f15de3bddcbcb0a690810dd46c358f85659ad6f20f905a2d WHIRLPOOL 3f3b7c3c916d88fb6fc53e0b348605fbaa0463abf44a164641fb8eba0050bd1513af971874b9415b1b4939b49504e4378d7142c04ba8300fb5e468cbdb35a144 +DIST setuptools-20.3.1.tar.gz 676378 SHA256 a1b3f74a1dc7c81368f2bc28a34366cfa6ffe80cdee1451261aabfba1ae1f4a8 SHA512 694258290c27cc2edbc83958de5ea4d8ebd3f96a3708012260438188fc4fd3b30a427ef87bfd418a188a74077acefb9d6e50bcf189c98a9380277f0087cce83b WHIRLPOOL 3119a672d4655f49d9dba0ad65230a0991584c4904c6eb6f3e6d15e09b3689f7cdeeb1e9198472830e02a6756c9cf92dc51292e77eb8f725f5a6f748a80fabda diff --git a/dev-python/setuptools/setuptools-18.7.ebuild b/dev-python/setuptools/setuptools-18.7.ebuild deleted file mode 100644 index 713d1deca53f..000000000000 --- a/dev-python/setuptools/setuptools-18.7.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://pypi.python.org/pypi/setuptools" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ) -" -PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -python_prepare_all() { - rm -r ./pkg_resources/_vendor || die - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-18.8.ebuild b/dev-python/setuptools/setuptools-18.8.ebuild deleted file mode 100644 index 914eeaef7b67..000000000000 --- a/dev-python/setuptools/setuptools-18.8.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://pypi.python.org/pypi/setuptools" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="PSF-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND=">=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ) -" -PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -python_prepare_all() { - rm -r ./pkg_resources/_vendor || die - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-19.6.ebuild b/dev-python/setuptools/setuptools-19.6.ebuild deleted file mode 100644 index 300425331f6d..000000000000 --- a/dev-python/setuptools/setuptools-19.6.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy pypy3 ) - -inherit distutils-r1 - -DESCRIPTION="Collection of extensions to Distutils" -HOMEPAGE="https://pypi.python.org/pypi/setuptools" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="test" - -RDEPEND=" - >=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - " -DEPEND="${RDEPEND} - test? ( - >=dev-python/pytest-2.8[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ) -" -PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" - -# Force in-source build because build system modifies sources. -DISTUTILS_IN_SOURCE_BUILD=1 - -DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) - -python_prepare_all() { - rm -r ./pkg_resources/_vendor || die - # disable tests requiring a network connection - rm setuptools/tests/test_packageindex.py || die - - # don't run integration tests - rm setuptools/tests/test_integration.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - # test_easy_install raises a SandboxViolation due to ${HOME}/.pydistutils.cfg - # It tries to sandbox the test in a tempdir - HOME="${PWD}" py.test --verbose ${PN} || die "Tests failed under ${EPYTHON}" -} - -python_install() { - export DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT=1 - distutils-r1_python_install -} diff --git a/dev-python/setuptools/setuptools-19.6.1.ebuild b/dev-python/setuptools/setuptools-20.3.1.ebuild similarity index 86% rename from dev-python/setuptools/setuptools-19.6.1.ebuild rename to dev-python/setuptools/setuptools-20.3.1.ebuild index 300425331f6d..6d462a6c8be2 100644 --- a/dev-python/setuptools/setuptools-19.6.1.ebuild +++ b/dev-python/setuptools/setuptools-20.3.1.ebuild @@ -17,17 +17,19 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="test" -RDEPEND=" - >=dev-python/packaging-15.3-r1[${PYTHON_USEDEP}] - >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - " +RDEPEND="" +# >=dev-python/packaging-16.4[${PYTHON_USEDEP}] +# >=dev-python/six-1.10.0[${PYTHON_USEDEP}] +# " DEPEND="${RDEPEND} test? ( >=dev-python/pytest-2.8[${PYTHON_USEDEP}] dev-python/mock[${PYTHON_USEDEP}] ) " -PDEPEND=">=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" +# >=dev-python/pyparsing-2.0.6[${PYTHON_USEDEP}] +PDEPEND=" + >=dev-python/certifi-2015.11.20[${PYTHON_USEDEP}]" # Force in-source build because build system modifies sources. DISTUTILS_IN_SOURCE_BUILD=1 @@ -35,7 +37,7 @@ DISTUTILS_IN_SOURCE_BUILD=1 DOCS=( README.txt docs/{easy_install.txt,pkg_resources.txt,setuptools.txt} ) python_prepare_all() { - rm -r ./pkg_resources/_vendor || die +# rm -r ./pkg_resources/_vendor || die # disable tests requiring a network connection rm setuptools/tests/test_packageindex.py || die diff --git a/dev-python/virtualenv/Manifest b/dev-python/virtualenv/Manifest index 443a74111022..fb5c0ed9635f 100644 --- a/dev-python/virtualenv/Manifest +++ b/dev-python/virtualenv/Manifest @@ -3,3 +3,4 @@ DIST virtualenv-14.0.1.tar.gz 1794063 SHA256 66778f6d27b3864644b923fdbac69d01228 DIST virtualenv-14.0.3.tar.gz 1794400 SHA256 9b67a5b78f8d8bac1f5221d19b912023574aaa2376d1b2ce4cc3ade9fe04b43e SHA512 b6de36e0aa009c5841589ebfc35f56f4ee46cfbe3f1f48bb79fdec04558bc6655e8a7b97fbb98077f0992fc17f7293539af36865c3b1e965f00e820a33ba93f8 WHIRLPOOL 5670100c1656105cb0e3244bf8634d96a2b63fb2063f5c14199ca8dee09f0923386f5825966ff2f4b2edf59ff14b63f8122459b8d666f76a83fa732acce85639 DIST virtualenv-14.0.5.tar.gz 1794654 SHA256 14b6148911f82d38bd3c7adcd1a16d54a1eca4d27d92ba11d06acf67f7566c71 SHA512 52ea2dcfc1b830aaf3c651f87b4e74dbba9b6ee1a93e641fbbb2ca10484044aece8aead9a12184115aa7f533233c790b65ffd40405f60e4dcef1d15a4786075b WHIRLPOOL f23cf8f9c6fc21c130e0dcb5f71f9430ac4dd167b73db9676ce37bbed7fcece1e61a09b0882737fb1e855b1910e2037f32bd59ba38445a3be6a2dfacddeb4af8 DIST virtualenv-14.0.6.tar.gz 1799312 SHA256 ce61e5d05e3532a8d910663c5ab92ed4c226c3daaba903f1ada281d96fabec98 SHA512 86fae16be973c8a981b106b22fec74909de225b70b7a486108ae769385a573087d64beb8963373f35a444a9baf0a1805c0035313f600655629dd8a03850c51fb WHIRLPOOL f4891ac11d2d2ca889e6b2eea4256c8f8628a59e205a20c022e050e37d3baebde221dcbb02fae7cdeb8d088d1dad30734a1471d37b658b7f13c3895287bc4769 +DIST virtualenv-15.0.1.tar.gz 1843933 SHA256 e9fc77f0ba37e18a16105e0c1601f10a308364b993edb5f6158f97088fb29ea3 SHA512 e313fd943446e52eddaf01010513b7ae64688223b0de844824206690d1fa136683aa6a03c5b5c7c42fa771056f9fa6ace81c39a821b688d63bfdd5a748036c6c WHIRLPOOL 843832c21925d6a36f82198326dfeb48a6c585b4eb52d360c1d6e6c0846b609657d4dc2225c69dbb0455ce336901b95bfad5f2ab46e71dcbeac7a677c2cb855f diff --git a/dev-python/virtualenv/virtualenv-15.0.1.ebuild b/dev-python/virtualenv/virtualenv-15.0.1.ebuild new file mode 100644 index 000000000000..5a917c3ea41d --- /dev/null +++ b/dev-python/virtualenv/virtualenv-15.0.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +PYTHON_COMPAT=( python2_7 python3_{3,4,5} pypy ) + +inherit distutils-r1 + +DESCRIPTION="Virtual Python Environment builder" +HOMEPAGE=" + http://www.virtualenv.org/ + https://pypi.python.org/pypi/virtualenv + https://github.com/pypa/virtualenv/ +" +SRC_URI="https://github.com/pypa/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +SLOT="0" +IUSE="doc test" + +RDEPEND="" +DEPEND="${RDEPEND} + >=dev-python/setuptools-19.6.2[${PYTHON_USEDEP}] + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( + dev-python/mock[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + )" + +DOCS=( docs/index.rst docs/changes.rst ) + +PATCHES=( + "${FILESDIR}"/${PN}-12.1.1-skip-broken-test.patch +) + +python_compile_all() { + use doc && emake -C docs html +} + +python_test() { + py.test -v -v || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + use doc && local HTML_DOCS=( "${S}"/docs/_build/html/. ) + distutils-r1_python_install_all +} diff --git a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild index 7f6c2a49663c..3523a23979a1 100644 --- a/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild +++ b/dev-qt/qtchooser/qtchooser-0_p20151008.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://dev.gentoo.org/~pesa/distfiles/${P}.tar.xz" LICENSE="|| ( LGPL-2.1 GPL-3 )" SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd" IUSE="test" DEPEND="test? ( diff --git a/dev-ros/actionlib/Manifest b/dev-ros/actionlib/Manifest index 507a4b62258a..4a8f1e682b3a 100644 --- a/dev-ros/actionlib/Manifest +++ b/dev-ros/actionlib/Manifest @@ -1 +1,2 @@ DIST actionlib-1.11.4.tar.gz 96491 SHA256 3584d822bd4c5254fe6f33cee833fb8703036bbdb7fa51e194b7ff5db3510281 SHA512 5bd416a1915373b6cf6f9599e115053b11b6892060438264f3e90f82a86f6c070ff0dd3f89bf3a6c4d930c20cceaa99da092346f04649ddd3286463dd43a6208 WHIRLPOOL ff8600d8a28f36776630b2462dd18ef540770d2ec1d36105e9a0393540dba8d7daf601510502ae3ccf85152b8f127f4cc0e73404842a0c65e74cd985be33c9bf +DIST actionlib-1.11.5.tar.gz 96979 SHA256 da2b8115686db17a47bc6897b07cfec3588b3c6b8970f2d2359cfff9c41e6ccd SHA512 ba3b163c8f5547d872b789abbc6238f371a542d691fc9ae8f62ba266c3a187b9e5026bf7f0edb29f0234a01bd4d3f60edacf6118a0d3d04719c1604a49c0ce23 WHIRLPOOL 74b95cefe674f85081897a571a0d71985aa66d1a7eb3d3924d625718dac43fe3e72889813676f3dc2236d44d096ac6190a77ee6f15bccd20cd9b07b11aabc1d9 diff --git a/dev-ros/actionlib/actionlib-1.11.5.ebuild b/dev-ros/actionlib/actionlib-1.11.5.ebuild new file mode 100644 index 000000000000..b53dcae9597f --- /dev/null +++ b/dev-ros/actionlib/actionlib-1.11.5.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/ros/actionlib" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/actionlib_msgs dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Provides a standardized interface for interfacing with preemptable tasks" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-libs/boost:=[threads] + dev-ros/roscpp + dev-ros/rospy[${PYTHON_USEDEP}] + " +DEPEND="${RDEPEND} + dev-ros/rosunit[${PYTHON_USEDEP}] + test? ( dev-ros/rostest[${PYTHON_USEDEP}] )" diff --git a/dev-ros/bond/Manifest b/dev-ros/bond/Manifest index 0d7a60a51eaa..3db390ef0d1a 100644 --- a/dev-ros/bond/Manifest +++ b/dev-ros/bond/Manifest @@ -1 +1,2 @@ DIST bond_core-1.7.16.tar.gz 25327 SHA256 177dc78ef9cf3cd9f48fe5aca4742f504956c71641c75048b7559af0e2aacd53 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e WHIRLPOOL 56fd05d2c6c8f5fb9fa8b47f2da939e16f79f39937febbf588137d5dd411c03f0c30edb3e70b50ed4c6b7c1ce8a0f1cd8c1922038c20495e62a57c80d0958864 +DIST bond_core-1.7.17.tar.gz 31334 SHA256 41e511233510b6d8c73f354c2198c4ff5e82bafa47120fb3ffcb6704a2d7f1a6 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73 WHIRLPOOL 2da1910eedc7b4af12c6172c01fd7fe60ad11645366e0b3e684c458b4f78a82b61f957c12d88f248cbc1aced57c4f97a2e1c6319c5a417a470fb1d0904ca66a9 diff --git a/dev-ros/bond/bond-1.7.17.ebuild b/dev-ros/bond/bond-1.7.17.ebuild new file mode 100644 index 000000000000..84d65c5825f3 --- /dev/null +++ b/dev-ros/bond/bond-1.7.17.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/ros/bond_core" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=${PN} +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="A bond allows two processes, A and B, to know when the other has terminated" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-ros/bondcpp/Manifest b/dev-ros/bondcpp/Manifest index 0d7a60a51eaa..3db390ef0d1a 100644 --- a/dev-ros/bondcpp/Manifest +++ b/dev-ros/bondcpp/Manifest @@ -1 +1,2 @@ DIST bond_core-1.7.16.tar.gz 25327 SHA256 177dc78ef9cf3cd9f48fe5aca4742f504956c71641c75048b7559af0e2aacd53 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e WHIRLPOOL 56fd05d2c6c8f5fb9fa8b47f2da939e16f79f39937febbf588137d5dd411c03f0c30edb3e70b50ed4c6b7c1ce8a0f1cd8c1922038c20495e62a57c80d0958864 +DIST bond_core-1.7.17.tar.gz 31334 SHA256 41e511233510b6d8c73f354c2198c4ff5e82bafa47120fb3ffcb6704a2d7f1a6 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73 WHIRLPOOL 2da1910eedc7b4af12c6172c01fd7fe60ad11645366e0b3e684c458b4f78a82b61f957c12d88f248cbc1aced57c4f97a2e1c6319c5a417a470fb1d0904ca66a9 diff --git a/dev-ros/bondcpp/bondcpp-1.7.17.ebuild b/dev-ros/bondcpp/bondcpp-1.7.17.ebuild new file mode 100644 index 000000000000..68f68325bd45 --- /dev/null +++ b/dev-ros/bondcpp/bondcpp-1.7.17.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/bond_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="C++ implementation of bond, a mechanism for checking when another process has terminated" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/bond + dev-ros/cmake_modules + dev-ros/roscpp + dev-ros/smclib + dev-libs/boost:= + sys-apps/util-linux +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/bondpy/Manifest b/dev-ros/bondpy/Manifest index 0d7a60a51eaa..3db390ef0d1a 100644 --- a/dev-ros/bondpy/Manifest +++ b/dev-ros/bondpy/Manifest @@ -1 +1,2 @@ DIST bond_core-1.7.16.tar.gz 25327 SHA256 177dc78ef9cf3cd9f48fe5aca4742f504956c71641c75048b7559af0e2aacd53 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e WHIRLPOOL 56fd05d2c6c8f5fb9fa8b47f2da939e16f79f39937febbf588137d5dd411c03f0c30edb3e70b50ed4c6b7c1ce8a0f1cd8c1922038c20495e62a57c80d0958864 +DIST bond_core-1.7.17.tar.gz 31334 SHA256 41e511233510b6d8c73f354c2198c4ff5e82bafa47120fb3ffcb6704a2d7f1a6 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73 WHIRLPOOL 2da1910eedc7b4af12c6172c01fd7fe60ad11645366e0b3e684c458b4f78a82b61f957c12d88f248cbc1aced57c4f97a2e1c6319c5a417a470fb1d0904ca66a9 diff --git a/dev-ros/bondpy/bondpy-1.7.17.ebuild b/dev-ros/bondpy/bondpy-1.7.17.ebuild new file mode 100644 index 000000000000..abb50962dc64 --- /dev/null +++ b/dev-ros/bondpy/bondpy-1.7.17.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/bond_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Python implementation of bond, a mechanism for checking when another process has terminated" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/bond[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/smclib + sys-apps/util-linux +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/cpp_common/Manifest b/dev-ros/cpp_common/Manifest index c28f6ba045fc..9c4df1ec4c43 100644 --- a/dev-ros/cpp_common/Manifest +++ b/dev-ros/cpp_common/Manifest @@ -1,2 +1,3 @@ DIST roscpp_core-0.5.6.tar.gz 31734 SHA256 0bd27394c18c7c79313ebc4eafecc04f88aa54a9d0872357b7123105444edf3a SHA512 caebca2817721a46c8ce850bc15bdeadb3bf6ad12aeb134b11bdb04da6054eb4056aef8c5194ca4e7fffa3e3f3563faf8e3148eebfba93bc6b5673d5437d977f WHIRLPOOL f977f9b0e10a287c7d201ffd765a4824e61d0b5f85767c7a8e81d96295f97dcbe22a9c2d376f36a329997d0498ce36f830263e4710eaf288b214b6bf894ede84 DIST roscpp_core-0.5.7.tar.gz 32006 SHA256 85028afb1e1630b47890d3c92bcb7edf61f4be04281669f73f000312621bf66d SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe WHIRLPOOL c395ccbdd3664e3337ba9a8c029df805585cf04f717c23caf75c582e08581e6a58d232b52679a9cb99150b0c6fa9f831c24b61be0a15839f76487ba67d09f8bb +DIST roscpp_core-0.6.0.tar.gz 32255 SHA256 352fdf2bce0efc562da70dd9ec72691145d8e9eb7a653a8da1b064553be3540b SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75 WHIRLPOOL 6ce40f71026671cff38c62278f44eccd7fc1a772ebf762f9df8322c29ba1e03ee6297886142209552164a0ef6a546cb9f96bfb6e3e34e02c3177bb90cb3a66fa diff --git a/dev-ros/cpp_common/cpp_common-0.6.0.ebuild b/dev-ros/cpp_common/cpp_common-0.6.0.ebuild new file mode 100644 index 000000000000..da8e09beb6e4 --- /dev/null +++ b/dev-ros/cpp_common/cpp_common-0.6.0.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/roscpp_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="C++ code for doing things that are not necessarily ROS related" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/console_bridge + dev-libs/boost:=[threads]" +DEPEND="${RDEPEND}" diff --git a/dev-ros/cv_bridge/Manifest b/dev-ros/cv_bridge/Manifest index 537a45e333c0..9f937f54b3d7 100644 --- a/dev-ros/cv_bridge/Manifest +++ b/dev-ros/cv_bridge/Manifest @@ -3,3 +3,4 @@ DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e DIST vision_opencv-1.11.12.tar.gz 110974 SHA256 9537246f167dcb1689888be127efd6706e66518583b74bac2d8a4ff6646a7a43 SHA512 6e836514931a6528ca609ab1c465484309ec85b21ae4d18b3dd596a0bbaf59283e07b269d953611af5d24eb48a1dd81a966fee8f74ea947e107b0d0f3ef833f1 WHIRLPOOL 0070e6c170f0e450f654e2c2502c99bd0f1c5d73921984b0efedc3aa34da7ec61eb8c3259de79cbf55841c7958e313ae014ffb0ad8513c2d60b54baa448c3367 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74 +DIST vision_opencv-1.12.0.tar.gz 110922 SHA256 bff37fe2d80d1fe125aa514791fe4aef5042d7715f621e39af696629881bf4ac SHA512 9aa5764cb97ab48b96484cfd1bcf492f726cdeb9a75338945f8a65c9fcf753e339fc1738d96091a01884a5f5b66af710c6ade651b09459c5f3cd08180cd135b4 WHIRLPOOL e214a7a03011ad66611ceb10a9fb88de03975538f8d52c44d0d4c82830c5c6b7e8fd3a6fe901faa7f1415f483acceb46b30db88f72125aed45fb6bda485ec231 diff --git a/dev-ros/cv_bridge/cv_bridge-1.12.0.ebuild b/dev-ros/cv_bridge/cv_bridge-1.12.0.ebuild new file mode 100644 index 000000000000..608a617ffa6a --- /dev/null +++ b/dev-ros/cv_bridge/cv_bridge-1.12.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/vision_opencv" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Converts between ROS Image messages and OpenCV images" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rosconsole + media-libs/opencv + dev-libs/boost:=[threads,python,${PYTHON_USEDEP}] + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/gencpp/Manifest b/dev-ros/gencpp/Manifest index e465d2490ada..bee6dcaaaf50 100644 --- a/dev-ros/gencpp/Manifest +++ b/dev-ros/gencpp/Manifest @@ -1 +1,2 @@ DIST gencpp-0.5.3.tar.gz 8496 SHA256 0959b1dee8682a30a97fedbebfa2dd04ca4de598f215626b873cb0b7ad1dfd14 SHA512 bc5a8307dffe3ad9a5f9a311b31f60de88d4d873309ce9afd4ab4961b93cb562b8037870f910c98a3a8f98fec3b9efaba6038e3c10fab320b7e58645f4e0c92c WHIRLPOOL b62838b7628dc76f12b5b4a5c73d972b10d9a9052f7d3aec9c761365bb2062f8bbb1613312515312e64bd342962ac620eeb26d4dba0a363e61cde850477a630a +DIST gencpp-0.5.4.tar.gz 8573 SHA256 58ebd37d6b9fc39cf8a14da7951a52ec3f3bf038db417c34d2bac28130847b16 SHA512 a0099e9329aa5d89d9d446883a1f4bd48bbf7f40220d40ed60f9c0cd8e1ae9f28e042954790a491393cb047ab17dbd5aa1c48bf24027526add0e9b304db3db6b WHIRLPOOL 8d6ceb304999f478adf5c53269d65f6eb5961210e7d2a5b63a1d533880ae0759ea43de369f246f42bac77bd06b24c93b4ac324cfc0d86d5385e5c6b05aea1f37 diff --git a/dev-ros/gencpp/gencpp-0.5.4.ebuild b/dev-ros/gencpp/gencpp-0.5.4.ebuild new file mode 100644 index 000000000000..bd58a6c856e6 --- /dev/null +++ b/dev-ros/gencpp/gencpp-0.5.4.ebuild @@ -0,0 +1,20 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/gencpp" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) + +inherit ros-catkin + +DESCRIPTION="ROS C++ message definition and serialization generators" +HOMEPAGE="http://wiki.ros.org/gencpp" +LICENSE="BSD" +SLOT="0/${PV}" +IUSE="" + +RDEPEND="dev-ros/genmsg[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND}" diff --git a/dev-ros/image_geometry/Manifest b/dev-ros/image_geometry/Manifest index 537a45e333c0..9f937f54b3d7 100644 --- a/dev-ros/image_geometry/Manifest +++ b/dev-ros/image_geometry/Manifest @@ -3,3 +3,4 @@ DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e DIST vision_opencv-1.11.12.tar.gz 110974 SHA256 9537246f167dcb1689888be127efd6706e66518583b74bac2d8a4ff6646a7a43 SHA512 6e836514931a6528ca609ab1c465484309ec85b21ae4d18b3dd596a0bbaf59283e07b269d953611af5d24eb48a1dd81a966fee8f74ea947e107b0d0f3ef833f1 WHIRLPOOL 0070e6c170f0e450f654e2c2502c99bd0f1c5d73921984b0efedc3aa34da7ec61eb8c3259de79cbf55841c7958e313ae014ffb0ad8513c2d60b54baa448c3367 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74 +DIST vision_opencv-1.12.0.tar.gz 110922 SHA256 bff37fe2d80d1fe125aa514791fe4aef5042d7715f621e39af696629881bf4ac SHA512 9aa5764cb97ab48b96484cfd1bcf492f726cdeb9a75338945f8a65c9fcf753e339fc1738d96091a01884a5f5b66af710c6ade651b09459c5f3cd08180cd135b4 WHIRLPOOL e214a7a03011ad66611ceb10a9fb88de03975538f8d52c44d0d4c82830c5c6b7e8fd3a6fe901faa7f1415f483acceb46b30db88f72125aed45fb6bda485ec231 diff --git a/dev-ros/image_geometry/image_geometry-1.12.0.ebuild b/dev-ros/image_geometry/image_geometry-1.12.0.ebuild new file mode 100644 index 000000000000..82066472ce06 --- /dev/null +++ b/dev-ros/image_geometry/image_geometry-1.12.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/vision_opencv" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="C++ and Python libraries for interpreting images geometrically" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + media-libs/opencv + dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + test? ( dev-python/nose[${PYTHON_USEDEP}] dev-cpp/gtest )" diff --git a/dev-ros/message_filters/Manifest b/dev-ros/message_filters/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/message_filters/Manifest +++ b/dev-ros/message_filters/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/message_filters/message_filters-1.12.0.ebuild b/dev-ros/message_filters/message_filters-1.12.0.ebuild new file mode 100644 index 000000000000..6295f1a04116 --- /dev/null +++ b/dev-ros/message_filters/message_filters-1.12.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=utilities/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Set of message filters which take in messages and may output those messages at a later time" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/xmlrpcpp + dev-libs/boost:=[threads] + dev-ros/genpy[${PYTHON_USEDEP}] + dev-ros/roslib[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_USEDEP}] + dev-cpp/gtest + dev-python/nose[${PYTHON_USEDEP}] + )" diff --git a/dev-ros/nodelet/Manifest b/dev-ros/nodelet/Manifest index d215469a8c9c..ce9d85cd2a6e 100644 --- a/dev-ros/nodelet/Manifest +++ b/dev-ros/nodelet/Manifest @@ -1 +1,2 @@ DIST nodelet_core-1.9.3.tar.gz 33825 SHA256 26256ff83c92db88b941e5d85ab2162fbcaa0f19ea066732c2de83255eed0001 SHA512 d2560ef2c973aae297ffc5f139ed12308a0e4ac4477407e533402fbaf127c5aa4105548d01438b3bb17636df9587018a953bb6c0ae810996445bb1368c97f190 WHIRLPOOL 88bb8ef3a0b2138f2f1d5ff95c4328e22da4fc23313ba52447d5156b13c452284a9953f89de1d48838b96e226ff9ab929d6482c8b0ad847676aaa13e9b1f596d +DIST nodelet_core-1.9.4.tar.gz 34236 SHA256 60e694e8575db93e24a8ed9cbebae8c257f6f25aef33a0e7f92418f318fd9131 SHA512 f2c49363029e8d53151433fa33162a3efb71750bfec55d68e2182ff385af0e65b983c6b4e799995a270cb8754d02b295c9d2a68fd712bca1fd4df0d276c93ce3 WHIRLPOOL 3474aab9d5d51f0672deacd79dfc294dc7b962c617e390beda7ae6e40b89a1dd3ba05beb0c4066b0c95588ffaf1bdeca73debcb0112f4802252e89ec5e8eb98e diff --git a/dev-ros/nodelet/nodelet-1.9.4.ebuild b/dev-ros/nodelet/nodelet-1.9.4.ebuild new file mode 100644 index 000000000000..e680cf52dd02 --- /dev/null +++ b/dev-ros/nodelet/nodelet-1.9.4.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/ros/nodelet_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit ros-catkin + +DESCRIPTION="Provides a way to run multiple algorithms in the same process with zero copy transport" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/bondcpp + dev-ros/cmake_modules + dev-ros/pluginlib + dev-ros/rosconsole + dev-ros/roscpp + dev-libs/boost:= + sys-apps/util-linux +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/nodelet_topic_tools/Manifest b/dev-ros/nodelet_topic_tools/Manifest index d215469a8c9c..ce9d85cd2a6e 100644 --- a/dev-ros/nodelet_topic_tools/Manifest +++ b/dev-ros/nodelet_topic_tools/Manifest @@ -1 +1,2 @@ DIST nodelet_core-1.9.3.tar.gz 33825 SHA256 26256ff83c92db88b941e5d85ab2162fbcaa0f19ea066732c2de83255eed0001 SHA512 d2560ef2c973aae297ffc5f139ed12308a0e4ac4477407e533402fbaf127c5aa4105548d01438b3bb17636df9587018a953bb6c0ae810996445bb1368c97f190 WHIRLPOOL 88bb8ef3a0b2138f2f1d5ff95c4328e22da4fc23313ba52447d5156b13c452284a9953f89de1d48838b96e226ff9ab929d6482c8b0ad847676aaa13e9b1f596d +DIST nodelet_core-1.9.4.tar.gz 34236 SHA256 60e694e8575db93e24a8ed9cbebae8c257f6f25aef33a0e7f92418f318fd9131 SHA512 f2c49363029e8d53151433fa33162a3efb71750bfec55d68e2182ff385af0e65b983c6b4e799995a270cb8754d02b295c9d2a68fd712bca1fd4df0d276c93ce3 WHIRLPOOL 3474aab9d5d51f0672deacd79dfc294dc7b962c617e390beda7ae6e40b89a1dd3ba05beb0c4066b0c95588ffaf1bdeca73debcb0112f4802252e89ec5e8eb98e diff --git a/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.4.ebuild b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.4.ebuild new file mode 100644 index 000000000000..9051d411fb0c --- /dev/null +++ b/dev-ros/nodelet_topic_tools/nodelet_topic_tools-1.9.4.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/nodelet_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Common nodelet tools such as a mux, demux and throttle" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads] + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/message_filters + dev-ros/nodelet + dev-ros/pluginlib + dev-ros/roscpp +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/opencv_apps/Manifest b/dev-ros/opencv_apps/Manifest index 537a45e333c0..9f937f54b3d7 100644 --- a/dev-ros/opencv_apps/Manifest +++ b/dev-ros/opencv_apps/Manifest @@ -3,3 +3,4 @@ DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e DIST vision_opencv-1.11.12.tar.gz 110974 SHA256 9537246f167dcb1689888be127efd6706e66518583b74bac2d8a4ff6646a7a43 SHA512 6e836514931a6528ca609ab1c465484309ec85b21ae4d18b3dd596a0bbaf59283e07b269d953611af5d24eb48a1dd81a966fee8f74ea947e107b0d0f3ef833f1 WHIRLPOOL 0070e6c170f0e450f654e2c2502c99bd0f1c5d73921984b0efedc3aa34da7ec61eb8c3259de79cbf55841c7958e313ae014ffb0ad8513c2d60b54baa448c3367 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74 +DIST vision_opencv-1.12.0.tar.gz 110922 SHA256 bff37fe2d80d1fe125aa514791fe4aef5042d7715f621e39af696629881bf4ac SHA512 9aa5764cb97ab48b96484cfd1bcf492f726cdeb9a75338945f8a65c9fcf753e339fc1738d96091a01884a5f5b66af710c6ade651b09459c5f3cd08180cd135b4 WHIRLPOOL e214a7a03011ad66611ceb10a9fb88de03975538f8d52c44d0d4c82830c5c6b7e8fd3a6fe901faa7f1415f483acceb46b30db88f72125aed45fb6bda485ec231 diff --git a/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild b/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild new file mode 100644 index 000000000000..f11ce398047d --- /dev/null +++ b/dev-ros/opencv_apps/opencv_apps-1.12.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/vision_opencv" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="OpenCV applications for ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cv_bridge + dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}] + dev-ros/image_transport + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/nodelet + dev-ros/roscpp + >=media-libs/opencv-3:0=[contrib] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/opencv_apps/opencv_apps-9999.ebuild b/dev-ros/opencv_apps/opencv_apps-9999.ebuild index 6d271ab79760..f11ce398047d 100644 --- a/dev-ros/opencv_apps/opencv_apps-9999.ebuild +++ b/dev-ros/opencv_apps/opencv_apps-9999.ebuild @@ -8,6 +8,7 @@ KEYWORDS="~amd64 ~arm" PYTHON_COMPAT=( python2_7 ) ROS_SUBDIR=${PN} CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" inherit ros-catkin diff --git a/dev-ros/opencv_tests/Manifest b/dev-ros/opencv_tests/Manifest index 537a45e333c0..9f937f54b3d7 100644 --- a/dev-ros/opencv_tests/Manifest +++ b/dev-ros/opencv_tests/Manifest @@ -3,3 +3,4 @@ DIST vision_opencv-1.11.11.tar.gz 107062 SHA256 33413f7d805cf6f3edaabae6b264af1e DIST vision_opencv-1.11.12.tar.gz 110974 SHA256 9537246f167dcb1689888be127efd6706e66518583b74bac2d8a4ff6646a7a43 SHA512 6e836514931a6528ca609ab1c465484309ec85b21ae4d18b3dd596a0bbaf59283e07b269d953611af5d24eb48a1dd81a966fee8f74ea947e107b0d0f3ef833f1 WHIRLPOOL 0070e6c170f0e450f654e2c2502c99bd0f1c5d73921984b0efedc3aa34da7ec61eb8c3259de79cbf55841c7958e313ae014ffb0ad8513c2d60b54baa448c3367 DIST vision_opencv-1.11.8.tar.gz 80160 SHA256 0cf0934d4d9bd91e966afc2f25a4e54646016b6628f4fe58e81faee0c58c88c2 SHA512 55ca2554a3736bd5102bfef14562a6bc341d13eb098fbb7d8d050c90b5d397820791aed54a3697f5084a1b629d959c7abc24172a8efbdfc65490ebdbcb548c77 WHIRLPOOL 8b2b9f4968618258ebd6b2d6d0674ca9c24ed5e7d1adcc4cbbf769e13206017ea06fe5172277a19d67c73c88066270a2e259743ee1b63e4cec7ce8508405b8d3 DIST vision_opencv-1.11.9.tar.gz 97544 SHA256 3ce781847f5f855083cfae94a8d89defbe4cc83e086b4c796653561aee08b826 SHA512 e1a40997d6a3cf821fb1d57f818b3bcb52d2d0372159eec7f756c7df52fbd2a3ec91ac960cd1a7454f13cd6fe0192f4c019e70fcd4b20d0f797f4845ce676211 WHIRLPOOL c0388e6a40a2b166231b960eff5a011ea2e96c23319209315a86744ac5628d75b9bcb3fd0abdebe941ff89b12852b8813b5e97b3ab7827a2320e0dc0fc64ab74 +DIST vision_opencv-1.12.0.tar.gz 110922 SHA256 bff37fe2d80d1fe125aa514791fe4aef5042d7715f621e39af696629881bf4ac SHA512 9aa5764cb97ab48b96484cfd1bcf492f726cdeb9a75338945f8a65c9fcf753e339fc1738d96091a01884a5f5b66af710c6ade651b09459c5f3cd08180cd135b4 WHIRLPOOL e214a7a03011ad66611ceb10a9fb88de03975538f8d52c44d0d4c82830c5c6b7e8fd3a6fe901faa7f1415f483acceb46b30db88f72125aed45fb6bda485ec231 diff --git a/dev-ros/opencv_tests/opencv_tests-1.12.0.ebuild b/dev-ros/opencv_tests/opencv_tests-1.12.0.ebuild new file mode 100644 index 000000000000..770ea0be049c --- /dev/null +++ b/dev-ros/opencv_tests/opencv_tests-1.12.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros-perception/vision_opencv" +KEYWORDS="~amd64 ~arm" +# Be careful: It needs opencv with python support but opencv is python-single-r1 +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Tests for ROS OpenCV integration" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cv_bridge[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + media-libs/opencv[python,python_single_target_python2_7] + dev-python/numpy[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_install() { + ros-catkin_src_install + insinto /usr/share/${PN}/launch + doins launch/*.launch + exeinto /usr/libexec/${PN} + doexe nodes/* +} diff --git a/dev-ros/python_qt_binding/Manifest b/dev-ros/python_qt_binding/Manifest index d46a9fc7d47d..25cc169a2b06 100644 --- a/dev-ros/python_qt_binding/Manifest +++ b/dev-ros/python_qt_binding/Manifest @@ -1 +1,2 @@ DIST python_qt_binding-0.2.17.tar.gz 12133 SHA256 7f0b5147c7b3908a09c7e771160a27d77b9047c095aa33f110345bf483b775e6 SHA512 332d63962f40d41e236a7f85e7859f1ed78dda4f02ae388e2026b53622e2551b2a702624aabf98e3fbe5d55d24f92b9c0a127386407e20ff60a5ebfbd63ffda0 WHIRLPOOL 05ecfbfaf37c94a333a517c655347f61eae17d5fa6af503e89c5f65ca624e143f7f9c097fa3f3cdda1d90b678805c1ea1228880f7074fb122fc3ebc166de2444 +DIST python_qt_binding-0.2.18.tar.gz 12168 SHA256 c38e36a8e4f8aa1d1241ee03bf1527837424bed4323dc941c21f9504956f8d8d SHA512 3bb7393e582c4e8cd5f11884b31671f73248a13141c800c902c080c370615417ccd3b7673871f6bc56e4ac078efcb991118090d8037f911d2214c94353fcf833 WHIRLPOOL 0082c6464cfca8eb817da65119ee58fcd03a0ffad347888c02a642f985b30254d0d0135c76c65112a51e066891d85cb66f3110c4743a09726a911f85e690d0f8 diff --git a/dev-ros/python_qt_binding/python_qt_binding-0.2.18.ebuild b/dev-ros/python_qt_binding/python_qt_binding-0.2.18.ebuild new file mode 100644 index 000000000000..4b34b88adf41 --- /dev/null +++ b/dev-ros/python_qt_binding/python_qt_binding-0.2.18.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros-visualization/python_qt_binding" +KEYWORDS="~amd64" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit ros-catkin + +DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-python/pyside[${PYTHON_USEDEP}] + dev-python/PyQt4[X,${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild index 2d7d4f641d2e..4b34b88adf41 100644 --- a/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild +++ b/dev-ros/python_qt_binding/python_qt_binding-9999.ebuild @@ -11,7 +11,7 @@ PYTHON_COMPAT=( python{2_7,3_3,3_4} ) inherit ros-catkin DESCRIPTION="Infrastructure for an integrated graphical user interface based on Qt" -LICENSE="BSD LGPL-2.1 GPL-2" +LICENSE="BSD" SLOT="0" IUSE="" diff --git a/dev-ros/rosbag/Manifest b/dev-ros/rosbag/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosbag/Manifest +++ b/dev-ros/rosbag/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosbag/rosbag-1.12.0.ebuild b/dev-ros/rosbag/rosbag-1.12.0.ebuild new file mode 100644 index 000000000000..e6e5ada3ad7e --- /dev/null +++ b/dev-ros/rosbag/rosbag-1.12.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Set of tools for recording from and playing back to ROS topics" +LICENSE="BSD" +SLOT="0" +IUSE="lz4" + +RDEPEND=" + dev-ros/rosbag_storage + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/topic_tools + dev-ros/xmlrpcpp + dev-libs/boost:= + app-arch/bzip2 + dev-ros/roslib[${PYTHON_USEDEP}] + dev-ros/genpy[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" +RDEPEND="${RDEPEND} + lz4? ( dev-ros/roslz4[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosbag_storage/Manifest b/dev-ros/rosbag_storage/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosbag_storage/Manifest +++ b/dev-ros/rosbag_storage/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosbag_storage/rosbag_storage-1.12.0.ebuild b/dev-ros/rosbag_storage/rosbag_storage-1.12.0.ebuild new file mode 100644 index 000000000000..ebb742bf256e --- /dev/null +++ b/dev-ros/rosbag_storage/rosbag_storage-1.12.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} + +inherit ros-catkin + +DESCRIPTION="Set of tools for recording from and playing back ROS message" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/console_bridge + dev-ros/cpp_common + dev-ros/roscpp_serialization + dev-ros/roscpp_traits + dev-ros/rostime + dev-ros/roslz4 + dev-libs/boost:= + app-arch/bzip2 +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rosconsole/Manifest b/dev-ros/rosconsole/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosconsole/Manifest +++ b/dev-ros/rosconsole/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosconsole/rosconsole-1.12.0.ebuild b/dev-ros/rosconsole/rosconsole-1.12.0.ebuild new file mode 100644 index 000000000000..7d1cc2938086 --- /dev/null +++ b/dev-ros/rosconsole/rosconsole-1.12.0.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} + +inherit ros-catkin + +DESCRIPTION="ROS console output library" +LICENSE="BSD" +SLOT="0" +IUSE="+log4cxx glog" + +RDEPEND=" + dev-ros/cpp_common + dev-ros/rostime + dev-ros/rosunit + dev-libs/boost:=[threads] + log4cxx? ( dev-libs/log4cxx ) + !log4cxx? ( glog? ( dev-cpp/glog ) ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local ROSCONSOLE_BACKEND="" + if use log4cxx; then + ROSCONSOLE_BACKEND="log4cxx" + elif use glog; then + ROSCONSOLE_BACKEND="glog" + else + ROSCONSOLE_BACKEND="print" + fi + local mycatkincmakeargs=( "-DROSCONSOLE_BACKEND=${ROSCONSOLE_BACKEND}" ) + ros-catkin_src_configure +} diff --git a/dev-ros/rosconsole_bridge/Manifest b/dev-ros/rosconsole_bridge/Manifest index 431ffce69653..01d2528467a0 100644 --- a/dev-ros/rosconsole_bridge/Manifest +++ b/dev-ros/rosconsole_bridge/Manifest @@ -1 +1,2 @@ DIST rosconsole_bridge-0.4.2.tar.gz 3974 SHA256 0834456f97e97f30ed27a6a234dac4e829970bffc20b439f4fcf442f0ba04d0c SHA512 ee44f0967d6325bdd20a6c0716502f93a39b5ac22ce9abbde906328ebb1e6fa61f1f4170f6a7fe2ea83cde255b9cb5159153ab23c911524743f0e63e6656330a WHIRLPOOL 3daee3baf0c80993596238304efb30ab59946e42de178db3b3c743eaa4f964a8b440b63120e87976d9af6372fcdf658f12a6e4a88b52af28583778915246cab1 +DIST rosconsole_bridge-0.4.3.tar.gz 3997 SHA256 1ccfa064f22115f30aab29137ee07a0e01bfdce0bb4e5d257d423bf28ae3f747 SHA512 6ed259e19c965af82373f9ca70b34639e6cadccddfe64564025d3003045906efc42374e0e38b3a9d7d8fa1f5d20b9370150b1f8a3253589106dc1aa81e531211 WHIRLPOOL f1baf38ee4caf18af45db8f181b64b909ac4715809f399afd4930831ce34f2bf63e8ecdf8b754053d8f800b44aaea94278746b1b8de2e98668801d9e254f2082 diff --git a/dev-ros/rosconsole_bridge/rosconsole_bridge-0.4.3.ebuild b/dev-ros/rosconsole_bridge/rosconsole_bridge-0.4.3.ebuild new file mode 100644 index 000000000000..eab539108b48 --- /dev/null +++ b/dev-ros/rosconsole_bridge/rosconsole_bridge-0.4.3.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/rosconsole_bridge" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +DESCRIPTION="Connects console_bridge-based logging to rosconsole-based logging" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-libs/console_bridge + dev-ros/rosconsole" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild b/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild index 2dd99c1acc66..eab539108b48 100644 --- a/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild +++ b/dev-ros/rosconsole_bridge/rosconsole_bridge-9999.ebuild @@ -16,11 +16,3 @@ IUSE="" RDEPEND="dev-libs/console_bridge dev-ros/rosconsole" DEPEND="${RDEPEND}" - -src_prepare() { - # fix libdir - sed -i \ - -e 's:DESTINATION lib:DESTINATION ${CMAKE_INSTALL_LIBDIR}:' \ - CMakeLists.txt || die - ros-catkin_src_prepare -} diff --git a/dev-ros/roscpp/Manifest b/dev-ros/roscpp/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/roscpp/Manifest +++ b/dev-ros/roscpp/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/roscpp/roscpp-1.12.0.ebuild b/dev-ros/roscpp/roscpp-1.12.0.ebuild new file mode 100644 index 000000000000..3fcf17b5ccad --- /dev/null +++ b/dev-ros/roscpp/roscpp-1.12.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=clients/${PN} + +inherit ros-catkin + +DESCRIPTION="C++ implementation of ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cpp_common + dev-ros/rosconsole + dev-ros/roscpp_serialization + dev-ros/roscpp_traits + dev-ros/rostime + dev-ros/xmlrpcpp + dev-libs/boost:= + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/roscpp_serialization/Manifest b/dev-ros/roscpp_serialization/Manifest index c28f6ba045fc..9c4df1ec4c43 100644 --- a/dev-ros/roscpp_serialization/Manifest +++ b/dev-ros/roscpp_serialization/Manifest @@ -1,2 +1,3 @@ DIST roscpp_core-0.5.6.tar.gz 31734 SHA256 0bd27394c18c7c79313ebc4eafecc04f88aa54a9d0872357b7123105444edf3a SHA512 caebca2817721a46c8ce850bc15bdeadb3bf6ad12aeb134b11bdb04da6054eb4056aef8c5194ca4e7fffa3e3f3563faf8e3148eebfba93bc6b5673d5437d977f WHIRLPOOL f977f9b0e10a287c7d201ffd765a4824e61d0b5f85767c7a8e81d96295f97dcbe22a9c2d376f36a329997d0498ce36f830263e4710eaf288b214b6bf894ede84 DIST roscpp_core-0.5.7.tar.gz 32006 SHA256 85028afb1e1630b47890d3c92bcb7edf61f4be04281669f73f000312621bf66d SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe WHIRLPOOL c395ccbdd3664e3337ba9a8c029df805585cf04f717c23caf75c582e08581e6a58d232b52679a9cb99150b0c6fa9f831c24b61be0a15839f76487ba67d09f8bb +DIST roscpp_core-0.6.0.tar.gz 32255 SHA256 352fdf2bce0efc562da70dd9ec72691145d8e9eb7a653a8da1b064553be3540b SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75 WHIRLPOOL 6ce40f71026671cff38c62278f44eccd7fc1a772ebf762f9df8322c29ba1e03ee6297886142209552164a0ef6a546cb9f96bfb6e3e34e02c3177bb90cb3a66fa diff --git a/dev-ros/roscpp_serialization/roscpp_serialization-0.6.0.ebuild b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.0.ebuild new file mode 100644 index 000000000000..5ce015d150f2 --- /dev/null +++ b/dev-ros/roscpp_serialization/roscpp_serialization-0.6.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/roscpp_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Code for serialization" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cpp_common + dev-ros/rostime + dev-ros/roscpp_traits +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/roscpp_traits/Manifest b/dev-ros/roscpp_traits/Manifest index c28f6ba045fc..9c4df1ec4c43 100644 --- a/dev-ros/roscpp_traits/Manifest +++ b/dev-ros/roscpp_traits/Manifest @@ -1,2 +1,3 @@ DIST roscpp_core-0.5.6.tar.gz 31734 SHA256 0bd27394c18c7c79313ebc4eafecc04f88aa54a9d0872357b7123105444edf3a SHA512 caebca2817721a46c8ce850bc15bdeadb3bf6ad12aeb134b11bdb04da6054eb4056aef8c5194ca4e7fffa3e3f3563faf8e3148eebfba93bc6b5673d5437d977f WHIRLPOOL f977f9b0e10a287c7d201ffd765a4824e61d0b5f85767c7a8e81d96295f97dcbe22a9c2d376f36a329997d0498ce36f830263e4710eaf288b214b6bf894ede84 DIST roscpp_core-0.5.7.tar.gz 32006 SHA256 85028afb1e1630b47890d3c92bcb7edf61f4be04281669f73f000312621bf66d SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe WHIRLPOOL c395ccbdd3664e3337ba9a8c029df805585cf04f717c23caf75c582e08581e6a58d232b52679a9cb99150b0c6fa9f831c24b61be0a15839f76487ba67d09f8bb +DIST roscpp_core-0.6.0.tar.gz 32255 SHA256 352fdf2bce0efc562da70dd9ec72691145d8e9eb7a653a8da1b064553be3540b SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75 WHIRLPOOL 6ce40f71026671cff38c62278f44eccd7fc1a772ebf762f9df8322c29ba1e03ee6297886142209552164a0ef6a546cb9f96bfb6e3e34e02c3177bb90cb3a66fa diff --git a/dev-ros/roscpp_traits/roscpp_traits-0.6.0.ebuild b/dev-ros/roscpp_traits/roscpp_traits-0.6.0.ebuild new file mode 100644 index 000000000000..484c9ed91e60 --- /dev/null +++ b/dev-ros/roscpp_traits/roscpp_traits-0.6.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/roscpp_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Message traits code" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cpp_common + dev-ros/rostime +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/roscpp_tutorials/Manifest b/dev-ros/roscpp_tutorials/Manifest index b0543368940a..f4bed6e24d82 100644 --- a/dev-ros/roscpp_tutorials/Manifest +++ b/dev-ros/roscpp_tutorials/Manifest @@ -1 +1,2 @@ DIST ros_tutorials-0.6.1.tar.gz 126792 SHA256 0227557d49343c8dc2c17f5fba6a44ca8fe46cb0d9f34315bf4c2f8c3d9969f5 SHA512 f09e5451030c0a76a9473020535e79ac06e748f4208109cf83e61526d13472c3390402814a3d145cb793c5418af703cd9959ca57143798d1706185c13d3418c5 WHIRLPOOL 861fec5410f5e1f6930b537f757abf120ee5b10b843a39010e0dc04f170c627c793dbf462fa1ac0a2c3f150780915d01ade459f973453a053ee53e2ccae7d795 +DIST ros_tutorials-0.7.0.tar.gz 140125 SHA256 38ed655e914de2990bfcf5f8a25b6ef99f1ed4287033bf153ee6383eeac2842d SHA512 b7c51bc007c0bddfb38361750a0225606d9e85a3404d6b21f3a32c8ccb1786844f225a49ad8f525c684c838eff9ec9f7e7c39a15adf5ea5dd187a59c90144711 WHIRLPOOL 6ff32292a7ce3e3c4d18e58509669a168bef707ecefaf523c7392b44d77e965ccca5c621ecaf52fd3382b2873f3e2ea84f209695d0c79ba32bb36401d2d9dfa5 diff --git a/dev-ros/roscpp_tutorials/roscpp_tutorials-0.7.0.ebuild b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.7.0.ebuild new file mode 100644 index 000000000000..5313d6fef602 --- /dev/null +++ b/dev-ros/roscpp_tutorials/roscpp_tutorials-0.7.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/ros_tutorials" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads] + dev-ros/rostime + dev-ros/roscpp + dev-ros/rosconsole + dev-ros/roscpp_serialization +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rosgraph/Manifest b/dev-ros/rosgraph/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosgraph/Manifest +++ b/dev-ros/rosgraph/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosgraph/rosgraph-1.12.0.ebuild b/dev-ros/rosgraph/rosgraph-1.12.0.ebuild new file mode 100644 index 000000000000..b4d40e484bf3 --- /dev/null +++ b/dev-ros/rosgraph/rosgraph-1.12.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=tools/${PN} + +inherit ros-catkin + +DESCRIPTION="Prints information about the ROS Computation Graph" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-python/netifaces[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/mock[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/roslaunch/Manifest b/dev-ros/roslaunch/Manifest index 7049d65c995c..17444df3e3b6 100644 --- a/dev-ros/roslaunch/Manifest +++ b/dev-ros/roslaunch/Manifest @@ -1,2 +1,3 @@ DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/roslaunch/roslaunch-1.12.0.ebuild b/dev-ros/roslaunch/roslaunch-1.12.0.ebuild new file mode 100644 index 000000000000..83dd9b8705ba --- /dev/null +++ b/dev-ros/roslaunch/roslaunch-1.12.0.ebuild @@ -0,0 +1,64 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin user + +DESCRIPTION="Tool for easily launching multiple ROS nodes" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roslib[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}] + dev-ros/rosclean[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] + dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/rosparam[${PYTHON_USEDEP}] + dev-ros/rosmaster[${PYTHON_USEDEP}] + dev-ros/rosout +" +DEPEND="${RDEPEND} + test? ( + dev-util/rosdep[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + dev-ros/test_rosmaster + )" +PATCHES=( "${FILESDIR}/timeout.patch" ) + +src_test() { + rosdep update + ros-catkin_src_test +} + +src_install() { + ros-catkin_src_install + + dodir /etc/ros + sed -e "s/@PKG_VERSION@/${PV}/" "${FILESDIR}/roscore.xml.in" > "${ED}/etc/ros/roscore.xml" || die + + newinitd "${FILESDIR}/roscore.initd" roscore + newconfd "${FILESDIR}/roscore.confd" roscore + + newinitd "${FILESDIR}/roslaunch.initd" roslaunch + newconfd "${FILESDIR}/roslaunch.confd" roslaunch + + doenvd "${FILESDIR}/40roslaunch" + + # Needed by test_roslaunch + insinto /usr/share/${PN} + doins test/xml/noop.launch +} + +pkg_preinst() { + enewgroup ros + enewuser ros -1 -1 /home/ros ros +} diff --git a/dev-ros/roslz4/Manifest b/dev-ros/roslz4/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/roslz4/Manifest +++ b/dev-ros/roslz4/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/roslz4/roslz4-1.12.0.ebuild b/dev-ros/roslz4/roslz4-1.12.0.ebuild new file mode 100644 index 000000000000..4d4bc7b747b8 --- /dev/null +++ b/dev-ros/roslz4/roslz4-1.12.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=utilities/${PN} + +inherit ros-catkin + +DESCRIPTION="Python and C++ implementation of the LZ4 streaming format" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="app-arch/lz4" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest )" diff --git a/dev-ros/rosmaster/Manifest b/dev-ros/rosmaster/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosmaster/Manifest +++ b/dev-ros/rosmaster/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosmaster/rosmaster-1.12.0.ebuild b/dev-ros/rosmaster/rosmaster-1.12.0.ebuild new file mode 100644 index 000000000000..ec8fb4f31a65 --- /dev/null +++ b/dev-ros/rosmaster/rosmaster-1.12.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +ROS_SUBDIR=tools/${PN} + +inherit ros-catkin + +DESCRIPTION="ROS Master implementation" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-python/nose[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosmsg/Manifest b/dev-ros/rosmsg/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosmsg/Manifest +++ b/dev-ros/rosmsg/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosmsg/rosmsg-1.12.0.ebuild b/dev-ros/rosmsg/rosmsg-1.12.0.ebuild new file mode 100644 index 000000000000..d7da61f40053 --- /dev/null +++ b/dev-ros/rosmsg/rosmsg-1.12.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Command-line tools for displaying information about message and services" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/genmsg[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}] + dev-ros/roslib[${PYTHON_USEDEP}] + dev-ros/rosbag[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rosnode/Manifest b/dev-ros/rosnode/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosnode/Manifest +++ b/dev-ros/rosnode/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosnode/rosnode-1.12.0.ebuild b/dev-ros/rosnode/rosnode-1.12.0.ebuild new file mode 100644 index 000000000000..1d4acc8351d8 --- /dev/null +++ b/dev-ros/rosnode/rosnode-1.12.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Command-line tool for displaying debug information about ROS nodes" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/genmsg[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}] + dev-ros/roslib[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + test? ( dev-ros/rostest[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosout/Manifest b/dev-ros/rosout/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosout/Manifest +++ b/dev-ros/rosout/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosout/rosout-1.12.0.ebuild b/dev-ros/rosout/rosout-1.12.0.ebuild new file mode 100644 index 000000000000..77c9e29bc631 --- /dev/null +++ b/dev-ros/rosout/rosout-1.12.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} + +inherit ros-catkin + +DESCRIPTION="System-wide logging mechanism for messages sent to the /rosout topic" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roscpp + dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rospack/Manifest b/dev-ros/rospack/Manifest index c51f4da6631e..046d9bd3d04e 100644 --- a/dev-ros/rospack/Manifest +++ b/dev-ros/rospack/Manifest @@ -1,2 +1,3 @@ DIST rospack-2.2.5.tar.gz 70273 SHA256 8602e21172ef453b63c6c6f1698c5ac81ec014b0a78bf98f31a60937dacee9ef SHA512 b685029e7306795459a1768050fd54e3eb82db91c0c3495410eeb6c6b3cb24b5d7f63cc5286d466659edb35719e76e4a43519526fd0c991fef2d7f9e092fd9e0 WHIRLPOOL 33191188ef39f817f48cdfbda407dc4d4bf288920b7e7b9a1b4b9ff383b87781a34fe7a3bfe734c8431c9e2cde19cadff1d70d84129de813bfbf2412a5728835 DIST rospack-2.2.6.tar.gz 70391 SHA256 3487f24bd5362fa9a0c44b145543e13d7aa20bdb19d0477b7872d52a11bef914 SHA512 3257007600fc7509c276dcdf8484c91f44e10fad988e62f227b0471cf77f41464712ec8e0f31141853d5b8fa863f701451adae10a5ea3ae7bdd4a96910e5ea28 WHIRLPOOL 026dbe2966305f67ae42959d7677c9fcbeffcc740f8bcb9207b1adfc0bbd45259dc7b1789566b7cffad4b61510efbcc172a4544ec76e43548b0209f4f0b13991 +DIST rospack-2.3.0.tar.gz 70879 SHA256 d54bf2f82cea3273a34c11d99fed5bb1d78a8e5c86046af425d646ebc94c627c SHA512 d0dd3da0282c2ef1721ac1d3671845cdef0d3307926435f91f7f63441942562d9128609a31368bf836935e6bfc337cc2c419100e5a2c8ed058131f22926e5459 WHIRLPOOL eed21ca219625534c7ba009ca50d52b20b922cb5a08c973bbf40267bbd70c9331fc5828bdd96acf130641f644b927ceeac867c16805c3f43837d98f471203ae6 diff --git a/dev-ros/rospack/rospack-2.3.0.ebuild b/dev-ros/rospack/rospack-2.3.0.ebuild new file mode 100644 index 000000000000..44ef9df841d0 --- /dev/null +++ b/dev-ros/rospack/rospack-2.3.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/rospack" +KEYWORDS="~amd64 ~arm" + +inherit ros-catkin + +# Do it that way to avoid ros-catkin pulling in python-r1 +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) +inherit python-single-r1 + +DESCRIPTION="Retrieves information about ROS packages available on the filesystem" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-libs/boost:= + dev-libs/tinyxml + " +DEPEND="${RDEPEND} + dev-ros/cmake_modules + test? ( + dev-cpp/gtest + dev-python/nose + )" diff --git a/dev-ros/rosparam/Manifest b/dev-ros/rosparam/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosparam/Manifest +++ b/dev-ros/rosparam/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosparam/rosparam-1.12.0.ebuild b/dev-ros/rosparam/rosparam-1.12.0.ebuild new file mode 100644 index 000000000000..608ff1c36d31 --- /dev/null +++ b/dev-ros/rosparam/rosparam-1.12.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Command-line tool for getting and setting ROS Parameters on the parameter server" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rosgraph[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rospy/Manifest b/dev-ros/rospy/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rospy/Manifest +++ b/dev-ros/rospy/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rospy/rospy-1.12.0.ebuild b/dev-ros/rospy/rospy-1.12.0.ebuild new file mode 100644 index 000000000000..720ae2de005b --- /dev/null +++ b/dev-ros/rospy/rospy-1.12.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +ROS_SUBDIR=clients/${PN} + +inherit ros-catkin + +DESCRIPTION="Python client library for ROS" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/roslib[${PYTHON_USEDEP}] + dev-ros/rosgraph[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" + +src_install() { + ros-catkin_src_install + # Other tests need these nodes + exeinto /usr/share/${PN} + doexe test_nodes/* +} diff --git a/dev-ros/rospy_tutorials/Manifest b/dev-ros/rospy_tutorials/Manifest index b0543368940a..f4bed6e24d82 100644 --- a/dev-ros/rospy_tutorials/Manifest +++ b/dev-ros/rospy_tutorials/Manifest @@ -1 +1,2 @@ DIST ros_tutorials-0.6.1.tar.gz 126792 SHA256 0227557d49343c8dc2c17f5fba6a44ca8fe46cb0d9f34315bf4c2f8c3d9969f5 SHA512 f09e5451030c0a76a9473020535e79ac06e748f4208109cf83e61526d13472c3390402814a3d145cb793c5418af703cd9959ca57143798d1706185c13d3418c5 WHIRLPOOL 861fec5410f5e1f6930b537f757abf120ee5b10b843a39010e0dc04f170c627c793dbf462fa1ac0a2c3f150780915d01ade459f973453a053ee53e2ccae7d795 +DIST ros_tutorials-0.7.0.tar.gz 140125 SHA256 38ed655e914de2990bfcf5f8a25b6ef99f1ed4287033bf153ee6383eeac2842d SHA512 b7c51bc007c0bddfb38361750a0225606d9e85a3404d6b21f3a32c8ccb1786844f225a49ad8f525c684c838eff9ec9f7e7c39a15adf5ea5dd187a59c90144711 WHIRLPOOL 6ff32292a7ce3e3c4d18e58509669a168bef707ecefaf523c7392b44d77e965ccca5c621ecaf52fd3382b2873f3e2ea84f209695d0c79ba32bb36401d2d9dfa5 diff --git a/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild b/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild new file mode 100644 index 000000000000..f1332470fdd1 --- /dev/null +++ b/dev-ros/rospy_tutorials/rospy_tutorials-0.7.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/ros_tutorials" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Attempts to show the features of ROS step-by-step, including using messages, servers, parameters" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rospy[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + test? ( dev-ros/rostest[${PYTHON_USEDEP}] )" diff --git a/dev-ros/rosservice/Manifest b/dev-ros/rosservice/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rosservice/Manifest +++ b/dev-ros/rosservice/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rosservice/rosservice-1.12.0.ebuild b/dev-ros/rosservice/rosservice-1.12.0.ebuild new file mode 100644 index 000000000000..05fb1e6f2599 --- /dev/null +++ b/dev-ros/rosservice/rosservice-1.12.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Command-line tool for listing and querying ROS Services" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rosgraph[${PYTHON_USEDEP}] + dev-ros/roslib[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/rosmsg[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/rostest/Manifest b/dev-ros/rostest/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rostest/Manifest +++ b/dev-ros/rostest/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rostest/rostest-1.12.0.ebuild b/dev-ros/rostest/rostest-1.12.0.ebuild new file mode 100644 index 000000000000..60104a36d6d0 --- /dev/null +++ b/dev-ros/rostest/rostest-1.12.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Integration test suite based on roslaunch that is compatible with xUnit frameworks" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rosunit[${PYTHON_USEDEP}] + dev-libs/boost:=[threads] +" +DEPEND="${RDEPEND}" +RDEPEND="${RDEPEND} + dev-ros/roslib[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/roslaunch[${PYTHON_USEDEP}] + dev-ros/rosmaster[${PYTHON_USEDEP}]" +DEPEND="${DEPEND} + test? ( + ${RDEPEND} + dev-cpp/gtest + )" diff --git a/dev-ros/rostime/Manifest b/dev-ros/rostime/Manifest index c28f6ba045fc..9c4df1ec4c43 100644 --- a/dev-ros/rostime/Manifest +++ b/dev-ros/rostime/Manifest @@ -1,2 +1,3 @@ DIST roscpp_core-0.5.6.tar.gz 31734 SHA256 0bd27394c18c7c79313ebc4eafecc04f88aa54a9d0872357b7123105444edf3a SHA512 caebca2817721a46c8ce850bc15bdeadb3bf6ad12aeb134b11bdb04da6054eb4056aef8c5194ca4e7fffa3e3f3563faf8e3148eebfba93bc6b5673d5437d977f WHIRLPOOL f977f9b0e10a287c7d201ffd765a4824e61d0b5f85767c7a8e81d96295f97dcbe22a9c2d376f36a329997d0498ce36f830263e4710eaf288b214b6bf894ede84 DIST roscpp_core-0.5.7.tar.gz 32006 SHA256 85028afb1e1630b47890d3c92bcb7edf61f4be04281669f73f000312621bf66d SHA512 a3a40b2e05e1ad9d442050fd5a5b8a2106a27aef5222eaa9ac1b0c8aff13d1a40da252e81f0544b72380db35594c1d49de06cd3e94b9ba5ed087d71362f3babe WHIRLPOOL c395ccbdd3664e3337ba9a8c029df805585cf04f717c23caf75c582e08581e6a58d232b52679a9cb99150b0c6fa9f831c24b61be0a15839f76487ba67d09f8bb +DIST roscpp_core-0.6.0.tar.gz 32255 SHA256 352fdf2bce0efc562da70dd9ec72691145d8e9eb7a653a8da1b064553be3540b SHA512 3adee84e3fc8f3b66ac3093f0bac82a6fec92e1096c4f2c0c5dd001b0e599d895c71fe62aa19a53d7b097e2eebfceb111262991d46ac9013fff9d2d92ebeec75 WHIRLPOOL 6ce40f71026671cff38c62278f44eccd7fc1a772ebf762f9df8322c29ba1e03ee6297886142209552164a0ef6a546cb9f96bfb6e3e34e02c3177bb90cb3a66fa diff --git a/dev-ros/rostime/rostime-0.6.0.ebuild b/dev-ros/rostime/rostime-0.6.0.ebuild new file mode 100644 index 000000000000..e673fcc54390 --- /dev/null +++ b/dev-ros/rostime/rostime-0.6.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/roscpp_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Time and Duration implementations for C++ libraries" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-libs/boost:=[threads] + dev-ros/cpp_common +" +DEPEND="${RDEPEND} + test? ( dev-cpp/gtest ) +" diff --git a/dev-ros/rostopic/Manifest b/dev-ros/rostopic/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/rostopic/Manifest +++ b/dev-ros/rostopic/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/rostopic/rostopic-1.12.0.ebuild b/dev-ros/rostopic/rostopic-1.12.0.ebuild new file mode 100644 index 000000000000..c3438a04756b --- /dev/null +++ b/dev-ros/rostopic/rostopic-1.12.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Command-line tool for displaying debug information about ROS Topics" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/rosbag[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND} + test? ( + dev-ros/rostest[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + ) +" diff --git a/dev-ros/roswtf/Manifest b/dev-ros/roswtf/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/roswtf/Manifest +++ b/dev-ros/roswtf/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/roswtf/roswtf-1.12.0.ebuild b/dev-ros/roswtf/roswtf-1.12.0.ebuild new file mode 100644 index 000000000000..708356a09df3 --- /dev/null +++ b/dev-ros/roswtf/roswtf-1.12.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=utilities/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Tool for diagnosing issues with a running ROS system" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-python/paramiko[${PYTHON_USEDEP}] + dev-ros/roslib[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( + dev-ros/rostest[${PYTHON_USEDEP}] + dev-util/rosdep[${PYTHON_USEDEP}] + dev-util/rosinstall[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + )" + +src_test() { + rosdep update + ros-catkin_src_test +} diff --git a/dev-ros/smclib/Manifest b/dev-ros/smclib/Manifest index 0d7a60a51eaa..3db390ef0d1a 100644 --- a/dev-ros/smclib/Manifest +++ b/dev-ros/smclib/Manifest @@ -1 +1,2 @@ DIST bond_core-1.7.16.tar.gz 25327 SHA256 177dc78ef9cf3cd9f48fe5aca4742f504956c71641c75048b7559af0e2aacd53 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e WHIRLPOOL 56fd05d2c6c8f5fb9fa8b47f2da939e16f79f39937febbf588137d5dd411c03f0c30edb3e70b50ed4c6b7c1ce8a0f1cd8c1922038c20495e62a57c80d0958864 +DIST bond_core-1.7.17.tar.gz 31334 SHA256 41e511233510b6d8c73f354c2198c4ff5e82bafa47120fb3ffcb6704a2d7f1a6 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73 WHIRLPOOL 2da1910eedc7b4af12c6172c01fd7fe60ad11645366e0b3e684c458b4f78a82b61f957c12d88f248cbc1aced57c4f97a2e1c6319c5a417a470fb1d0904ca66a9 diff --git a/dev-ros/smclib/smclib-1.7.17.ebuild b/dev-ros/smclib/smclib-1.7.17.ebuild new file mode 100644 index 000000000000..aa83c6f90022 --- /dev/null +++ b/dev-ros/smclib/smclib-1.7.17.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/bond_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +PYTHON_COMPAT=( python{2_7,3_3,3_4} ) + +inherit ros-catkin + +DESCRIPTION="The State Machine Compiler (SMC) converts the description of a state machine into source code" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND}" diff --git a/dev-ros/test_bond/Manifest b/dev-ros/test_bond/Manifest index 0d7a60a51eaa..3db390ef0d1a 100644 --- a/dev-ros/test_bond/Manifest +++ b/dev-ros/test_bond/Manifest @@ -1 +1,2 @@ DIST bond_core-1.7.16.tar.gz 25327 SHA256 177dc78ef9cf3cd9f48fe5aca4742f504956c71641c75048b7559af0e2aacd53 SHA512 1c35776782edfb7397845fde0ef3fcaac6179f1c55637fd5209303feb1755f13bff85e6cf36a2dd2671c18d5b433cb8e9ede04df923f742e22934b19d044e06e WHIRLPOOL 56fd05d2c6c8f5fb9fa8b47f2da939e16f79f39937febbf588137d5dd411c03f0c30edb3e70b50ed4c6b7c1ce8a0f1cd8c1922038c20495e62a57c80d0958864 +DIST bond_core-1.7.17.tar.gz 31334 SHA256 41e511233510b6d8c73f354c2198c4ff5e82bafa47120fb3ffcb6704a2d7f1a6 SHA512 248146e6704c36f014e0f4c5178e566b6c4e344f46b39d4ac9a6cf6b152d1c163b5881921168b8898ec44da9d9b5bc69dc3a66ae26be61007c109aed1990ee73 WHIRLPOOL 2da1910eedc7b4af12c6172c01fd7fe60ad11645366e0b3e684c458b4f78a82b61f957c12d88f248cbc1aced57c4f97a2e1c6319c5a417a470fb1d0904ca66a9 diff --git a/dev-ros/test_bond/test_bond-1.7.17.ebuild b/dev-ros/test_bond/test_bond-1.7.17.ebuild new file mode 100644 index 000000000000..9ea825ecc3f7 --- /dev/null +++ b/dev-ros/test_bond/test_bond-1.7.17.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/bond_core" +KEYWORDS="~amd64 ~arm" +CATKIN_HAS_MESSAGES=yes +ROS_SUBDIR=${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Tests for bond, bondpy and bondcpp" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/bondcpp + dev-ros/bondpy[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/test_nodelet/Manifest b/dev-ros/test_nodelet/Manifest index d215469a8c9c..ce9d85cd2a6e 100644 --- a/dev-ros/test_nodelet/Manifest +++ b/dev-ros/test_nodelet/Manifest @@ -1 +1,2 @@ DIST nodelet_core-1.9.3.tar.gz 33825 SHA256 26256ff83c92db88b941e5d85ab2162fbcaa0f19ea066732c2de83255eed0001 SHA512 d2560ef2c973aae297ffc5f139ed12308a0e4ac4477407e533402fbaf127c5aa4105548d01438b3bb17636df9587018a953bb6c0ae810996445bb1368c97f190 WHIRLPOOL 88bb8ef3a0b2138f2f1d5ff95c4328e22da4fc23313ba52447d5156b13c452284a9953f89de1d48838b96e226ff9ab929d6482c8b0ad847676aaa13e9b1f596d +DIST nodelet_core-1.9.4.tar.gz 34236 SHA256 60e694e8575db93e24a8ed9cbebae8c257f6f25aef33a0e7f92418f318fd9131 SHA512 f2c49363029e8d53151433fa33162a3efb71750bfec55d68e2182ff385af0e65b983c6b4e799995a270cb8754d02b295c9d2a68fd712bca1fd4df0d276c93ce3 WHIRLPOOL 3474aab9d5d51f0672deacd79dfc294dc7b962c617e390beda7ae6e40b89a1dd3ba05beb0c4066b0c95588ffaf1bdeca73debcb0112f4802252e89ec5e8eb98e diff --git a/dev-ros/test_nodelet/test_nodelet-1.9.4.ebuild b/dev-ros/test_nodelet/test_nodelet-1.9.4.ebuild new file mode 100644 index 000000000000..4de9404655c0 --- /dev/null +++ b/dev-ros/test_nodelet/test_nodelet-1.9.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/ros/nodelet_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Nodelet unit tests" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + test? ( + dev-ros/nodelet + dev-ros/pluginlib + dev-ros/rostest + dev-libs/boost + dev-cpp/gtest + dev-ros/rosbash + ) +" diff --git a/dev-ros/test_nodelet/test_nodelet-9999.ebuild b/dev-ros/test_nodelet/test_nodelet-9999.ebuild index c856d07e03cf..4de9404655c0 100644 --- a/dev-ros/test_nodelet/test_nodelet-9999.ebuild +++ b/dev-ros/test_nodelet/test_nodelet-9999.ebuild @@ -23,5 +23,6 @@ DEPEND="${RDEPEND} dev-ros/rostest dev-libs/boost dev-cpp/gtest + dev-ros/rosbash ) " diff --git a/dev-ros/test_nodelet_topic_tools/Manifest b/dev-ros/test_nodelet_topic_tools/Manifest index d215469a8c9c..ce9d85cd2a6e 100644 --- a/dev-ros/test_nodelet_topic_tools/Manifest +++ b/dev-ros/test_nodelet_topic_tools/Manifest @@ -1 +1,2 @@ DIST nodelet_core-1.9.3.tar.gz 33825 SHA256 26256ff83c92db88b941e5d85ab2162fbcaa0f19ea066732c2de83255eed0001 SHA512 d2560ef2c973aae297ffc5f139ed12308a0e4ac4477407e533402fbaf127c5aa4105548d01438b3bb17636df9587018a953bb6c0ae810996445bb1368c97f190 WHIRLPOOL 88bb8ef3a0b2138f2f1d5ff95c4328e22da4fc23313ba52447d5156b13c452284a9953f89de1d48838b96e226ff9ab929d6482c8b0ad847676aaa13e9b1f596d +DIST nodelet_core-1.9.4.tar.gz 34236 SHA256 60e694e8575db93e24a8ed9cbebae8c257f6f25aef33a0e7f92418f318fd9131 SHA512 f2c49363029e8d53151433fa33162a3efb71750bfec55d68e2182ff385af0e65b983c6b4e799995a270cb8754d02b295c9d2a68fd712bca1fd4df0d276c93ce3 WHIRLPOOL 3474aab9d5d51f0672deacd79dfc294dc7b962c617e390beda7ae6e40b89a1dd3ba05beb0c4066b0c95588ffaf1bdeca73debcb0112f4802252e89ec5e8eb98e diff --git a/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.4.ebuild b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.4.ebuild new file mode 100644 index 000000000000..f9e364c55a3f --- /dev/null +++ b/dev-ros/test_nodelet_topic_tools/test_nodelet_topic_tools-1.9.4.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +CATKIN_HAS_MESSAGES=yes +ROS_REPO_URI="https://github.com/ros/nodelet_core" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} + +inherit ros-catkin + +DESCRIPTION="Nodelet topic tools unit tests" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/message_filters + dev-ros/nodelet + dev-ros/nodelet_topic_tools + dev-ros/pluginlib + dev-ros/roscpp + dev-ros/rostest +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/test_rosbag/Manifest b/dev-ros/test_rosbag/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_rosbag/Manifest +++ b/dev-ros/test_rosbag/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_rosbag/test_rosbag-1.12.0.ebuild b/dev-ros/test_rosbag/test_rosbag-1.12.0.ebuild new file mode 100644 index 000000000000..fd134828883f --- /dev/null +++ b/dev-ros/test_rosbag/test_rosbag-1.12.0.ebuild @@ -0,0 +1,40 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +PYTHON_COMPAT=( python2_7 ) +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Unit tests for rosbag" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/message_generation + dev-ros/rosbag[${PYTHON_USEDEP}] + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_USEDEP}] + dev-ros/topic_tools[${PYTHON_USEDEP}] + dev-ros/xmlrpcpp +" +DEPEND="${RDEPEND} + test? ( + dev-libs/boost[threads] + app-arch/bzip2 + dev-ros/rosout + dev-python/nose[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_USEDEP}] + dev-cpp/gtest + ) +" diff --git a/dev-ros/test_rosbag_storage/Manifest b/dev-ros/test_rosbag_storage/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_rosbag_storage/Manifest +++ b/dev-ros/test_rosbag_storage/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_rosbag_storage/test_rosbag_storage-1.12.0.ebuild b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.12.0.ebuild new file mode 100644 index 000000000000..1bdd56f7c94a --- /dev/null +++ b/dev-ros/test_rosbag_storage/test_rosbag_storage-1.12.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} + +inherit ros-catkin + +DESCRIPTION="Unit tests for rosbag_storage" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/rosbag_storage + dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:= + test? ( dev-cpp/gtest )" diff --git a/dev-ros/test_roscpp/Manifest b/dev-ros/test_roscpp/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_roscpp/Manifest +++ b/dev-ros/test_roscpp/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_roscpp/test_roscpp-1.12.0.ebuild b/dev-ros/test_roscpp/test_roscpp-1.12.0.ebuild new file mode 100644 index 000000000000..aba89d4693f4 --- /dev/null +++ b/dev-ros/test_roscpp/test_roscpp-1.12.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Unit tests for roscpp" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/roscpp + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_USEDEP}] + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-libs/boost:=[threads] + test? ( + dev-cpp/gtest + ) +" +REQUIRED_USE="test? ( ros_messages_cxx )" diff --git a/dev-ros/test_rosgraph/Manifest b/dev-ros/test_rosgraph/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_rosgraph/Manifest +++ b/dev-ros/test_rosgraph/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_rosgraph/test_rosgraph-1.12.0.ebuild b/dev-ros/test_rosgraph/test_rosgraph-1.12.0.ebuild new file mode 100644 index 000000000000..86083c9d0f86 --- /dev/null +++ b/dev-ros/test_rosgraph/test_rosgraph-1.12.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Unit tests for rosgraph" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-ros/rostest[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-ros/rosgraph[${PYTHON_USEDEP}] ) +" diff --git a/dev-ros/test_roslaunch/Manifest b/dev-ros/test_roslaunch/Manifest index 7049d65c995c..17444df3e3b6 100644 --- a/dev-ros/test_roslaunch/Manifest +++ b/dev-ros/test_roslaunch/Manifest @@ -1,2 +1,3 @@ DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_roslaunch/test_roslaunch-1.12.0.ebuild b/dev-ros/test_roslaunch/test_roslaunch-1.12.0.ebuild new file mode 100644 index 000000000000..e5299e80d7b9 --- /dev/null +++ b/dev-ros/test_roslaunch/test_roslaunch-1.12.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Unit tests for roslaunch" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/rostest[${PYTHON_USEDEP}] + test? ( + dev-ros/roslaunch[${PYTHON_USEDEP}] + dev-python/rospkg[${PYTHON_USEDEP}] + ) +" diff --git a/dev-ros/test_roslib_comm/Manifest b/dev-ros/test_roslib_comm/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_roslib_comm/Manifest +++ b/dev-ros/test_roslib_comm/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_roslib_comm/test_roslib_comm-1.12.0.ebuild b/dev-ros/test_roslib_comm/test_roslib_comm-1.12.0.ebuild new file mode 100644 index 000000000000..d37b72324b81 --- /dev/null +++ b/dev-ros/test_roslib_comm/test_roslib_comm-1.12.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/rosgraph_msgs dev-ros/std_msgs" + +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Unit tests for roslib" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + test? ( dev-ros/roslib[${PYTHON_USEDEP}] dev-python/nose[${PYTHON_USEDEP}] dev-ros/test_rosmaster ) +" diff --git a/dev-ros/test_rosmaster/Manifest b/dev-ros/test_rosmaster/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_rosmaster/Manifest +++ b/dev-ros/test_rosmaster/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_rosmaster/test_rosmaster-1.12.0.ebuild b/dev-ros/test_rosmaster/test_rosmaster-1.12.0.ebuild new file mode 100644 index 000000000000..66e52c1b5985 --- /dev/null +++ b/dev-ros/test_rosmaster/test_rosmaster-1.12.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes + +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Unit tests for rosmaster" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-ros/rosgraph[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/std_msgs[${PYTHON_USEDEP}]" +DEPEND="${RDEPEND} + test? ( dev-ros/roslib[${PYTHON_USEDEP}] ) +" + +mycatkincmakeargs=( "-DCATKIN_ENABLE_TESTING=ON" ) + +src_install() { + ros-catkin_src_install + dodir /usr/share/${PN} + cp -a test "${ED}//usr/share/${PN}/" || die +} diff --git a/dev-ros/test_rosparam/Manifest b/dev-ros/test_rosparam/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_rosparam/Manifest +++ b/dev-ros/test_rosparam/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_rosparam/test_rosparam-1.12.0.ebuild b/dev-ros/test_rosparam/test_rosparam-1.12.0.ebuild new file mode 100644 index 000000000000..7c14578e9162 --- /dev/null +++ b/dev-ros/test_rosparam/test_rosparam-1.12.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes + +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Unit tests for rosparam" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/rostest[${PYTHON_USEDEP}] + test? ( + dev-python/nose[${PYTHON_USEDEP}] + dev-ros/rosparam[${PYTHON_USEDEP}] + )" diff --git a/dev-ros/test_rospy/Manifest b/dev-ros/test_rospy/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_rospy/Manifest +++ b/dev-ros/test_rospy/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_rospy/test_rospy-1.12.0.ebuild b/dev-ros/test_rospy/test_rospy-1.12.0.ebuild new file mode 100644 index 000000000000..174ea68dbec0 --- /dev/null +++ b/dev-ros/test_rospy/test_rospy-1.12.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/test_rosmaster" + +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Unit tests for rospy" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/std_msgs[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/test_rosmaster[${PYTHON_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_USEDEP}] + test? ( + dev-python/numpy[${PYTHON_USEDEP}] + dev-ros/rosbuild + dev-ros/rosgraph[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + )" diff --git a/dev-ros/test_rosservice/Manifest b/dev-ros/test_rosservice/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/test_rosservice/Manifest +++ b/dev-ros/test_rosservice/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/test_rosservice/test_rosservice-1.12.0.ebuild b/dev-ros/test_rosservice/test_rosservice-1.12.0.ebuild new file mode 100644 index 000000000000..2a35b10b96ff --- /dev/null +++ b/dev-ros/test_rosservice/test_rosservice-1.12.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=test/${PN} +CATKIN_HAS_MESSAGES=yes +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +PYTHON_COMPAT=( python2_7 ) + +inherit ros-catkin + +DESCRIPTION="Unit tests for rospy" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="" +DEPEND="${RDEPEND} + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/std_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}] + test? ( + dev-ros/test_rosmaster[${PYTHON_USEDEP}] + dev-ros/rospy[${PYTHON_USEDEP}] + dev-ros/rostest[${PYTHON_USEDEP}] + dev-python/nose[${PYTHON_USEDEP}] + )" diff --git a/dev-ros/topic_tools/Manifest b/dev-ros/topic_tools/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/topic_tools/Manifest +++ b/dev-ros/topic_tools/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/topic_tools/topic_tools-1.12.0.ebuild b/dev-ros/topic_tools/topic_tools-1.12.0.ebuild new file mode 100644 index 000000000000..fdffe5711009 --- /dev/null +++ b/dev-ros/topic_tools/topic_tools-1.12.0.ebuild @@ -0,0 +1,34 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +CATKIN_HAS_MESSAGES=yes +ROS_SUBDIR=tools/${PN} +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs" + +inherit ros-catkin + +DESCRIPTION="Tools for directing, throttling and selecting ROS topics" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-ros/cpp_common + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/rostime + dev-ros/xmlrpcpp +" +DEPEND="${RDEPEND} + test? ( + dev-ros/rostest[${PYTHON_USEDEP}] + dev-ros/rosunit[${PYTHON_USEDEP}] + dev-cpp/gtest + dev-python/nose[${PYTHON_USEDEP}] + )" diff --git a/dev-ros/turtlesim/Manifest b/dev-ros/turtlesim/Manifest index b0543368940a..f4bed6e24d82 100644 --- a/dev-ros/turtlesim/Manifest +++ b/dev-ros/turtlesim/Manifest @@ -1 +1,2 @@ DIST ros_tutorials-0.6.1.tar.gz 126792 SHA256 0227557d49343c8dc2c17f5fba6a44ca8fe46cb0d9f34315bf4c2f8c3d9969f5 SHA512 f09e5451030c0a76a9473020535e79ac06e748f4208109cf83e61526d13472c3390402814a3d145cb793c5418af703cd9959ca57143798d1706185c13d3418c5 WHIRLPOOL 861fec5410f5e1f6930b537f757abf120ee5b10b843a39010e0dc04f170c627c793dbf462fa1ac0a2c3f150780915d01ade459f973453a053ee53e2ccae7d795 +DIST ros_tutorials-0.7.0.tar.gz 140125 SHA256 38ed655e914de2990bfcf5f8a25b6ef99f1ed4287033bf153ee6383eeac2842d SHA512 b7c51bc007c0bddfb38361750a0225606d9e85a3404d6b21f3a32c8ccb1786844f225a49ad8f525c684c838eff9ec9f7e7c39a15adf5ea5dd187a59c90144711 WHIRLPOOL 6ff32292a7ce3e3c4d18e58509669a168bef707ecefaf523c7392b44d77e965ccca5c621ecaf52fd3382b2873f3e2ea84f209695d0c79ba32bb36401d2d9dfa5 diff --git a/dev-ros/turtlesim/turtlesim-0.7.0.ebuild b/dev-ros/turtlesim/turtlesim-0.7.0.ebuild new file mode 100644 index 000000000000..2c0f51b4ae64 --- /dev/null +++ b/dev-ros/turtlesim/turtlesim-0.7.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +ROS_REPO_URI="https://github.com/ros/ros_tutorials" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=${PN} +CATKIN_HAS_MESSAGES=yes +PYTHON_COMPAT=( python2_7 ) +CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/std_srvs dev-ros/geometry_msgs" + +inherit ros-catkin + +DESCRIPTION="Tool made for teaching ROS and ROS packages" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-libs/boost:=[threads] + dev-ros/rosconsole + dev-ros/roscpp + dev-ros/roscpp_serialization + dev-ros/roslib + dev-ros/rostime + dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}] + dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}] +" +DEPEND="${RDEPEND}" diff --git a/dev-ros/turtlesim/turtlesim-9999.ebuild b/dev-ros/turtlesim/turtlesim-9999.ebuild index 3ab4a968c01c..2c0f51b4ae64 100644 --- a/dev-ros/turtlesim/turtlesim-9999.ebuild +++ b/dev-ros/turtlesim/turtlesim-9999.ebuild @@ -18,8 +18,9 @@ SLOT="0" IUSE="" RDEPEND=" - dev-qt/qtcore:4 - dev-qt/qtgui:4 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 dev-libs/boost:=[threads] dev-ros/rosconsole dev-ros/roscpp diff --git a/dev-ros/xmlrpcpp/Manifest b/dev-ros/xmlrpcpp/Manifest index ac1cb93a8bba..610174d8f8b3 100644 --- a/dev-ros/xmlrpcpp/Manifest +++ b/dev-ros/xmlrpcpp/Manifest @@ -2,3 +2,4 @@ DIST ros_comm-1.11.14.tar.gz 945041 SHA256 8e7beff35711b1918501c69cca4f29648d4d4 DIST ros_comm-1.11.15.tar.gz 946139 SHA256 532b8cc764e9ca8765484a4468b8537c1ddd84342896267cf3e9f6b19c1b7203 SHA512 8eea3fc948093a7640851f18856f2a20748afb80f935e28d230dc2095956d753bde5081dcd020d09638d9c5d63e031257515b6c6874286c03737507e67cce270 WHIRLPOOL 5e0a971f4312dce99c2e2c11841445cea999dbe5b1ebde3ce26badb9a7eaf9fb84220ed5d1e0088e85835104ddad3cd4d555708d010f83da6e84d257bafe699b DIST ros_comm-1.11.16.tar.gz 947310 SHA256 b8f48c57d58b623c0b9828476fd8fc785570238d1e117fddaae9aaf8600915d3 SHA512 a97678acbafbe33d063f2c69b42e11bc4815c18ba9bb701542fb272d95410d2c1c2a133aa40ad2211ea1b0c2535938a364adac8099b5231c50e37fa42fff5d3d WHIRLPOOL 16dbdb2f754f16ae73b989e443de9f9e4fdbea2f9411c63d02a53a46517fb565dd97d5ea2b155833bcd592d7e9dd23ae3e7676dd1a49ea3dd509ab47f28082f2 DIST ros_comm-1.11.17.tar.gz 950987 SHA256 a7222b849d709e47ab9c491e491f6b90dcf12db1780382c9cd294e4410839eb2 SHA512 2dfb95feafa6976c62d2d31f2c6586636e534f39cfce20bc6dfa22731ee256ab8a0c0050a672098123d4d7d32702203bf15c7f323b897f74201bb41bd823ebf7 WHIRLPOOL 0c0d55a2119503b2e0b0b218ce99862815b7070c66127ace51929cda91267fdb33f50012936f1da784ac9c82ace86c41059b3b919effb6b767b7617ff4d33c09 +DIST ros_comm-1.12.0.tar.gz 951540 SHA256 511894fde55a1150a88023ecd9d7a3f0557b90df5fbe375941db0071ba63ae43 SHA512 6e429b6b34ccdf1f17b4998b59518975290f0e6e431750f6172f5c86c35d48ae5f21de293d283ed952f142af3c03500f55d27172055a026b2f17e1cfbb4777d0 WHIRLPOOL 411b5a1106f96008ac2cac72c209dc0806bc5134ffe5d8b87d652d76efba0c7e32e388994598c5aecfabfdf700ba9e9f785eecb02e40c493e631a45dab13be39 diff --git a/dev-ros/xmlrpcpp/xmlrpcpp-1.12.0.ebuild b/dev-ros/xmlrpcpp/xmlrpcpp-1.12.0.ebuild new file mode 100644 index 000000000000..c2699ae5d9a0 --- /dev/null +++ b/dev-ros/xmlrpcpp/xmlrpcpp-1.12.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +ROS_REPO_URI="https://github.com/ros/ros_comm" +KEYWORDS="~amd64 ~arm" +ROS_SUBDIR=utilities/${PN} + +inherit ros-catkin + +DESCRIPTION="C++ implementation of the XML-RPC protocol" +LICENSE="BSD" +SLOT="0" +IUSE="" + +RDEPEND="dev-ros/cpp_common" +DEPEND="${RDEPEND}" +PATCHES=( "${FILESDIR}/headers.patch" ) + +src_configure() { + ros-catkin_src_configure + # Hack so that proper -I are added + sed -e "s#_include_dirs \"include\"#_include_dirs \"include;${EPREFIX}/usr/include/xmlrpcpp\"#" \ + -i "${BUILD_DIR}/catkin_generated/installspace/xmlrpcppConfig.cmake" || die + + sed -e "s#/usr/include#/usr/include;${EPREFIX}/usr/include/xmlrpcpp#g" \ + -i "${BUILD_DIR}/catkin_generated/pkg.installspace.context.pc.py" || die + + sed -e "s#/usr/include#/usr/include -I${EPREFIX}/usr/include/xmlrpcpp#g" \ + -i "${BUILD_DIR}/./catkin_generated/installspace/xmlrpcpp.pc" || die +} diff --git a/dev-ruby/amq-protocol/Manifest b/dev-ruby/amq-protocol/Manifest index ff831e39eea7..6902df6d2b69 100644 --- a/dev-ruby/amq-protocol/Manifest +++ b/dev-ruby/amq-protocol/Manifest @@ -1,3 +1,2 @@ DIST amq-protocol-1.9.2.gem 43520 SHA256 79e018cb1a3522967525973ae04d40884620e8d4adca02afeb710f00643a84be SHA512 ea4553b337589589cc89b70e351722ec8af402bd560d73fd35ad41665424a6212e03e26ac86aace5d90f599c7fc2236686fbd83bd75c7023647d95163a2d8573 WHIRLPOOL 5fcfd806b8d84aa64b10bc160fe439dcdff2977b739e04ec23b8f86d94f7a5bee4b95d3688317096b0dcf9214a12921f4b0a4c93c9bd0f6ad3376a6199659189 -DIST amq-protocol-2.0.0.gem 43008 SHA256 13ffd60f8f41d986b522f4dabce1c9d97e248395998e358298d1dfe54943ef9b SHA512 d0bc3de546b4d618fb66ecee57691c948058f8c82fab6f5747a6122d56be39d36a5670df76e4ad23124cccc81c5d1ba2babe6dda02f070a6d306eb30a8ad7cc8 WHIRLPOOL c4c98f6892f35959f92c42b35aea51b90bc074942e30999c7f8bf4f13156148d917f2a6d35580654483f8495b2e8423cbe123c130865ea2e2ac173860e8347a9 DIST amq-protocol-2.0.1.gem 43008 SHA256 fd5c0ef0f01c040529a6ddbc12cbdde3e40f63d5045c08b13a03f803df4ef6e6 SHA512 d723899902338562c9b4ad7fdd625e7efa27380b35e9986dfd31f8d334b7cdba4bea47a0f0306a4d24bd14376011287a98d5f31e2d92f89e9fdce7e267d37818 WHIRLPOOL 17657719885871532e1eb99ef4cf69dba84141c895f038c71f22fc054642a3b45cbbaf57bf0429aa4c239309b0c2c78d0ac1d9c6f3cb5a307672af4facce8f46 diff --git a/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild b/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild index f34147336728..fac40312e24f 100644 --- a/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild +++ b/dev-ruby/amq-protocol/amq-protocol-1.9.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md" diff --git a/dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild b/dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild deleted file mode 100644 index e1517c879e37..000000000000 --- a/dev-ruby/amq-protocol/amq-protocol-2.0.0.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md" - -RUBY_FAKEGEM_RECIPE_TEST="rspec3" - -inherit ruby-fakegem - -DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby" -HOMEPAGE="https://github.com/ruby-amqp/amq-protocol" - -LICENSE="MIT" -SLOT="2" -KEYWORDS="~amd64 ~x86" -IUSE="test" - -ruby_add_bdepend "test? ( dev-ruby/rspec-its )" - -all_ruby_prepare() { - rm Gemfile || die - sed -i -e '/bundler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die -} diff --git a/dev-ruby/facter/facter-3.1.5.ebuild b/dev-ruby/facter/facter-3.1.5.ebuild index 53f9a1416e0a..b3123ca85bc1 100644 --- a/dev-ruby/facter/facter-3.1.5.ebuild +++ b/dev-ruby/facter/facter-3.1.5.ebuild @@ -20,6 +20,7 @@ KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86" CDEPEND=" >=sys-devel/gcc-4.8:* >=dev-libs/boost-1.54[nls] + >=dev-libs/leatherman-0.4.2 >=dev-cpp/yaml-cpp-0.5.1 dev-libs/openssl:* sys-apps/util-linux @@ -31,7 +32,6 @@ RDEPEND+=" ${CDEPEND}" DEPEND+=" test? ( ${CDEPEND} )" src_prepare() { - sed -i 's/\-Werror\ //g' "vendor/leatherman/cmake/cflags.cmake" || die # Remove the code that installs facter.rb to the wrong directory. sed -i 's/if(RUBY_VENDORDIR)/if(False)/g' lib/CMakeLists.txt || die sed -i '/RUBY_VENDORDIR/d' lib/CMakeLists.txt || die diff --git a/dev-ruby/locale/locale-2.1.2.ebuild b/dev-ruby/locale/locale-2.1.2.ebuild index df122743dbdc..a9816f3caf7f 100644 --- a/dev-ruby/locale/locale-2.1.2.ebuild +++ b/dev-ruby/locale/locale-2.1.2.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_DOCDIR="doc/reference" diff --git a/dev-ruby/lockfile/lockfile-2.1.3.ebuild b/dev-ruby/lockfile/lockfile-2.1.3.ebuild index a4e8153be416..62d8a1b92b4a 100644 --- a/dev-ruby/lockfile/lockfile-2.1.3.ebuild +++ b/dev-ruby/lockfile/lockfile-2.1.3.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_TASK_TEST="" RUBY_FAKEGEM_TASK_DOC="" diff --git a/dev-ruby/test-unit/Manifest b/dev-ruby/test-unit/Manifest index 08e75a0b4056..b7618399bf82 100644 --- a/dev-ruby/test-unit/Manifest +++ b/dev-ruby/test-unit/Manifest @@ -1,6 +1,5 @@ DIST test-unit-1.2.3.gem 40960 SHA256 a7551459c53b0d73ac8e3ad3624b88d211bc80bc41a8c1a57c9d4b422beea4b7 SHA512 5e12a9691715a1e1afb53623867b77e2e06739929da5f0615c7341dc75f5feb281492bc0f6c55bdf1cc190f09a9a2c0f602638d5cad8a65682ba5f361bd22e57 WHIRLPOOL 2d459056aabf5804cc868d893060f6833570fbdd5c3d1d3fae09c2488909a55bdd340ab34297ac57298a03ff9c48a660705c1e28390e498aaef7ed40bf165205 DIST test-unit-2.5.5.gem 111104 SHA256 3216d6584293964c438e0573fa8f0273d12df2abb1c32d7a6aa427d6e0779d47 SHA512 4f710997d187011bc240ef869f5c86c11e01d9c7c8bee5fd938f194155137d7164e69bae6d63e41b90de8f7f6ab813a62131f2f9518d57b3913777923b491142 WHIRLPOOL 8bcdd17b02162e73afe6a306fc34e7687db7c6abb38cd94c3e558c25d30db3dda1893a923d217d887af55ff64f88e6c14861de5c30786798d3c4cf99f2c26ce3 -DIST test-unit-3.1.3.gem 121856 SHA256 b34ed36148329b1f4df9b3385259172c5435457f0da3d5494e3fcd0ae1f33d79 SHA512 3b2ab5e74940c9e02ca345212858ace4fec2266137da896efed50d87f53fb6076be11dcc05603b294bfe48a68ac2458c2b6bd437ddcf45ea7b0b1959b3c7fb89 WHIRLPOOL baba9eba099c6a599c8237dccef9749075b32a187041080c5230ad36f9354f175d9c96d7d2a02f7fcc4b18bb21cf628f0e3f06bc530914fd68cd4565e6a369ab -DIST test-unit-3.1.4.gem 122368 SHA256 9af970e9106b57672cccf917af6bc252e18ceef500d026eac360559f4560c4af SHA512 9e7b3d1a83b5d296d082281cf0f177ce6ab4347351cb358c199924bfc6bc2c56ed2c9a0701aac7dc056bede29087b91389a3e51c04e7f31852bfa6d90bac6b16 WHIRLPOOL 84911bbf8427d7575456257f4ac0f2fe6cb1862a4c9e68507e185529a65c4cca6fc1980b795a813bd886c3c7a4d389ca2435393539a13eb447d4515b45e72410 DIST test-unit-3.1.5.gem 122368 SHA256 9c38357eb0342e7971b6e6c37691b1ceb5161736a0e92e314797e6cabfb4bf4b SHA512 46840108402ef6319e76fd9b5270e88aaf45d6cf99fa84f28e8a01ce2bc2d5e0e79d1fdf660807fcc5b2434540f4240bd4799ecbb7fa6231af1cd96a7c89f994 WHIRLPOOL fbec655035463fd0b10f4c514444c2448feb37dd4f072ad536fc3f834afd5f9059409da87b23f4c7b7d73f7150815b26a91cdb80a9365211d2280a5ec102b97b DIST test-unit-3.1.7.gem 124416 SHA256 01133018f929db5290471b8e39feb5317bde2488efde1ec18e9653b2edb526f1 SHA512 fb41fdc27b0278fd272db100d76b4691468ab68d1327baf63d4e230285aec5e9faedb3b2fced4445a8a801828e9c715533ab6311dbe7a4033b6c8402e711b06e WHIRLPOOL 4d660d4c4da7329daa5ea1d4f5ac1859d150c0cfea8591adc82a5ad2ef1c08095cc29a8ef269d0f989ded7de20c903068ac1733a95c0cf7d1912887c003dd0c6 +DIST test-unit-3.1.8.gem 124416 SHA256 1bf50d79eee99c1aa7d8e199cb0d8e1a08d1a77692e61b0a99b72bb8b01f9374 SHA512 e83010db59f7000f8d7be2d85759e20dd8a07495f49052a7bcf1c31486b50231668039d2b94f5aa67d62f60da9a796875d3cfc876822acffeb18b429481804d7 WHIRLPOOL 9d9afd151ff3f366f1d6a661f03c87afe73acd5b7d183a1a5d27aa18851986c6845897d89a6b0dca7d076bc0a8caf081d6e8450b410fd4b4c7ee2d49b5c79137 diff --git a/dev-ruby/test-unit/test-unit-1.2.3-r1.ebuild b/dev-ruby/test-unit/test-unit-1.2.3-r1.ebuild index edb0ec5eac79..3cd436a2c0e6 100644 --- a/dev-ruby/test-unit/test-unit-1.2.3-r1.ebuild +++ b/dev-ruby/test-unit/test-unit-1.2.3-r1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20" +USE_RUBY="ruby20" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" diff --git a/dev-ruby/test-unit/test-unit-1.2.3-r2.ebuild b/dev-ruby/test-unit/test-unit-1.2.3-r2.ebuild deleted file mode 100644 index 628cfbbc4ab5..000000000000 --- a/dev-ruby/test-unit/test-unit-1.2.3-r2.ebuild +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_RECIPE_DOC="rdoc" -RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" - -# Disable default binwraps -RUBY_FAKEGEM_BINWRAP="" - -inherit ruby-fakegem - -# Tests need to be verified -RESTRICT=test - -DESCRIPTION="Nathaniel Talbott's originial test-unit" -HOMEPAGE="http://test-unit.rubyforge.org/" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="" diff --git a/dev-ruby/test-unit/test-unit-1.2.3-r3.ebuild b/dev-ruby/test-unit/test-unit-1.2.3-r3.ebuild index 865504c2558a..29f55cbf812d 100644 --- a/dev-ruby/test-unit/test-unit-1.2.3-r3.ebuild +++ b/dev-ruby/test-unit/test-unit-1.2.3-r3.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22" RUBY_FAKEGEM_RECIPE_DOC="rdoc" RUBY_FAKEGEM_EXTRADOC="README.txt History.txt" diff --git a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild index 2c897b3ad29e..ee8ca25bc228 100644 --- a/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild +++ b/dev-ruby/test-unit/test-unit-2.5.5-r2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_DOCDIR="doc" diff --git a/dev-ruby/test-unit/test-unit-3.1.3.ebuild b/dev-ruby/test-unit/test-unit-3.1.3.ebuild deleted file mode 100644 index 85d1f67e8902..000000000000 --- a/dev-ruby/test-unit/test-unit-3.1.3.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md" - -inherit ruby-fakegem - -# Assume for now that ruby22 is not eselected yet and only depend on -# yard for the other ruby implementations. Without this assumption -# bootstrapping ruby22 won't be possible due to the yard dependency -# tree. -#USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )" -ruby_add_bdepend "doc? ( dev-ruby/yard )" - -DESCRIPTION="An xUnit family unit testing framework for Ruby" -HOMEPAGE="https://rubygems.org/gems/test-unit" - -LICENSE="|| ( Ruby GPL-2 ) PSF-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -# power_assert does not work with ruby19 but is not needed for backward -# compatibility: -# https://github.com/k-tsj/power_assert/issues/8#issuecomment-71363455 -USE_RUBY="${USE_RUBY/ruby19/}" ruby_add_rdepend "dev-ruby/power_assert" - -each_ruby_prepare() { - case ${RUBY} in - *ruby19) - # Remove metadata to avoid registering the unsupported - # power_assert dependency. - rm -f ../metadata || die - ;; - esac -} - -all_ruby_compile() { - all_fakegem_compile - - if use doc; then - yard doc --title ${PN} || die - fi -} - -each_ruby_test() { - ${RUBY} test/run-test.rb || die "testsuite failed" -} - -all_ruby_install() { - all_fakegem_install - - newbin "${FILESDIR}"/testrb-3 testrb-2 -} diff --git a/dev-ruby/test-unit/test-unit-3.1.4.ebuild b/dev-ruby/test-unit/test-unit-3.1.4.ebuild deleted file mode 100644 index 85d1f67e8902..000000000000 --- a/dev-ruby/test-unit/test-unit-3.1.4.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" - -RUBY_FAKEGEM_TASK_DOC="" -RUBY_FAKEGEM_DOCDIR="doc" -RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md" - -inherit ruby-fakegem - -# Assume for now that ruby22 is not eselected yet and only depend on -# yard for the other ruby implementations. Without this assumption -# bootstrapping ruby22 won't be possible due to the yard dependency -# tree. -#USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )" -ruby_add_bdepend "doc? ( dev-ruby/yard )" - -DESCRIPTION="An xUnit family unit testing framework for Ruby" -HOMEPAGE="https://rubygems.org/gems/test-unit" - -LICENSE="|| ( Ruby GPL-2 ) PSF-2" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="doc test" - -# power_assert does not work with ruby19 but is not needed for backward -# compatibility: -# https://github.com/k-tsj/power_assert/issues/8#issuecomment-71363455 -USE_RUBY="${USE_RUBY/ruby19/}" ruby_add_rdepend "dev-ruby/power_assert" - -each_ruby_prepare() { - case ${RUBY} in - *ruby19) - # Remove metadata to avoid registering the unsupported - # power_assert dependency. - rm -f ../metadata || die - ;; - esac -} - -all_ruby_compile() { - all_fakegem_compile - - if use doc; then - yard doc --title ${PN} || die - fi -} - -each_ruby_test() { - ${RUBY} test/run-test.rb || die "testsuite failed" -} - -all_ruby_install() { - all_fakegem_install - - newbin "${FILESDIR}"/testrb-3 testrb-2 -} diff --git a/dev-ruby/test-unit/test-unit-3.1.5.ebuild b/dev-ruby/test-unit/test-unit-3.1.8.ebuild similarity index 50% rename from dev-ruby/test-unit/test-unit-3.1.5.ebuild rename to dev-ruby/test-unit/test-unit-3.1.8.ebuild index 85d1f67e8902..073ce3189d49 100644 --- a/dev-ruby/test-unit/test-unit-3.1.5.ebuild +++ b/dev-ruby/test-unit/test-unit-3.1.8.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21 ruby22" +USE_RUBY="ruby20 ruby21 ruby22 ruby23" RUBY_FAKEGEM_TASK_DOC="" RUBY_FAKEGEM_DOCDIR="doc" @@ -11,12 +11,11 @@ RUBY_FAKEGEM_EXTRADOC="README.md doc/text/news.md" inherit ruby-fakegem -# Assume for now that ruby22 is not eselected yet and only depend on -# yard for the other ruby implementations. Without this assumption -# bootstrapping ruby22 won't be possible due to the yard dependency -# tree. -#USE_RUBY="${USE_RUBY/ruby22/}" ruby_add_bdepend "doc? ( dev-ruby/yard )" -ruby_add_bdepend "doc? ( dev-ruby/yard )" +# Assume for now that ruby23 is not eselected yet and only +# depend on yard for the other ruby implementations. Without this +# assumption bootstrapping ruby23 won't be possible due to the yard +# dependency tree. +USE_RUBY="${USE_RUBY/ruby23/}" ruby_add_bdepend "doc? ( dev-ruby/yard )" DESCRIPTION="An xUnit family unit testing framework for Ruby" HOMEPAGE="https://rubygems.org/gems/test-unit" @@ -26,20 +25,7 @@ SLOT="2" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="doc test" -# power_assert does not work with ruby19 but is not needed for backward -# compatibility: -# https://github.com/k-tsj/power_assert/issues/8#issuecomment-71363455 -USE_RUBY="${USE_RUBY/ruby19/}" ruby_add_rdepend "dev-ruby/power_assert" - -each_ruby_prepare() { - case ${RUBY} in - *ruby19) - # Remove metadata to avoid registering the unsupported - # power_assert dependency. - rm -f ../metadata || die - ;; - esac -} +ruby_add_rdepend "dev-ruby/power_assert" all_ruby_compile() { all_fakegem_compile diff --git a/dev-scheme/racket/Manifest b/dev-scheme/racket/Manifest index aee4d65fc33a..557d6c289790 100644 --- a/dev-scheme/racket/Manifest +++ b/dev-scheme/racket/Manifest @@ -1,11 +1,7 @@ -DIST racket-5.1.2-src-unix.tgz 15960181 SHA256 99871d6c17c383eb31c5788e17e52849144b51494bd96d2ff1ab396d8041175b SHA512 bafcefeb4788621463745d19aa018d1e0a996585d0a025669dda0006893be76884aefd15d1a1213287fb777cca4f3a5136ad09c1af28b50164656085e1062243 WHIRLPOOL f7aab8936f902018f2d34781530ea3e596d21fa7b2487a61493991560f3084487d86f6e9b7bf6800cb4c52318f1253ea6e7a1af1b6ae1caf8fb44825b02af5d4 -DIST racket-5.2.1-src-unix.tgz 17210561 SHA256 69942a4efbfc2b17d836b5252e6f77b4aa40887a8a4a04ec228a44b7cfddb3ec SHA512 b60d259878cc237e26952ffcd07aa483c460a14a1f62e0a939466a4a51ad4ddfb8eda6845962823c0394268ceb3f050a88d1ab364013381f7ebcf077c4571e3e WHIRLPOOL 7b4eddf90a0dd17579aaf19e8df3a6867b9fa06349d254728b0a2cbd56ea83968fb5e1ac3202cb1001e62726cd4160dd174d6e5bf8310918eb4e8d84ba8913ef -DIST racket-5.3.1-src-unix.tgz 18296513 SHA256 2abfcd4edf39db9eafcc8a456ccf216fe486cb718e1f70210f902cc6b1d418c3 SHA512 3586a5e06dd7ba0357fca0478df967ec2984ff9457137f4a6947a690e0b66c372ea4785d9608069938234947127ebb8120cc5adf944dc4bf4bca903596a42435 WHIRLPOOL 3ba50e678b361dba059667bcd3421a0e736c1c27079b48cdc5f22786733737b36ccdcc013d2bb9821af5a67cf344b7276bee99274805a77a76bb14ce4f4d2a08 -DIST racket-5.3.2-src-unix.tgz 18903002 SHA256 dfbb4d305388c23bd80352a18b19a3746a8e402a23e0081416cd6f61b55701fb SHA512 36293de679530e85f4bf4e416d1028cb6fe7cc6d012e7b7f3a0b2203603e7d04c449dee5d0d0b6ab8cf3386e758a557d752119cd60c1a0aec12ea8815a17e413 WHIRLPOOL aae25f4507dd54dabc8b2e5ce4f11202cf69d25bffcf1fd8575ddd1623c5a2249f6f5a9750fc5ff7843c9c152587b6cfc94f1421581ddfd79c176c54461b4b23 -DIST racket-5.3.3-src-unix.tgz 18903284 SHA256 4772a01c0d1db32827b390b3239263f2a44a1c6bdcf63224dd7d36027575e0e2 SHA512 fdf1cfad87f5324a839dd766ac46681928f2d555b1b91ecfbe234ba1d83fc1412f7fe9d4e9586f0e9d36a724185b6c382de9cf0b74426d64570e9c22d0d057f1 WHIRLPOOL d6434fc970dc88476593233b5ff970d6a307350b8a34788bc42f81baedac0efa51910919581b10ca48a2e47f9c645432682819185e2ef9acc46fddd34e279ef1 -DIST racket-5.3.4-src-unix.tgz 19314579 SHA256 4d1fb86e001c497af674199f1ddff5534843bb94f21b9f0c1209b8bfdbad2d7b SHA512 35a05e31a11a8569d938af152a784358479cdad9f5007b04890d485ce92f04554df09d46179042478df96e018756b06e6c7c544b4f113272c31234b75ca740a9 WHIRLPOOL e114c4b18d4c18c8852627c9de207dd543e1f63b056bd1e8cbdecbe5e2a2a916d3144585ddb620c539ceb4c0710e0ee237803ffd4fa5b45e73434f7f017673e0 DIST racket-5.3.6-src-unix.tgz 19278914 SHA256 7fe0ffc1231f888cd481f175e428f0217257dd136d2513bde73954af5a7cfb8a SHA512 08e8b599e800f41c9497b07e163ed43ae02ae9d9bcc3e20da31eb2f6aa20aa4b0071db51e93696ae1bd644ddfa1c3aea587a334db24ced4a3654dcf5da138e8f WHIRLPOOL c2c34de08d0ec9942f040cc23ea7f2a9bb743d0dcc7125e1b5336b0845482e67abd46b1b5cb821e898c3db50767312f3a27e386a0b7046bf068feb23a1b1bf52 DIST racket-6.0.1-src-builtpkgs.tgz 101425779 SHA256 2b5f2bccb21d408041e167a4476115075c3b230ab50e1d66fe1a3c0ab205bfa1 SHA512 b51fade0afa33b11c4be7da8aec910a8b33bb1cc097748362ecc342b3cd50dcd1c6c52c68c3485b91bddd74a15f8767d357d911151c8cd263a0caa5d72a888a5 WHIRLPOOL d7944c7e1851bb48cc08c29d93763fb0c269ecbc33b59e02bbd6fc1592287376434c0c8c87bada29289d235d7816420170bc6c0f12f684eb9a32a7508342ce0b DIST racket-6.2.1-src-builtpkgs.tgz 113159311 SHA256 04429315159d86c71037e4c1157a724476065803e32346abc0ee37708aed0fcd SHA512 1776e22412d37de69019147e670c88b015d31c31c654cc647ee6598588e94cad32b8d52e4d1738febe3ed47aaf1dc89c5db03878a0e3a4baff75dab302c2a294 WHIRLPOOL 9de2f3068061b13067c6e05289ae6ca233c9c0a90ef639a6e9853df5deb9e1358f2609e712e472312bd599a0cbe79973c4525c5fa99bbc9cd59837d674498b68 +DIST racket-6.4-src-builtpkgs.tgz 120269476 SHA256 5feb8279d9b3b1adf8642714dcb4cb8514832cb17135174be8733b92e1a0078a SHA512 58ef8a27afe61a44ee65f00a1096dbbb833f5d2e8a1fddd1dd4a250164031358216c88c21ef6b9a3a84996a4317338175301493511c49e92a80135653af8159c WHIRLPOOL 9e4258bd2cdb1758546db7e149a8c3429f43f3fd71cafabb6fb3d7012098d56e68420bf743571adfd9082639da5455e4dbe98baa64a50746e5969af20b906378 DIST racket-minimal-6.0.1-src-builtpkgs.tgz 9139061 SHA256 f58aa4e3e831417b72d5c19aba20a5b0eaa1111af2f1afa3096b0a4e83b860a3 SHA512 99c7ecf5d7e1de40358a03a5878271e2864fa9e6fe11bab71bd68784bd058a2edbb4ec65ba455dbff2a943c78ec0f9a9b0f46b1532fc1b55be500593160da313 WHIRLPOOL bc3dc19d8c23129866adeb71d125314d66ce2e505d1a453f26c09e9aa42bc98626cba2ddb87d8ae53c7ad5939443defc88c4f1c4ce174567a01b1f56be9788ea DIST racket-minimal-6.2.1-src-builtpkgs.tgz 9736885 SHA256 47eceb5f23ab66a939650fa44dd89ffcb17a6227f58c6bc80e90aa8999c86b36 SHA512 048f247136b15c2b118f497e9058a34dc7135ad4fbe707345290238e1268dd72e0ba35d3fd1690d0f9e97e56748f8964eb80c23c6be278bc6e5e819414c0d4a9 WHIRLPOOL 3c475a8204cea6c802043f4e823d2b1cdc50055ebc3288768988d5e3bf8e502b32300228360603743a9b1d065a845bb1e22d12e4b0fe79a4a6132e2ba335be53 +DIST racket-minimal-6.4-src-builtpkgs.tgz 10880010 SHA256 cf717d4983f4198fce8973ead5d427bc9da78b73bd51fee16b58c894c2a146e8 SHA512 7ff59dcfe97e96d1d8a22b2cfcc28e32833742dae93839d0bcd80a43ff3834a02128681f9b9adab0f66ae99745f3b6cf87f6fa39f71f9a288f14cf22e6cc4629 WHIRLPOOL 74633074ed9f44e4c99c2eb0808ee393c8dbc66f84f2c9787ad1ab359bb4c60b3cda86a858d08fabe38680a8fe42e5f856c8baab780e9847aa3a2eb0fb1e0158 diff --git a/dev-scheme/racket/racket-5.1.2.ebuild b/dev-scheme/racket/racket-5.1.2.ebuild deleted file mode 100644 index 090b35b69651..000000000000 --- a/dev-scheme/racket/racket-5.1.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYWORDS - -inherit eutils -#inherit git-2 - -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" -HOMEPAGE="http://racket-lang.org/" -SRC_URI="http://download.racket-lang.org/installers/${PV}/${PN}/${P}-src-unix.tgz" -#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" -EGIT_REPO_URI="git://git.racket-lang.org/plt.git" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="backtrace cairo doc futures jit places plot threads X" - -RDEPEND="X? ( x11-libs/cairo[X] ) virtual/libffi" - -DEPEND="${RDEPEND} !dev-tex/slatex" - -EGIT_SOURCEDIR="${WORKDIR}/${P}" -S="${WORKDIR}/${P}/src" - -src_prepare() { - #remove bundled libraries - rm -rf foreign/libffi/ - - sed -e "s,docdir=\"\${datadir}/${PN}/doc,docdir=\"\${datadir}/doc/${PF}," -i configure || die -} - -src_configure() { -# according to vapier, we should use the bundled libtool -# such that we don't preclude cross-compile. Thus don't use -# --enable-lt=/usr/bin/libtool - econf \ - $(use_enable X gracket) \ - $(use_enable plot) \ - $(use_enable doc docs) \ - --enable-shared \ - $(use_enable jit) \ - --enable-foreign \ - $(use_enable places) \ - $(use_enable futures) \ - $(use_enable backtrace) \ - $(use_enable threads pthread) \ - --disable-perl \ - $(use_with X x) -} - -src_compile() { - emake || die -} - -src_install() { - # deal with slatex - insinto /usr/share/texmf/tex/latex/slatex/ - doins ../collects/slatex/slatex.sty - - emake DESTDIR="${D}" install || die "emake install failed" - - if use X; then - newicon ../collects/icons/PLT-206.png drracket.png - make_desktop_entry drracket "DrRacket" drracket "Development" - fi -} diff --git a/dev-scheme/racket/racket-5.2.1.ebuild b/dev-scheme/racket/racket-5.2.1.ebuild deleted file mode 100644 index 090b35b69651..000000000000 --- a/dev-scheme/racket/racket-5.2.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYWORDS - -inherit eutils -#inherit git-2 - -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" -HOMEPAGE="http://racket-lang.org/" -SRC_URI="http://download.racket-lang.org/installers/${PV}/${PN}/${P}-src-unix.tgz" -#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" -EGIT_REPO_URI="git://git.racket-lang.org/plt.git" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="backtrace cairo doc futures jit places plot threads X" - -RDEPEND="X? ( x11-libs/cairo[X] ) virtual/libffi" - -DEPEND="${RDEPEND} !dev-tex/slatex" - -EGIT_SOURCEDIR="${WORKDIR}/${P}" -S="${WORKDIR}/${P}/src" - -src_prepare() { - #remove bundled libraries - rm -rf foreign/libffi/ - - sed -e "s,docdir=\"\${datadir}/${PN}/doc,docdir=\"\${datadir}/doc/${PF}," -i configure || die -} - -src_configure() { -# according to vapier, we should use the bundled libtool -# such that we don't preclude cross-compile. Thus don't use -# --enable-lt=/usr/bin/libtool - econf \ - $(use_enable X gracket) \ - $(use_enable plot) \ - $(use_enable doc docs) \ - --enable-shared \ - $(use_enable jit) \ - --enable-foreign \ - $(use_enable places) \ - $(use_enable futures) \ - $(use_enable backtrace) \ - $(use_enable threads pthread) \ - --disable-perl \ - $(use_with X x) -} - -src_compile() { - emake || die -} - -src_install() { - # deal with slatex - insinto /usr/share/texmf/tex/latex/slatex/ - doins ../collects/slatex/slatex.sty - - emake DESTDIR="${D}" install || die "emake install failed" - - if use X; then - newicon ../collects/icons/PLT-206.png drracket.png - make_desktop_entry drracket "DrRacket" drracket "Development" - fi -} diff --git a/dev-scheme/racket/racket-5.3.1.ebuild b/dev-scheme/racket/racket-5.3.1.ebuild deleted file mode 100644 index 090b35b69651..000000000000 --- a/dev-scheme/racket/racket-5.3.1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYWORDS - -inherit eutils -#inherit git-2 - -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" -HOMEPAGE="http://racket-lang.org/" -SRC_URI="http://download.racket-lang.org/installers/${PV}/${PN}/${P}-src-unix.tgz" -#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" -EGIT_REPO_URI="git://git.racket-lang.org/plt.git" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="backtrace cairo doc futures jit places plot threads X" - -RDEPEND="X? ( x11-libs/cairo[X] ) virtual/libffi" - -DEPEND="${RDEPEND} !dev-tex/slatex" - -EGIT_SOURCEDIR="${WORKDIR}/${P}" -S="${WORKDIR}/${P}/src" - -src_prepare() { - #remove bundled libraries - rm -rf foreign/libffi/ - - sed -e "s,docdir=\"\${datadir}/${PN}/doc,docdir=\"\${datadir}/doc/${PF}," -i configure || die -} - -src_configure() { -# according to vapier, we should use the bundled libtool -# such that we don't preclude cross-compile. Thus don't use -# --enable-lt=/usr/bin/libtool - econf \ - $(use_enable X gracket) \ - $(use_enable plot) \ - $(use_enable doc docs) \ - --enable-shared \ - $(use_enable jit) \ - --enable-foreign \ - $(use_enable places) \ - $(use_enable futures) \ - $(use_enable backtrace) \ - $(use_enable threads pthread) \ - --disable-perl \ - $(use_with X x) -} - -src_compile() { - emake || die -} - -src_install() { - # deal with slatex - insinto /usr/share/texmf/tex/latex/slatex/ - doins ../collects/slatex/slatex.sty - - emake DESTDIR="${D}" install || die "emake install failed" - - if use X; then - newicon ../collects/icons/PLT-206.png drracket.png - make_desktop_entry drracket "DrRacket" drracket "Development" - fi -} diff --git a/dev-scheme/racket/racket-5.3.2.ebuild b/dev-scheme/racket/racket-5.3.2.ebuild deleted file mode 100644 index e5aeb2adc095..000000000000 --- a/dev-scheme/racket/racket-5.3.2.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYWORDS - -inherit eutils -#inherit git-2 - -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" -HOMEPAGE="http://racket-lang.org/" -SRC_URI="http://download.racket-lang.org/installers/${PV}/${PN}/${P}-src-unix.tgz" -#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" -EGIT_REPO_URI="git://git.racket-lang.org/plt.git" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="backtrace cairo doc futures jit places plot threads X" - -RDEPEND="dev-db/sqlite:3 X? ( x11-libs/cairo[X] ) virtual/libffi" - -DEPEND="${RDEPEND} !dev-tex/slatex" - -EGIT_SOURCEDIR="${WORKDIR}/${P}" -S="${WORKDIR}/${P}/src" - -src_prepare() { - #remove bundled libraries - rm -rf foreign/libffi/ - - sed -e "s,docdir=\"\${datadir}/${PN}/doc,docdir=\"\${datadir}/doc/${PF}," -i configure || die -} - -src_configure() { -# according to vapier, we should use the bundled libtool -# such that we don't preclude cross-compile. Thus don't use -# --enable-lt=/usr/bin/libtool - econf \ - $(use_enable X gracket) \ - $(use_enable plot) \ - $(use_enable doc docs) \ - --enable-shared \ - $(use_enable jit) \ - --enable-foreign \ - $(use_enable places) \ - $(use_enable futures) \ - $(use_enable backtrace) \ - $(use_enable threads pthread) \ - --disable-perl \ - $(use_with X x) -} - -src_compile() { - emake || die -} - -src_install() { - # deal with slatex - insinto /usr/share/texmf/tex/latex/slatex/ - doins ../collects/slatex/slatex.sty - - emake DESTDIR="${D}" install || die "emake install failed" - - if use X; then - newicon ../collects/icons/PLT-206.png drracket.png - make_desktop_entry drracket "DrRacket" drracket "Development" - fi -} diff --git a/dev-scheme/racket/racket-5.3.3.ebuild b/dev-scheme/racket/racket-5.3.3.ebuild deleted file mode 100644 index e5aeb2adc095..000000000000 --- a/dev-scheme/racket/racket-5.3.3.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYWORDS - -inherit eutils -#inherit git-2 - -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" -HOMEPAGE="http://racket-lang.org/" -SRC_URI="http://download.racket-lang.org/installers/${PV}/${PN}/${P}-src-unix.tgz" -#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" -EGIT_REPO_URI="git://git.racket-lang.org/plt.git" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="backtrace cairo doc futures jit places plot threads X" - -RDEPEND="dev-db/sqlite:3 X? ( x11-libs/cairo[X] ) virtual/libffi" - -DEPEND="${RDEPEND} !dev-tex/slatex" - -EGIT_SOURCEDIR="${WORKDIR}/${P}" -S="${WORKDIR}/${P}/src" - -src_prepare() { - #remove bundled libraries - rm -rf foreign/libffi/ - - sed -e "s,docdir=\"\${datadir}/${PN}/doc,docdir=\"\${datadir}/doc/${PF}," -i configure || die -} - -src_configure() { -# according to vapier, we should use the bundled libtool -# such that we don't preclude cross-compile. Thus don't use -# --enable-lt=/usr/bin/libtool - econf \ - $(use_enable X gracket) \ - $(use_enable plot) \ - $(use_enable doc docs) \ - --enable-shared \ - $(use_enable jit) \ - --enable-foreign \ - $(use_enable places) \ - $(use_enable futures) \ - $(use_enable backtrace) \ - $(use_enable threads pthread) \ - --disable-perl \ - $(use_with X x) -} - -src_compile() { - emake || die -} - -src_install() { - # deal with slatex - insinto /usr/share/texmf/tex/latex/slatex/ - doins ../collects/slatex/slatex.sty - - emake DESTDIR="${D}" install || die "emake install failed" - - if use X; then - newicon ../collects/icons/PLT-206.png drracket.png - make_desktop_entry drracket "DrRacket" drracket "Development" - fi -} diff --git a/dev-scheme/racket/racket-5.3.4.ebuild b/dev-scheme/racket/racket-5.3.4.ebuild deleted file mode 100644 index 28e2c0c8c91a..000000000000 --- a/dev-scheme/racket/racket-5.3.4.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -# for live ebuilds uncomment inherit git, comment SRC_URI and empty KEYWORDS - -inherit eutils -#inherit git-2 - -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" -HOMEPAGE="http://racket-lang.org/" -SRC_URI="http://download.racket-lang.org/installers/${PV}/${PN}/${P}-src-unix.tgz" -#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" -EGIT_REPO_URI="git://git.racket-lang.org/plt.git" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="backtrace cairo doc futures jit places plot threads X" - -RDEPEND="dev-db/sqlite:3 x11-libs/cairo[X?] virtual/libffi" - -# see bug 426316: racket/draw (which depends on cairo) is sometimes used in compile-time code or when rendering documentation -DEPEND="${RDEPEND} x11-libs/cairo !dev-tex/slatex" - -EGIT_SOURCEDIR="${WORKDIR}/${P}" -S="${WORKDIR}/${P}/src" - -src_prepare() { - #remove bundled libraries - rm -rf foreign/libffi/ - - sed -e "s,docdir=\"\${datadir}/${PN}/doc,docdir=\"\${datadir}/doc/${PF}," -i configure || die -} - -src_configure() { -# according to vapier, we should use the bundled libtool -# such that we don't preclude cross-compile. Thus don't use -# --enable-lt=/usr/bin/libtool - econf \ - $(use_enable X gracket) \ - $(use_enable plot) \ - $(use_enable doc docs) \ - --enable-shared \ - $(use_enable jit) \ - --enable-foreign \ - $(use_enable places) \ - $(use_enable futures) \ - $(use_enable backtrace) \ - $(use_enable threads pthread) \ - --disable-perl \ - $(use_with X x) -} - -src_compile() { - emake || die -} - -src_install() { - # deal with slatex - insinto /usr/share/texmf/tex/latex/slatex/ - doins ../collects/slatex/slatex.sty - - emake DESTDIR="${D}" install || die "emake install failed" - - if use X; then - newicon ../collects/icons/PLT-206.png drracket.png - make_desktop_entry drracket "DrRacket" drracket "Development" - fi -} diff --git a/dev-scheme/racket/racket-5.3.6.ebuild b/dev-scheme/racket/racket-5.3.6.ebuild index b1212581dfa6..0ed44d3ef064 100644 --- a/dev-scheme/racket/racket-5.3.6.ebuild +++ b/dev-scheme/racket/racket-5.3.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI="4" inherit eutils #inherit git-2 -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" +DESCRIPTION="General purpose, multi-paradigm programming language in the Lisp-Scheme family." HOMEPAGE="http://racket-lang.org/" SRC_URI="http://download.racket-lang.org/installers/${PV}/${PN}/${P}-src-unix.tgz" #SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" diff --git a/dev-scheme/racket/racket-6.0.1.ebuild b/dev-scheme/racket/racket-6.0.1.ebuild index 845364807c74..d05b2a032f47 100644 --- a/dev-scheme/racket/racket-6.0.1.ebuild +++ b/dev-scheme/racket/racket-6.0.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI="5" inherit eutils pax-utils #inherit git-2 -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" +DESCRIPTION="General purpose, multi-paradigm programming language in the Lisp-Scheme family." HOMEPAGE="http://racket-lang.org/" SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )" #SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" diff --git a/dev-scheme/racket/racket-6.2.1.ebuild b/dev-scheme/racket/racket-6.2.1.ebuild index 20e48f09af84..171c433bfb8b 100644 --- a/dev-scheme/racket/racket-6.2.1.ebuild +++ b/dev-scheme/racket/racket-6.2.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -9,7 +9,7 @@ EAPI="5" inherit eutils pax-utils #inherit git-2 -DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" +DESCRIPTION="General purpose, multi-paradigm programming language in the Lisp-Scheme family." HOMEPAGE="http://racket-lang.org/" SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )" #SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" diff --git a/dev-scheme/racket/racket-6.4.ebuild b/dev-scheme/racket/racket-6.4.ebuild new file mode 100644 index 000000000000..2cd5718d0296 --- /dev/null +++ b/dev-scheme/racket/racket-6.4.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI="5" + +# for live ebuilds uncomment inherit git-2, comment SRC_URI and empty KEYWORDS + +inherit eutils pax-utils +#inherit git-2 + +#DESCRIPTION="Racket is a general-purpose programming language with strong support for domain-specific languages" +DESCRIPTION="General purpose, multi-paradigm programming language in the Lisp-Scheme family." +HOMEPAGE="http://racket-lang.org/" +SRC_URI="minimal? ( http://download.racket-lang.org/installers/${PV}/${PN}-minimal-${PV}-src-builtpkgs.tgz ) !minimal? ( http://download.racket-lang.org/installers/${PV}/${P}-src-builtpkgs.tgz )" +#SRC_URI="http://pre.racket-lang.org/installers/plt-${PV}-src-unix.tgz" +EGIT_REPO_URI="git://git.racket-lang.org/plt.git" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="doc +futures +jit minimal +places +threads +X" +REQUIRED_USE="futures? ( jit )" + +# see bug 426316: racket/draw (which depends on cairo) is sometimes used in compile-time code or when rendering documentation +RDEPEND="dev-db/sqlite:3 x11-libs/cairo[X?] virtual/libffi" +DEPEND="${RDEPEND}" + +EGIT_SOURCEDIR="${WORKDIR}/${P}" +S="${WORKDIR}/${P}/src" + +src_prepare() { + #remove bundled libraries + rm -rf foreign/libffi/ +} + +src_configure() { +# according to vapier, we should use the bundled libtool +# such that we don't preclude cross-compile. Thus don't use +# --enable-lt=/usr/bin/libtool + econf \ + $(use_enable X gracket) \ + $(use_enable doc docs) \ + --enable-shared \ + $(use_enable jit) \ + --enable-foreign \ + $(use_enable places) \ + $(use_enable futures) \ + $(use_enable threads pthread) +} + +src_compile() { + if use jit; then + pushd racket + emake cgc + pax-mark m .libs/racketcgc + emake 3m + pax-mark m .libs/racket3m + popd + fi + emake +} + +src_install() { + emake DESTDIR="${D}" install + + #racket now comes with desktop files, but DESTDIR is mishandled + for f in /usr/share/applications/{drracket,slideshow}.desktop; do + sed -e "s|${D}||g" \ + -i "${D}/${f}" || die "Failed to patch '${f}'" + done +} diff --git a/dev-scheme/slib/slib-3.2.2.ebuild b/dev-scheme/slib/slib-3.2.2.ebuild index aabded457e6b..634da06b620c 100644 --- a/dev-scheme/slib/slib-3.2.2.ebuild +++ b/dev-scheme/slib/slib-3.2.2.ebuild @@ -19,7 +19,7 @@ HOMEPAGE="http://swiss.csail.mit.edu/~jaffer/SLIB" SLOT="0" LICENSE="public-domain BSD" -KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 ia64 ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x86-solaris" IUSE="" #test" #unzip for unpacking diff --git a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild index 3258154c63ff..8fc9943e01f7 100644 --- a/dev-tex/latexdiff/latexdiff-1.1.0.ebuild +++ b/dev-tex/latexdiff/latexdiff-1.1.0.ebuild @@ -10,7 +10,7 @@ SRC_URI="http://mirror.ctan.org/support/${PN}.zip -> ${P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" +KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" IUSE="" diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest index a000ed3c550e..c665791943da 100644 --- a/dev-util/bitcoin-tx/Manifest +++ b/dev-util/bitcoin-tx/Manifest @@ -3,8 +3,10 @@ DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4 DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a DIST bitcoin-0.11.2.ljr20151118.patches.tar.xz 98552 SHA256 de44c8604de476d282820c2419ccbba3bef3eb054887cdd16b0ab4e7ff450dcb SHA512 283d0b6550fa1c6d2347e146c350b2afb9d7ca0c2e8ad150a8dcb6c0522abd17ca31ba8dcdee7e2d7020561be6e8bdc9bd33f7d21e7901ca675ff990441a97ef WHIRLPOOL 24f25ba32d1c22e1e795aba13e202af661b9e23992b633382cdd62953d744862901494726c36075eb0ae186bd6e60e4c15148e0f46a2401efffa1b419b4d2390 +DIST bitcoin-0.12.0.knots20160226.rc1.patches.tar.xz 145776 SHA256 93431aa2c1d66c41d52bbf8810df27228f5a0823db2416312d6e07a20dc78dea SHA512 042c02dc64591f4edbad1cc421ee90e84d628f93292fd42b190728960a65eb76d0234d821ce2df92a3a66328a5368b5b42670ebf130045d92d74d74287a90990 WHIRLPOOL b4543468936c6e16a8636c2eaed1d6f76a20958c2f2fda6f9c6a389cc79111369d906c08878e3eb7b2d6bad8299e3e16ad38a190dab80996f63adfda8c1c93f2 DIST bitcoin-v0.10.0.tgz 5022212 SHA256 ecff92e184fac4a96684085590a67554a27db72d0ac235b7cc054887644c0b70 SHA512 f362a9d4ba405c02b2d01024a61b68f984dd6e441ef2254d05bf65cfe803c8b084bd3b14a76a3472251d96087e450091f95f26a691c248836c6d0b43dece8255 WHIRLPOOL 2185413c6d073b0dcb30001c8fb56301390206680ffc6d705ed99e102e68e5c4c1d08c495c38703631696fa9a4a3784befd71acfbec0e94b164bbbfde76158c3 DIST bitcoin-v0.10.1.tgz 5053846 SHA256 51bff5ba2372ca53782c5fec3d9b4b4226e94b5ac0b1b4b2b5949b97082af256 SHA512 f89330b93f22ba5f393c9a7a48ce28196be0e16468e5d99c459e889c458cc3a7c3f6e4537996571aa8ccb0ebb2eedf80ad028da136a2e08e2f8631f69ac5f2fc WHIRLPOOL 0cfb182f355151cde75601d2260cc92801e2dc1231ae2fca67610e699bb5f0cae826b09f456ca8afa283730954f11a8b180f43ae5a5297d129093fc0f9f53b4e DIST bitcoin-v0.11.0.tgz 5898627 SHA256 a52cb63e96a13626243c78662ea659c90277728b8f40d27846e82fdf81ce58e3 SHA512 bf1e05e115ecc375bfe9e342bf65db74784926e599a05f42f33b43781775d0469826228876269fcdc8a469bce45cb3dd4513e1f9dda5d36cc40adbb9aaf6f054 WHIRLPOOL ca2f3feb9815ad9bfac0b573bc0a3a7bb55bb7467724d84a6baf6a469983625727bb0fd01722a0be74e2df0a29833aadc152d036819be660270733b57089e9bf DIST bitcoin-v0.11.1.tgz 5945124 SHA256 3b6907c70a0d79823e873f9212f253b5abc96c61859d9686d102a1a08be8febc SHA512 8c4acf0386a5a17525ac4fa5ecfb66ff13fde65052b4aeba9f847344c9149ddff2af81323b6b9a675ea9fdc76f654546f96725a7fb80a9e4aa545f5ede17ee63 WHIRLPOOL 4f4984d8a4af5604a47dc0c5538b35a9233c09c0181929ca285bd89368044d11eb6be4eb376eaf1e9c695078deb243abdfb0bbd36a161ffdf043a5db0f424dcc DIST bitcoin-v0.11.2.tgz 5958338 SHA256 1adb0b5ea6dcbf9e3de9c6338b4f0d0abc6f72d8023ac5451370cdf43c9971c4 SHA512 0a76ca482c71e9a88e14e274d082bce796b2a9abd48d0fb40e41d169479ced144530825b36e1ab0953dac80b823607aaa8be52fe631f7df9a5062dc2a4bf4e66 WHIRLPOOL 9d8c98b45919e3323a27eacf1c0cc28d992bf7fe1cef9f738dab880e104613e8fb9184ecaa5ad3ea2234625254f3329c7ab5c939f6076d50b9f1ce970db85b9d +DIST bitcoin-v0.12.0.tgz 6708553 SHA256 a5bac23b087c183821f06c19947cba2399ced09ee2b02c751ecbda9f808d8e33 SHA512 2c6bec18eed7b8145ee711ae143b425e08ed3243454083a1a91eb2a1f16abcac2a5e053f83c9ae840cbbdea3960856b613ba17d269d8b60706379744a4cf9f4b WHIRLPOOL bd159d52567a84a577c0581cdd8df02030c25b32ee44df26e1081b588cbddde0d951226c1c46e69077d2e2887c98874455f340bb3fe01bede85d044ef1bb02e8 diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.12.0.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.12.0.ebuild new file mode 100644 index 000000000000..63f25e2d7c52 --- /dev/null +++ b/dev-util/bitcoin-tx/bitcoin-tx-0.12.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 2010-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +BITCOINCORE_COMMITHASH="188ca9c305d3dd0fb462b9d6a44048b1d99a05f3" +BITCOINCORE_LJR_DATE="20160226" +BITCOINCORE_LJR_PREV="rc1" +BITCOINCORE_IUSE="ljr" +BITCOINCORE_NEED_LIBSECP256K1=1 +BITCOINCORE_NO_DEPEND="libevent" +inherit bitcoincore + +DESCRIPTION="Command-line Bitcoin transaction tool" +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-linux ~x86-linux" + +src_configure() { + bitcoincore_conf \ + --enable-util-tx +} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild index c41e1e207907..755248dc0827 100644 --- a/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild +++ b/dev-util/bitcoin-tx/bitcoin-tx-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2015 Gentoo Foundation +# Copyright 2010-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,6 +6,7 @@ EAPI=5 BITCOINCORE_IUSE="" BITCOINCORE_NEED_LIBSECP256K1=1 +BITCOINCORE_NO_DEPEND="libevent" inherit bitcoincore DESCRIPTION="Command-line Bitcoin transaction tool" diff --git a/dev-util/bitcoin-tx/files/9999-syslibs.patch b/dev-util/bitcoin-tx/files/9999-syslibs.patch index 2cdf2ab9837b..c594c54634ed 100644 --- a/dev-util/bitcoin-tx/files/9999-syslibs.patch +++ b/dev-util/bitcoin-tx/files/9999-syslibs.patch @@ -12,10 +12,10 @@ index 66f106c..5f0a3b1 100644 if test "x${newinclpath}" != "x"; then eval "$1=\"\$$1\"' -I${newinclpath}'" diff --git a/configure.ac b/configure.ac -index 37fe47e..14e5c34 100644 +index 939dfea..6c9acb3 100644 --- a/configure.ac +++ b/configure.ac -@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], +@@ -200,6 +200,18 @@ AC_ARG_WITH([utils], [build_bitcoin_utils=$withval], [build_bitcoin_utils=yes]) @@ -34,7 +34,7 @@ index 37fe47e..14e5c34 100644 AC_ARG_WITH([libs], [AS_HELP_STRING([--with-libs], [build libraries (default=yes)])], -@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then +@@ -531,14 +543,65 @@ if test x$use_reduce_exports = xyes; then [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) fi @@ -101,16 +101,16 @@ index 37fe47e..14e5c34 100644 if test x$enable_wallet != xno; then dnl Check for libdb_cxx only if wallet enabled BITCOIN_FIND_BDB48 -@@ -515,7 +578,7 @@ BITCOIN_QT_INIT +@@ -558,7 +621,7 @@ BITCOIN_QT_INIT dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) + BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt5]) -if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then +if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then use_boost=no else use_boost=yes -@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) +@@ -848,9 +911,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) AC_MSG_RESULT($build_bitcoind) @@ -127,7 +127,7 @@ index 37fe47e..14e5c34 100644 AC_MSG_CHECKING([whether to build libraries]) AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -826,7 +893,7 @@ else +@@ -975,7 +1042,7 @@ else AC_MSG_RESULT([no]) fi @@ -136,34 +136,54 @@ index 37fe47e..14e5c34 100644 AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) fi -@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" - unset PKG_CONFIG_LIBDIR - PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" +@@ -1062,8 +1129,10 @@ if test x$system_univalue = xno; then + AC_CONFIG_SUBDIRS([src/univalue]) + fi +if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" + ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no --enable-module-recovery" AC_CONFIG_SUBDIRS([src/secp256k1]) +fi AC_OUTPUT -diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh -index 9b31865..5bb187c 100755 ---- a/qa/pull-tester/rpc-tests.sh -+++ b/qa/pull-tester/rpc-tests.sh -@@ -57,7 +57,7 @@ testScriptsExt=( - extArg="-extended" - passOn=${@#$extArg} - --if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then -+if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then - for (( i = 0; i < ${#testScripts[@]}; i++ )) - do - if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ] -diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in -index 10f4d33..e0e407d 100755 ---- a/qa/pull-tester/tests-config.sh.in -+++ b/qa/pull-tester/tests-config.sh.in +diff --git a/qa/pull-tester/rpc-tests.py b/qa/pull-tester/rpc-tests.py +index 7649c11..978419b 100755 +--- a/qa/pull-tester/rpc-tests.py ++++ b/qa/pull-tester/rpc-tests.py +@@ -36,8 +36,8 @@ if not vars().has_key('ENABLE_WALLET'): + ENABLE_WALLET=0 + if not vars().has_key('ENABLE_BITCOIND'): + ENABLE_BITCOIND=0 +-if not vars().has_key('ENABLE_UTILS'): +- ENABLE_UTILS=0 ++if not vars().has_key('ENABLE_CLI'): ++ ENABLE_CLI=0 + if not vars().has_key('ENABLE_ZMQ'): + ENABLE_ZMQ=0 + +@@ -141,7 +141,7 @@ def runtests(): + coverage = RPCCoverage() + print("Initializing coverage directory at %s\n" % coverage.dir) + +- if(ENABLE_WALLET == 1 and ENABLE_UTILS == 1 and ENABLE_BITCOIND == 1): ++ if(ENABLE_WALLET == 1 and ENABLE_CLI == 1 and ENABLE_BITCOIND == 1): + rpcTestDir = buildDir + '/qa/rpc-tests/' + run_extended = '-extended' in opts + cov_flag = coverage.flag if coverage else '' +@@ -187,7 +187,7 @@ def runtests(): + coverage.cleanup() + + else: +- print "No rpc tests to run. Wallet, utils, and bitcoind must all be enabled" ++ print "No rpc tests to run. Wallet, cli, and bitcoind must all be enabled" + + + class RPCCoverage(object): +diff --git a/qa/pull-tester/tests_config.py.in b/qa/pull-tester/tests_config.py.in +index 937b423..71a917c 100644 +--- a/qa/pull-tester/tests_config.py.in ++++ b/qa/pull-tester/tests_config.py.in @@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" # These will turn into comments if they were disabled when configuring. @@ -171,31 +191,24 @@ index 10f4d33..e0e407d 100755 -@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 +@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 + @ENABLE_ZMQ_TRUE@ENABLE_ZMQ=1 - REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" diff --git a/src/Makefile.am b/src/Makefile.am -index 1c2f770..4d60ddf 100644 +index fa7a78f..cc2f2ca 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -1,4 +1,6 @@ -+if EMBEDDED_LIBSECP256K1 - DIST_SUBDIRS = secp256k1 -+endif - AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) - - -@@ -20,7 +22,7 @@ endif +@@ -31,7 +31,7 @@ endif BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) -BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include +BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) + BITCOIN_INCLUDES += $(UNIVALUE_CFLAGS) LIBBITCOIN_SERVER=libbitcoin_server.a - LIBBITCOIN_WALLET=libbitcoin_wallet.a -@@ -30,10 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a +@@ -42,10 +42,16 @@ LIBBITCOIN_CLI=libbitcoin_cli.a + LIBBITCOIN_UTIL=libbitcoin_util.a LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a - LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a LIBBITCOINQT=qt/libbitcoinqt.a +if EMBEDDED_LIBSECP256K1 LIBSECP256K1=secp256k1/libsecp256k1.la @@ -210,7 +223,7 @@ index 1c2f770..4d60ddf 100644 # Make is not made aware of per-object dependencies to avoid limiting building parallelization # But to build the less dependent modules first, we manually select their order here: -@@ -63,8 +71,11 @@ if BUILD_BITCOIND +@@ -79,8 +85,11 @@ if BUILD_BITCOIND bin_PROGRAMS += bitcoind endif @@ -223,21 +236,18 @@ index 1c2f770..4d60ddf 100644 + bin_PROGRAMS += bitcoin-tx endif - .PHONY: FORCE + .PHONY: FORCE check-symbols check-security diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 0997148..14b4deb 100644 +index 6ef6a69..1b6e759 100644 --- a/src/Makefile.test.include +++ b/src/Makefile.test.include -@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE - bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) - -+if EMBEDDED_LIBSECP256K1 +@@ -127,7 +127,9 @@ bitcoin_test_clean : FORCE check-local: @echo "Running test/bitcoin-util-test.py..." $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py ++if EMBEDDED_LIBSECP256K1 $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check +endif - - %.json.h: %.json - @$(MKDIR_P) $(@D) + if EMBEDDED_UNIVALUE + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C univalue check + endif diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml index 7a8f5cb5bdcf..a686a21c5264 100644 --- a/dev-util/bitcoin-tx/metadata.xml +++ b/dev-util/bitcoin-tx/metadata.xml @@ -9,10 +9,9 @@ luke-jr+gentoobugs@utopios.org Luke Dashjr - - proxy-maint@gentoo.org - Proxy Maintainers - + + Enable Luke Dashjr's patches + bitcoin/bitcoin diff --git a/dev-util/byacc/byacc-20150711.ebuild b/dev-util/byacc/byacc-20150711.ebuild index b22167c79194..786210cfb5f7 100644 --- a/dev-util/byacc/byacc-20150711.ebuild +++ b/dev-util/byacc/byacc-20150711.ebuild @@ -10,7 +10,7 @@ SRC_URI="ftp://invisible-island.net/byacc/${P}.tgz" LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README ) diff --git a/dev-util/geany-plugins/geany-plugins-1.25.ebuild b/dev-util/geany-plugins/geany-plugins-1.25.ebuild index d12b742be04c..d1c15b0a74c3 100644 --- a/dev-util/geany-plugins/geany-plugins-1.25.ebuild +++ b/dev-util/geany-plugins/geany-plugins-1.25.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://plugins.geany.org/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86" IUSE="+autoclose +automark +commander ctags debugger +defineformat devhelp enchant git gpg gtkspell lua markdown multiterm nls +overview python scope soup webkit" LINGUAS="be ca da de es fr gl ja pt pt_BR ru tr zh_CN" diff --git a/dev-util/geany/geany-1.25.ebuild b/dev-util/geany/geany-1.25.ebuild index 9fad636508de..6d6d69a88e45 100644 --- a/dev-util/geany/geany-1.25.ebuild +++ b/dev-util/geany/geany-1.25.ebuild @@ -14,7 +14,7 @@ SRC_URI="http://download.geany.org/${P}.tar.bz2" LICENSE="GPL-2+ HPND" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux" IUSE="gtk3 +vte" RDEPEND=">=dev-libs/glib-2.28:2 diff --git a/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch new file mode 100644 index 000000000000..5916271b3a00 --- /dev/null +++ b/dev-util/oprofile/files/oprofile-1.0.0-athlon.patch @@ -0,0 +1,20 @@ +Fix AMD Athlon CPU family recognition. +See upstream bug 275 for details: +https://sourceforge.net/p/oprofile/bugs/275/ +--- oprofile-1.0.0/libop/op_cpu_type.c.orig 2014-09-12 18:39:47.000000000 +0400 ++++ oprofile-1.0.0/libop/op_cpu_type.c 2014-11-30 18:29:00.328342552 +0300 +@@ -538,10 +538,13 @@ + family = cpu_family(eax); + + /* These family does not exist in the past.*/ +- if (family < 0x0f || family == 0x13) ++ if ((family < 0x0f && family != 0x06) || family == 0x13) + return ret; + + switch (family) { ++ case 0x6: ++ ret = op_get_cpu_number("i386/athlon"); ++ break; + case 0x0f: + ret = op_get_cpu_number("x86-64/hammer"); + break; diff --git a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild index f4aae039acbb..2f76ec28245d 100644 --- a/dev-util/oprofile/oprofile-1.1.0-r1.ebuild +++ b/dev-util/oprofile/oprofile-1.1.0-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86" IUSE="java pch" RDEPEND=">=dev-libs/popt-1.7-r1 diff --git a/dev-util/pkgconf/pkgconf-0.9.12.ebuild b/dev-util/pkgconf/pkgconf-0.9.12.ebuild index e36a031ddde8..7ee43dedb5d2 100644 --- a/dev-util/pkgconf/pkgconf-0.9.12.ebuild +++ b/dev-util/pkgconf/pkgconf-0.9.12.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then else inherit eutils multilib-minimal SRC_URI="http://rabbit.dereferenced.org/~nenolod/distfiles/${P}.tar.bz2" - KEYWORDS="alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris ~x64-solaris" fi DESCRIPTION="pkg-config compatible replacement with no dependencies other than ANSI C89" diff --git a/dev-util/shards/Manifest b/dev-util/shards/Manifest index 687da2c0a7c2..73d6f4157437 100644 --- a/dev-util/shards/Manifest +++ b/dev-util/shards/Manifest @@ -1 +1,2 @@ DIST shards-0.6.1.tar.gz 26505 SHA256 8e7d179a499a2fca895b534c6204e2e34828e6a645e48f83f08fbefcd6a03951 SHA512 fc1e32cf459a5c448ef780601b9515cd331fc40d3f6f0666e71e218a62e202e0d4f642f5e82660529d24145a5ed5f5cbf2fdc6fc251421850d9c7ac1ebcf4d07 WHIRLPOOL 0bf8ef2de47b6dd6be728c489b7ac9ff8101a51329d956ac2d1ad21ac9322442646d624b5b6e9baee5f1738326e3a5e039b94b5057ce6a2a5223a04db226b5a6 +DIST shards-0.6.2.tar.gz 26589 SHA256 11d22086d736598efa87eea558e7b304d538372f017fce9bb21476e40c586110 SHA512 baeebe496ea52c93313e9a550a8f1dda225674ca49e9e2b2660b059a8e7cd6a148085d33d5c70a46d2d4c7db9260f841a634c079cc590576a6d98c9308fb1100 WHIRLPOOL 944c3265aab2a7dc2e9261f68ea250b77f16ce16dd8fead8521ae367edd41b7998b624db6b1526759da60b52f6a6f02d710f9657021dd4e9ea494248ab620b6d diff --git a/dev-util/shards/shards-0.6.2.ebuild b/dev-util/shards/shards-0.6.2.ebuild new file mode 100644 index 000000000000..c892d7713001 --- /dev/null +++ b/dev-util/shards/shards-0.6.2.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +DESCRIPTION="Dependency manager for the Crystal language" +HOMEPAGE="https://github.com/crystal-lang/shards" +SRC_URI="https://github.com/crystal-lang/shards/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" + +DEPEND=" + >dev-lang/crystal-0.11.1[yaml] +" +RDEPEND="${DEPEND}" + +src_install() { + dobin bin/${PN} + dodoc README.md +} diff --git a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild index b622706549ca..1b022ddb5ea9 100644 --- a/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild +++ b/dev-util/universalindentgui/universalindentgui-1.2.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -30,7 +30,7 @@ RDEPEND="${DEPEND} app-text/htmltidy perl? ( dev-lang/perl ) ) - perl? ( dev-perl/perltidy ) + perl? ( dev-perl/Perl-Tidy ) php? ( dev-php/PEAR-PHP_Beautifier ) ruby? ( dev-lang/ruby ) xml? ( dev-util/xmlindent ) diff --git a/dev-util/vdkbuilder/Manifest b/dev-util/vdkbuilder/Manifest deleted file mode 100644 index d6100bb18d98..000000000000 --- a/dev-util/vdkbuilder/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST vdkbuilder2-2.4.0.tar.gz 1079112 SHA256 549a298214f314933d7b8d0e7785c98a388faad3ea0725a0dffc08d660174381 SHA512 9a40c7c4ea17aaa565cd2a3d8392f11d2cd336e7361134ea9f2a8b12bf6ee888f6e02daec60dbc0f80b37defb08eef54edf9547f209d8ddd43388c9bc514ff33 WHIRLPOOL 8d3cf5827c94e59bf0b9944ab4e4f7acba66b9962f58b602a79d2983349fae92e5e6a3ff623d59a7d691dfb8f03ce2f8731316bb401ad8d204525fffef0116ec -DIST vdkbuilder2-2.5.0.tar.gz 1159849 SHA256 75053fa125b203e1aa4143eba8dd74698286eeb2458e52fa20c68c822c0640b4 SHA512 b100d433e0c8addafcece943a9da05c48985b18dfc7154df203fb0a2befbfa7caca42bd6ac4f764d66685dbaeb11916ae777da07d0b5e413a577bd764bcc4281 WHIRLPOOL a5116067491ebdbb6fcb622f7ed0de4c044adc4ede00e5f0cfdead013f2d1e55ac4c91b3bf46397bf925475399de9c979449a9638daf594e6a8293952b1df82c diff --git a/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch b/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch deleted file mode 100644 index 4b0dc099607c..000000000000 --- a/dev-util/vdkbuilder/files/vdkbuilder-2.4.0-make-382.patch +++ /dev/null @@ -1,23 +0,0 @@ -http://bugs.gentoo.org/334847 - ---- intl/Makefile.in -+++ intl/Makefile.in -@@ -202,12 +202,12 @@ - # The dependency for intlh.inst is different in gettext and all other - # packages. Because we cannot you GNU make features we have to solve - # the problem while rewriting Makefile.in. --@GT_YES@intlh.inst: intlh.inst.in ../config.status --@GT_YES@ cd .. \ --@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ --@GT_YES@ $(SHELL) ./config.status --@GT_NO@.PHONY: intlh.inst --@GT_NO@intlh.inst: -+intlh.inst: intlh.inst.in ../config.status -+ cd .. \ -+ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -+ $(SHELL) ./config.status -+.PHONY: intlh.inst -+intlh.inst: - - # Tell versions [3.59,3.63) of GNU make not to export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild deleted file mode 100644 index 0c7ceebffeed..000000000000 --- a/dev-util/vdkbuilder/vdkbuilder-2.4.0.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -inherit eutils - -MY_P=${PN}2-${PV} - -DESCRIPTION="The Visual Development Kit used for VDK Builder" -HOMEPAGE="http://vdkbuilder.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS=" ppc x86" -IUSE="nls debug" - -RDEPEND=">=dev-libs/vdk-2.4.0" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -custom_cflags() { - for files in * - do - if [ -e ${files}/Makefile ] - then - sed -e "s/CFLAGS = .*/CFLAGS = ${CFLAGS} -I../include/" -i ${files}/Makefile - sed -e "s/CXXFLAGS = .*/CFLAGS = ${CXXFLAGS} -I../include/" -i ${files}/Makefile - fi - done -} - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}"/${P}-make-382.patch -} - -src_compile() { - local myconf="" - - use debug \ - && myconf="${myconf} --enable-devel=yes" \ - || myconf="${myconf} --enable-devel=no" - - econf \ - $(use_enable nls) \ - --disable-vdktest \ - ${myconf} || die "econf failed" - - custom_cflags - - emake -j1 || die -} - -src_install () { - einstall || die - dodoc AUTHORS BUGS ChangeLog NEWS README TODO -} diff --git a/dev-util/vdkbuilder/vdkbuilder-2.5.0.ebuild b/dev-util/vdkbuilder/vdkbuilder-2.5.0.ebuild deleted file mode 100644 index f59bf8453d8a..000000000000 --- a/dev-util/vdkbuilder/vdkbuilder-2.5.0.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit eutils autotools - -MY_P=${PN}2-${PV} - -DESCRIPTION="The Visual Development Kit used for VDK Builder" -HOMEPAGE="http://vdkbuilder.sf.net" -SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS=" ~amd64 ~ppc ~x86" -IUSE="nls debug" - -RDEPEND=">=dev-libs/vdk-2.5.0" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${MY_P} - -custom_cflags() { - for files in * - do - if [ -e ${files}/Makefile ] - then - sed -e "s/CFLAGS = .*/CFLAGS = ${CFLAGS} -I../include/" -i ${files}/Makefile - sed -e "s/CXXFLAGS = .*/CFLAGS = ${CXXFLAGS} -I../include/" -i ${files}/Makefile - fi - done -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-2.4.0-make-382.patch || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die - eautoreconf -} - -src_configure() { - eautoreconf - - local myconf="" - - use debug \ - && myconf="${myconf} --enable-devel=yes" \ - || myconf="${myconf} --enable-devel=no" - - econf \ - $(use_enable nls) \ - --disable-vdktest \ - ${myconf} || die "econf failed" - - custom_cflags -} - -src_compile() { - emake -j1 || die -} - -src_install () { - einstall || die - dodoc AUTHORS BUGS ChangeLog NEWS README TODO -} diff --git a/dev-vcs/git/git-2.7.3-r1.ebuild b/dev-vcs/git/git-2.7.3-r1.ebuild index 0ea82232cb5f..d2a90eab46f2 100644 --- a/dev-vcs/git/git-2.7.3-r1.ebuild +++ b/dev-vcs/git/git-2.7.3-r1.ebuild @@ -34,7 +34,7 @@ if [[ ${PV} != *9999 ]]; then ${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} ${SRC_URI_GOOG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX} )" - KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" fi LICENSE="GPL-2" diff --git a/dev-vcs/gitsh/Manifest b/dev-vcs/gitsh/Manifest index 339f895b44be..df7028e59d8f 100644 --- a/dev-vcs/gitsh/Manifest +++ b/dev-vcs/gitsh/Manifest @@ -1,2 +1 @@ DIST gitsh-0.10.tar.gz 57550 SHA256 a5b07c44d68700c6e41681c838625650dbe1313f2bbe0976a3ee30086b4d5f93 SHA512 e51858c62e31e6b3644fb7239e6ffb7e8ffc7dd9983d67f792f739fd3459a8741d29f67709738127754454ff1e0f87014f8eb77cfd506cc5d32c5d9c719b2b16 WHIRLPOOL daac99aa5fef26652e606de5039e00be0d25579c3045e9eb5f4c2195ae34ec038408e29f8c55fdde7b9bef7ad1b3aab31aade2e5a03b60a8bbe46ccd0cf515b1 -DIST gitsh-0.8.tar.gz 48393 SHA256 61125105819f8b10005ed41ed334ab2ad6104a8dba799090b0827b72075b1665 SHA512 9ec115f0e71e3708245b11cef0c853446b2e774c30372b5516a239e9db03937d9cde1d1525ca1812759b5c3d59101179490691756a84478ebd8667268beeb8ae WHIRLPOOL 9b0368091ffe59191eff481073b9fa06172d39f2a14076ff03866767349daf0fb3e1de62d7d176bd88efefaceecf68eec607b0ec72a86b1709c8ae9f71f3a96e diff --git a/dev-vcs/gitsh/gitsh-0.10.ebuild b/dev-vcs/gitsh/gitsh-0.10.ebuild index 7f7c2fd54310..1c044e90c355 100644 --- a/dev-vcs/gitsh/gitsh-0.10.ebuild +++ b/dev-vcs/gitsh/gitsh-0.10.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -USE_RUBY="ruby19 ruby20 ruby21" +USE_RUBY="ruby20 ruby21" RUBY_FAKEGEM_EXTRADOC="README.md" diff --git a/dev-vcs/gitsh/gitsh-0.8.ebuild b/dev-vcs/gitsh/gitsh-0.8.ebuild deleted file mode 100644 index 4e18b0440029..000000000000 --- a/dev-vcs/gitsh/gitsh-0.8.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_RUBY="ruby19 ruby20 ruby21" - -RUBY_FAKEGEM_EXTRADOC="README.md" - -inherit autotools ruby-fakegem - -DESCRIPTION="An interactive shell for git" -HOMEPAGE="https://github.com/thoughtbot/gitsh" -SRC_URI="https://github.com/thoughtbot/gitsh/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -SLOT="0" -LICENSE="BSD" -KEYWORDS="~amd64 ~amd64-linux" -IUSE="" - -ruby_add_rdepend " - dev-ruby/bundler - dev-ruby/blankslate:2 - dev-ruby/metaclass - dev-ruby/bourne - dev-ruby/coderay - dev-ruby/diff-lcs - dev-ruby/method_source - dev-ruby/mocha:0.14 - dev-ruby/parslet - dev-ruby/pry - dev-ruby/slop:3 - dev-ruby/rspec:2 - " - -DOCS="README.md" - -each_ruby_prepare() { - rm Gemfile.lock || die - eautoreconf -} - -each_ruby_configure() { - default -} - -each_ruby_compile() { - default -} diff --git a/eclass/bitcoincore.eclass b/eclass/bitcoincore.eclass index 0362c8cdcf26..4a4f33d33806 100644 --- a/eclass/bitcoincore.eclass +++ b/eclass/bitcoincore.eclass @@ -70,11 +70,14 @@ MyP="${MyPN}-${MyPV}" DOCS="${DOCS} doc/README.md doc/release-notes.md" OPENSSL_DEPEND="dev-libs/openssl:0[-bindist]" WALLET_DEPEND="sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]" +LIBEVENT_DEPEND="" +UNIVALUE_DEPEND="" +BITCOINCORE_LJR_NAME=ljr [ -n "${BITCOINCORE_LJR_PV}" ] || BITCOINCORE_LJR_PV="${PV}" case "${PV}" in 0.10*) - BITCOINCORE_SERIES="0.10.x" + BITCOINCORE_MINOR=10 LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20141212" case "${PVR}" in 0.10.2) @@ -89,7 +92,7 @@ case "${PV}" in BITCOINCORE_XT_DIFF="047a89831760ff124740fe9f58411d57ee087078...d4084b62c42c38bfe302d712b98909ab26ecce2f" ;; 0.11*) - BITCOINCORE_SERIES="0.11.x" + BITCOINCORE_MINOR=11 LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20150423" # RBF is bundled with ljr patchset since 0.11.1 if [ "${PVR}" = "0.11.0" ]; then @@ -97,21 +100,55 @@ case "${PV}" in BITCOINCORE_RBF_PATCHFILE="${MyPN}-rbf-v0.11.0rc3.patch" fi ;; +0.12*) + BITCOINCORE_MINOR=12 + IUSE="${IUSE} libressl" + OPENSSL_DEPEND="!libressl? ( dev-libs/openssl:0[-bindist] ) libressl? ( dev-libs/libressl )" + if in_bcc_iuse libevent; then + LIBEVENT_DEPEND="libevent? ( dev-libs/libevent )" + else + LIBEVENT_DEPEND="dev-libs/libevent" + fi + LIBSECP256K1_DEPEND="=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]" + UNIVALUE_DEPEND="dev-libs/univalue" + BITCOINCORE_LJR_NAME=knots + if in_bcc_policy spamfilter; then + REQUIRED_USE="${REQUIRED_USE} bitcoin_policy_spamfilter? ( ljr )" + fi + ;; 9999*) + BITCOINCORE_MINOR=9999 BITCOINCORE_SERIES="9999" + LIBEVENT_DEPEND="dev-libs/libevent" LIBSECP256K1_DEPEND=">dev-libs/libsecp256k1-0.0.0_pre20150422" + UNIVALUE_DEPEND="dev-libs/univalue" ;; *) die "Unrecognised version" ;; esac -LJR_PV() { echo "${BITCOINCORE_LJR_PV}.${1}${BITCOINCORE_LJR_DATE}"; } +[ -n "${BITCOINCORE_SERIES}" ] || BITCOINCORE_SERIES="0.${BITCOINCORE_MINOR}.x" + +LJR_PV() { + local testsfx= + if [ -n "${BITCOINCORE_LJR_PREV}" ]; then + if [ "$1" = "dir" ]; then + testsfx="/test/${BITCOINCORE_LJR_PREV}" + else + testsfx=".${BITCOINCORE_LJR_PREV}" + fi + fi + echo "${BITCOINCORE_LJR_PV}.${BITCOINCORE_LJR_NAME}${BITCOINCORE_LJR_DATE}${testsfx}" +} LJR_PATCHDIR="${MyPN}-$(LJR_PV ljr).patches" LJR_PATCH() { echo "${WORKDIR}/${LJR_PATCHDIR}/${MyPN}-$(LJR_PV ljr).$@.patch"; } LJR_PATCH_DESC="http://luke.dashjr.org/programs/${MyPN}/files/${MyPN}d/luke-jr/${BITCOINCORE_SERIES}/$(LJR_PV ljr)/${MyPN}-$(LJR_PV ljr).desc.txt" +if [ "$BITCOINCORE_MINOR" -ge 12 ]; then + LJR_PATCH_DESC="http://bitcoinknots.org/files/${BITCOINCORE_SERIES}/$(LJR_PV dir)/${MyPN}-$(LJR_PV).desc.txt" +fi -HOMEPAGE="https://github.com/bitcoin/bitcoin" +HOMEPAGE="http://bitcoincore.org/" if [ -z "$BITCOINCORE_COMMITHASH" ]; then EGIT_PROJECT='bitcoin' @@ -119,7 +156,10 @@ if [ -z "$BITCOINCORE_COMMITHASH" ]; then else SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}${BITCOINCORE_SRC_SUFFIX}.tgz" if [ -z "${BITCOINCORE_NO_SYSLIBS}" ]; then - SRC_URI="${SRC_URI} http://luke.dashjr.org/programs/${MyPN}/files/${MyPN}d/luke-jr/${BITCOINCORE_SERIES}/$(LJR_PV ljr)/${LJR_PATCHDIR}.txz -> ${LJR_PATCHDIR}.tar.xz" + SRC_URI="${SRC_URI} http://bitcoinknots.org/files/${BITCOINCORE_SERIES}/$(LJR_PV dir)/${LJR_PATCHDIR}.txz -> ${LJR_PATCHDIR}.tar.xz" + fi + if in_bcc_iuse addrindex; then + SRC_URI="${SRC_URI} addrindex? ( https://github.com/btcdrak/bitcoin/compare/${BITCOINCORE_ADDRINDEX_DIFF}.diff -> ${BITCOINCORE_ADDRINDEX_PATCHFILE} )" fi if in_bcc_iuse xt; then BITCOINXT_PATCHFILE="${MyPN}xt-v${PV}.patch" @@ -152,11 +192,17 @@ fi BITCOINCORE_COMMON_DEPEND=" ${OPENSSL_DEPEND} " +if ! has libevent ${BITCOINCORE_NO_DEPEND}; then + BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} ${LIBEVENT_DEPEND}" +fi if [ "${BITCOINCORE_NEED_LIBSECP256K1}" = "1" ]; then BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} $LIBSECP256K1_DEPEND" fi -if [ "${PN}" != "libbitcoinconsensus" ]; then - BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} >=dev-libs/boost-1.52.0[threads(+)]" +if [ "${PN}" != "libbitcoinconsensus" ] && ! use_if_iuse test; then + BITCOINCORE_COMMON_DEPEND="${BITCOINCORE_COMMON_DEPEND} + ${UNIVALUE_DEPEND} + >=dev-libs/boost-1.52.0[threads(+)] + " fi bitcoincore_common_depend_use() { in_bcc_iuse "$1" || return @@ -173,8 +219,12 @@ DEPEND="${DEPEND} ${BITCOINCORE_COMMON_DEPEND} if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then RDEPEND="${RDEPEND} virtual/bitcoin-leveldb" fi -if in_bcc_iuse ljr && [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then - DEPEND="${DEPEND} ljr? ( dev-vcs/git )" +if in_bcc_iuse ljr; then + if [ "$BITCOINCORE_SERIES" = "0.10.x" ]; then + DEPEND="${DEPEND} ljr? ( dev-vcs/git )" + elif [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then + DEPEND="${DEPEND} ljr? ( dev-lang/perl )" + fi fi bitcoincore_policymsg() { @@ -190,9 +240,12 @@ bitcoincore_policymsg() { bitcoincore_pkg_pretend() { bitcoincore_policymsg_flag=false - if use_if_iuse ljr || use_if_iuse 1stclassmsg || use_if_iuse xt || use_if_iuse zeromq; then + if use_if_iuse ljr || use_if_iuse 1stclassmsg || use_if_iuse addrindex || use_if_iuse xt || { use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; }; then einfo "Extra functionality improvements to Bitcoin Core are enabled." bitcoincore_policymsg_flag=true + if use_if_iuse addrindex addrindex; then + einfo "Please be aware that the addrindex functionality is known to be unreliable." + fi fi bitcoincore_policymsg cltv \ "CLTV policy is enabled: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions." \ @@ -212,6 +265,37 @@ bitcoincore_pkg_pretend() { $bitcoincore_policymsg_flag && einfo "For more information on any of the above, see ${LJR_PATCH_DESC}" } +bitcoincore_git_apply() { + local patchfile="$1" + einfo "Applying ${patchfile##*/} ..." + git apply --whitespace=nowarn "${patchfile}" || die +} + +bitcoincore_predelete_patch() { + local patchfile="$1" + mkdir -p "${WORKDIR}/pdp" + local tmpfile="${WORKDIR}/pdp/${patchfile##*/}" + perl -ne ' + newline: + if (m[(^diff .* b/(.*)$)]) { + $a = "$1\n"; + $f = $2; + $_ = <>; + if (m[^deleted file]) { + unlink($f) || die; + while (!m[^diff ]) { + $_ = <> + } + goto newline + } else { + print($a) + } + } + print + ' <"${patchfile}" >"${tmpfile}" || die + epatch "${tmpfile}" +} + bitcoincore_prepare() { local mypolicy if [ -n "${BITCOINCORE_NO_SYSLIBS}" ]; then @@ -222,11 +306,13 @@ bitcoincore_prepare() { epatch "$(LJR_PATCH syslibs)" fi if use_if_iuse ljr; then - if [ "${BITCOINCORE_SERIES}" = "0.10.x" ]; then + if [ "${BITCOINCORE_LJR_NAME}" = "knots" ]; then + epatch "$(LJR_PATCH f)" + bitcoincore_predelete_patch "$(LJR_PATCH branding)" + epatch "$(LJR_PATCH ts)" + elif [ "${BITCOINCORE_SERIES}" = "0.10.x" ]; then # Regular epatch won't work with binary files - local patchfile="$(LJR_PATCH ljrF)" - einfo "Applying ${patchfile##*/} ..." - git apply --whitespace=nowarn "${patchfile}" || die + bitcoincore_git_apply "$(LJR_PATCH ljrF)" else epatch "$(LJR_PATCH ljrF)" fi @@ -234,12 +320,30 @@ bitcoincore_prepare() { if use_if_iuse 1stclassmsg; then epatch "$(LJR_PATCH 1stclassmsg)" fi + if use_if_iuse addrindex; then + epatch "${DISTDIR}/${BITCOINCORE_ADDRINDEX_PATCHFILE}" + fi if use_if_iuse xt; then epatch "${DISTDIR}/${BITCOINXT_PATCHFILE}" fi - use_if_iuse zeromq && epatch "$(LJR_PATCH zeromq)" + { use_if_iuse zeromq && [ "${BITCOINCORE_MINOR}" -lt 12 ]; } && epatch "$(LJR_PATCH zeromq)" for mypolicy in ${BITCOINCORE_POLICY_PATCHES}; do mypolicy="${mypolicy#[-+]}" + + if [ "${BITCOINCORE_MINOR}" -ge 12 ]; then + case "${mypolicy}" in + rbf) + use bitcoin_policy_rbf || sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/main.h + ;; + spamfilter) + use bitcoin_policy_spamfilter || sed -i 's/\(DEFAULT_SPAMFILTER = \)true/\1false/' src/main.h + ;; + *) + die "Unknown policy ${mypolicy}" + esac + continue + fi + use bitcoin_policy_${mypolicy} || continue case "${mypolicy}" in rbf) @@ -284,19 +388,29 @@ bitcoincore_conf() { else my_econf="${my_econf} --disable-wallet" fi + if ! use_if_iuse zeromq; then + # NOTE: Older (pre-0.12) patches would disable ZMQ if --enable-zmq was passed + my_econf="${my_econf} --disable-zmq" + fi if [ -z "${BITCOINCORE_NO_SYSLIBS}" ]; then my_econf="${my_econf} --disable-util-cli --disable-util-tx" else my_econf="${my_econf} --without-utils" fi + # Knots 0.12.0 errors if --with-libevent used for bitcoin{d,-cli}, so only disable it when not wanted + if has libevent ${BITCOINCORE_NO_DEPEND} || { in_bcc_iuse libevent && ! use libevent; }; then + my_econf="${my_econf} --without-libevent" + fi if [ "${BITCOINCORE_NEED_LEVELDB}" = "1" ]; then # Passing --with-system-leveldb fails if leveldb is not installed, so only use it for targets that use LevelDB my_econf="${my_econf} --with-system-leveldb" fi econf \ + --disable-bench \ --disable-ccache \ --disable-static \ --with-system-libsecp256k1 \ + --with-system-univalue \ --without-libs \ --without-daemon \ --without-gui \ diff --git a/eclass/toolchain.eclass b/eclass/toolchain.eclass index 7dade5cf192c..03e550dd6f72 100644 --- a/eclass/toolchain.eclass +++ b/eclass/toolchain.eclass @@ -1684,10 +1684,12 @@ toolchain_src_install() { ln -sf ${CTARGET}-${x} ${CTARGET}-${x}-${GCC_CONFIG_VER} fi done - # Clear out the main go binaries as we don't want to clobber dev-lang/go + # Rename the main go binaries as we don't want to clobber dev-lang/go # when gcc-config runs. #567806 if tc_version_is_at_least 5 && is_go ; then - rm -f go gofmt + for x in go gofmt; do + mv ${x} ${x}-${GCCMAJOR} || die + done fi # Now do the fun stripping stuff diff --git a/eclass/unpacker.eclass b/eclass/unpacker.eclass index 7ff00685648f..610765fbca8e 100644 --- a/eclass/unpacker.eclass +++ b/eclass/unpacker.eclass @@ -440,6 +440,9 @@ unpacker_src_uri_depends() { case ${uri} in *.cpio.*|*.cpio) d="app-arch/cpio" ;; + *.deb) + # platforms like AIX don't have a good ar + d="kernel_AIX? ( app-arch/deb2targz )" ;; *.rar|*.RAR) d="app-arch/unrar" ;; *.7z) diff --git a/games-action/atanks/Manifest b/games-action/atanks/Manifest index 69dc222c227d..7563b2fbe0ef 100644 --- a/games-action/atanks/Manifest +++ b/games-action/atanks/Manifest @@ -1,2 +1 @@ -DIST atanks-6.1.tar.gz 2786775 SHA256 116f5160b61116729d655a9c9110a6e358e8c45b696ed0e9c347bf89ab4afaab SHA512 1463455afcd67d042fda964f9c8b0caa9627611e758cb3badb5f8080b84644ec3452b78f2160d967ed9ebf427f426594fd0c6ee661fe48a731fcee85f14a3adb WHIRLPOOL d803d6885f185e4f5645a57b1be67a918b2682f74d725b891a057b2b4be23c90507202c314c22db553f2b0593df1dace498aff5ad44a678c1f4adcfc89be22f9 DIST atanks-6.4.tar.gz 6059315 SHA256 ea5b560fb15872f7329a1f70d749c93cf553eeaa02480108e95c1664b85f049f SHA512 e9410e5bf0e8ec0281718ad8ddca74b67000db96b09b6af8aa906bbf2cd815f07ff550087ecdee2e4c5bfabc42941f184173f35e50538e57bb008372a599e1e6 WHIRLPOOL 25b59cf4592f526cdfbac4cc26b386571e658c8d0493a49790ffbfffe15d16b2796bf7a6684cdb9fad6de9c46d9ed544991469c3cf88a4ec24e4ba2d27c7db3e diff --git a/games-action/atanks/atanks-6.1.ebuild b/games-action/atanks/atanks-6.1.ebuild deleted file mode 100644 index ea1acef41d3c..000000000000 --- a/games-action/atanks/atanks-6.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils gnome2-utils games - -DESCRIPTION="Worms and Scorched Earth-like game" -HOMEPAGE="http://atanks.sourceforge.net/" -SRC_URI="mirror://sourceforge/atanks/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -DEPEND="media-libs/allegro:0[X]" -RDEPEND=${DEPEND} - -src_prepare() { - find . -type f -name ".directory" -exec rm -vf '{}' + -} - -src_compile() { - emake \ - BINDIR="${GAMES_BINDIR}" \ - INSTALLDIR="${GAMES_DATADIR}/${PN}" -} - -src_install() { - dogamesbin ${PN} - insinto "${GAMES_DATADIR}"/${PN} - doins -r button misc missile sound stock tank tankgun text title unicode.dat *.txt - doicon -s 48 ${PN}.png - make_desktop_entry atanks "Atomic Tanks" - dodoc Changelog README TODO - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-action/openclonk/Manifest b/games-action/openclonk/Manifest index 12525dde0832..2a7482506956 100644 --- a/games-action/openclonk/Manifest +++ b/games-action/openclonk/Manifest @@ -1,2 +1 @@ -DIST openclonk-6.1-src.tar.bz2 68861317 SHA256 5c3903f82c9d7e8c466ab1ff594d553911a6e5fa0be2a326684d823ef1c24905 SHA512 2705a34e797e8352c2f480c57f1c8131a4e2c71bec3ac353d1cdbca6976e7b9e4722ed171b67c03f958eecedbe43b2751be843d7fcc460c2ee65fd035bc6bb4a WHIRLPOOL 3cb05e758c91ec963f198dbe2fbdb117641628ccd139ad787e55a1b57a93719e2d4b655758cbcbf8f42a5391b09282488133febd7f9400e51587291f72126136 DIST openclonk-7.0-src.tar.bz2 102143348 SHA256 bc1a231d72774a7aa8819e54e1f79be27a21b579fb057609398f2aa5700b0732 SHA512 b7ea557b5441986c0527abcb9c074c462f73bf45dd7ac4835329169d63ace5cc02e122d0dee7241da8621a7727ce9b09a2ad17e06dfc5610fcb529d350a51577 WHIRLPOOL 62619fa9b9071cdeff4b37dea703e822580a029d1a9193477117fc7426f47a999e4a1827775c5a215e1f7e7d786467fb9f4c6bea81e4ad9740f32df989d533b0 diff --git a/games-action/openclonk/files/openclonk-6.1-dedicated.patch b/games-action/openclonk/files/openclonk-6.1-dedicated.patch deleted file mode 100644 index 588e14ae422a..000000000000 --- a/games-action/openclonk/files/openclonk-6.1-dedicated.patch +++ /dev/null @@ -1,1073 +0,0 @@ -From 652c7e43e23652fb8bf05b4b57e6db36b0eb765c Mon Sep 17 00:00:00 2001 -From: Nicolas Hake -Date: Wed, 17 Jun 2015 21:30:56 +0200 -Subject: [PATCH] Fix headless build - -Several rendering changes have resulted in a non-rendering build that -failed to build from source. Dummy out all of these functions to make it -work again. - -Cherry-picked. -Author: Nicolas Hake -Date: Wed Jun 17 21:30:56 2015 +0200 -Conflicts: - src/lib/StdMesh.h ---- - src/graphics/C4DrawT.cpp | 2 +- - src/graphics/C4DrawT.h | 6 +++++- - src/graphics/C4GraphicsResource.cpp | 2 ++ - src/graphics/C4Shader.cpp | 21 +++++++++++++++++-- - src/graphics/C4Shader.h | 37 +++++++++++++++++++++++++++++---- - src/landscape/fow/C4FoW.cpp | 14 +++++++++++++ - src/landscape/fow/C4FoW.h | 2 ++ - src/landscape/fow/C4FoWAmbient.cpp | 13 ++++++++++-- - src/landscape/fow/C4FoWAmbient.h | 2 ++ - src/landscape/fow/C4FoWBeam.cpp | 6 +++++- - src/landscape/fow/C4FoWBeam.h | 5 ++++- - src/landscape/fow/C4FoWDrawStrategy.cpp | 4 ++++ - src/landscape/fow/C4FoWDrawStrategy.h | 4 ++++ - src/landscape/fow/C4FoWLight.cpp | 5 +++++ - src/landscape/fow/C4FoWLight.h | 6 +++++- - src/landscape/fow/C4FoWLightSection.cpp | 5 +++++ - src/landscape/fow/C4FoWLightSection.h | 6 +++++- - src/landscape/fow/C4FoWRegion.cpp | 12 +++++++++-- - src/landscape/fow/C4FoWRegion.h | 5 ++++- - src/lib/StdMesh.cpp | 35 +++++++++++++++++++++++++++++-- - src/lib/StdMesh.h | 6 +++++- - src/lib/StdMeshMaterial.cpp | 19 ++++++++++++++++- - src/object/C4Def.cpp | 2 ++ - 23 files changed, 198 insertions(+), 21 deletions(-) - -diff --git a/src/graphics/C4DrawT.cpp b/src/graphics/C4DrawT.cpp -index 694dd98..69b93e4 100644 ---- a/src/graphics/C4DrawT.cpp -+++ b/src/graphics/C4DrawT.cpp -@@ -22,7 +22,7 @@ CStdNoGfx::CStdNoGfx() - Default(); - } - --bool CStdNoGfx::CreatePrimarySurfaces(bool Fullscreen, unsigned int iXRes, unsigned int iYRes, int iColorDepth, unsigned int iMonitor) -+bool CStdNoGfx::CreatePrimarySurfaces(unsigned int iXRes, unsigned int iYRes, int iColorDepth, unsigned int iMonitor) - { - Log("Graphics disabled."); - // Save back color depth -diff --git a/src/graphics/C4DrawT.h b/src/graphics/C4DrawT.h -index b7b7e97..519ba95 100644 ---- a/src/graphics/C4DrawT.h -+++ b/src/graphics/C4DrawT.h -@@ -41,8 +41,12 @@ public: - virtual bool InvalidateDeviceObjects() { return true; } - virtual bool DeleteDeviceObjects() { return true; } - virtual bool DeviceReady() { return true; } -- virtual bool CreatePrimarySurfaces(bool, unsigned int, unsigned int, int, unsigned int); -+ virtual bool CreatePrimarySurfaces(unsigned int, unsigned int, int, unsigned int); - virtual bool SetOutputAdapter(unsigned int) { return true; } -+ -+ virtual void PerformMultiPix(C4Surface *, const C4BltVertex *, unsigned int) {} -+ virtual void PerformMultiLines(C4Surface *, const C4BltVertex *, unsigned int, float) {} -+ virtual void PerformMultiTris(C4Surface *, const C4BltVertex *, unsigned int, const C4BltTransform *, C4TexRef *, C4TexRef *, C4TexRef *, DWORD) {} - }; - - #endif -diff --git a/src/graphics/C4GraphicsResource.cpp b/src/graphics/C4GraphicsResource.cpp -index 774fd39..f55b22f 100644 ---- a/src/graphics/C4GraphicsResource.cpp -+++ b/src/graphics/C4GraphicsResource.cpp -@@ -186,6 +186,7 @@ bool C4GraphicsResource::Init() - return false; - } - -+#ifndef USE_CONSOLE - // Pre-load all shader files - Files.PreCacheEntries(C4CFN_ShaderFiles); - if (!pGL->InitShaders(&Files)) -@@ -193,6 +194,7 @@ bool C4GraphicsResource::Init() - LogFatal(LoadResStr("IDS_ERR_GFX_INITSHADERS")); - return false; - } -+#endif - - Game.SetInitProgress(11.0f); - ProgressStart = 12.0f; ProgressIncrement = 0.35f; // TODO: This should be changed so that it stops at 25%, no matter how many graphics we load. -diff --git a/src/graphics/C4Shader.cpp b/src/graphics/C4Shader.cpp -index 32de995..bec53b5 100644 ---- a/src/graphics/C4Shader.cpp -+++ b/src/graphics/C4Shader.cpp -@@ -39,8 +39,10 @@ C4ShaderPosName C4SH_PosNames[] = { - - C4Shader::C4Shader() - : iTexCoords(0) -+#ifndef USE_CONSOLE - , hVert(0), hFrag(0), hProg(0) - , pUniforms(NULL) -+#endif - { - - } -@@ -260,6 +262,7 @@ void C4Shader::AddVertexDefaults() - AddVertexSlice(C4Shader_Vertex_PositionPos, "gl_Position = ftransform();\n"); - } - -+#ifndef USE_CONSOLE - GLenum C4Shader::AddTexCoord(const char *szName) - { - // Make sure we have enough space -@@ -275,6 +278,7 @@ GLenum C4Shader::AddTexCoord(const char *szName) - - return GL_TEXTURE0 + iTexCoords++; - } -+#endif - - void C4Shader::ClearSlices() - { -@@ -285,6 +289,7 @@ void C4Shader::ClearSlices() - - void C4Shader::Clear() - { -+#ifndef USE_CONSOLE - if (!hProg) return; - // Need to be detached, then deleted - glDetachObjectARB(hProg, hFrag); -@@ -296,11 +301,12 @@ void C4Shader::Clear() - // Clear uniform data - delete[] pUniforms; pUniforms = NULL; - iUniformCount = 0; -+#endif - } - - bool C4Shader::Init(const char *szWhat, const char **szUniforms) - { -- -+#ifndef USE_CONSOLE - // No support? - if(!GLEW_ARB_fragment_program) - { -@@ -310,6 +316,7 @@ bool C4Shader::Init(const char *szWhat, const char **szUniforms) - - // Clear old shader first - if (hProg) Clear(); -+#endif - - // Dump - if (C4Shader::IsLogging()) -@@ -320,6 +327,7 @@ bool C4Shader::Init(const char *szWhat, const char **szUniforms) - ShaderLog(Build(FragmentSlices, true).getData()); - } - -+#ifndef USE_CONSOLE - // Attempt to create shaders - StdStrBuf VertexShader = Build(VertexSlices), - FragmentShader = Build(FragmentSlices); -@@ -363,6 +371,7 @@ bool C4Shader::Init(const char *szWhat, const char **szUniforms) - // because the respective uniforms got optimized out! - for (int i = 0; i < iUniformCount; i++) - pUniforms[i] = glGetUniformLocationARB(hProg, szUniforms[i]); -+#endif - - return true; - } -@@ -420,9 +429,13 @@ StdStrBuf C4Shader::Build(const ShaderSliceList &Slices, bool fDebug) - // At the start of the shader set the #version and number of - // available uniforms - StdStrBuf Buf; -+#ifndef USE_CONSOLE - GLint iMaxFrags = 0, iMaxVerts = 0; - glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB, &iMaxFrags); - glGetIntegerv(GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB, &iMaxVerts); -+#else -+ int iMaxFrags = INT_MAX, iMaxVerts = INT_MAX; -+#endif - Buf.Format("#version %d\n" - "#define MAX_FRAGMENT_UNIFORM_COMPONENTS %d\n" - "#define MAX_VERTEX_UNIFORM_COMPONENTS %d\n", -@@ -468,6 +481,7 @@ StdStrBuf C4Shader::Build(const ShaderSliceList &Slices, bool fDebug) - return Buf; - } - -+#ifndef USE_CONSOLE - GLhandleARB C4Shader::Create(GLenum iShaderType, const char *szWhat, const char *szShader) - { - // Create shader -@@ -515,9 +529,11 @@ int C4Shader::GetObjectStatus(GLhandleARB hObj, GLenum type) - glGetObjectParameterivARB(hObj, type, &iStatus); - return iStatus; - } -+#endif - - bool C4Shader::IsLogging() { return !!Application.isEditor; } - -+#ifndef USE_CONSOLE - GLint C4ShaderCall::AllocTexUnit(int iUniform, GLenum iType) - { - // Want to bind uniform automatically? If not, the caller will take -@@ -550,7 +566,6 @@ void C4ShaderCall::Start() - // Activate shader - glUseProgramObjectARB(pShader->hProg); - fStarted = true; -- - } - - void C4ShaderCall::Finish() -@@ -569,3 +584,5 @@ void C4ShaderCall::Finish() - iUnits = 0; - fStarted = false; - } -+ -+#endif -diff --git a/src/graphics/C4Shader.h b/src/graphics/C4Shader.h -index 53e38cc..c988d90 100644 ---- a/src/graphics/C4Shader.h -+++ b/src/graphics/C4Shader.h -@@ -68,11 +68,13 @@ private: - // Used texture coordinates - int iTexCoords; - -+#ifndef USE_CONSOLE - // shaders - GLhandleARB hVert, hFrag, hProg; - // shader variables - int iUniformCount; - GLint *pUniforms; -+#endif - - public: - enum VertexAttribIndex -@@ -93,15 +95,35 @@ public: - VAI_BoneIndicesMax = VAI_BoneIndices + VAI_BoneWeightsMax - VAI_BoneWeights - }; - -- bool Initialised() const { return hVert != 0; } -+ bool Initialised() const -+ { -+#ifndef USE_CONSOLE -+ return hVert != 0; -+#else -+ return true; -+#endif -+ } - - // Uniform getters -- GLint GetUniform(int iUniform) const { -+#ifndef USE_CONSOLE -+ GLint GetUniform(int iUniform) const -+ { - return iUniform >= 0 && iUniform < iUniformCount ? pUniforms[iUniform] : -1; - } -- bool HaveUniform(int iUniform) const { -+ bool HaveUniform(int iUniform) const -+ { - return GetUniform(iUniform) != GLint(-1); - } -+#else -+ int GetUniform(int iUniform) const -+ { -+ return -1; -+ } -+ bool HaveUniform(int iUniform) const -+ { -+ return false; -+ } -+#endif - - // Shader is composed from various slices - void AddVertexSlice(int iPos, const char *szText); -@@ -113,10 +135,12 @@ public: - // Add default vertex code (2D - no transformation) - void AddVertexDefaults(); - -+#ifndef USE_CONSOLE - // Allocate a texture coordinate, returning its ID to be used with glMultiTexCoord. - // The texture coordinate will be visible to both shaders under the given name. - // Note that in contrast to uniforms, these will not disappear if not used! - GLenum AddTexCoord(const char *szName); -+#endif - - // Assemble and link the shader. Should be called again after new slices are added. - bool Init(const char *szWhat, const char **szUniforms); -@@ -131,18 +155,22 @@ private: - int ParsePosition(const char *szWhat, const char **ppPos); - - StdStrBuf Build(const ShaderSliceList &Slices, bool fDebug = false); -+ -+#ifndef USE_CONSOLE - GLhandleARB Create(GLenum iShaderType, const char *szWhat, const char *szShader); - void DumpInfoLog(const char *szWhat, GLhandleARB hShader); - int GetObjectStatus(GLhandleARB hObj, GLenum type); -+#endif - - public: - static bool IsLogging(); - }; - -+#ifndef USE_CONSOLE - class C4ShaderCall - { - public: -- C4ShaderCall(const C4Shader *pShader) -+ C4ShaderCall(const C4Shader *pShader) - : fStarted(false), pShader(pShader), iUnits(0) - { } - ~C4ShaderCall() { Finish(); } -@@ -210,5 +238,6 @@ public: - void Start(); - void Finish(); - }; -+#endif - - #endif // INC_C4Shader -diff --git a/src/landscape/fow/C4FoW.cpp b/src/landscape/fow/C4FoW.cpp -index 1dcddb6..be9019b 100644 ---- a/src/landscape/fow/C4FoW.cpp -+++ b/src/landscape/fow/C4FoW.cpp -@@ -26,6 +26,7 @@ C4FoW::C4FoW() - - C4Shader *C4FoW::GetFramebufShader() - { -+#ifndef USE_CONSOLE - // Not created yet? - if (!FramebufShader.Initialised()) - { -@@ -46,10 +47,14 @@ C4Shader *C4FoW::GetFramebufShader() - - } - return &FramebufShader; -+#else -+ return NULL; -+#endif - } - - void C4FoW::Add(C4Object *pObj) - { -+#ifndef USE_CONSOLE - // No view range? Probably want to remove instead - if(!pObj->lightRange && !pObj->lightFadeoutRange) - { -@@ -77,10 +82,12 @@ void C4FoW::Add(C4Object *pObj) - pLight->pNext = pLights; - pLights = pLight; - } -+#endif - } - - void C4FoW::Remove(C4Object *pObj) - { -+#ifndef USE_CONSOLE - // Look for matching light - C4FoWLight *pPrev = NULL, *pLight; - for (pLight = pLights; pLight; pPrev = pLight, pLight = pLight->getNext()) -@@ -92,24 +99,31 @@ void C4FoW::Remove(C4Object *pObj) - // Remove - (pPrev ? pPrev->pNext : pLights) = pLight->getNext(); - delete pLight; -+#endif - } - - void C4FoW::Invalidate(C4Rect r) - { -+#ifndef USE_CONSOLE - for (C4FoWLight *pLight = pLights; pLight; pLight = pLight->getNext()) - pLight->Invalidate(r); -+#endif - } - - void C4FoW::Update(C4Rect r, C4Player *pPlr) - { -+#ifndef USE_CONSOLE - for (C4FoWLight *pLight = pLights; pLight; pLight = pLight->getNext()) - if (pLight->IsVisibleForPlayer(pPlr)) - pLight->Update(r); -+#endif - } - - void C4FoW::Render(C4FoWRegion *pRegion, const C4TargetFacet *pOnScreen, C4Player *pPlr) - { -+#ifndef USE_CONSOLE - for (C4FoWLight *pLight = pLights; pLight; pLight = pLight->getNext()) - if (pLight->IsVisibleForPlayer(pPlr)) - pLight->Render(pRegion, pOnScreen); -+#endif - } -diff --git a/src/landscape/fow/C4FoW.h b/src/landscape/fow/C4FoW.h -index 4006f6e..59f110b 100644 ---- a/src/landscape/fow/C4FoW.h -+++ b/src/landscape/fow/C4FoW.h -@@ -99,8 +99,10 @@ public: - void Render(class C4FoWRegion *pRegion, const C4TargetFacet *pOnScreen, C4Player *pPlr); - - private: -+#ifndef USE_CONSOLE - // Shader for updating the frame buffer - C4Shader FramebufShader; -+#endif - }; - - #endif // C4FOW_H -diff --git a/src/landscape/fow/C4FoWAmbient.cpp b/src/landscape/fow/C4FoWAmbient.cpp -index 6e0ec09..e257570 100644 ---- a/src/landscape/fow/C4FoWAmbient.cpp -+++ b/src/landscape/fow/C4FoWAmbient.cpp -@@ -84,7 +84,10 @@ struct LightMapZoom { - } // anonymous namespace - - C4FoWAmbient::C4FoWAmbient() : -- Tex(0), Resolution(0.), Radius(0.), FullCoverage(0.), -+#ifndef USE_CONSOLE -+ Tex(0), -+#endif -+ Resolution(0.), Radius(0.), FullCoverage(0.), - SizeX(0), LandscapeX(0), SizeY(0), LandscapeY(0), - Brightness(1.) - { -@@ -97,8 +100,10 @@ C4FoWAmbient::~C4FoWAmbient() - - void C4FoWAmbient::Clear() - { -+#ifndef USE_CONSOLE - if(Tex != 0) glDeleteTextures(1, &Tex); - Tex = 0; -+#endif - Resolution = Radius = FullCoverage = 0.; - SizeX = SizeY = 0; - LandscapeX = LandscapeY = 0; -@@ -112,7 +117,7 @@ void C4FoWAmbient::CreateFromLandscape(const C4Landscape& landscape, double reso - assert(full_coverage > 0 && full_coverage <= 1.); - - // Clear old map -- if(Tex != 0) Clear(); -+ Clear(); - - Resolution = resolution; - Radius = radius; -@@ -124,6 +129,7 @@ void C4FoWAmbient::CreateFromLandscape(const C4Landscape& landscape, double reso - SizeX = Min(static_cast(ceil(LandscapeX / resolution)), pDraw->MaxTexSize); - SizeY = Min(static_cast(ceil(LandscapeY / resolution)), pDraw->MaxTexSize); - -+#ifndef USE_CONSOLE - glGenTextures(1, &Tex); - glBindTexture(GL_TEXTURE_2D, Tex); - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR); -@@ -136,10 +142,12 @@ void C4FoWAmbient::CreateFromLandscape(const C4Landscape& landscape, double reso - UpdateFromLandscape(landscape, C4Rect(0, 0, landscape.Width, landscape.Height)); - uint32_t dt = C4TimeMilliseconds::Now() - begin; - LogF("Created %ux%u ambient map in %g secs", SizeX, SizeY, dt / 1000.); -+#endif - } - - void C4FoWAmbient::UpdateFromLandscape(const C4Landscape& landscape, const C4Rect& update) - { -+#ifndef USE_CONSOLE - // Nothing to do? - if(update.Wdt == 0 || update.Hgt == 0) return; - -@@ -191,6 +199,7 @@ void C4FoWAmbient::UpdateFromLandscape(const C4Landscape& landscape, const C4Rec - glBindTexture(GL_TEXTURE_2D, Tex); - glTexSubImage2D(GL_TEXTURE_2D, 0, left, top, (right - left), (bottom - top), GL_RED, GL_FLOAT, ambient); - delete[] ambient; -+#endif - } - - void C4FoWAmbient::GetFragTransform(const FLOAT_RECT& vpRect, const C4Rect& clipRect, const C4Rect& outRect, float ambientTransform[6]) const -diff --git a/src/landscape/fow/C4FoWAmbient.h b/src/landscape/fow/C4FoWAmbient.h -index ded91b9..d8ce833 100644 ---- a/src/landscape/fow/C4FoWAmbient.h -+++ b/src/landscape/fow/C4FoWAmbient.h -@@ -28,7 +28,9 @@ public: - C4FoWAmbient(); - ~C4FoWAmbient(); - -+#ifndef USE_CONSOLE - GLuint Tex; -+#endif - - private: - // Parameters -diff --git a/src/landscape/fow/C4FoWBeam.cpp b/src/landscape/fow/C4FoWBeam.cpp -index a5736a0..e515d0c 100644 ---- a/src/landscape/fow/C4FoWBeam.cpp -+++ b/src/landscape/fow/C4FoWBeam.cpp -@@ -14,6 +14,8 @@ - */ - - #include "C4Include.h" -+ -+#ifndef USE_CONSOLE - #include "C4FoWBeam.h" - - // Maximum error allowed while merging beams. -@@ -48,7 +50,7 @@ bool C4FoWBeam::MergeRight(int32_t x, int32_t y) - - // Calculate error. Note that simply summing up errors is not correct, - // strictly speaking (as new and old error surfaces might overlap). Still, -- // this is quite elaborate already, no need to make it even more -+ // this is quite elaborate already, no need to make it even more - int32_t iErr = getDoubleTriangleSurface( - getLeftEndX(), iLeftEndY, - getRightEndX(), iRightEndY, -@@ -193,3 +195,5 @@ void C4FoWBeam::CompileFunc(StdCompiler *pComp) - pComp->Value(mkNamingAdapt(iError, "iError")); - pComp->Value(mkNamingAdapt(fDirty, "fDirty")); - } -+ -+#endif -diff --git a/src/landscape/fow/C4FoWBeam.h b/src/landscape/fow/C4FoWBeam.h -index 7297fa9..531e7a4 100644 ---- a/src/landscape/fow/C4FoWBeam.h -+++ b/src/landscape/fow/C4FoWBeam.h -@@ -16,6 +16,7 @@ - #ifndef C4FOWBEAM_H - #define C4FOWBEAM_H - -+#ifndef USE_CONSOLE - #include "StdBuf.h" - - /** This class represents one beam. A beam is a triangle spanned by two rays: one going from the origin to the -@@ -133,4 +134,6 @@ public: - - }; - --#endif // C4FOWBEAM -\ No newline at end of file -+#endif -+ -+#endif // C4FOWBEAM -diff --git a/src/landscape/fow/C4FoWDrawStrategy.cpp b/src/landscape/fow/C4FoWDrawStrategy.cpp -index fc1fbd4..cc55c09 100644 ---- a/src/landscape/fow/C4FoWDrawStrategy.cpp -+++ b/src/landscape/fow/C4FoWDrawStrategy.cpp -@@ -14,6 +14,9 @@ - */ - - #include "C4Include.h" -+ -+#ifndef USE_CONSOLE -+ - #include "C4FoWDrawStrategy.h" - #include "C4FoWLight.h" - #include "C4FoWRegion.h" -@@ -151,3 +154,4 @@ void C4FoWDrawWireframeStrategy::DrawLightVertex(float x, float y) - DrawVertex(x, y); - } - -+#endif -diff --git a/src/landscape/fow/C4FoWDrawStrategy.h b/src/landscape/fow/C4FoWDrawStrategy.h -index feb0512..4743c11 100644 ---- a/src/landscape/fow/C4FoWDrawStrategy.h -+++ b/src/landscape/fow/C4FoWDrawStrategy.h -@@ -16,6 +16,8 @@ - #ifndef C4FOWDRAWSTRATEGY_H - #define C4FOWDRAWSTRATEGY_H - -+#ifndef USE_CONSOLE -+ - #include "C4DrawGL.h" - #include - -@@ -122,3 +124,5 @@ private: - }; - - #endif -+ -+#endif -diff --git a/src/landscape/fow/C4FoWLight.cpp b/src/landscape/fow/C4FoWLight.cpp -index 8becfea..4e35db9 100644 ---- a/src/landscape/fow/C4FoWLight.cpp -+++ b/src/landscape/fow/C4FoWLight.cpp -@@ -14,6 +14,9 @@ - */ - - #include "C4Include.h" -+ -+#ifndef USE_CONSOLE -+ - #include "C4FoWLight.h" - #include "C4FoWLightSection.h" - #include "C4FoWBeamTriangle.h" -@@ -344,3 +347,5 @@ bool C4FoWLight::IsVisibleForPlayer(C4Player *player) const - if (!pObj || !player) return true; - return !::Hostile(pObj->Owner,player->Number); - } -+ -+#endif -diff --git a/src/landscape/fow/C4FoWLight.h b/src/landscape/fow/C4FoWLight.h -index 13ad58e..52f0457 100644 ---- a/src/landscape/fow/C4FoWLight.h -+++ b/src/landscape/fow/C4FoWLight.h -@@ -15,6 +15,8 @@ - #ifndef C4FOWLIGHT_H - #define C4FOWLIGHT_H - -+#ifndef USE_CONSOLE -+ - #include "C4Object.h" - #include "C4Surface.h" - #include "C4FacetEx.h" -@@ -95,4 +97,6 @@ private: - - }; - --#endif -\ No newline at end of file -+#endif -+ -+#endif -diff --git a/src/landscape/fow/C4FoWLightSection.cpp b/src/landscape/fow/C4FoWLightSection.cpp -index 0ef4d77..30009a6 100644 ---- a/src/landscape/fow/C4FoWLightSection.cpp -+++ b/src/landscape/fow/C4FoWLightSection.cpp -@@ -14,6 +14,9 @@ - */ - - #include "C4Include.h" -+ -+#ifndef USE_CONSOLE -+ - #include "C4FoWLightSection.h" - #include "C4FoWBeamTriangle.h" - #include "C4FoWBeam.h" -@@ -856,3 +859,5 @@ void C4FoWLightSection::CompileFunc(StdCompiler *pComp) - } - } - } -+ -+#endif -diff --git a/src/landscape/fow/C4FoWLightSection.h b/src/landscape/fow/C4FoWLightSection.h -index cde356a..edecd34 100644 ---- a/src/landscape/fow/C4FoWLightSection.h -+++ b/src/landscape/fow/C4FoWLightSection.h -@@ -16,6 +16,8 @@ - #ifndef C4FOWLIGHTSECTION_H - #define C4FOWLIGHTSECTION_H - -+#ifndef USE_CONSOLE -+ - #include "C4Rect.h" - #include - -@@ -134,4 +136,6 @@ public: - - }; - --#endif -\ No newline at end of file -+#endif -+ -+#endif -diff --git a/src/landscape/fow/C4FoWRegion.cpp b/src/landscape/fow/C4FoWRegion.cpp -index 5e107a7..1df661e 100644 ---- a/src/landscape/fow/C4FoWRegion.cpp -+++ b/src/landscape/fow/C4FoWRegion.cpp -@@ -16,6 +16,7 @@ - #include "C4Include.h" - #include "C4FoWRegion.h" - -+#ifndef USE_CONSOLE - bool glCheck() { - if (int err = glGetError()) { - LogF("GL error %d: %s", err, gluErrorString(err)); -@@ -23,6 +24,7 @@ bool glCheck() { - } - return true; - } -+#endif - - C4FoWRegion::~C4FoWRegion() - { -@@ -31,7 +33,7 @@ C4FoWRegion::~C4FoWRegion() - - bool C4FoWRegion::BindFramebuf() - { -- -+#ifndef USE_CONSOLE - // Flip texture - C4Surface *pSfc = pSurface; - pSurface = pBackSurface; -@@ -79,6 +81,7 @@ bool C4FoWRegion::BindFramebuf() - glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0); - return false; - } -+#endif - - // Worked! - return true; -@@ -86,11 +89,13 @@ bool C4FoWRegion::BindFramebuf() - - void C4FoWRegion::Clear() - { -+#ifndef USE_CONSOLE - if (hFrameBufDraw) { - glDeleteFramebuffersEXT(1, &hFrameBufDraw); - glDeleteFramebuffersEXT(1, &hFrameBufRead); - } - hFrameBufDraw = hFrameBufRead = 0; -+#endif - delete pSurface; pSurface = NULL; - delete pBackSurface; pBackSurface = NULL; - } -@@ -104,6 +109,7 @@ void C4FoWRegion::Update(C4Rect r, const FLOAT_RECT& vp) - - void C4FoWRegion::Render(const C4TargetFacet *pOnScreen) - { -+#ifndef USE_CONSOLE - // Update FoW at interesting location - pFoW->Update(Region, pPlayer); - -@@ -199,7 +205,7 @@ void C4FoWRegion::Render(const C4TargetFacet *pOnScreen) - glCheck(); - - OldRegion = Region; -- -+#endif - } - - void C4FoWRegion::GetFragTransform(const C4Rect& clipRect, const C4Rect& outRect, float lightTransform[6]) const -@@ -229,7 +235,9 @@ void C4FoWRegion::GetFragTransform(const C4Rect& clipRect, const C4Rect& outRect - C4FoWRegion::C4FoWRegion(C4FoW *pFoW, C4Player *pPlayer) - : pFoW(pFoW) - , pPlayer(pPlayer) -+#ifndef USE_CONSOLE - , hFrameBufDraw(0), hFrameBufRead(0) -+#endif - , Region(0,0,0,0), OldRegion(0,0,0,0) - , pSurface(NULL), pBackSurface(NULL) - { -diff --git a/src/landscape/fow/C4FoWRegion.h b/src/landscape/fow/C4FoWRegion.h -index 20e33a6..a264e4b 100644 ---- a/src/landscape/fow/C4FoWRegion.h -+++ b/src/landscape/fow/C4FoWRegion.h -@@ -31,10 +31,13 @@ public: - private: - C4FoW *pFoW; - C4Player *pPlayer; -+ C4Surface *pSurface, *pBackSurface; - C4Rect Region, OldRegion; - FLOAT_RECT ViewportRegion; // Region covered by visible viewport -- C4Surface *pSurface, *pBackSurface; -+ -+#ifndef USE_CONSOLE - GLuint hFrameBufDraw, hFrameBufRead; -+#endif - - public: - const C4FoW* getFoW() const { return pFoW; } -diff --git a/src/lib/StdMesh.cpp b/src/lib/StdMesh.cpp -index 6c1905d..9930097 100644 ---- a/src/lib/StdMesh.cpp -+++ b/src/lib/StdMesh.cpp -@@ -534,7 +534,11 @@ StdSubMesh::StdSubMesh() : - { - } - --StdMesh::StdMesh() : Skeleton(new StdMeshSkeleton), vbo(0) -+StdMesh::StdMesh() : -+ Skeleton(new StdMeshSkeleton) -+#ifndef USE_CONSOLE -+ , vbo(0) -+#endif - { - BoundingBox.x1 = BoundingBox.y1 = BoundingBox.z1 = 0.0f; - BoundingBox.x2 = BoundingBox.y2 = BoundingBox.z2 = 0.0f; -@@ -543,17 +547,22 @@ StdMesh::StdMesh() : Skeleton(new StdMeshSkeleton), vbo(0) - - StdMesh::~StdMesh() - { -+#ifndef USE_CONSOLE - if (vbo) - glDeleteBuffers(1, &vbo); -+#endif - } - - void StdMesh::PostInit() - { -+#ifndef USE_CONSOLE - // Order submeshes so that opaque submeshes come before non-opaque ones - std::sort(SubMeshes.begin(), SubMeshes.end(), StdMeshSubMeshVisibilityCmpPred()); - UpdateVBO(); -+#endif - } - -+#ifndef USE_CONSOLE - void StdMesh::UpdateVBO() - { - // We're only uploading vertices once, so there shouldn't be a VBO so far -@@ -603,18 +612,21 @@ void StdMesh::UpdateVBO() - // Unbind the buffer so following rendering calls do not use it - glBindBuffer(GL_ARRAY_BUFFER, 0); - } -- -+#endif - - StdSubMeshInstance::StdSubMeshInstance(StdMeshInstance& instance, const StdSubMesh& submesh, float completion): - base(&submesh), Material(NULL), CurrentFaceOrdering(FO_Fixed) - { -+#ifndef USE_CONSOLE - LoadFacesForCompletion(instance, submesh, completion); -+#endif - - SetMaterial(submesh.GetMaterial()); - } - - void StdSubMeshInstance::LoadFacesForCompletion(StdMeshInstance& instance, const StdSubMesh& submesh, float completion) - { -+#ifndef USE_CONSOLE - // First: Copy all faces - Faces.resize(submesh.GetNumFaces()); - for (unsigned int i = 0; i < submesh.GetNumFaces(); ++i) -@@ -637,12 +649,14 @@ void StdSubMeshInstance::LoadFacesForCompletion(StdMeshInstance& instance, const - assert(submesh.GetNumFaces() >= 1); - Faces.resize(Clamp(static_cast(completion * submesh.GetNumFaces() + 0.5), 1, submesh.GetNumFaces())); - } -+#endif - } - - void StdSubMeshInstance::SetMaterial(const StdMeshMaterial& material) - { - Material = &material; - -+#ifndef USE_CONSOLE - // Setup initial texture animation data - assert(Material->BestTechniqueIndex >= 0); - const StdMeshMaterialTechnique& technique = Material->Techniques[Material->BestTechniqueIndex]; -@@ -664,10 +678,12 @@ void StdSubMeshInstance::SetMaterial(const StdMeshMaterial& material) - } - - // TODO: Reset face ordering -+#endif - } - - void StdSubMeshInstance::SetFaceOrdering(const StdSubMesh& submesh, FaceOrdering ordering) - { -+#ifndef USE_CONSOLE - if (CurrentFaceOrdering != ordering) - { - CurrentFaceOrdering = ordering; -@@ -677,10 +693,12 @@ void StdSubMeshInstance::SetFaceOrdering(const StdSubMesh& submesh, FaceOrdering - Faces[i] = submesh.GetFace(i); - } - } -+#endif - } - - void StdSubMeshInstance::SetFaceOrderingForClrModulation(const StdSubMesh& submesh, uint32_t clrmod) - { -+#ifndef USE_CONSOLE - bool opaque = Material->IsOpaque(); - - if(!opaque) -@@ -689,6 +707,7 @@ void StdSubMeshInstance::SetFaceOrderingForClrModulation(const StdSubMesh& subme - SetFaceOrdering(submesh, FO_NearestToFarthest); - else - SetFaceOrdering(submesh, FO_Fixed); -+#endif - } - - void StdSubMeshInstance::CompileFunc(StdCompiler* pComp) -@@ -1050,6 +1069,7 @@ StdMeshInstance::~StdMeshInstance() - - void StdMeshInstance::SetFaceOrdering(FaceOrdering ordering) - { -+#ifndef USE_CONSOLE - for (unsigned int i = 0; i < Mesh->GetNumSubMeshes(); ++i) - SubMeshInstances[i]->SetFaceOrdering(Mesh->GetSubMesh(i), ordering); - -@@ -1058,10 +1078,12 @@ void StdMeshInstance::SetFaceOrdering(FaceOrdering ordering) - for (AttachedMeshIter iter = AttachChildren.begin(); iter != AttachChildren.end(); ++iter) - if ((*iter)->OwnChild) - (*iter)->Child->SetFaceOrdering(ordering); -+#endif - } - - void StdMeshInstance::SetFaceOrderingForClrModulation(uint32_t clrmod) - { -+#ifndef USE_CONSOLE - for (unsigned int i = 0; i < Mesh->GetNumSubMeshes(); ++i) - SubMeshInstances[i]->SetFaceOrderingForClrModulation(Mesh->GetSubMesh(i), clrmod); - -@@ -1070,16 +1092,19 @@ void StdMeshInstance::SetFaceOrderingForClrModulation(uint32_t clrmod) - for (AttachedMeshIter iter = AttachChildren.begin(); iter != AttachChildren.end(); ++iter) - if ((*iter)->OwnChild) - (*iter)->Child->SetFaceOrderingForClrModulation(clrmod); -+#endif - } - - void StdMeshInstance::SetCompletion(float completion) - { - Completion = completion; - -+#ifndef USE_CONSOLE - // TODO: Load all submesh faces and then determine the ones to use from the - // full pool. - for(unsigned int i = 0; i < Mesh->GetNumSubMeshes(); ++i) - SubMeshInstances[i]->LoadFacesForCompletion(*this, Mesh->GetSubMesh(i), completion); -+#endif - } - - StdMeshInstance::AnimationNode* StdMeshInstance::PlayAnimation(const StdStrBuf& animation_name, int slot, AnimationNode* sibling, ValueProvider* position, ValueProvider* weight) -@@ -1210,6 +1235,7 @@ void StdMeshInstance::ExecuteAnimation(float dt) - if(!ExecuteAnimationNode(AnimationStack[i-1])) - StopAnimation(AnimationStack[i-1]); - -+#ifndef USE_CONSOLE - // Update animated textures - for (unsigned int i = 0; i < SubMeshInstances.size(); ++i) - { -@@ -1240,6 +1266,7 @@ void StdMeshInstance::ExecuteAnimation(float dt) - } - } - } -+#endif - - // Update animation for attached meshes - for (AttachedMeshList::iterator iter = AttachChildren.begin(); iter != AttachChildren.end(); ++iter) -@@ -1321,7 +1348,9 @@ void StdMeshInstance::SetMaterial(size_t i, const StdMeshMaterial& material) - { - assert(i < SubMeshInstances.size()); - SubMeshInstances[i]->SetMaterial(material); -+#ifndef USE_CONSOLE - std::stable_sort(SubMeshInstancesOrdered.begin(), SubMeshInstancesOrdered.end(), StdMeshSubMeshInstanceVisibilityCmpPred()); -+#endif - } - - const StdMeshMatrix& StdMeshInstance::GetBoneTransform(size_t i) const -@@ -1433,6 +1462,7 @@ bool StdMeshInstance::UpdateBoneTransforms() - - void StdMeshInstance::ReorderFaces(StdMeshMatrix* global_trans) - { -+#ifndef USE_CONSOLE - for (unsigned int i = 0; i < SubMeshInstances.size(); ++i) - { - StdSubMeshInstance& inst = *SubMeshInstances[i]; -@@ -1450,6 +1480,7 @@ void StdMeshInstance::ReorderFaces(StdMeshMatrix* global_trans) - } - - // TODO: Also reorder submeshes, attached meshes and include AttachTransformation for attached meshes... -+#endif - } - - void StdMeshInstance::CompileFunc(StdCompiler* pComp, AttachedMesh::DenumeratorFactoryFunc Factory) -diff --git a/src/lib/StdMesh.h b/src/lib/StdMesh.h -index 7007a74..a5ae5f3 100644 ---- a/src/lib/StdMesh.h -+++ b/src/lib/StdMesh.h -@@ -197,11 +197,15 @@ public: - - void PostInit(); - -- const GLuint GetVBO() const { return vbo; } -+#ifndef USE_CONSOLE -+ GLuint GetVBO() const { return vbo; } -+#endif - - private: -+#ifndef USE_CONSOLE - GLuint vbo; - void UpdateVBO(); -+#endif - - StdMesh(const StdMesh& other); // non-copyable - StdMesh& operator=(const StdMesh& other); // non-assignable -diff --git a/src/lib/StdMeshMaterial.cpp b/src/lib/StdMeshMaterial.cpp -index cb601a5..f1f65ce 100644 ---- a/src/lib/StdMeshMaterial.cpp -+++ b/src/lib/StdMeshMaterial.cpp -@@ -849,7 +849,9 @@ bool StdMeshMaterialProgram::CompileShader(StdMeshMaterialLoader& loader, C4Shad - shader.AddVertexSlices(VertexShader->GetFilename(), VertexShader->GetCode(), VertexShader->GetFilename()); - shader.AddFragmentSlices(FragmentShader->GetFilename(), FragmentShader->GetCode(), FragmentShader->GetFilename()); - // Construct the list of uniforms -- std::vector uniformNames(C4SSU_Count + ParameterNames.size() + 1); -+ std::vector uniformNames; -+#ifndef USE_CONSOLE -+ uniformNames.resize(C4SSU_Count + ParameterNames.size() + 1); - uniformNames[C4SSU_ClrMod] = "clrMod"; - uniformNames[C4SSU_BaseTex] = "baseTex"; // unused - uniformNames[C4SSU_OverlayTex] = "overlayTex"; // unused -@@ -864,25 +866,31 @@ bool StdMeshMaterialProgram::CompileShader(StdMeshMaterialLoader& loader, C4Shad - for (unsigned int i = 0; i < ParameterNames.size(); ++i) - uniformNames[C4SSU_Count + i] = ParameterNames[i].getData(); - uniformNames[C4SSU_Count + ParameterNames.size()] = NULL; -+#endif - // Compile the shader - StdCopyStrBuf name(Name); -+#ifndef USE_CONSOLE - if (ssc != 0) name.Append(":"); - if (ssc & C4SSC_LIGHT) name.Append("Light"); - if (ssc & C4SSC_MOD2) name.Append("Mod2"); -+#endif - return shader.Init(name.getData(), &uniformNames[0]); - } - - bool StdMeshMaterialProgram::Compile(StdMeshMaterialLoader& loader) - { -+#ifndef USE_CONSOLE - if (!CompileShader(loader, Shader, 0)) return false; - if (!CompileShader(loader, ShaderMod2, C4SSC_MOD2)) return false; - if (!CompileShader(loader, ShaderLight, C4SSC_LIGHT)) return false; - if (!CompileShader(loader, ShaderLightMod2, C4SSC_LIGHT | C4SSC_MOD2)) return false; -+#endif - return true; - } - - const C4Shader* StdMeshMaterialProgram::GetShader(int ssc) const - { -+#ifndef USE_CONSOLE - const C4Shader* shaders[4] = { - &Shader, - &ShaderMod2, -@@ -896,13 +904,20 @@ const C4Shader* StdMeshMaterialProgram::GetShader(int ssc) const - - assert(index < 4); - return shaders[index]; -+#else -+ return NULL; -+#endif - } - - int StdMeshMaterialProgram::GetParameterIndex(const char* name) const - { -+#ifndef USE_CONSOLE - std::vector::const_iterator iter = std::find(ParameterNames.begin(), ParameterNames.end(), name); - if(iter == ParameterNames.end()) return -1; - return C4SSU_Count + std::distance(ParameterNames.begin(), iter); -+#else -+ return -1; -+#endif - } - - double StdMeshMaterialTextureUnit::Transformation::GetWaveXForm(double t) const -@@ -1515,12 +1530,14 @@ void StdMeshMatManager::Parse(const char* mat_script, const char* filename, StdM - - Materials[material_name] = mat; - -+#ifndef USE_CONSOLE - // To Gfxspecific setup of the material; choose working techniques - if (!pDraw->PrepareMaterial(*this, loader, Materials[material_name])) - { - Materials.erase(material_name); - ctx.Error(StdCopyStrBuf("No working technique for material '") + material_name + "'"); - } -+#endif - } - else if (token_name == "vertex_program") - { -diff --git a/src/object/C4Def.cpp b/src/object/C4Def.cpp -index 5d8442e..81a0e36 100644 ---- a/src/object/C4Def.cpp -+++ b/src/object/C4Def.cpp -@@ -59,6 +59,7 @@ public: - - virtual void AddShaderSlices(C4Shader& shader, int ssc) - { -+#ifndef USE_CONSOLE - // Add mesh-independent slices - shader.AddFragmentSlice(-1, "#define OPENCLONK"); - shader.AddVertexSlice(-1, "#define OPENCLONK"); -@@ -80,6 +81,7 @@ public: - - if (ssc & C4SSC_BASE) shader.LoadSlices(&::GraphicsResource.Files, "SpriteTextureShader.glsl"); - if (ssc & C4SSC_OVERLAY) shader.LoadSlices(&::GraphicsResource.Files, "SpriteOverlayShader.glsl"); -+#endif - } - - private: --- -2.1.4 - diff --git a/games-action/openclonk/files/openclonk-6.1-jpeg9.patch b/games-action/openclonk/files/openclonk-6.1-jpeg9.patch deleted file mode 100644 index 161258604e6b..000000000000 --- a/games-action/openclonk/files/openclonk-6.1-jpeg9.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/graphics/C4SurfaceLoaders.cpp.old 2015-01-02 18:01:35.768676874 +0100 -+++ src/graphics/C4SurfaceLoaders.cpp 2015-01-02 18:02:17.705896683 +0100 -@@ -303,7 +303,7 @@ - // The doc says to give fake end-of-inputs if there is no more data - cinfo->src->next_input_byte = &end_of_input; - cinfo->src->bytes_in_buffer = 1; -- return true; -+ return (boolean)true; - } - static void skip_input_data (j_decompress_ptr cinfo, long num_bytes) - { -@@ -354,7 +354,7 @@ - blub.term_source = jpeg_noop; - - // a missing image is an error -- jpeg_read_header(&cinfo, true); -+ jpeg_read_header(&cinfo, (boolean)true); - - // Let libjpeg convert for us - cinfo.out_color_space = JCS_RGB; diff --git a/games-action/openclonk/files/openclonk-6.1-paths.patch b/games-action/openclonk/files/openclonk-6.1-paths.patch deleted file mode 100644 index f95a9a5982cb..000000000000 --- a/games-action/openclonk/files/openclonk-6.1-paths.patch +++ /dev/null @@ -1,69 +0,0 @@ -Updated for openclonk-6.0, based on this patch: - From: Julian Ospald - Date: Thu Feb 6 19:58:45 UTC 2014 - Subject: make paths modifiable - -diff -Naur openclonk-release-6.0-src.orig/CMakeLists.txt openclonk-release-6.0-src/CMakeLists.txt ---- openclonk-release-6.0-src.orig/CMakeLists.txt 2015-03-12 21:21:51.000000000 +0000 -+++ openclonk-release-6.0-src/CMakeLists.txt 2015-04-25 08:07:16.000000000 +0000 -@@ -42,6 +42,16 @@ - set(${_var} "${_string}" PARENT_SCOPE) - endfunction() - -+ -+############################################################################ -+# User selectable paths -+############################################################################ -+set(INSTALL_BINDIR "bin/" CACHE PATH "Binary install destination") -+set(INSTALL_GAMES_BINDIR "games/bin" CACHE PATH "Games binary install destination") -+set(INSTALL_DATAROOTDIR "share/" CACHE PATH "Data root install destination") -+set(INSTALL_DATADIR "${INSTALL_DATAROOTDIR}" CACHE PATH "Data install destination") -+ -+ - ############################################################################ - # User selectable options - ############################################################################ -@@ -1212,10 +1222,16 @@ - # Assemble compiler flags - ############################################################################ - if(UNIX) -+ if(NOT IS_ABSOLUTE "${INSTALL_DATADIR}") -+ set(ABSOLUTE_INSTALL_DATADIR "${CMAKE_INSTALL_PREFIX}/${INSTALL_DATADIR}") -+ else() -+ set(ABSOLUTE_INSTALL_DATADIR "${INSTALL_DATADIR}") -+ endif() -+ - # Don't put this into CMAKE_CXX_FLAGS because otherwise it is cached, - # and when the path is changed both the old and new definition appears - # in the list of flags. -- add_definitions("-DOC_SYSTEM_DATA_DIR=\"${CMAKE_INSTALL_PREFIX}/share/games/openclonk\"") -+ add_definitions("-DOC_SYSTEM_DATA_DIR=\"${ABSOLUTE_INSTALL_DATADIR}/openclonk\"") - endif() - if(OC_CXX_FLAGS) - list(REMOVE_DUPLICATES OC_CXX_FLAGS) -@@ -1537,7 +1553,7 @@ - DEPENDS "${native_c4group}" - VERBATIM - ) -- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION share/games/openclonk) -+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${group} DESTINATION "${INSTALL_DATADIR}/openclonk") - endif() - endforeach() - -@@ -1546,13 +1562,13 @@ - add_dependencies(data groups) - - # Install new files -- install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION share/applications) -+ install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications") - # Update the MIME cache -- this makes the clonk:// protocol handler actually work - install(CODE "execute_process(COMMAND update-desktop-database)") - - # Install binaries -- install(TARGETS openclonk DESTINATION games) -- install(TARGETS c4group DESTINATION bin) -+ install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}") -+ install(TARGETS c4group DESTINATION "${INSTALL_BINDIR}") - else() - install(TARGETS openclonk - BUNDLE DESTINATION . diff --git a/games-action/openclonk/files/openclonk-6.1-postinst.patch b/games-action/openclonk/files/openclonk-6.1-postinst.patch deleted file mode 100644 index d957e5cd929b..000000000000 --- a/games-action/openclonk/files/openclonk-6.1-postinst.patch +++ /dev/null @@ -1,15 +0,0 @@ -update-desktop-database is called from the pkg_postinst stage instead. - -diff -Naur openclonk-release-6.0-src.orig/CMakeLists.txt openclonk-release-6.0-src/CMakeLists.txt ---- openclonk-release-6.0-src.orig/CMakeLists.txt 2015-04-25 08:22:16.000000000 +0000 -+++ openclonk-release-6.0-src/CMakeLists.txt 2015-04-25 09:50:16.000000000 +0000 -@@ -1564,7 +1564,8 @@ - # Install new files - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/openclonk.desktop DESTINATION "${INSTALL_DATAROOTDIR}/applications") - # Update the MIME cache -- this makes the clonk:// protocol handler actually work -- install(CODE "execute_process(COMMAND update-desktop-database)") -+ # --> ebuild, pkg_postinst stage -+ #install(CODE "execute_process(COMMAND update-desktop-database)") - - # Install binaries - install(TARGETS openclonk DESTINATION "${INSTALL_GAMES_BINDIR}") diff --git a/games-action/openclonk/openclonk-6.1.ebuild b/games-action/openclonk/openclonk-6.1.ebuild deleted file mode 100644 index 19ed34808122..000000000000 --- a/games-action/openclonk/openclonk-6.1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -inherit cmake-utils eutils gnome2-utils python-any-r1 fdo-mime games - -MY_P=${PN}-release-${PV}-src - -DESCRIPTION="A free multiplayer action game where you control clonks" -HOMEPAGE="http://openclonk.org/" -SRC_URI="http://www.openclonk.org/builds/release/${PV}/openclonk-${PV}-src.tar.bz2" - -LICENSE="BSD ISC CLONK-trademark LGPL-2.1 POSTGRESQL" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="dedicated doc" - -RDEPEND=" - >=dev-libs/boost-1.40:= - dev-libs/tinyxml - net-libs/libupnp - media-libs/libpng:0= - sys-libs/zlib - !dedicated? ( - dev-libs/glib:2 - media-libs/freealut - media-libs/freetype:2 - media-libs/glew - media-libs/libsdl[X,opengl,sound,video] - media-libs/libvorbis - media-libs/openal - media-libs/sdl-mixer[mp3,vorbis,wav] - virtual/jpeg:0= - virtual/opengl - virtual/glu - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libXrandr - x11-libs/libX11 - ) - dedicated? ( sys-libs/readline:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( - ${PYTHON_DEPS} - dev-libs/libxml2[python] - sys-devel/gettext - )" - -PATCHES=( - "${FILESDIR}"/${P}-paths.patch - "${FILESDIR}"/${P}-jpeg9.patch - "${FILESDIR}"/${P}-postinst.patch - "${FILESDIR}"/${P}-dedicated.patch -) -S=${WORKDIR}/${P}-src - -pkg_setup() { - games_pkg_setup - use doc && python-any-r1_pkg_setup -} - -src_prepare() { - cmake-utils_src_prepare -} - -src_configure() { - local mycmakeargs=( - $(usex dedicated \ - "-DUSE_CONSOLE=ON -DUSE_X11=OFF -DUSE_GTK=OFF -DUSE_GTK3=OFF" \ - "-DUSE_CONSOLE=OFF -DUSE_X11=ON -DUSE_GTK=ON -DUSE_GTK3=ON") - -DWITH_AUTOMATIC_UPDATE=OFF - -DINSTALL_GAMES_BINDIR="${GAMES_BINDIR}" - -DINSTALL_DATADIR="${GAMES_DATADIR}" - -DUSE_STATIC_BOOST=OFF - -DUSE_SYSTEM_TINYXML=ON - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - use doc && emake -C docs -} - -src_install() { - cmake-utils_src_install - - if ! use dedicated; then - mv "${ED%/}${GAMES_BINDIR}/"{openclonk,clonk} || die - newgamesbin "${FILESDIR}"/${PN}-wrapper-script.sh ${PN} - fi - use doc && dohtml -r docs/online/* - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} diff --git a/games-board/gnuchess/Manifest b/games-board/gnuchess/Manifest index 14d80248c2c3..57c29f28bf9d 100644 --- a/games-board/gnuchess/Manifest +++ b/games-board/gnuchess/Manifest @@ -1,2 +1 @@ -DIST gnuchess-6.2.1.tar.gz 730761 SHA256 17caab725539447bcb17a14b17905242cbf287087e53a6777524feb7bbaeed06 SHA512 8f7ac477333703743984089e495ae3e61f8b4dd41c89c4141b33a9dcd598c9a5e2374ece50431f9eb72ccea86338ea19077e2e8ee592225c3c0a928a2fc11bc8 WHIRLPOOL fe8c6976f1e20de3e1ee30d9f2663ab32a217a66e88fda273f2381119df9ad616c7229d5647dcaf3225e6a0ba8ba4c5e96cc84e9382a24e4931793fcd469e60f DIST gnuchess-6.2.2.tar.gz 747054 SHA256 7776c114eeb5889dea69dc4715a3622ec57f65efab667987e7d7183cc05381a8 SHA512 3b9bbf8999301a867f6b0e277ee01240472553d4e6dd43b9c479558b3bba687ebaa188f23cc8dbcb8656ddbd5c9511d89cf68ae717c55824f0c797460c4ab101 WHIRLPOOL 454ee7ec902ffd342142d9d04ccb6cf0d4f6bfcd2575b039d39adb78c0b016b8971609016754704750edbc13b2ec962639cf306c27ca460ffaa8009764686eee diff --git a/games-board/gnuchess/gnuchess-6.2.1.ebuild b/games-board/gnuchess/gnuchess-6.2.1.ebuild deleted file mode 100644 index e503075890e9..000000000000 --- a/games-board/gnuchess/gnuchess-6.2.1.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit flag-o-matic games - -DESCRIPTION="Console based chess interface" -HOMEPAGE="https://www.gnu.org/software/chess/chess.html" -SRC_URI="mirror://gnu/chess/${P}.tar.gz" - -KEYWORDS="amd64 ~arm ppc ppc64 x86" -LICENSE="GPL-3" -SLOT="0" -IUSE="" - -src_configure() { - strip-flags # bug #199097 - egamesconf --without-readline # bug 491088 -} - -src_install () { - default - prepgamesdirs -} diff --git a/games-board/gtkatlantic/Manifest b/games-board/gtkatlantic/Manifest index fac6ad66a9ff..2b809a405ddd 100644 --- a/games-board/gtkatlantic/Manifest +++ b/games-board/gtkatlantic/Manifest @@ -1,2 +1 @@ -DIST gtkatlantic-0.5.0.tar.bz2 782124 SHA256 065f649e37144a545936546c8655c5d66558415c259c4838c101ab1c733e0d86 SHA512 5aa332af2f17612caae0e396614ddfecbb1df4ad1f2c15a402efea5e96fde72cb0aefa87e690234382b82d03904e7235536434e455827b838a988c13eaa78bfe WHIRLPOOL 48e0e44ecedb02686414b1fdbfbf355b7e214c31edc1db70f90657489b19fb65d5a984c5814f31aab045e3c0837e3978e105a330510a42704c05995a1b3a1556 DIST gtkatlantic-0.6.1.tar.bz2 505701 SHA256 ab57fca9c45854752b4da77b749328884ddc975e9636ae6c73cc191f1d7eb331 SHA512 8388cbdd4c73d56eacb18a645bdd2d1f6e1fa8d21be972eaba1c4d6af6d0681a2a54909a82d6846ddd785b46b0ad99193e5afea528c5662956ff89a1e6e366df WHIRLPOOL 909331b930c540131bebcc7f1fd25ec36fa75f934ac23e21581c099aea61a78282ac5a9533b6a8622b4a76e482c023c54261bb98a5b563fa9563a3a4c5314d29 diff --git a/games-board/gtkatlantic/gtkatlantic-0.5.0.ebuild b/games-board/gtkatlantic/gtkatlantic-0.5.0.ebuild deleted file mode 100644 index 150c11458f85..000000000000 --- a/games-board/gtkatlantic/gtkatlantic-0.5.0.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils gnome2-utils games - -DESCRIPTION="Monopoly-like game that works with the monopd server" -HOMEPAGE="http://gtkatlantic.gradator.net/" -SRC_URI="http://download.tuxfamily.org/gtkatlantic/downloads/v0.5/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="" - -RDEPEND="x11-libs/gtk+:3 - dev-libs/libxml2 - media-libs/libpng:0" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_install() { - default - newicon data/icon32x32.xpm ${PN}.xpm - newicon -s 16 data/icon16x16.xpm ${PN}.xpm - newicon -s 32 data/icon32x32.xpm ${PN}.xpm - make_desktop_entry ${PN} GtkAtlantic - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-board/pokerth/pokerth-1.1.1-r1.ebuild b/games-board/pokerth/pokerth-1.1.1-r1.ebuild index 357ab9dd6e17..1c2e78e0c220 100644 --- a/games-board/pokerth/pokerth-1.1.1-r1.ebuild +++ b/games-board/pokerth/pokerth-1.1.1-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/pokerth/${MY_P}.tar.bz2" LICENSE="AGPL-3 GPL-1 GPL-2 GPL-3 BitstreamVera public-domain" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="dedicated" RDEPEND="dev-db/sqlite:3 diff --git a/games-emulation/sdlmametools/Manifest b/games-emulation/sdlmametools/Manifest deleted file mode 100644 index f0e246118259..000000000000 --- a/games-emulation/sdlmametools/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a -DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5 -DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531 diff --git a/games-emulation/sdlmametools/files/sdlmametools-0.148_p1-makefile.patch b/games-emulation/sdlmametools/files/sdlmametools-0.148_p1-makefile.patch deleted file mode 100644 index 7ba59692f2e3..000000000000 --- a/games-emulation/sdlmametools/files/sdlmametools-0.148_p1-makefile.patch +++ /dev/null @@ -1,177 +0,0 @@ ---- makefile -+++ makefile -@@ -314,13 +314,14 @@ - endif - - # compiler, linker and utilities --AR = @ar --CC = @gcc --LD = @g++ -+AR ?= @ar -+CC ?= @gcc -+CXX ?= @g++ -+LD = $(CXX) - MD = -mkdir$(EXE) - RM = @rm -f - OBJDUMP = @objdump --PYTHON = @python -+PYTHON ?= @python - - - #------------------------------------------------- -@@ -455,7 +456,7 @@ - - # CFLAGS is defined based on C or C++ targets - # (remember, expansion only happens when used, so doing it here is ok) --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) - - # we compile C-only to C89 standard with GNU extensions - # we compile C++ code to C++98 standard with GNU extensions -@@ -463,9 +464,6 @@ - CPPONLYFLAGS += -x c++ -std=gnu++98 - COBJFLAGS += -x objective-c++ - --# this speeds it up a bit by piping between the preprocessor/compiler/assembler --CCOMFLAGS += -pipe -- - # add -g if we need symbols, and ensure we have frame pointers - ifdef SYMBOLS - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -@@ -479,19 +477,6 @@ - # add profiling information for the compiler - ifdef PROFILE - CCOMFLAGS += -pg --endif -- --# add the optimization flag --CCOMFLAGS += -O$(OPTIMIZE) -- --# add the error warning flag --ifndef NOWERROR --CCOMFLAGS += -Werror --endif -- --# if we are optimizing, include optimization options --ifneq ($(OPTIMIZE),0) --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) - endif - - # add a basic set of warnings -@@ -565,26 +550,11 @@ - - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional - # flags only used when linking the core emulator --LDFLAGS = --ifneq ($(TARGETOS),macosx) --ifneq ($(TARGETOS),os2) --ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common --endif --endif --endif - LDFLAGSEMULATOR = - - # add profiling information for the linker - ifdef PROFILE - LDFLAGS += -pg --endif -- --# strip symbols and other metadata in non-symbols and non profiling builds --ifndef SYMBOLS --ifneq ($(TARGETOS),macosx) --LDFLAGS += -s --endif - endif - - # output a map file (emulator only) ---- src/osd/sdl/sdl.mak -+++ src/osd/sdl/sdl.mak -@@ -24,6 +24,8 @@ - # uncomment and edit next line to specify a distribution - # supported debian-stable, ubuntu-intrepid - -+PKG_CONFIG ?= pkg-config -+ - # DISTRO = debian-stable - # DISTRO = ubuntu-intrepid - # DISTRO = gcc44-generic -@@ -91,9 +93,9 @@ - endif - - ifdef SDL_INSTALL_ROOT --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config - else --SDL_CONFIG = $(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_LIBVER)-config - endif - - ifeq ($(SDL_LIBVER),sdl2) -@@ -190,8 +192,8 @@ - SDL_NETWORK = taptun - - ifndef NO_USE_MIDI --INCPATH += `pkg-config --cflags alsa` --LIBS += `pkg-config --libs alsa` -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa) -+LIBS += $(shell $(PKG_CONFIG) --libs alsa) - endif - - endif -@@ -476,10 +478,10 @@ - # Remove the "/SDL" component from the include path so that we can compile - # files (header files are #include "SDL/something.h", so the extra "/SDL" - # causes a significant problem) --INCPATH += `sdl-config --cflags | sed 's:/SDL::'` -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::') - CCOMFLAGS += -DNO_SDL_GLEXT - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread - DEFS += -DMACOSX_USE_LIBSDL - endif # MACOSX_USE_LIBSDL - -@@ -532,8 +534,8 @@ - endif - endif - --INCPATH += `pkg-config --cflags fontconfig` --LIBS += `pkg-config --libs fontconfig` -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig) -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig) - - ifeq ($(SDL_LIBVER),sdl2) - LIBS += -lSDL2_ttf -@@ -616,8 +618,8 @@ - - ifeq ($(BASE_TARGETOS),os2) - --INCPATH += `sdl-config --cflags` --LIBS += `sdl-config --libs` -+INCPATH += $(shell $(SDL_CONFIG) --cflags) -+LIBS += $(shell $(SDL_CONFIG) --libs) - - endif # OS2 - -@@ -690,15 +692,15 @@ - - # the new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0` --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0` --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0` -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED - - # The newer debugger uses QT - ifdef USE_QTDEBUG --INCPATH += `pkg-config QtGui --cflags` --LIBS += `pkg-config QtGui --libs` -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs) - endif - - # some systems still put important things in a different prefix diff --git a/games-emulation/sdlmametools/files/sdlmametools-0.148_p1-no-opengl.patch b/games-emulation/sdlmametools/files/sdlmametools-0.148_p1-no-opengl.patch deleted file mode 100644 index 7b339ba71a59..000000000000 --- a/games-emulation/sdlmametools/files/sdlmametools-0.148_p1-no-opengl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h ---- a/src/osd/sdl/osdsdl.h 2012-07-11 20:49:55.070264487 +0200 -+++ b/src/osd/sdl/osdsdl.h 2012-07-11 20:51:45.976264395 +0200 -@@ -216,6 +216,8 @@ - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } - #if USE_OPENGL - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } -+#else -+ const char *gl_lib() const { return NULL; } - #endif - - private: diff --git a/games-emulation/sdlmametools/files/sdlmametools-0.149-QA.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-QA.patch deleted file mode 100644 index 97e4b8f41c10..000000000000 --- a/games-emulation/sdlmametools/files/sdlmametools-0.149-QA.patch +++ /dev/null @@ -1,191 +0,0 @@ -commit 938cfdf1f01bcc9ac736249ee6458a774d560738 -Author: hasufell -Date: Tue Jun 25 23:48:02 2013 +0200 - - QA: respect several environment variables - - such as CC,CFLAGS,PKG_CONFIG... - -diff --git a/makefile b/makefile -index ad6ae2d..dd4598d 100644 ---- a/makefile -+++ b/makefile -@@ -317,13 +317,15 @@ BUILD_EXE = $(EXE) - endif - - # compiler, linker and utilities --AR = @ar --CC = @gcc --LD = @g++ -+AR ?= @ar -+CC ?= @gcc -+CXX ?= @g++ -+LD = $(CXX) - MD = -mkdir$(EXE) - RM = @rm -f - OBJDUMP = @objdump --PYTHON = @python -+PYTHON ?= @python -+PKG_CONFIG ?= pkg-config - - - #------------------------------------------------- -@@ -458,7 +460,7 @@ CPPONLYFLAGS = - - # CFLAGS is defined based on C or C++ targets - # (remember, expansion only happens when used, so doing it here is ok) --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) - - # we compile C-only to C89 standard with GNU extensions - # we compile C++ code to C++98 standard with GNU extensions -@@ -466,9 +468,6 @@ CONLYFLAGS += -std=gnu89 - CPPONLYFLAGS += -x c++ -std=gnu++98 - COBJFLAGS += -x objective-c++ - --# this speeds it up a bit by piping between the preprocessor/compiler/assembler --CCOMFLAGS += -pipe -- - # add -g if we need symbols, and ensure we have frame pointers - ifdef SYMBOLS - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -@@ -484,19 +483,6 @@ ifdef PROFILE - CCOMFLAGS += -pg - endif - --# add the optimization flag --CCOMFLAGS += -O$(OPTIMIZE) -- --# add the error warning flag --ifndef NOWERROR --CCOMFLAGS += -Werror --endif -- --# if we are optimizing, include optimization options --ifneq ($(OPTIMIZE),0) --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) --endif -- - # add a basic set of warnings - CCOMFLAGS += \ - -Wall \ -@@ -576,14 +562,6 @@ endif - - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional - # flags only used when linking the core emulator --LDFLAGS = --ifneq ($(TARGETOS),macosx) --ifneq ($(TARGETOS),os2) --ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common --endif --endif --endif - LDFLAGSEMULATOR = - - # add profiling information for the linker -@@ -591,13 +569,6 @@ ifdef PROFILE - LDFLAGS += -pg - endif - --# strip symbols and other metadata in non-symbols and non profiling builds --ifndef SYMBOLS --ifneq ($(TARGETOS),macosx) --LDFLAGS += -s --endif --endif -- - # output a map file (emulator only) - ifdef MAP - LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak -index 84332ef..36655d3 100644 ---- a/src/osd/sdl/sdl.mak -+++ b/src/osd/sdl/sdl.mak -@@ -24,6 +24,8 @@ - # uncomment and edit next line to specify a distribution - # supported debian-stable, ubuntu-intrepid - -+PKG_CONFIG ?= pkg-config -+ - # DISTRO = debian-stable - # DISTRO = ubuntu-intrepid - # DISTRO = gcc44-generic -@@ -88,9 +90,9 @@ SDL_LIBVER = sdl - endif - - ifdef SDL_INSTALL_ROOT --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config - else --SDL_CONFIG = $(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_LIBVER)-config - endif - - ifeq ($(SDL_LIBVER),sdl2) -@@ -187,8 +189,8 @@ SYNC_IMPLEMENTATION = tc - SDL_NETWORK = taptun - - ifndef NO_USE_MIDI --INCPATH += `pkg-config --cflags alsa` --LIBS += `pkg-config --libs alsa` -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa) -+LIBS += $(shell $(PKG_CONFIG) --libs alsa) - endif - - endif -@@ -478,10 +480,10 @@ else - # Remove the "/SDL" component from the include path so that we can compile - # files (header files are #include "SDL/something.h", so the extra "/SDL" - # causes a significant problem) --INCPATH += `sdl-config --cflags | sed 's:/SDL::'` -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::') - CCOMFLAGS += -DNO_SDL_GLEXT - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread - DEFS += -DMACOSX_USE_LIBSDL - endif # MACOSX_USE_LIBSDL - -@@ -534,8 +536,8 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb - endif - endif - --INCPATH += `pkg-config --cflags fontconfig` --LIBS += `pkg-config --libs fontconfig` -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig) -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig) - - ifeq ($(SDL_LIBVER),sdl2) - LIBS += -lSDL2_ttf -@@ -620,8 +622,8 @@ endif # Win32 - - ifeq ($(BASE_TARGETOS),os2) - --INCPATH += `sdl-config --cflags` --LIBS += `sdl-config --libs` -+INCPATH += $(shell $(SDL_CONFIG) --cflags) -+LIBS += $(shell $(SDL_CONFIG) --libs) - - endif # OS2 - -@@ -696,14 +698,14 @@ LIBS += -lX11 -lXinerama - - # The newer debugger uses QT - ifndef NO_USE_QTDEBUG --INCPATH += `pkg-config QtGui --cflags` --LIBS += `pkg-config QtGui --libs` -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs) - else - # the old-new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0` --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0` --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0` -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - endif - - # some systems still put important things in a different prefix diff --git a/games-emulation/sdlmametools/files/sdlmametools-0.149-debugger-linking.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-debugger-linking.patch deleted file mode 100644 index 6c7cd5d64199..000000000000 --- a/games-emulation/sdlmametools/files/sdlmametools-0.149-debugger-linking.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit ec92ac2b0180b101c30748e62eb8b76cdf0cb439 -Author: hasufell -Date: Wed Jun 26 14:33:01 2013 +0200 - - remove unneeded linking - - if we don't build the debugger, we don't want gtk+ linking - -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak -index 36655d3..2089707 100644 ---- a/src/osd/sdl/sdl.mak -+++ b/src/osd/sdl/sdl.mak -@@ -696,6 +696,7 @@ else - DEFS += -DSDLMAME_X11 - LIBS += -lX11 -lXinerama - -+ifneq ($(NO_DEBUGGER),1) - # The newer debugger uses QT - ifndef NO_USE_QTDEBUG - INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -@@ -707,6 +708,7 @@ INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) - CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) - LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - endif -+endif # NO_DEBUGGER - - # some systems still put important things in a different prefix - LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib diff --git a/games-emulation/sdlmametools/files/sdlmametools-0.149-no-opengl.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-no-opengl.patch deleted file mode 100644 index cd32cd35d075..000000000000 --- a/games-emulation/sdlmametools/files/sdlmametools-0.149-no-opengl.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 6ee372b3693857372a7b4855039ad1a94d3aebca -Author: hasufell -Date: Tue Jun 25 23:51:12 2013 +0200 - - fix for disabled opengl - -diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h -index ed0b66b..03d68f9 100644 ---- a/src/osd/sdl/osdsdl.h -+++ b/src/osd/sdl/osdsdl.h -@@ -219,6 +219,8 @@ public: - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } - #if USE_OPENGL - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } -+#else -+ const char *gl_lib() const { return NULL; } - #endif - - private: diff --git a/games-emulation/sdlmametools/files/sdlmametools-0.149-system-lua.patch b/games-emulation/sdlmametools/files/sdlmametools-0.149-system-lua.patch deleted file mode 100644 index 8460497f1d68..000000000000 --- a/games-emulation/sdlmametools/files/sdlmametools-0.149-system-lua.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit ea514c9ded266aa365976649d88fa5593ef7ebf5 -Author: hasufell -Date: Tue Jun 25 23:48:26 2013 +0200 - - add switch to use system lua - -diff --git a/makefile b/makefile -index dd4598d..bdf22d2 100644 ---- a/makefile -+++ b/makefile -@@ -228,6 +228,9 @@ BUILD_JPEGLIB = 1 - # uncomment next line to build PortMidi as part of MAME/MESS build - BUILD_MIDILIB = 1 - -+# uncomment next line to build Lua-5.2 as part of MAME/MESS build -+BUILD_LUA = 1 -+ - # uncomment next line to include the symbols - # SYMBOLS = 1 - -@@ -664,7 +667,12 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a - FORMATS_LIB = $(OBJ)/libformats.a - - # add LUA library -+ifeq ($(BUILD_LUA),1) - LUA_LIB = $(OBJ)/liblua.a -+else -+LIBS += $(shell $(PKG_CONFIG) --libs lua) -+INCPATH += $(shell $(PKG_CONFIG) --cflags lua) -+endif - - # add PortMidi MIDI library - ifeq ($(BUILD_MIDILIB),1) diff --git a/games-emulation/sdlmametools/sdlmametools-0.148_p1.ebuild b/games-emulation/sdlmametools/sdlmametools-0.148_p1.ebuild deleted file mode 100644 index fc268ed1475f..000000000000 --- a/games-emulation/sdlmametools/sdlmametools-0.148_p1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic python-any-r1 games - -MY_PV=${PV/.} -MY_P=${PN%tools}${MY_PV} -MY_P=${MY_P%%_p*} - -# patches -SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)" - -DESCRIPTION="Set of development tools shared between sdlmame and sdlmess" -HOMEPAGE="http://mamedev.org/" -# Upstream doesn't allow fetching with unknown User-Agent such as wget -SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip" - -LICENSE="XMAME" -SLOT="0" -KEYWORDS="amd64 ~ppc x86" -IUSE="X debug" -REQUIRED_USE="debug? ( X )" - -RDEPEND=" - dev-libs/expat - media-libs/flac - >=media-libs/libsdl-1.2.10 - media-libs/sdl-ttf - sys-libs/zlib - X? ( - x11-libs/libX11 - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/unzip - virtual/pkgconfig - X? ( x11-proto/xineramaproto )" - -S=${WORKDIR} - -# Function to disable a makefile option -disable_feature() { - sed -i \ - -e "/$1.*=/s:^:# :" \ - "${S}"/makefile \ - || die "sed failed" -} - -# Function to enable a makefile option -enable_feature() { - sed -i \ - -e "/^#.*$1.*=/s:^#::" \ - "${S}"/${2:-makefile} \ - || die "sed failed" -} - -pkg_setup() { - games_pkg_setup - python-any-r1_pkg_setup -} - -src_unpack() { - default - unpack ./mame.zip - rm -f mame.zip -} - -src_prepare() { - if [[ $PV == *_p* ]] ; then - edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff - einfo "Patching release with source updates" - epatch ${MY_PV%%_p*}*.diff - fi - edos2unix src/osd/sdl/osdsdl.h - - epatch \ - "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-no-opengl.patch - - # Don't compile zlib and expat - einfo "Disabling embedded libraries: expat, flac, jpeg, zlib" - disable_feature BUILD_EXPAT - disable_feature BUILD_FLAC - disable_feature BUILD_JPEG - disable_feature BUILD_ZLIB - - if use amd64; then - einfo "Enabling 64-bit support" - enable_feature PTR64 - fi - - if use ppc; then - einfo "Enabling PPC support" - enable_feature BIGENDIAN - fi - - if use debug; then - einfo "Enabling debug support" - enable_feature DEBUG - fi - - if ! use X ; then - einfo "Disabling X support" - enable_feature NO_X11 src/osd/sdl/sdl.mak - fi -} - -src_compile() { - emake \ - NO_DEBUGGER=$(usex debug "0" "1") tools -} - -src_install() { - for i in chdman jedutil ldresample ldverify regrep romcmp testkeys ; do - newgamesbin ${i} sdlmame-${i} - [[ -f src/osd/sdl/man/${i}.1 ]] && newman src/osd/sdl/man/${i}.1 sdlmame-${i}.1 - done - - prepgamesdirs -} diff --git a/games-emulation/sdlmametools/sdlmametools-0.149.ebuild b/games-emulation/sdlmametools/sdlmametools-0.149.ebuild deleted file mode 100644 index c3bf3f4c5312..000000000000 --- a/games-emulation/sdlmametools/sdlmametools-0.149.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic python-any-r1 games - -MY_PV=${PV/.} -MY_P=${PN%tools}${MY_PV} -MY_P=${MY_P%%_p*} - -# patches -SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)" - -DESCRIPTION="Set of development tools shared between sdlmame and sdlmess" -HOMEPAGE="http://mamedev.org/" -# Upstream doesn't allow fetching with unknown User-Agent such as wget -SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip" - -LICENSE="XMAME" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" - -RDEPEND=" - dev-libs/expat - media-libs/flac - >=media-libs/libsdl-1.2.10 - media-libs/sdl-ttf - sys-libs/zlib" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/unzip - virtual/pkgconfig" - -S=${WORKDIR} - -# Function to disable a makefile option -disable_feature() { - sed -i \ - -e "/$1.*=/s:^:# :" \ - "${S}"/${2:-makefile} \ - || die "sed failed" -} - -# Function to enable a makefile option -enable_feature() { - sed -i \ - -e "/^#.*$1.*=/s:^#::" \ - "${S}"/${2:-makefile} \ - || die "sed failed" -} - -pkg_setup() { - games_pkg_setup - python-any-r1_pkg_setup -} - -src_unpack() { - default - unpack ./mame.zip - rm -f mame.zip -} - -src_prepare() { - if [[ $PV == *_p* ]] ; then - edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff - einfo "Patching release with source updates" - epatch ${MY_PV%%_p*}*.diff - fi - edos2unix makefile src/osd/sdl/{osdsdl.h,sdl.mak} - - epatch \ - "${FILESDIR}"/${P}-QA.patch \ - "${FILESDIR}"/${P}-system-lua.patch \ - "${FILESDIR}"/${P}-no-opengl.patch \ - "${FILESDIR}"/${P}-debugger-linking.patch - - # Don't compile zlib and expat - einfo "Disabling embedded libraries: expat, flac, jpeg, zlib, lua" - disable_feature BUILD_EXPAT - disable_feature BUILD_FLAC - disable_feature BUILD_JPEG - disable_feature BUILD_ZLIB - - # unused, avoid linking -# disable_feature BUILD_LUA - - if use amd64; then - einfo "Enabling 64-bit support" - enable_feature PTR64 - fi - - if use ppc; then - einfo "Enabling PPC support" - enable_feature BIGENDIAN - fi - - enable_feature NO_USE_MIDI src/osd/sdl/sdl.mak - enable_feature NO_USE_QTDEBUG src/osd/sdl/sdl.mak - enable_feature NO_OPENGL src/osd/sdl/sdl.mak - enable_feature NO_X11 src/osd/sdl/sdl.mak -} - -src_compile() { - emake \ - NO_DEBUGGER=1 tools -} - -src_install() { - for i in chdman jedutil ldresample ldverify romcmp testkeys ; do - newgamesbin ${i} sdlmame-${i} - newman src/osd/sdl/man/${i}.1 sdlmame-${i}.1 - done - - prepgamesdirs -} diff --git a/games-emulation/sdlmess/Manifest b/games-emulation/sdlmess/Manifest deleted file mode 100644 index f0e246118259..000000000000 --- a/games-emulation/sdlmess/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST mame0148s.zip 33822494 SHA256 78d8a68ba53934fdfc895f450c08682dada81f7ec3e74a98fb042539506d9321 SHA512 a520115e2e82b2da3200ffa1fa56f668f95c3e26a927bcdb30a34e73053e55d26a6a6c1ec95eae1237bce1d2d0cd276b84466705fd5f53ac77827d06ea04bc03 WHIRLPOOL c6de71c198396977475110ab5840b7eaa6e5074519adffc286dd539ab916ea951fa1c307218b0d144cdc8aeeb096216106a3c21a6d53b42c04dc75e8103be04a -DIST mame0149s.zip 35160585 SHA256 0e41b5773bea217d3ca04002903ac5ef569e6f5b67c05c72496d2cd7993b0a6b SHA512 4b8bd72e93f71fdb52c643776ecefb87fe605effe3f8c1724156cf7fafb8107330d92914eb14208a170cd5a0ee2775e7ea8d8edd0b525a35bbb0d5514172c1c3 WHIRLPOOL c5821ffc0f640e93986cd88f9e530be36e5ba0405a5dbc69a5021c828248dc74541340d5d9d49ece19635b5239bbaeeeb93bad2800fc46e9f441d8ffd3751ca5 -DIST sdlmame0148u1_diff.zip 3386949 SHA256 27378d09e50f31ca0dd4f39df4c474016671946657eb7af9ea5aa0ffbae1d9bb SHA512 f62aa8ebfc3cfa96d2fd5e58c921cc2adfbe3704a745ef49bc247060ecd3333ecc12e1a3add810c6237f3f7a1946cf1b9d46e6d72aeb87baffebadb933de44de WHIRLPOOL 550f2e777363f307b8e56b4ec31f4852abe89434af5ce596bd6e6023f35a728e4078033b1edc4b302e0cf50fa646a190ec02be9329127379405aec2e9b591531 diff --git a/games-emulation/sdlmess/files/mess-0.148.ini.in b/games-emulation/sdlmess/files/mess-0.148.ini.in deleted file mode 100644 index 91d4db10aa44..000000000000 --- a/games-emulation/sdlmess/files/mess-0.148.ini.in +++ /dev/null @@ -1,283 +0,0 @@ -# -# CORE CONFIGURATION OPTIONS -# -readconfig 1 -writeconfig 0 - -# -# CORE SEARCH PATH OPTIONS -# -rompath $HOME/.sdlmess/roms;@GAMES_DATADIR@/sdlmess/roms -hashpath hash -samplepath $HOME/.sdlmess/samples;@GAMES_DATADIR@/sdlmess/samples -artpath $HOME/.sdlmess/artwork;@GAMES_DATADIR@/sdlmess/artwork -ctrlrpath $HOME/.sdlmess/ctrlr;@GAMES_SYSCONFDIR@/sdlmess/ctrlr;@GAMES_DATADIR@/sdlmess/ctrlr -inipath $HOME/.sdlmess;@GAMES_SYSCONFDIR@/sdlmess -fontpath $HOME/.sdlmess;@GAMES_DATADIR@/sdlmess -cheatpath $HOME/.sdlmess/cheats;@GAMES_SYSCONFDIR@/sdlmess/cheats;@GAMES_DATADIR@/sdlmess/cheats -crosshairpath $HOME/.sdlmess/crosshair;@GAMES_DATADIR@/sdlmess/crosshair - -# -# CORE OUTPUT DIRECTORY OPTIONS -# -cfg_directory $HOME/.sdlmess/cfg -nvram_directory $HOME/.sdlmess/nvram -memcard_directory $HOME/.sdlmess/memcard -input_directory $HOME/.sdlmess/inp -state_directory $HOME/.sdlmess/sta -snapshot_directory $HOME/.sdlmess/snap -diff_directory $HOME/.sdlmess/diff -comment_directory $HOME/.sdlmess/comments - -# -# CORE STATE/PLAYBACK OPTIONS -# -state -autosave 0 -playback -record -mngwrite -aviwrite -wavwrite -snapname %g/%i -snapsize auto -snapview internal -burnin 0 - -# -# CORE PERFORMANCE OPTIONS -# -autoframeskip 0 -frameskip 0 -seconds_to_run 0 -throttle 1 -sleep 1 -speed 1.0 -refreshspeed 0 - -# -# CORE ROTATION OPTIONS -# -rotate 1 -ror 0 -rol 0 -autoror 0 -autorol 0 -flipx 0 -flipy 0 - -# -# CORE ARTWORK OPTIONS -# -artwork_crop 0 -use_backdrops 1 -use_overlays 1 -use_bezels 1 -use_cpanels 1 -use_marquees 1 - -# -# CORE SCREEN OPTIONS -# -brightness 1.0 -contrast 1.0 -gamma 1.0 -pause_brightness 0.65 -effect none - -# -# CORE VECTOR OPTIONS -# -antialias 1 -beam 1.0 -flicker 0 - -# -# CORE SOUND OPTIONS -# -sound 1 -samplerate 48000 -samples 1 -volume 0 - -# -# CORE INPUT OPTIONS -# -coin_lockout 1 -ctrlr -mouse 0 -joystick 1 -lightgun 0 -multikeyboard 0 -multimouse 0 -steadykey 0 -ui_active 0 -offscreen_reload 0 -joystick_map auto -joystick_deadzone 0.3 -joystick_saturation 0.85 -natural 0 -joystick_contradictory 0 -coin_impulse 0 - -# -# CORE INPUT AUTOMATIC ENABLE OPTIONS -# -paddle_device keyboard -adstick_device keyboard -pedal_device keyboard -dial_device keyboard -trackball_device keyboard -lightgun_device keyboard -positional_device keyboard -mouse_device mouse - -# -# CORE DEBUGGING OPTIONS -# -log 0 -verbose 0 -update_in_pause 0 -debug 0 -debugscript -debug_internal 0 - -# -# CORE MISC OPTIONS -# -bios -cheat 0 -skip_gameinfo 0 -uifont default -ramsize -confirm_quit 0 -ui_mouse 0 - -# -# DEBUGGING OPTIONS -# -oslog 0 -watchdog 0 - -# -# PERFORMANCE OPTIONS -# -multithreading 0 -numprocessors auto -sdlvideofps 0 -bench 0 - -# -# VIDEO OPTIONS -# -video soft -numscreens 1 -window 0 -maximize 1 -keepaspect 1 -unevenstretch 1 -centerh 1 -centerv 1 -waitvsync 0 -syncrefresh 0 -scalemode none - -# -# OpenGL-SPECIFIC OPTIONS -# -filter 1 -prescale 1 -gl_forcepow2texture 0 -gl_notexturerect 0 -gl_vbo 1 -gl_pbo 1 -gl_glsl 0 -gl_glsl_filter 1 -glsl_shader_mame0 none -glsl_shader_mame1 none -glsl_shader_mame2 none -glsl_shader_mame3 none -glsl_shader_mame4 none -glsl_shader_mame5 none -glsl_shader_mame6 none -glsl_shader_mame7 none -glsl_shader_mame8 none -glsl_shader_mame9 none -glsl_shader_screen0 none -glsl_shader_screen1 none -glsl_shader_screen2 none -glsl_shader_screen3 none -glsl_shader_screen4 none -glsl_shader_screen5 none -glsl_shader_screen6 none -glsl_shader_screen7 none -glsl_shader_screen8 none -glsl_shader_screen9 none -gl_glsl_vid_attr 1 - -# -# PER-WINDOW VIDEO OPTIONS -# -screen auto -aspect auto -resolution auto -view auto -screen0 auto -aspect0 auto -resolution0 auto -view0 auto -screen1 auto -aspect1 auto -resolution1 auto -view1 auto -screen2 auto -aspect2 auto -resolution2 auto -view2 auto -screen3 auto -aspect3 auto -resolution3 auto -view3 auto - -# -# FULL SCREEN OPTIONS -# -switchres 0 -useallheads 0 - -# -# SOUND OPTIONS -# -audio_latency 3 - -# -# SDL KEYBOARD MAPPING -# -keymap 0 -keymap_file $HOME/.sdlmess/keymap.dat -uimodekey auto -#keymap_file @GAMES_DATADIR@/sdlmess/keymaps/km-be.txt -#keymap_file @GAMES_DATADIR@/sdlmess/keymaps/km-ch.txt -#keymap_file @GAMES_DATADIR@/sdlmess/keymaps/km-de.txt -#keymap_file @GAMES_DATADIR@/sdlmess/keymaps/km-fr.txt -#keymap_file @GAMES_DATADIR@/sdlmess/keymaps/km_it.txt - -# -# SDL JOYSTICK MAPPING -# -joy_idx1 auto -joy_idx2 auto -joy_idx3 auto -joy_idx4 auto -joy_idx5 auto -joy_idx6 auto -joy_idx7 auto -joy_idx8 auto -sixaxis 0 - -# -# SDL LOWLEVEL DRIVER OPTIONS -# -videodriver auto -audiodriver auto -gl_lib auto diff --git a/games-emulation/sdlmess/files/sdlmess-0.148_p1-makefile.patch b/games-emulation/sdlmess/files/sdlmess-0.148_p1-makefile.patch deleted file mode 100644 index 7ba59692f2e3..000000000000 --- a/games-emulation/sdlmess/files/sdlmess-0.148_p1-makefile.patch +++ /dev/null @@ -1,177 +0,0 @@ ---- makefile -+++ makefile -@@ -314,13 +314,14 @@ - endif - - # compiler, linker and utilities --AR = @ar --CC = @gcc --LD = @g++ -+AR ?= @ar -+CC ?= @gcc -+CXX ?= @g++ -+LD = $(CXX) - MD = -mkdir$(EXE) - RM = @rm -f - OBJDUMP = @objdump --PYTHON = @python -+PYTHON ?= @python - - - #------------------------------------------------- -@@ -455,7 +456,7 @@ - - # CFLAGS is defined based on C or C++ targets - # (remember, expansion only happens when used, so doing it here is ok) --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) - - # we compile C-only to C89 standard with GNU extensions - # we compile C++ code to C++98 standard with GNU extensions -@@ -463,9 +464,6 @@ - CPPONLYFLAGS += -x c++ -std=gnu++98 - COBJFLAGS += -x objective-c++ - --# this speeds it up a bit by piping between the preprocessor/compiler/assembler --CCOMFLAGS += -pipe -- - # add -g if we need symbols, and ensure we have frame pointers - ifdef SYMBOLS - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -@@ -479,19 +477,6 @@ - # add profiling information for the compiler - ifdef PROFILE - CCOMFLAGS += -pg --endif -- --# add the optimization flag --CCOMFLAGS += -O$(OPTIMIZE) -- --# add the error warning flag --ifndef NOWERROR --CCOMFLAGS += -Werror --endif -- --# if we are optimizing, include optimization options --ifneq ($(OPTIMIZE),0) --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) - endif - - # add a basic set of warnings -@@ -565,26 +550,11 @@ - - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional - # flags only used when linking the core emulator --LDFLAGS = --ifneq ($(TARGETOS),macosx) --ifneq ($(TARGETOS),os2) --ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common --endif --endif --endif - LDFLAGSEMULATOR = - - # add profiling information for the linker - ifdef PROFILE - LDFLAGS += -pg --endif -- --# strip symbols and other metadata in non-symbols and non profiling builds --ifndef SYMBOLS --ifneq ($(TARGETOS),macosx) --LDFLAGS += -s --endif - endif - - # output a map file (emulator only) ---- src/osd/sdl/sdl.mak -+++ src/osd/sdl/sdl.mak -@@ -24,6 +24,8 @@ - # uncomment and edit next line to specify a distribution - # supported debian-stable, ubuntu-intrepid - -+PKG_CONFIG ?= pkg-config -+ - # DISTRO = debian-stable - # DISTRO = ubuntu-intrepid - # DISTRO = gcc44-generic -@@ -91,9 +93,9 @@ - endif - - ifdef SDL_INSTALL_ROOT --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config - else --SDL_CONFIG = $(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_LIBVER)-config - endif - - ifeq ($(SDL_LIBVER),sdl2) -@@ -190,8 +192,8 @@ - SDL_NETWORK = taptun - - ifndef NO_USE_MIDI --INCPATH += `pkg-config --cflags alsa` --LIBS += `pkg-config --libs alsa` -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa) -+LIBS += $(shell $(PKG_CONFIG) --libs alsa) - endif - - endif -@@ -476,10 +478,10 @@ - # Remove the "/SDL" component from the include path so that we can compile - # files (header files are #include "SDL/something.h", so the extra "/SDL" - # causes a significant problem) --INCPATH += `sdl-config --cflags | sed 's:/SDL::'` -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::') - CCOMFLAGS += -DNO_SDL_GLEXT - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread - DEFS += -DMACOSX_USE_LIBSDL - endif # MACOSX_USE_LIBSDL - -@@ -532,8 +534,8 @@ - endif - endif - --INCPATH += `pkg-config --cflags fontconfig` --LIBS += `pkg-config --libs fontconfig` -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig) -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig) - - ifeq ($(SDL_LIBVER),sdl2) - LIBS += -lSDL2_ttf -@@ -616,8 +618,8 @@ - - ifeq ($(BASE_TARGETOS),os2) - --INCPATH += `sdl-config --cflags` --LIBS += `sdl-config --libs` -+INCPATH += $(shell $(SDL_CONFIG) --cflags) -+LIBS += $(shell $(SDL_CONFIG) --libs) - - endif # OS2 - -@@ -690,15 +692,15 @@ - - # the new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0` --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0` --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0` -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - #CCOMFLAGS += -DGTK_DISABLE_DEPRECATED - - # The newer debugger uses QT - ifdef USE_QTDEBUG --INCPATH += `pkg-config QtGui --cflags` --LIBS += `pkg-config QtGui --libs` -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs) - endif - - # some systems still put important things in a different prefix diff --git a/games-emulation/sdlmess/files/sdlmess-0.148_p1-no-opengl.patch b/games-emulation/sdlmess/files/sdlmess-0.148_p1-no-opengl.patch deleted file mode 100644 index 7b339ba71a59..000000000000 --- a/games-emulation/sdlmess/files/sdlmess-0.148_p1-no-opengl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h ---- a/src/osd/sdl/osdsdl.h 2012-07-11 20:49:55.070264487 +0200 -+++ b/src/osd/sdl/osdsdl.h 2012-07-11 20:51:45.976264395 +0200 -@@ -216,6 +216,8 @@ - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } - #if USE_OPENGL - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } -+#else -+ const char *gl_lib() const { return NULL; } - #endif - - private: diff --git a/games-emulation/sdlmess/files/sdlmess-0.149-QA.patch b/games-emulation/sdlmess/files/sdlmess-0.149-QA.patch deleted file mode 100644 index 97e4b8f41c10..000000000000 --- a/games-emulation/sdlmess/files/sdlmess-0.149-QA.patch +++ /dev/null @@ -1,191 +0,0 @@ -commit 938cfdf1f01bcc9ac736249ee6458a774d560738 -Author: hasufell -Date: Tue Jun 25 23:48:02 2013 +0200 - - QA: respect several environment variables - - such as CC,CFLAGS,PKG_CONFIG... - -diff --git a/makefile b/makefile -index ad6ae2d..dd4598d 100644 ---- a/makefile -+++ b/makefile -@@ -317,13 +317,15 @@ BUILD_EXE = $(EXE) - endif - - # compiler, linker and utilities --AR = @ar --CC = @gcc --LD = @g++ -+AR ?= @ar -+CC ?= @gcc -+CXX ?= @g++ -+LD = $(CXX) - MD = -mkdir$(EXE) - RM = @rm -f - OBJDUMP = @objdump --PYTHON = @python -+PYTHON ?= @python -+PKG_CONFIG ?= pkg-config - - - #------------------------------------------------- -@@ -458,7 +460,7 @@ CPPONLYFLAGS = - - # CFLAGS is defined based on C or C++ targets - # (remember, expansion only happens when used, so doing it here is ok) --CFLAGS = $(CCOMFLAGS) $(CPPONLYFLAGS) -+CFLAGS += $(CCOMFLAGS) $(CPPONLYFLAGS) - - # we compile C-only to C89 standard with GNU extensions - # we compile C++ code to C++98 standard with GNU extensions -@@ -466,9 +468,6 @@ CONLYFLAGS += -std=gnu89 - CPPONLYFLAGS += -x c++ -std=gnu++98 - COBJFLAGS += -x objective-c++ - --# this speeds it up a bit by piping between the preprocessor/compiler/assembler --CCOMFLAGS += -pipe -- - # add -g if we need symbols, and ensure we have frame pointers - ifdef SYMBOLS - CCOMFLAGS += -g$(SYMLEVEL) -fno-omit-frame-pointer -@@ -484,19 +483,6 @@ ifdef PROFILE - CCOMFLAGS += -pg - endif - --# add the optimization flag --CCOMFLAGS += -O$(OPTIMIZE) -- --# add the error warning flag --ifndef NOWERROR --CCOMFLAGS += -Werror --endif -- --# if we are optimizing, include optimization options --ifneq ($(OPTIMIZE),0) --CCOMFLAGS += -fno-strict-aliasing $(ARCHOPTS) --endif -- - # add a basic set of warnings - CCOMFLAGS += \ - -Wall \ -@@ -576,14 +562,6 @@ endif - - # LDFLAGS are used generally; LDFLAGSEMULATOR are additional - # flags only used when linking the core emulator --LDFLAGS = --ifneq ($(TARGETOS),macosx) --ifneq ($(TARGETOS),os2) --ifneq ($(TARGETOS),solaris) --LDFLAGS = -Wl,--warn-common --endif --endif --endif - LDFLAGSEMULATOR = - - # add profiling information for the linker -@@ -591,13 +569,6 @@ ifdef PROFILE - LDFLAGS += -pg - endif - --# strip symbols and other metadata in non-symbols and non profiling builds --ifndef SYMBOLS --ifneq ($(TARGETOS),macosx) --LDFLAGS += -s --endif --endif -- - # output a map file (emulator only) - ifdef MAP - LDFLAGSEMULATOR += -Wl,-Map,$(FULLNAME).map -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak -index 84332ef..36655d3 100644 ---- a/src/osd/sdl/sdl.mak -+++ b/src/osd/sdl/sdl.mak -@@ -24,6 +24,8 @@ - # uncomment and edit next line to specify a distribution - # supported debian-stable, ubuntu-intrepid - -+PKG_CONFIG ?= pkg-config -+ - # DISTRO = debian-stable - # DISTRO = ubuntu-intrepid - # DISTRO = gcc44-generic -@@ -88,9 +90,9 @@ SDL_LIBVER = sdl - endif - - ifdef SDL_INSTALL_ROOT --SDL_CONFIG = $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_INSTALL_ROOT)/bin/$(SDL_LIBVER)-config - else --SDL_CONFIG = $(SDL_LIBVER)-config -+SDL_CONFIG ?= $(SDL_LIBVER)-config - endif - - ifeq ($(SDL_LIBVER),sdl2) -@@ -187,8 +189,8 @@ SYNC_IMPLEMENTATION = tc - SDL_NETWORK = taptun - - ifndef NO_USE_MIDI --INCPATH += `pkg-config --cflags alsa` --LIBS += `pkg-config --libs alsa` -+INCPATH += $(shell $(PKG_CONFIG) --cflags alsa) -+LIBS += $(shell $(PKG_CONFIG) --libs alsa) - endif - - endif -@@ -478,10 +480,10 @@ else - # Remove the "/SDL" component from the include path so that we can compile - # files (header files are #include "SDL/something.h", so the extra "/SDL" - # causes a significant problem) --INCPATH += `sdl-config --cflags | sed 's:/SDL::'` -+INCPATH += $(shell $(SDL_CONFIG) --cflags | sed 's:/SDL::') - CCOMFLAGS += -DNO_SDL_GLEXT - # Remove libSDLmain, as its symbols conflict with SDLMain_tmpl.m --LIBS += `sdl-config --libs | sed 's/-lSDLmain//'` -lpthread -+LIBS += $(shell $(SDL_CONFIG) --libs | sed 's/-lSDLmain//') -lpthread - DEFS += -DMACOSX_USE_LIBSDL - endif # MACOSX_USE_LIBSDL - -@@ -534,8 +536,8 @@ INCPATH += -I$(SDL_INSTALL_ROOT)/include/directfb - endif - endif - --INCPATH += `pkg-config --cflags fontconfig` --LIBS += `pkg-config --libs fontconfig` -+INCPATH += $(shell $(PKG_CONFIG) --cflags fontconfig) -+LIBS += $(shell $(PKG_CONFIG) --libs fontconfig) - - ifeq ($(SDL_LIBVER),sdl2) - LIBS += -lSDL2_ttf -@@ -620,8 +622,8 @@ endif # Win32 - - ifeq ($(BASE_TARGETOS),os2) - --INCPATH += `sdl-config --cflags` --LIBS += `sdl-config --libs` -+INCPATH += $(shell $(SDL_CONFIG) --cflags) -+LIBS += $(shell $(SDL_CONFIG) --libs) - - endif # OS2 - -@@ -696,14 +698,14 @@ LIBS += -lX11 -lXinerama - - # The newer debugger uses QT - ifndef NO_USE_QTDEBUG --INCPATH += `pkg-config QtGui --cflags` --LIBS += `pkg-config QtGui --libs` -+INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -+LIBS += $(shell $(PKG_CONFIG) QtGui --libs) - else - # the old-new debugger relies on GTK+ in addition to the base SDLMAME needs - # Non-X11 builds can not use the debugger --INCPATH += `pkg-config --cflags-only-I gtk+-2.0` `pkg-config --cflags-only-I gconf-2.0` --CCOMFLAGS += `pkg-config --cflags-only-other gtk+-2.0` `pkg-config --cflags-only-other gconf-2.0` --LIBS += `pkg-config --libs gtk+-2.0` `pkg-config --libs gconf-2.0` -+INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) -+CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) -+LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - endif - - # some systems still put important things in a different prefix diff --git a/games-emulation/sdlmess/files/sdlmess-0.149-debugger-linking.patch b/games-emulation/sdlmess/files/sdlmess-0.149-debugger-linking.patch deleted file mode 100644 index 6c7cd5d64199..000000000000 --- a/games-emulation/sdlmess/files/sdlmess-0.149-debugger-linking.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit ec92ac2b0180b101c30748e62eb8b76cdf0cb439 -Author: hasufell -Date: Wed Jun 26 14:33:01 2013 +0200 - - remove unneeded linking - - if we don't build the debugger, we don't want gtk+ linking - -diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak -index 36655d3..2089707 100644 ---- a/src/osd/sdl/sdl.mak -+++ b/src/osd/sdl/sdl.mak -@@ -696,6 +696,7 @@ else - DEFS += -DSDLMAME_X11 - LIBS += -lX11 -lXinerama - -+ifneq ($(NO_DEBUGGER),1) - # The newer debugger uses QT - ifndef NO_USE_QTDEBUG - INCPATH += $(shell $(PKG_CONFIG) QtGui --cflags) -@@ -707,6 +708,7 @@ INCPATH += $(shell $(PKG_CONFIG) --cflags-only-I gtk+-2.0 gconf-2.0) - CCOMFLAGS += $(shell $(PKG_CONFIG) --cflags-only-other gtk+-2.0 gconf-2.0) - LIBS += $(shell $(PKG_CONFIG) --libs gtk+-2.0 gconf-2.0) - endif -+endif # NO_DEBUGGER - - # some systems still put important things in a different prefix - LIBS += -L/usr/X11/lib -L/usr/X11R6/lib -L/usr/openwin/lib diff --git a/games-emulation/sdlmess/files/sdlmess-0.149-no-opengl.patch b/games-emulation/sdlmess/files/sdlmess-0.149-no-opengl.patch deleted file mode 100644 index cd32cd35d075..000000000000 --- a/games-emulation/sdlmess/files/sdlmess-0.149-no-opengl.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 6ee372b3693857372a7b4855039ad1a94d3aebca -Author: hasufell -Date: Tue Jun 25 23:51:12 2013 +0200 - - fix for disabled opengl - -diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h -index ed0b66b..03d68f9 100644 ---- a/src/osd/sdl/osdsdl.h -+++ b/src/osd/sdl/osdsdl.h -@@ -219,6 +219,8 @@ public: - const char *audio_driver() const { return value(SDLOPTION_AUDIODRIVER); } - #if USE_OPENGL - const char *gl_lib() const { return value(SDLOPTION_GL_LIB); } -+#else -+ const char *gl_lib() const { return NULL; } - #endif - - private: diff --git a/games-emulation/sdlmess/files/sdlmess-0.149-system-lua.patch b/games-emulation/sdlmess/files/sdlmess-0.149-system-lua.patch deleted file mode 100644 index 8460497f1d68..000000000000 --- a/games-emulation/sdlmess/files/sdlmess-0.149-system-lua.patch +++ /dev/null @@ -1,33 +0,0 @@ -commit ea514c9ded266aa365976649d88fa5593ef7ebf5 -Author: hasufell -Date: Tue Jun 25 23:48:26 2013 +0200 - - add switch to use system lua - -diff --git a/makefile b/makefile -index dd4598d..bdf22d2 100644 ---- a/makefile -+++ b/makefile -@@ -228,6 +228,9 @@ BUILD_JPEGLIB = 1 - # uncomment next line to build PortMidi as part of MAME/MESS build - BUILD_MIDILIB = 1 - -+# uncomment next line to build Lua-5.2 as part of MAME/MESS build -+BUILD_LUA = 1 -+ - # uncomment next line to include the symbols - # SYMBOLS = 1 - -@@ -664,7 +667,12 @@ SOFTFLOAT = $(OBJ)/libsoftfloat.a - FORMATS_LIB = $(OBJ)/libformats.a - - # add LUA library -+ifeq ($(BUILD_LUA),1) - LUA_LIB = $(OBJ)/liblua.a -+else -+LIBS += $(shell $(PKG_CONFIG) --libs lua) -+INCPATH += $(shell $(PKG_CONFIG) --cflags lua) -+endif - - # add PortMidi MIDI library - ifeq ($(BUILD_MIDILIB),1) diff --git a/games-emulation/sdlmess/files/vector.ini b/games-emulation/sdlmess/files/vector.ini deleted file mode 100644 index d4906e34ccd7..000000000000 --- a/games-emulation/sdlmess/files/vector.ini +++ /dev/null @@ -1,9 +0,0 @@ -# -# Specific options file for vector games -# - -# -# VIDEO OPTIONS -# -video soft -yuvmode yv12 diff --git a/games-emulation/sdlmess/metadata.xml b/games-emulation/sdlmess/metadata.xml deleted file mode 100644 index 78274e0fa550..000000000000 --- a/games-emulation/sdlmess/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - games@gentoo.org - Gentoo Games Project - - diff --git a/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild b/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild deleted file mode 100644 index 06921fbaf7e5..000000000000 --- a/games-emulation/sdlmess/sdlmess-0.148_p1.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic python-any-r1 games - -MY_PV=${PV/.} -MY_CONF_PN=${PN/sdl} -MY_P=sdlmame${MY_PV} -MY_P=${MY_P%%_p*} -MY_CONF_VER="0.148" - -# patches -SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)" - -DESCRIPTION="Multi Emulator Super System (SDL)" -HOMEPAGE="http://mamedev.org/" -# Upstream doesn't allow fetching with unknown User-Agent such as wget -SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip" -if [[ ${PN} == "sdlmame" ]] ; then - SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz" -fi - -LICENSE="XMAME" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="X debug opengl" -REQUIRED_USE="debug? ( X )" - -RDEPEND="dev-libs/expat - media-libs/fontconfig - media-libs/flac - >=media-libs/libsdl-1.2.10[sound,joystick,opengl?,video] - media-libs/sdl-ttf - sys-libs/zlib - virtual/jpeg:0 - media-libs/portmidi - X? ( - gnome-base/gconf - x11-libs/gtk+:2 - x11-libs/libX11 - x11-libs/libXinerama - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/unzip - virtual/pkgconfig - X? ( x11-proto/xineramaproto )" - -S=${WORKDIR} - -# Function to disable a makefile option -disable_feature() { - sed -i \ - -e "/$1.*=/s:^:# :" \ - "${S}"/makefile \ - || die "sed failed" -} - -# Function to enable a makefile option -enable_feature() { - sed -i \ - -e "/^#.*$1.*=/s:^#::" \ - "${S}"/${2:-makefile} \ - || die "sed failed" -} - -pkg_setup() { - games_pkg_setup - python-any-r1_pkg_setup -} - -src_unpack() { - default - unpack ./mame.zip - rm -f mame.zip -} - -src_prepare() { - if [[ $PV == *_p* ]] ; then - edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff - einfo "Patching release with source updates" - epatch ${MY_PV%%_p*}*.diff - fi - edos2unix src/osd/sdl/osdsdl.h - - epatch \ - "${FILESDIR}"/${P}-makefile.patch \ - "${FILESDIR}"/${P}-no-opengl.patch - - # Don't compile zlib and expat - einfo "Disabling embedded libraries: expat, flac, jpeg, portmidi, zlib" - disable_feature BUILD_EXPAT - disable_feature BUILD_FLAC - disable_feature BUILD_JPEG - disable_feature BUILD_MIDILIB - disable_feature BUILD_ZLIB - - if use amd64; then - einfo "Enabling 64-bit support" - enable_feature PTR64 - fi - - if use ppc; then - einfo "Enabling PPC support" - enable_feature BIGENDIAN - fi - - if use debug; then - einfo "Enabling debug support" - enable_feature DEBUG - fi - - if ! use opengl ; then - einfo "Disabling opengl support" - enable_feature NO_OPENGL src/osd/sdl/sdl.mak - fi - - if ! use X ; then - einfo "Disabling X support" - enable_feature NO_X11 src/osd/sdl/sdl.mak - fi -} - -src_compile() { - emake \ - TARGET="${PN#sdl}" \ - NAME="${PN}" \ - OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \ - NO_DEBUGGER=$(usex debug "0" "1") default -} - -src_install() { - newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} - - newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6 - - insinto "${GAMES_DATADIR}/${PN}" - doins -r src/osd/sdl/keymaps - [[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf - - insinto "${GAMES_SYSCONFDIR}/${PN}" - doins "${FILESDIR}"/vector.ini - - sed \ - -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \ - -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \ - "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \ - || die "sed failed" - - dodoc docs/{config,mame,newvideo}.txt - if [[ ${PN} == "sdlmame" ]] ; then - dodoc whatsnew*.txt - else - dodoc messnew*.txt - fi - - keepdir \ - "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \ - "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats} - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - - elog "optional dependencies:" - elog " games-emulation/sdlmametools (development tools)" - echo - elog "It's strongly recommended that you change either the system-wide" - elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}" - - if use opengl; then - echo - elog "You built ${PN} with opengl support and should set" - elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that" - fi -} diff --git a/games-emulation/sdlmess/sdlmess-0.149.ebuild b/games-emulation/sdlmess/sdlmess-0.149.ebuild deleted file mode 100644 index 48fe1ccd4643..000000000000 --- a/games-emulation/sdlmess/sdlmess-0.149.ebuild +++ /dev/null @@ -1,190 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils flag-o-matic python-any-r1 games - -MY_PV=${PV/.} -MY_CONF_PN=${PN/sdl} -MY_P=sdlmame${MY_PV} -MY_P=${MY_P%%_p*} -MY_CONF_VER="0.148" - -# patches -SRC_URI="$(for PATCH_VER in $(seq 1 ${PV##*_p}) ; do echo "https://dev.gentoo.org/~hasufell/distfiles/${MY_P}u${PATCH_VER}_diff.zip"; done)" - -DESCRIPTION="Multi Emulator Super System (SDL)" -HOMEPAGE="http://mamedev.org/" -# Upstream doesn't allow fetching with unknown User-Agent such as wget -SRC_URI="$SRC_URI https://dev.gentoo.org/~hasufell/distfiles/${MY_P/sdl}s.zip" -if [[ ${PN} == "sdlmame" ]] ; then - SRC_URI="$SRC_URI http://www.netswarm.net/misc/sdlmame-ui.bdf.gz" -fi - -LICENSE="XMAME" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X debug opengl" -REQUIRED_USE="debug? ( X )" - -RDEPEND=">=dev-lang/lua-5.2 - dev-libs/expat - media-libs/fontconfig - media-libs/flac - >=media-libs/libsdl-1.2.10[sound,joystick,opengl?,video] - media-libs/sdl-ttf - sys-libs/zlib - virtual/jpeg:0 - media-libs/portmidi - debug? ( - x11-libs/gtk+:2 - gnome-base/gconf - ) - X? ( - x11-libs/libX11 - x11-libs/libXinerama - )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - app-arch/unzip - virtual/pkgconfig - X? ( x11-proto/xineramaproto )" - -S=${WORKDIR} - -# Function to disable a makefile option -disable_feature() { - sed -i \ - -e "/$1.*=/s:^:# :" \ - "${S}"/${2:-makefile} \ - || die "sed failed" -} - -# Function to enable a makefile option -enable_feature() { - sed -i \ - -e "/^#.*$1.*=/s:^#::" \ - "${S}"/${2:-makefile} \ - || die "sed failed" -} - -pkg_setup() { - games_pkg_setup - python-any-r1_pkg_setup -} - -src_unpack() { - default - unpack ./mame.zip - rm -f mame.zip -} - -src_prepare() { - if [[ $PV == *_p* ]] ; then - edos2unix $(find $(grep +++ *diff | awk '{ print $2 }' | sort -u) 2>/dev/null) *diff - einfo "Patching release with source updates" - epatch ${MY_PV%%_p*}*.diff - fi - edos2unix makefile src/osd/sdl/{osdsdl.h,sdl.mak} - - epatch \ - "${FILESDIR}"/${P}-QA.patch \ - "${FILESDIR}"/${P}-system-lua.patch \ - "${FILESDIR}"/${P}-no-opengl.patch \ - "${FILESDIR}"/${P}-debugger-linking.patch - - # Don't compile zlib and expat - einfo "Disabling embedded libraries: expat, flac, jpeg, lua, portmidi, zlib" - disable_feature BUILD_EXPAT - disable_feature BUILD_FLAC - disable_feature BUILD_JPEG - disable_feature BUILD_LUA - disable_feature BUILD_MIDILIB - disable_feature BUILD_ZLIB - - if use amd64; then - einfo "Enabling 64-bit support" - enable_feature PTR64 - fi - - if use ppc; then - einfo "Enabling PPC support" - enable_feature BIGENDIAN - fi - - if use debug; then - einfo "Enabling debug support" - enable_feature DEBUG - enable_feature DEBUG src/osd/sdl/sdl.mak - fi - - enable_feature NO_USE_QTDEBUG src/osd/sdl/sdl.mak - - if ! use opengl ; then - einfo "Disabling opengl support" - enable_feature NO_OPENGL src/osd/sdl/sdl.mak - fi - - if ! use X ; then - einfo "Disabling X support" - enable_feature NO_X11 src/osd/sdl/sdl.mak - fi -} - -src_compile() { - emake \ - TARGET="${PN#sdl}" \ - NAME="${PN}" \ - OPT_FLAGS='-DINI_PATH=\"\$$HOME/.'${PN}'\;'"${GAMES_SYSCONFDIR}/${PN}"'\"' \ - NO_DEBUGGER=$(usex debug "0" "1") default -} - -src_install() { - newgamesbin ${PN}$(use amd64 && echo 64)$(use debug && echo d) ${PN} - - newman src/osd/sdl/man/${PN#sdl}.6 ${PN}.6 - - insinto "${GAMES_DATADIR}/${PN}" - doins -r src/osd/sdl/keymaps - [[ ${PN} == "sdlmame" ]] && newins sdlmame-ui.bdf ui.bdf - - insinto "${GAMES_SYSCONFDIR}/${PN}" - doins "${FILESDIR}"/vector.ini - - sed \ - -e "s:@GAMES_SYSCONFDIR@:${GAMES_SYSCONFDIR}:" \ - -e "s:@GAMES_DATADIR@:${GAMES_DATADIR}:" \ - "${FILESDIR}/${MY_CONF_PN}-${MY_CONF_VER}".ini.in > "${D}/${GAMES_SYSCONFDIR}/${PN}/${MY_CONF_PN}".ini \ - || die "sed failed" - - dodoc docs/{config,mame,newvideo}.txt - if [[ ${PN} == "sdlmame" ]] ; then - dodoc whatsnew*.txt - else - dodoc messnew*.txt - fi - - keepdir \ - "${GAMES_DATADIR}/${PN}"/{ctrlr,cheats,roms,samples,artwork,crosshair} \ - "${GAMES_SYSCONFDIR}/${PN}"/{ctrlr,cheats} - - prepgamesdirs -} - -pkg_postinst() { - games_pkg_postinst - - elog "optional dependencies:" - elog " games-emulation/sdlmametools (development tools)" - echo - elog "It's strongly recommended that you change either the system-wide" - elog "${MY_CONF_PN}.ini at \"${GAMES_SYSCONFDIR}/${PN}\" or use a per-user setup at \$HOME/.${PN}" - - if use opengl; then - echo - elog "You built ${PN} with opengl support and should set" - elog "\"video\" to \"opengl\" in ${MY_CONF_PN}.ini to take advantage of that" - fi -} diff --git a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild b/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild deleted file mode 100644 index 736a1e74c6b5..000000000000 --- a/games-emulation/visualboyadvance/visualboyadvance-1.7.2-r3.ebuild +++ /dev/null @@ -1,82 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils flag-o-matic autotools games - -DESCRIPTION="gameboy, gameboy color, and gameboy advance emulator" -HOMEPAGE="http://vba.ngemu.com/" -SRC_URI="mirror://sourceforge/vba/VisualBoyAdvance-src-${PV}.tar.gz - mirror://gentoo/${P}-deprecatedsigc++.patch.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86 ~x86-fbsd" -IUSE="gtk cpu_flags_x86_mmx nls" - -RDEPEND="media-libs/libpng:0 - media-libs/libsdl[sound,video] - sys-libs/zlib[minizip] - gtk? ( - >=x11-libs/gtk+-2.4:2 - >=dev-cpp/gtkmm-2.4:2.4 - >=dev-cpp/libglademm-2.4:2.4 - ) - nls? ( virtual/libintl )" -DEPEND="${RDEPEND} - virtual/pkgconfig - cpu_flags_x86_mmx? ( dev-lang/nasm ) - nls? ( sys-devel/gettext )" - -S=${WORKDIR}/VisualBoyAdvance-${PV} - -src_prepare() { - cat >> src/i386/2xSaImmx.asm <<-EOF - %ifidn __OUTPUT_FORMAT__,elf - section .note.GNU-stack noalloc noexec nowrite progbits - %endif - EOF - - epatch \ - "${FILESDIR}"/${PV}-homedir.patch \ - "${FILESDIR}"/${PV}-gcc34.patch \ - "${FILESDIR}"/${PV}-gcc41.patch \ - "${FILESDIR}"/${P}-gcc47.patch \ - "${WORKDIR}"/${P}-deprecatedsigc++.patch \ - "${FILESDIR}"/${P}-uninit.patch \ - "${FILESDIR}"/${P}-glibc2.10.patch \ - "${FILESDIR}"/${P}-ovflfix.patch \ - "${FILESDIR}"/${P}-libpng15.patch \ - "${FILESDIR}"/${P}-zlib.patch \ - "${FILESDIR}"/${P}-zlib-1.2.6.patch \ - "${FILESDIR}"/${P}-sys-types.patch - - mv configure.in configure.ac || die - eautoreconf - - sed -i \ - -e 's:$(localedir):/usr/share/locale:' \ - -e 's:$(datadir)/locale:/usr/share/locale:' \ - $(find . -name 'Makefile.in*') || die -} - -src_configure() { - # -O3 causes GCC to behave badly and hog memory, bug #64670. - replace-flags -O3 -O2 - - # Removed --enable-c-core as it *should* determine this based on arch - egamesconf \ - $(use_with cpu_flags_x86_mmx mmx) \ - $(use_enable gtk gtk 2.4) \ - $(use_enable nls) -} - -src_install() { - default - if use gtk ; then - newicon src/gtk/images/vba-64.png ${PN}.png - make_desktop_entry gvba VisualBoyAdvance - fi - prepgamesdirs -} diff --git a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild deleted file mode 100644 index a10bc424a32d..000000000000 --- a/games-engines/scummvm-tools/scummvm-tools-1.7.0.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -WX_GTK_VER=2.8 -inherit wxwidgets eutils flag-o-matic games - -DESCRIPTION="utilities for the SCUMM game engine" -HOMEPAGE="http://scummvm.sourceforge.net/" -SRC_URI="mirror://sourceforge/scummvm/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd" -IUSE="flac iconv mad png vorbis" -RESTRICT="test" # some tests require external files - -RDEPEND="png? ( media-libs/libpng:0 ) - mad? ( media-libs/libmad ) - flac? ( media-libs/flac ) - vorbis? ( media-libs/libvorbis ) - iconv? ( virtual/libiconv media-libs/freetype:2 ) - sys-libs/zlib - >=dev-libs/boost-1.32 - x11-libs/wxGTK:2.8" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -src_prepare() { - rm -rf *.bat dists/win32 - sed -ri -e '/^(CC|CXX)\b/d' Makefile || die - epatch "${FILESDIR}/${P}-binprefix.patch" -} - -src_configure() { - # Not an autoconf script - ./configure \ - --enable-verbose-build \ - --mandir=/usr/share/man \ - --prefix="${GAMES_PREFIX}" \ - --libdir="${GAMES_PREFIX}/lib" \ - --datadir="${GAMES_DATADIR}" \ - $(use_enable flac) \ - $(use_enable iconv) \ - $(use_enable iconv freetype) \ - $(use_enable mad) \ - $(use_enable png) \ - $(use_enable vorbis) || die -} - -src_install() { - emake DESTDIR="${D}" EXEPREFIX="${PN}-" install - dodoc README TODO - prepgamesdirs -} diff --git a/games-engines/stratagus/Manifest b/games-engines/stratagus/Manifest index fbe2195a6446..da5357e36840 100644 --- a/games-engines/stratagus/Manifest +++ b/games-engines/stratagus/Manifest @@ -1,2 +1 @@ -DIST stratagus_2.2.7.orig.tar.gz 939967 SHA256 9bdaf207623b60a5e98451128bb7fb649e00ce4aba507320bde63e60f93e8c9f SHA512 965d7b87db209c03fbdb73bbc4a7a660e1de3073638ddb1883d62bd3f837c5785e130e5328cd704cb2859be5e49b1f5f09cadee42a1b202213f24859bf6dc10e WHIRLPOOL 55c975e75d2838fc3cc553f35a42ac5763243bd4c4970df713cc8f762a3aeb24ed23e291ecba5f948b24c1f6bbb4613706a80770d9baed1847cbb4cfcb4869f4 DIST stratagus_2.3.0.orig.tar.gz 1000990 SHA256 d3d124f253e987ee1be396ebcdec31228790163a121a9f4e0049d334114adb99 SHA512 ad38568029aa777fcc2d2e6d4a862b4192bc87354b23712270b9f0a62e269548a08097305e97adcea7bc9d9d506a6d092c578656a1957db808a48f44712a76bf WHIRLPOOL 705ab071fff4dc6d865d8e14c67bf3ef1e64fde45a85115178b4686d3c066907e193d733f5f9d09ec363660925349097f83afa6895a8c27e73c680e27db357a9 diff --git a/games-engines/stratagus/files/stratagus-2.2.7-debug.patch b/games-engines/stratagus/files/stratagus-2.2.7-debug.patch deleted file mode 100644 index 41817865c577..000000000000 --- a/games-engines/stratagus/files/stratagus-2.2.7-debug.patch +++ /dev/null @@ -1,19 +0,0 @@ -From: Julian Ospald -Date: Thu Oct 18 14:31:37 UTC 2012 -Subject: build-system - -do not rename the target if debug is enabled - ---- stratagus_2.2.7.orig/CMakeLists.txt -+++ stratagus_2.2.7.orig/CMakeLists.txt -@@ -911,10 +911,6 @@ - add_executable(stratagus WIN32 ${stratagus_SRCS} ${stratagus_HDRS}) - target_link_libraries(stratagus ${stratagus_LIBS}) - --if(CMAKE_BUILD_TYPE STREQUAL "Debug") -- set_target_properties(stratagus PROPERTIES OUTPUT_NAME stratagus-dbg) --endif() -- - if(WIN32 AND MINGW AND ENABLE_STATIC) - set_target_properties(stratagus PROPERTIES LINK_FLAGS "${LINK_FLAGS} -static-libgcc -static-libstdc++ -Wl,--stack,10485760") - endif() diff --git a/games-engines/stratagus/files/stratagus-2.2.7-doc.patch b/games-engines/stratagus/files/stratagus-2.2.7-doc.patch deleted file mode 100644 index 1605b81411fa..000000000000 --- a/games-engines/stratagus/files/stratagus-2.2.7-doc.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- stratagus_2.2.7.orig/CMakeLists.txt -+++ stratagus_2.2.7.orig/CMakeLists.txt -@@ -1050,7 +1050,7 @@ - doc/media.html - doc/metaserver_protocol.txt - doc/README-SDL.txt -- DESTINATION share/doc/stratagus -+ DESTINATION ${DOCDIR} - ) - install(DIRECTORY doc/graphics doc/scripts ${CMAKE_CURRENT_BINARY_DIR}/doxygen DESTINATION ${DOCDIR}) - endif(ENABLE_DOC AND DOXYGEN_FOUND) diff --git a/games-engines/stratagus/stratagus-2.2.7.ebuild b/games-engines/stratagus/stratagus-2.2.7.ebuild deleted file mode 100644 index dc052412e80d..000000000000 --- a/games-engines/stratagus/stratagus-2.2.7.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit cmake-utils eutils games - -DESCRIPTION="A realtime strategy game engine" -HOMEPAGE="http://stratagus.sourceforge.net/" -SRC_URI="https://launchpad.net/stratagus/trunk/${PV}/+download/stratagus_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="bzip2 debug doc mikmod mng theora vorbis" - -RDEPEND="dev-db/sqlite:3 - >=dev-lang/lua-5:0 - dev-lua/toluapp - media-libs/libpng:0 - virtual/opengl - x11-libs/libX11 - media-libs/libsdl[sound,opengl,video] - sys-libs/zlib - bzip2? ( app-arch/bzip2 ) - mikmod? ( media-libs/libmikmod ) - mng? ( media-libs/libmng ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - theora? ( media-libs/libtheora ) - )" -DEPEND="${RDEPEND} - doc? ( app-doc/doxygen ) - virtual/pkgconfig" - -REQUIRED_USE="theora? ( vorbis )" - -S=${WORKDIR}/${PN}_${PV}.orig - -src_prepare() { - epatch "${FILESDIR}"/${P}-{debug,doc}.patch -} - -src_configure() { - # there are in-source switches - use debug && CMAKE_BUILD_TYPE=Debug - - local mycmakeargs=( - -DGAMEDIR="${GAMES_BINDIR}" - -DBINDIR="${GAMES_BINDIR}" - -DSBINDIR="${GAMES_BINDIR}" - -DDOCDIR="/usr/share/doc/${PF}" - $(cmake-utils_use_with bzip2 BZIP2) - $(cmake-utils_use_enable doc DOC) - $(cmake-utils_use_with mikmod MIKMOD) - $(cmake-utils_use_with mng MNG) - $(cmake-utils_use_with vorbis OGGVORBIS) - $(cmake-utils_use_with theora THEORA) - -DENABLE_DEV=ON - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - prepgamesdirs -} diff --git a/games-fps/sauerbraten/Manifest b/games-fps/sauerbraten/Manifest index b55ec8496c0e..9d42bdef920a 100644 --- a/games-fps/sauerbraten/Manifest +++ b/games-fps/sauerbraten/Manifest @@ -1,2 +1 @@ -DIST sauerbraten_2013_01_04_collect_edition_linux.tar.bz2 589939261 SHA256 3ecc27c318125883763130e45805eb7ba3a426234e5766ab0d00522f4a437bd1 SHA512 f89c9e69bb69596829661f551e4b63b2f2af96a01f075cb94a80e2bfae4f8664b7dab8f4850b91499817240e0311b64b049ea985c761ff7bb6d39ed75e6198cd WHIRLPOOL d10e354942180064ab44a2f8c8b13819240fde3537825908768d1ddda24f600971641b8a9cee4abee9539ec912bf265cb1771c001ad81a33e287c99e0f6906b8 DIST sauerbraten_2013_02_03_collect_edition_linux.tar.bz2 589941180 SHA256 45c20521e3e56374490b2d9112a211538e801cf0161197f35476b30b7b58a78e SHA512 7864e346cc2bc86d78973db1b341fd8256cc2e1953be51263ef91a5374f9ec00276ba2940850e6d5bba7a57c71190b670dc7ba97021be2935c31f8694fed4897 WHIRLPOOL 47a21e233dc90b5284027dbe47d13e891a434e0e550c6102a456e6300e6d5f9daba23c27fc100428161641ba276fa13faac12b935ac590a108c516b9b7987f4e diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-QA.patch b/games-fps/sauerbraten/files/sauerbraten-2013.01.04-QA.patch deleted file mode 100644 index 21f1b13c7a2a..000000000000 --- a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-QA.patch +++ /dev/null @@ -1,50 +0,0 @@ -applied on top of sauerbraten-2013.01.04-system-enet.patch - -respect LDFLAGS, CXXFLAGS and CPPFLAGS ---- sauerbraten/src/Makefile -+++ sauerbraten/src/Makefile -@@ -1,4 +1,4 @@ --CXXFLAGS= -O3 -fomit-frame-pointer -+CXXFLAGS ?= -O3 -fomit-frame-pointer - override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti - - PLATFORM= $(shell uname -s) -@@ -139,11 +139,11 @@ - -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master - - %.h.gch: %.h -- $(CXX) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -o $(subst .h.gch,.tmp.h.gch,$@) $(subst .h.gch,.h,$@) - $(MV) $(subst .h.gch,.tmp.h.gch,$@) $@ - - %-standalone.o: %.cpp -- $(CXX) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $(subst -standalone.o,.cpp,$@) - - $(CLIENT_OBJS): CXXFLAGS += $(CLIENT_INCLUDES) - $(filter shared/%,$(CLIENT_OBJS)): $(filter shared/%,$(CLIENT_PCH)) -@@ -168,19 +168,19 @@ - install: all - else - client: $(CLIENT_OBJS) -- $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) - - server: $(SERVER_OBJS) -- $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) - - master: $(MASTER_OBJS) -- $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) - - shared/cube2font.o: shared/cube2font.c -- $(CXX) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags` -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c -o $@ $< `freetype-config --cflags` - - cube2font: shared/cube2font.o -- $(CXX) $(CXXFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz -+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -o cube2font shared/cube2font.o `freetype-config --libs` -lz - - install: all - cp sauer_client ../bin_unix/$(PLATFORM_PREFIX)_client diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-master.patch b/games-fps/sauerbraten/files/sauerbraten-2013.01.04-master.patch deleted file mode 100644 index 730a69a2f4d0..000000000000 --- a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-master.patch +++ /dev/null @@ -1,323 +0,0 @@ -http://sourceforge.net/p/sauerbraten/code/4699/ - ---- a/src/shared/iengine.h -+++ b/src/shared/iengine.h -@@ -415,23 +415,6 @@ - extern int getservermtu(); - extern int getnumclients(); - extern uint getclientip(int n); --extern void putint(ucharbuf &p, int n); --extern void putint(packetbuf &p, int n); --extern void putint(vector &p, int n); --extern int getint(ucharbuf &p); --extern void putuint(ucharbuf &p, int n); --extern void putuint(packetbuf &p, int n); --extern void putuint(vector &p, int n); --extern int getuint(ucharbuf &p); --extern void putfloat(ucharbuf &p, float f); --extern void putfloat(packetbuf &p, float f); --extern void putfloat(vector &p, float f); --extern float getfloat(ucharbuf &p); --extern void sendstring(const char *t, ucharbuf &p); --extern void sendstring(const char *t, packetbuf &p); --extern void sendstring(const char *t, vector &p); --extern void getstring(char *t, ucharbuf &p, int len = MAXTRANS); --extern void filtertext(char *dst, const char *src, bool whitespace = true, int len = sizeof(string)-1); - extern void localconnect(); - extern const char *disconnectreason(int reason); - extern void disconnect_client(int n, int reason); ---- a/src/engine/server.cpp -+++ b/src/engine/server.cpp -@@ -99,125 +99,6 @@ - va_end(args); - } - #endif -- --// all network traffic is in 32bit ints, which are then compressed using the following simple scheme (assumes that most values are small). -- --template --static inline void putint_(T &p, int n) --{ -- if(n<128 && n>-127) p.put(n); -- else if(n<0x8000 && n>=-0x8000) { p.put(0x80); p.put(n); p.put(n>>8); } -- else { p.put(0x81); p.put(n); p.put(n>>8); p.put(n>>16); p.put(n>>24); } --} --void putint(ucharbuf &p, int n) { putint_(p, n); } --void putint(packetbuf &p, int n) { putint_(p, n); } --void putint(vector &p, int n) { putint_(p, n); } -- --int getint(ucharbuf &p) --{ -- int c = (char)p.get(); -- if(c==-128) { int n = p.get(); n |= char(p.get())<<8; return n; } -- else if(c==-127) { int n = p.get(); n |= p.get()<<8; n |= p.get()<<16; return n|(p.get()<<24); } -- else return c; --} -- --// much smaller encoding for unsigned integers up to 28 bits, but can handle signed --template --static inline void putuint_(T &p, int n) --{ -- if(n < 0 || n >= (1<<21)) -- { -- p.put(0x80 | (n & 0x7F)); -- p.put(0x80 | ((n >> 7) & 0x7F)); -- p.put(0x80 | ((n >> 14) & 0x7F)); -- p.put(n >> 21); -- } -- else if(n < (1<<7)) p.put(n); -- else if(n < (1<<14)) -- { -- p.put(0x80 | (n & 0x7F)); -- p.put(n >> 7); -- } -- else -- { -- p.put(0x80 | (n & 0x7F)); -- p.put(0x80 | ((n >> 7) & 0x7F)); -- p.put(n >> 14); -- } --} --void putuint(ucharbuf &p, int n) { putuint_(p, n); } --void putuint(packetbuf &p, int n) { putuint_(p, n); } --void putuint(vector &p, int n) { putuint_(p, n); } -- --int getuint(ucharbuf &p) --{ -- int n = p.get(); -- if(n & 0x80) -- { -- n += (p.get() << 7) - 0x80; -- if(n & (1<<14)) n += (p.get() << 14) - (1<<14); -- if(n & (1<<21)) n += (p.get() << 21) - (1<<21); -- if(n & (1<<28)) n |= -1<<28; -- } -- return n; --} -- --template --static inline void putfloat_(T &p, float f) --{ -- lilswap(&f, 1); -- p.put((uchar *)&f, sizeof(float)); --} --void putfloat(ucharbuf &p, float f) { putfloat_(p, f); } --void putfloat(packetbuf &p, float f) { putfloat_(p, f); } --void putfloat(vector &p, float f) { putfloat_(p, f); } -- --float getfloat(ucharbuf &p) --{ -- float f; -- p.get((uchar *)&f, sizeof(float)); -- return lilswap(f); --} -- --template --static inline void sendstring_(const char *t, T &p) --{ -- while(*t) putint(p, *t++); -- putint(p, 0); --} --void sendstring(const char *t, ucharbuf &p) { sendstring_(t, p); } --void sendstring(const char *t, packetbuf &p) { sendstring_(t, p); } --void sendstring(const char *t, vector &p) { sendstring_(t, p); } -- --void getstring(char *text, ucharbuf &p, int len) --{ -- char *t = text; -- do -- { -- if(t>=&text[len]) { text[len-1] = 0; return; } -- if(!p.remaining()) { *t = 0; return; } -- *t = getint(p); -- } -- while(*t++); --} -- --void filtertext(char *dst, const char *src, bool whitespace, int len) --{ -- for(int c = uchar(*src); c; c = uchar(*++src)) -- { -- if(c == '\f') -- { -- if(!*++src) break; -- continue; -- } -- if(iscubeprint(c) || (iscubespace(c) && whitespace)) -- { -- *dst++ = c; -- if(!--len) break; -- } -- } -- *dst = '\0'; --} - - enum { ST_EMPTY, ST_LOCAL, ST_TCPIP }; - ---- a/src/shared/tools.h -+++ b/src/shared/tools.h -@@ -1178,5 +1178,24 @@ - extern uint randomMT(); - extern int guessnumcpus(); - --#endif -- -+extern void putint(ucharbuf &p, int n); -+extern void putint(packetbuf &p, int n); -+extern void putint(vector &p, int n); -+extern int getint(ucharbuf &p); -+extern void putuint(ucharbuf &p, int n); -+extern void putuint(packetbuf &p, int n); -+extern void putuint(vector &p, int n); -+extern int getuint(ucharbuf &p); -+extern void putfloat(ucharbuf &p, float f); -+extern void putfloat(packetbuf &p, float f); -+extern void putfloat(vector &p, float f); -+extern float getfloat(ucharbuf &p); -+extern void sendstring(const char *t, ucharbuf &p); -+extern void sendstring(const char *t, packetbuf &p); -+extern void sendstring(const char *t, vector &p); -+extern void getstring(char *t, ucharbuf &p, int len); -+template static inline void getstring(T (&t)[N], ucharbuf &p) { getstring(t, p, N); } -+extern void filtertext(char *dst, const char *src, bool whitespace = true, int len = sizeof(string)-1); -+ -+#endif -+ ---- a/src/engine/master.cpp -+++ b/src/engine/master.cpp -@@ -514,7 +514,7 @@ - authreq &a = c.authreqs.add(); - a.reqtime = servtime; - a.id = id; -- uint seed[3] = { starttime, servtime, randomMT() }; -+ uint seed[3] = { uint(starttime), servtime, randomMT() }; - static vector buf; - buf.setsize(0); - a.answer = genchallenge(u->pubkey, seed, sizeof(seed), buf); ---- a/src/shared/tools.cpp -+++ b/src/shared/tools.cpp -@@ -53,3 +53,124 @@ - return y; - } - -+///////////////////////// network /////////////////////// -+ -+// all network traffic is in 32bit ints, which are then compressed using the following simple scheme (assumes that most values are small). -+ -+template -+static inline void putint_(T &p, int n) -+{ -+ if(n<128 && n>-127) p.put(n); -+ else if(n<0x8000 && n>=-0x8000) { p.put(0x80); p.put(n); p.put(n>>8); } -+ else { p.put(0x81); p.put(n); p.put(n>>8); p.put(n>>16); p.put(n>>24); } -+} -+void putint(ucharbuf &p, int n) { putint_(p, n); } -+void putint(packetbuf &p, int n) { putint_(p, n); } -+void putint(vector &p, int n) { putint_(p, n); } -+ -+int getint(ucharbuf &p) -+{ -+ int c = (char)p.get(); -+ if(c==-128) { int n = p.get(); n |= char(p.get())<<8; return n; } -+ else if(c==-127) { int n = p.get(); n |= p.get()<<8; n |= p.get()<<16; return n|(p.get()<<24); } -+ else return c; -+} -+ -+// much smaller encoding for unsigned integers up to 28 bits, but can handle signed -+template -+static inline void putuint_(T &p, int n) -+{ -+ if(n < 0 || n >= (1<<21)) -+ { -+ p.put(0x80 | (n & 0x7F)); -+ p.put(0x80 | ((n >> 7) & 0x7F)); -+ p.put(0x80 | ((n >> 14) & 0x7F)); -+ p.put(n >> 21); -+ } -+ else if(n < (1<<7)) p.put(n); -+ else if(n < (1<<14)) -+ { -+ p.put(0x80 | (n & 0x7F)); -+ p.put(n >> 7); -+ } -+ else -+ { -+ p.put(0x80 | (n & 0x7F)); -+ p.put(0x80 | ((n >> 7) & 0x7F)); -+ p.put(n >> 14); -+ } -+} -+void putuint(ucharbuf &p, int n) { putuint_(p, n); } -+void putuint(packetbuf &p, int n) { putuint_(p, n); } -+void putuint(vector &p, int n) { putuint_(p, n); } -+ -+int getuint(ucharbuf &p) -+{ -+ int n = p.get(); -+ if(n & 0x80) -+ { -+ n += (p.get() << 7) - 0x80; -+ if(n & (1<<14)) n += (p.get() << 14) - (1<<14); -+ if(n & (1<<21)) n += (p.get() << 21) - (1<<21); -+ if(n & (1<<28)) n |= -1<<28; -+ } -+ return n; -+} -+ -+template -+static inline void putfloat_(T &p, float f) -+{ -+ lilswap(&f, 1); -+ p.put((uchar *)&f, sizeof(float)); -+} -+void putfloat(ucharbuf &p, float f) { putfloat_(p, f); } -+void putfloat(packetbuf &p, float f) { putfloat_(p, f); } -+void putfloat(vector &p, float f) { putfloat_(p, f); } -+ -+float getfloat(ucharbuf &p) -+{ -+ float f; -+ p.get((uchar *)&f, sizeof(float)); -+ return lilswap(f); -+} -+ -+template -+static inline void sendstring_(const char *t, T &p) -+{ -+ while(*t) putint(p, *t++); -+ putint(p, 0); -+} -+void sendstring(const char *t, ucharbuf &p) { sendstring_(t, p); } -+void sendstring(const char *t, packetbuf &p) { sendstring_(t, p); } -+void sendstring(const char *t, vector &p) { sendstring_(t, p); } -+ -+void getstring(char *text, ucharbuf &p, int len) -+{ -+ char *t = text; -+ do -+ { -+ if(t>=&text[len]) { text[len-1] = 0; return; } -+ if(!p.remaining()) { *t = 0; return; } -+ *t = getint(p); -+ } -+ while(*t++); -+} -+ -+void filtertext(char *dst, const char *src, bool whitespace, int len) -+{ -+ for(int c = uchar(*src); c; c = uchar(*++src)) -+ { -+ if(c == '\f') -+ { -+ if(!*++src) break; -+ continue; -+ } -+ if(iscubeprint(c) || (iscubespace(c) && whitespace)) -+ { -+ *dst++ = c; -+ if(!--len) break; -+ } -+ } -+ *dst = '\0'; -+} -+ diff --git a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-system-enet.patch b/games-fps/sauerbraten/files/sauerbraten-2013.01.04-system-enet.patch deleted file mode 100644 index e87b280ba0c1..000000000000 --- a/games-fps/sauerbraten/files/sauerbraten-2013.01.04-system-enet.patch +++ /dev/null @@ -1,64 +0,0 @@ ---- sauerbraten/src/Makefile -+++ sauerbraten/src/Makefile -@@ -4,7 +4,7 @@ - PLATFORM= $(shell uname -s) - PLATFORM_PREFIX= native - --INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include -+INCLUDES= -Ishared -Iengine -Ifpsgame - - STRIP= - ifeq (,$(findstring -g,$(CXXFLAGS))) -@@ -36,8 +36,8 @@ - endif - CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm - else --CLIENT_INCLUDES= $(INCLUDES) -I/usr/X11R6/include `sdl-config --cflags` --CLIENT_LIBS= -Lenet/.libs -lenet -L/usr/X11R6/lib -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL -+CLIENT_INCLUDES= $(INCLUDES) `sdl-config --cflags` -+CLIENT_LIBS= -lenet -lX11 `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lGL - endif - ifeq ($(PLATFORM),Linux) - CLIENT_LIBS+= -lrt -@@ -106,7 +106,7 @@ - MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm - else - SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) --SERVER_LIBS= -Lenet/.libs -lenet -lz -+SERVER_LIBS= -lenet -lz - MASTER_LIBS= $(SERVER_LIBS) - endif - SERVER_OBJS= \ -@@ -135,15 +135,6 @@ - - all: client server - --enet/Makefile: -- cd enet; ./configure --enable-shared=no --enable-static=yes -- --libenet: enet/Makefile -- $(MAKE) -C enet/ all -- --clean-enet: enet/Makefile -- $(MAKE) -C enet/ clean -- - clean: - -$(RM) $(CLIENT_PCH) $(CLIENT_OBJS) $(SERVER_OBJS) $(MASTER_OBJS) sauer_client sauer_server sauer_master - -@@ -176,13 +167,13 @@ - - install: all - else --client: libenet $(CLIENT_OBJS) -+client: $(CLIENT_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_client $(CLIENT_OBJS) $(CLIENT_LIBS) - --server: libenet $(SERVER_OBJS) -+server: $(SERVER_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_server $(SERVER_OBJS) $(SERVER_LIBS) - --master: libenet $(MASTER_OBJS) -+master: $(MASTER_OBJS) - $(CXX) $(CXXFLAGS) -o sauer_master $(MASTER_OBJS) $(MASTER_LIBS) - - shared/cube2font.o: shared/cube2font.c diff --git a/games-fps/sauerbraten/files/sauerbraten_unix.patch b/games-fps/sauerbraten/files/sauerbraten_unix.patch deleted file mode 100644 index db2a032becf6..000000000000 --- a/games-fps/sauerbraten/files/sauerbraten_unix.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- sauerbraten_unix.orig 2008-08-15 20:05:44.000000000 +0200 -+++ sauerbraten_unix 2008-08-15 22:49:47.000000000 +0200 -@@ -3,6 +3,7 @@ - #SAUER_DIR=~/sauerbraten - #SAUER_DIR=/usr/local/sauerbraten - SAUER_DIR=. -+SAUER_DATADIR=. - - # SAUER_OPTIONS contains any command line options you would like to start Sauerbraten with. - #SAUER_OPTIONS="-f" -@@ -46,7 +47,7 @@ - - if [ -x ${SAUER_DIR}/bin_unix/${MACHINE_NAME}${SYSTEM_NAME}client ] - then -- cd ${SAUER_DIR} -+ cd ${SAUER_DATADIR} - exec ${SAUER_DIR}/bin_unix/${MACHINE_NAME}${SYSTEM_NAME}client ${SAUER_OPTIONS} $@ - else - echo "Your platform does not have a pre-compiled Sauerbraten client." diff --git a/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild b/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild deleted file mode 100644 index 053d913aec6c..000000000000 --- a/games-fps/sauerbraten/sauerbraten-2013.01.04.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils flag-o-matic gnome2-utils games - -EDITION="collect_edition" -DESCRIPTION="Cube 2: Sauerbraten is an open source game engine (Cube 2) with freeware game data (Sauerbraten)" -HOMEPAGE="http://sauerbraten.org/" -SRC_URI="mirror://sourceforge/sauerbraten/sauerbraten/2013_01_04/sauerbraten_${PV//./_}_${EDITION}_linux.tar.bz2" - -LICENSE="ZLIB freedist" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug dedicated server" - -RDEPEND=" - sys-libs/zlib - >=net-libs/enet-1.3.6:1.3 - !dedicated? ( - media-libs/libsdl[X,opengl] - media-libs/sdl-mixer[vorbis] - media-libs/sdl-image[png,jpeg] - virtual/opengl - virtual/glu - x11-libs/libX11 )" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/${PN} - -src_prepare() { - ecvs_clean - rm -rf sauerbraten_unix bin_unix src/{include,lib,vcpp} - - # Patch makefile to use system enet instead of bundled - # respect CXXFLAGS, LDFLAGS - epatch "${FILESDIR}"/${P}-{system-enet,QA,master}.patch - - # Fix links so they point to the correct directory - sed -i \ - -e 's:docs/::' \ - README.html \ - || die -} - -src_compile() { - use debug && append-cppflags -D_DEBUG - emake -C src master $(usex dedicated "server" "$(usex server "server client" "client")") -} - -src_install() { - local LIBEXECDIR="${GAMES_PREFIX}/lib" - local DATADIR="${GAMES_DATADIR}/${PN}" - local STATEDIR="${GAMES_STATEDIR}/${PN}" - - if ! use dedicated ; then - # Install the game data - insinto "${DATADIR}" - doins -r data packages - - # Install the client executable - exeinto "${LIBEXECDIR}" - doexe src/sauer_client - - # Install the client wrapper - games_make_wrapper "${PN}-client" "${LIBEXECDIR}/sauer_client -q\$HOME/.${PN} -r" "${DATADIR}" - - # Create menu entry - newicon -s 256 data/cube.png ${PN}.png - make_desktop_entry "${PN}-client" "Cube 2: Sauerbraten" - fi - - # Install the server config files - insinto "${STATEDIR}" - doins "server-init.cfg" - - # Install the server executables - exeinto "${LIBEXECDIR}" - doexe src/sauer_master - use dedicated || use server && doexe src/sauer_server - - games_make_wrapper "${PN}-server" \ - "${LIBEXECDIR}/sauer_server -k${DATADIR} -q${STATEDIR}" - games_make_wrapper "${PN}-master" \ - "${LIBEXECDIR}/sauer_master ${STATEDIR}" - - # Install the server init script - keepdir "${GAMES_STATEDIR}/run/${PN}" - cp "${FILESDIR}"/${PN}.init "${T}" || die - sed -i \ - -e "s:%SYSCONFDIR%:${STATEDIR}:g" \ - -e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \ - -e "s:%GAMES_STATEDIR%:${GAMES_STATEDIR}:g" \ - "${T}"/${PN}.init || die - newinitd "${T}"/${PN}.init ${PN} - cp "${FILESDIR}"/${PN}.conf "${T}" || die - sed -i \ - -e "s:%SYSCONFDIR%:${STATEDIR}:g" \ - -e "s:%LIBEXECDIR%:${LIBEXECDIR}:g" \ - -e "s:%GAMES_USER_DED%:${GAMES_USER_DED}:g" \ - -e "s:%GAMES_GROUP%:${GAMES_GROUP}:g" \ - "${T}"/${PN}.conf || die - newconfd "${T}"/${PN}.conf ${PN} - - dodoc src/*.txt docs/dev/*.txt - dohtml -r README.html docs/* - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update - - elog "If you plan to use map editor feature copy all map data from ${DATADIR}" - elog "to corresponding folder in your HOME/.${PN}" -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-fps/urbanterror/urbanterror-4.2.023.ebuild b/games-fps/urbanterror/urbanterror-4.2.023.ebuild index 012463043844..a28e710fcacb 100644 --- a/games-fps/urbanterror/urbanterror-4.2.023.ebuild +++ b/games-fps/urbanterror/urbanterror-4.2.023.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -12,7 +12,7 @@ DESCRIPTION="Hollywood tactical shooter based on the ioquake3 engine" HOMEPAGE="http://www.urbanterror.info/home/" SRC_URI="http://up.barbatos.fr/urt/${FULL_P}.zip https://github.com/Barbatos/ioq3-for-UrbanTerror-4/archive/release-${ENGINE_PV}.tar.gz -> ${PN}-${ENGINE_PV}.tar.gz - http://upload.wikimedia.org/wikipedia/en/5/56/Urbanterror.svg -> ${PN}.svg" + https://upload.wikimedia.org/wikipedia/commons/5/56/Urbanterror.svg -> ${PN}.svg" # fetch updates if [[ ${FULL_P#*full} != ${PV#*.} ]] ; then diff --git a/games-puzzle/xbomb/Manifest b/games-puzzle/xbomb/Manifest index 7a9e39037472..aed474b44a20 100644 --- a/games-puzzle/xbomb/Manifest +++ b/games-puzzle/xbomb/Manifest @@ -1,2 +1 @@ -DIST xbomb-2.2a.tgz 25080 SHA256 be9372a0447b9b606af2f705bcf24760e7cf5a51e7e917da43d4804c6ca8f068 SHA512 e0b223fbbbc1e3bf552b045134856e460e3c11366ace1b27564f9d3ae44c7fd32d65ba78b327b460a5c7f70deea01ab63aa21c9dab4996f813543347c86bd282 WHIRLPOOL 3ccca22a384de9a487ab7a183acb7bf33339e5cd4aa82ac2903c83f5ef2271fa832b629ef70b4b0b5684f8186b1c2126ad312f343989b84977270f44c2236a43 DIST xbomb-2.2b.tgz 24774 SHA256 350d8443c0f6339ef463effbb17c9347f669b8641a159a2447706324b87c2219 SHA512 7315cc08bff1ef14cc376ea3ad4913c4286e2e33e92ca1d924e4703fba2f58e5aa9df0db760cd0d9a83f2f1730cc65281403f5b198f32a30d0c5e736add8c2e1 WHIRLPOOL 0db3088207bb14548d300b3c19aa5310b71f81d05068de8070bd1195524849cdf47ea82f585b2461db0259a543d323d6a15f93be1dcf43c482fb84b90c2c1059 diff --git a/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch b/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch deleted file mode 100644 index 945ac700be86..000000000000 --- a/games-puzzle/xbomb/files/xbomb-2.2a-DESTDIR.patch +++ /dev/null @@ -1,35 +0,0 @@ -diff -c xbomb-2.1/Makefile xbomb-2.1.new/Makefile -*** xbomb-2.1/Makefile 1996-01-20 16:02:46.000000000 -0500 ---- xbomb-2.1.new/Makefile 2002-11-13 10:31:30.000000000 -0500 -*************** -*** 27,34 **** - - OBJ=xbomb.o xwindow.o hiscore.o - -- INSTDIR=/usr/local -- - ######## - - xbomb : $(OBJ) ---- 27,32 ---- -*************** -*** 52,60 **** - - install : - strip xbomb -! install -d $(INSTDIR)/bin -! install -d $(INSTDIR)/man/man6 -! install -d $(INSTDIR)/lib/app-defaults -! install -m 755 xbomb $(INSTDIR)/bin -! install -m 644 xbomb.6 $(INSTDIR)/man/man6 -! install -m 644 xbomb.ad $(INSTDIR)/lib/app-defaults/XBomb ---- 50,58 ---- - - install : - strip xbomb -! install -d $(DESTDIR)/usr/bin -! install -d $(DESTDIR)/usr/share/man/man6 -! install -d $(DESTDIR)/etc/X11/app-defaults -! install -m 755 xbomb $(DESTDIR)/usr/bin -! install -m 644 xbomb.6 $(DESTDIR)/usr/share/man/man6 -! install -m 644 xbomb.ad $(DESTDIR)/etc/X11/app-defaults/XBomb diff --git a/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch b/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch deleted file mode 100644 index b1a18784fa43..000000000000 --- a/games-puzzle/xbomb/files/xbomb-2.2a-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.old 2010-09-22 14:18:37.000000000 +0200 -+++ Makefile 2010-09-22 14:19:06.000000000 +0200 -@@ -30,7 +30,7 @@ - ######## - - xbomb : $(OBJ) -- $(LINK) $(OBJ) -o $@ $(LIB) $(XLIB) -+ $(LINK) $(LDFLAGS) $(OBJ) -o $@ $(LIB) $(XLIB) - - ######## - diff --git a/games-puzzle/xbomb/xbomb-2.2a.ebuild b/games-puzzle/xbomb/xbomb-2.2a.ebuild deleted file mode 100644 index dc722a6adc54..000000000000 --- a/games-puzzle/xbomb/xbomb-2.2a.ebuild +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils games - -DESCRIPTION="Minesweeper clone with hexagonal, rectangular and triangular grid" -HOMEPAGE="http://www.gedanken.demon.co.uk/xbomb/" -SRC_URI="http://www.gedanken.demon.co.uk/download-xbomb/${P}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="" - -DEPEND="x11-libs/libXaw" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch "${FILESDIR}"/${P}-DESTDIR.patch \ - "${FILESDIR}"/${P}-ldflags.patch - sed -i \ - -e '/strip/d' \ - -e "/^CFLAGS/ { s:=.*:=${CFLAGS}: }" \ - -e "s:/usr/bin:${GAMES_BINDIR}:" \ - Makefile \ - || die "sed Makefile failed" - sed -i \ - -e "s:/var/tmp:${GAMES_STATEDIR}/${PN}:g" \ - hiscore.c \ - || die "sed hiscore.c failed" -} - -src_install() { - default - dodoc LSM - dodir "${GAMES_STATEDIR}"/${PN} - touch "${D}/${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi || die "touch failed" - fperms 660 "${GAMES_STATEDIR}"/${PN}/${PN}{3,4,6}.hi - prepgamesdirs -} diff --git a/games-roguelike/angband/Manifest b/games-roguelike/angband/Manifest index 26cecd092c4f..5abfef6e7460 100644 --- a/games-roguelike/angband/Manifest +++ b/games-roguelike/angband/Manifest @@ -1,2 +1 @@ -DIST angband-4.0.3.tar.gz 19884304 SHA256 1752d22a164bb073b9a7be322a2b607b06a4c919c073d012c010a61578081ce8 SHA512 c900648b6972e27ab30aaac776bbad34aee2196b5b80c4574762ff21c7c42a42061f76379ec4c0c2aefdfd1647aa76f2bd9fdd0286a7bc762616d97799e51a24 WHIRLPOOL 45c6eb4b71bf51bf2d41d270a8bb699d924137ccce605df867bf098f8545067c405a4ea851fe25e37304c908a13dd4e41229bf653bb87632f2fedb64323f2363 DIST angband-4.0.4.tar.gz 19888293 SHA256 93f95444304d5178d23569dbd3dbe1eb29747201d353c676206f26b5bec4667c SHA512 73dbf0782f042dbc5ee9fe42430041f447a58ec14076280d2d6a44ec2b338dd4a7c220dc36f1b214380852283fb0d6e56fb338c2da95911b450714fb7f71e680 WHIRLPOOL aafa1fb9f0a54f8a39cb194e86fc4df43f0d773da58703b401cda0856ef2f99db7f351f444a3e0405b140a6130dd2da6fb318fde0e66f143ad38c51b7b91fa73 diff --git a/games-roguelike/angband/angband-4.0.3.ebuild b/games-roguelike/angband/angband-4.0.3.ebuild deleted file mode 100644 index d9cfb5fb5b3e..000000000000 --- a/games-roguelike/angband/angband-4.0.3.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit autotools eutils gnome2-utils versionator games - -MAJOR_PV=$(get_version_component_range 1-2) - -DESCRIPTION="A roguelike dungeon exploration game based on the books of J.R.R. Tolkien" -HOMEPAGE="http://rephial.org/" -SRC_URI="http://rephial.org/downloads/${MAJOR_PV}/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="ncurses sdl +sound X" - -RDEPEND="X? ( x11-libs/libX11 ) - !ncurses? ( !X? ( !sdl? ( sys-libs/ncurses:0=[unicode] ) ) ) - ncurses? ( sys-libs/ncurses:0=[unicode] ) - sdl? ( media-libs/libsdl[video,X] - media-libs/sdl-ttf - media-libs/sdl-image - sound? ( media-libs/sdl-mixer[mp3] - media-libs/libsdl[sound] ) )" -DEPEND="${RDEPEND} - dev-python/docutils - virtual/pkgconfig" - -src_prepare() { - - sed -i -e '/libpath/s#datarootdir#datadir#' configure.ac || die - sed -i -e "/^.SILENT/d" mk/buildsys.mk.in || die - sed -i -e '/^DOC =/s/=.*/=/' doc/Makefile || die - - if use !sound ; then - sed -i -e 's/sounds//' lib/Makefile || die - fi - - # Game constant files are now system config files in Angband, but - # users will be hidden from applying updates by default - { - echo "CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/customize/\"" - echo "CONFIG_PROTECT_MASK=\"${GAMES_SYSCONFDIR}/${PN}/gamedata/\"" - } > "${T}"/99${PN} || die - - eautoreconf -} - -src_configure() { - local myconf - - if use sdl; then - myconf="$(use_enable sound sdl-mixer)" - else - myconf="--disable-sdl-mixer" - fi - - egamesconf \ - --bindir="${GAMES_BINDIR}" \ - --with-private-dirs \ - $(use_enable X x11) \ - $(use_enable sdl) \ - $(use_enable ncurses curses) \ - $(use !sdl && use !ncurses && use !X && \ - echo --enable-curses) \ - ${myconf} -} - -src_install() { - DOCS="changes.txt faq.txt readme.txt thanks.txt" \ - default - - dohtml doc/manual.html - doenvd "${T}"/99${PN} - - if use X || use sdl ; then - if use X; then - make_desktop_entry "angband -mx11" "Angband (X11)" "${PN}" - fi - - if use sdl; then - make_desktop_entry "angband -msdl" "Angband (SDL)" "${PN}" - fi - - local s - for s in 16 32 128 256 512 - do - newicon -s ${s} lib/icons/att-${s}.png "${PN}.png" - done - newicon -s scalable lib/icons/att.svg "${PN}.svg" - fi - - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - if use X || use sdl ; then - gnome2_icon_savelist - fi -} - -pkg_postinst() { - echo - elog "Angband now uses private savefiles instead of system-wide ones." - elog "This version of Angband is not compatible with the save files" - elog "of previous versions." - echo - - games_pkg_postinst - if use X || use sdl ; then - gnome2_icon_cache_update - fi -} diff --git a/games-rpg/freedroidrpg/Manifest b/games-rpg/freedroidrpg/Manifest index dfe3e3b884a3..18b4a8623269 100644 --- a/games-rpg/freedroidrpg/Manifest +++ b/games-rpg/freedroidrpg/Manifest @@ -1,2 +1 @@ -DIST freedroidRPG-0.15.1.tar.gz 209427247 SHA256 3e0e0e901f05386f49b8dfa1a8b3582ea82347deb7fb8e94fc15bf8ad058ba08 SHA512 3e38753a040e507229b87235e449fc77db2457a4eb0129f8866a58e3863baa08304feb846828be95183a0b9e46f11761c706571ea68500203c953e1467e108a4 WHIRLPOOL 42f0d6e5ae48437ad0fb00d38966904601de80f2d7dbf6d93d40da5cf4897cc12fc82ec1b9ce500947ed4f1f583eb736fbfc2cdf7619f22999c0e28a007b0aac DIST freedroidRPG-0.16.tar.gz 225570013 SHA256 c11f28b69eed3e8e40528442d9e840847502ccd4d3d95d3f8182abc2b3b18135 SHA512 039ee4bfcd58e29a3cfa26ae7f2bc8aed7c289119476bb8f8486006910cf6a2127ba49f7526fac887392ca9e5320fb1a59ba068834e162348905423908b0755a WHIRLPOOL cc8e812515c9f0ce979558c8307fc2f7d30597c198fecd42e43e927b1969b8cacff0db4eed71a41b4119ddb64829d729593ee4151ca69c776f45b9295cda0978 diff --git a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild b/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild deleted file mode 100644 index 30483f5c26b8..000000000000 --- a/games-rpg/freedroidrpg/freedroidrpg-0.15.1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) -inherit eutils gnome2-utils python-any-r1 games - -DESCRIPTION="A modification of the classical Freedroid engine into an RPG" -HOMEPAGE="http://freedroid.sourceforge.net/" -SRC_URI="mirror://sourceforge/freedroid/freedroidRPG-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="opengl vorbis" - -RDEPEND="media-libs/libsdl[opengl?,video] - dev-lang/lua:0 - virtual/jpeg:0 - media-libs/libpng:0 - media-libs/sdl-image[jpeg,png] - media-libs/sdl-mixer[vorbis?] - >=media-libs/sdl-gfx-2.0.21 - vorbis? ( media-libs/libogg media-libs/libvorbis ) - x11-libs/libX11 - opengl? ( virtual/opengl )" -DEPEND="${RDEPEND} - ${PYTHON_DEPS}" - -pkg_setup() { - python-any-r1_pkg_setup - games_pkg_setup -} - -src_prepare() { - # No need for executable game resources - find sound graphics -type f -execdir chmod -c a-x '{}' + -} - -src_configure() { - egamesconf \ - --disable-dependency-tracking \ - --disable-fastmath \ - $(use_enable opengl) \ - $(use_enable vorbis) -} - -src_install() { - emake DESTDIR="${D}" install || die - rm -f "${D}/${GAMES_BINDIR}/"{croppy,pngtoico,*glue*,explode*,make_atlas} - newicon -s 64 win32/w32icon2_64x64.png ${PN}.png - make_desktop_entry freedroidRPG "Freedroid RPG" - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/games-strategy/wargus/Manifest b/games-strategy/wargus/Manifest index ef5fb999b80b..541dd702fc4f 100644 --- a/games-strategy/wargus/Manifest +++ b/games-strategy/wargus/Manifest @@ -1,2 +1 @@ -DIST wargus_2.2.7.orig.tar.gz 3655476 SHA256 f688663458e035725f5cd18535a7a1eaecd66eaf55b032fe2ac21ed48b239908 SHA512 a419e70c53db6f3919255ef98ea717a0802e0854095b019bd9c6eef66d6602f75c1849a53ef654b5d66191a824725e3eff23f1f01767eab861e6ddfaf2414bbb WHIRLPOOL d440ac1f279912b13f37fd618f31b1bb2ac53f143789dbe56835343e9486a6ec2aeca71874c4ae2bd9c707706cdf33efbec8df8993d102b0276da0aa53e04cc3 DIST wargus_2.3.0.orig.tar.gz 45006918 SHA256 9b8def814a8c7135653ae95bb1ff836627d39d5f8242a436f486c59701eaeee7 SHA512 79dbef5f86fafe7357c2911a16655c29bccef71dad39bfe6e02866c1734ee1598bb29a9005c8fa7c73d6f64e13fb7cdd3962214921b0b18c3868cb5abb2a0a87 WHIRLPOOL 8c34fcd6b84f26183c5a0ad1f8d14cae1eed601d2b4e38aa22a8fa8a1bd068b93fb2f1ae5fb223a41524ef467269b585c446e8476a4736507b91cb6bd23b8006 diff --git a/games-strategy/wargus/wargus-2.2.7.ebuild b/games-strategy/wargus/wargus-2.2.7.ebuild deleted file mode 100644 index 170cf8bcab0d..000000000000 --- a/games-strategy/wargus/wargus-2.2.7.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit eutils cmake-utils gnome2-utils games - -DESCRIPTION="Warcraft II for the Stratagus game engine" -HOMEPAGE="http://wargus.sourceforge.net/" -SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${PN}_${PV}.orig.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -RDEPEND="=games-engines/stratagus-${PV}*[theora] - media-libs/freetype - media-libs/libpng:0 - sys-libs/zlib - x11-libs/gtk+:2 - x11-libs/libX11" -DEPEND="${RDEPEND} - virtual/pkgconfig" -PDEPEND="games-strategy/wargus-data" - -S=${WORKDIR}/${PN}_${PV}.orig - -src_configure() { - local mycmakeargs=( - -DGAMEDIR="${GAMES_BINDIR}" - -DBINDIR="${GAMES_BINDIR}" - -DSTRATAGUS="${GAMES_BINDIR}"/stratagus - -DICONDIR=/usr/share/icons/hicolor/64x64/apps - ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile -} - -src_install() { - cmake-utils_src_install - prepgamesdirs -} - -pkg_preinst() { - games_pkg_preinst - gnome2_icon_savelist -} - -pkg_postinst() { - elog "Enabling OpenGL in-game seems to cause segfaults/crashes." - games_pkg_postinst - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/gnome-base/dconf/dconf-0.24.0.ebuild b/gnome-base/dconf/dconf-0.24.0.ebuild index 91e2398a11d5..f0f44ae3c3ff 100644 --- a/gnome-base/dconf/dconf-0.24.0.ebuild +++ b/gnome-base/dconf/dconf-0.24.0.ebuild @@ -16,7 +16,7 @@ SLOT="0" # TODO: coverage ? IUSE="test" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd ~arm-linux ~x86-linux" RDEPEND=" >=dev-libs/glib-2.39.1:2 diff --git a/gnome-extra/connman-gnome/Manifest b/gnome-extra/connman-gnome/Manifest deleted file mode 100644 index 911d5bdf4006..000000000000 --- a/gnome-extra/connman-gnome/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST connman-gnome-0.7.tar.gz 98682 SHA256 d05d3c850667ec0881a0fa36975b53c8ad86a6860a15f95fca465de9096a887c SHA512 90bd42162e8735702dfb21b9e19b4bcc46000cc713e13c11f9a4769d789b42ddecfea3fb9f9fe5d7625c70a6243460e177a6be79319c272b2e9fe916754fc12a WHIRLPOOL 3790de959bd5d7dcc0dd692203e747cdb390c547515d4eef76a8f789f67e51949413a05bd8b4f9bc2b8f0da696d36aa9f73a3a57f9316f5e8480eab316cd1134 diff --git a/gnome-extra/connman-gnome/connman-gnome-0.7.ebuild b/gnome-extra/connman-gnome/connman-gnome-0.7.ebuild deleted file mode 100644 index 8395400b21e0..000000000000 --- a/gnome-extra/connman-gnome/connman-gnome-0.7.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -inherit vcs-snapshot autotools - -DESCRIPTION="Provides a daemon for managing internet connections" -HOMEPAGE="https://github.com/connectivity/connman-gnome" -SRC_URI="${HOMEPAGE}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm ~amd64 ~x86" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.16 - >=sys-apps/dbus-1.2 - >=dev-libs/dbus-glib-0.73 - >=x11-libs/gtk+-2.10:2 - >=net-misc/connman-1.0" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.35 - >=dev-lang/perl-5.8.1" - -src_prepare() { - eautoreconf -} diff --git a/gnome-extra/connman-gnome/metadata.xml b/gnome-extra/connman-gnome/metadata.xml deleted file mode 100644 index 76c85d9df2cd..000000000000 --- a/gnome-extra/connman-gnome/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - connectivity/connman-gnome - - diff --git a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild index c10f2bb78987..69b45ffb0f05 100644 --- a/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild +++ b/gnome-extra/polkit-gnome/polkit-gnome-0.105-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -10,7 +10,7 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/polkit" LICENSE="LGPL-2" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd" IUSE="" RDEPEND=">=dev-libs/glib-2.30 diff --git a/kde-apps/kcalc/files/kcalc-15.12.3-fixsetsize.patch b/kde-apps/kcalc/files/kcalc-15.12.3-fixsetsize.patch new file mode 100644 index 000000000000..a2ff272a47cb --- /dev/null +++ b/kde-apps/kcalc/files/kcalc-15.12.3-fixsetsize.patch @@ -0,0 +1,15 @@ +Fix issue where kcalc has a zero-sized window and appears not to start. + +Patch-by: Rex Dieter +Gentoo-bug: 577782 +KDE-bug: 360105 + +--- a/kcalc.cpp ++++ b/kcalc.cpp +@@ -124,5 +124,5 @@ KCalculator::KCalculator(QWidget *parent + updateGeometry(); + +- setFixedSize(minimumSize()); ++ if ( ! minimumSize().isEmpty() ) setFixedSize(minimumSize()); + + updateDisplay(UPDATE_FROM_CORE); diff --git a/kde-apps/kcalc/kcalc-15.12.3-r1.ebuild b/kde-apps/kcalc/kcalc-15.12.3-r1.ebuild new file mode 100644 index 000000000000..47e3b424b19b --- /dev/null +++ b/kde-apps/kcalc/kcalc-15.12.3-r1.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_DOXYGEN="true" +KDE_HANDBOOK="forceoptional" +KDE_TEST="true" +inherit kde5 + +DESCRIPTION="KDE calculator" +HOMEPAGE="https://www.kde.org/applications/utilities/kcalc +https://utils.kde.org/projects/kcalc" +KEYWORDS=" ~amd64 ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + dev-libs/gmp:0= + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND} + $(add_frameworks_dep kinit) + dev-libs/mpfr:0 + sys-devel/gettext +" + +PATCHES=( "${FILESDIR}/${P}-fixsetsize.patch" ) diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest index 348d2f54907f..bf60e554def5 100644 --- a/kde-frameworks/attica/Manifest +++ b/kde-frameworks/attica/Manifest @@ -1,2 +1,3 @@ DIST attica-5.18.0.tar.xz 60464 SHA256 bc97eb3fde1b77f14e7b3169aeefab674f5caa43998705a2b7c7f534959ad7d8 SHA512 7fb2014dede5491511db058e39793544c536991381865bb6d2b67509094fd69ceec56ec832fa7b632862559b3279481d502ac3ef2c2f74864c015090605e1e69 WHIRLPOOL c5a7b2198a031d7977bb37580faa35867255247d3146078ea06e97f26e753b46c0917b8da25ec733cc815741d220164496a25666d589024e2108d9976f78ea61 DIST attica-5.19.0.tar.xz 59800 SHA256 9b06375988eadf67da3c22c9c434adcaddfcadadff161fafee1a3327b6957b31 SHA512 1dcdda6927c9a0e5eaff96f7bd32de30565758f037745baaa06206e5af52b819fa89d94623a9dbac5d40127012a4072e21bd66a338d37bc39eda0b7a58f3aa37 WHIRLPOOL b16a812dd40d7da2100329d9e3275a65974dcf4ffe0d646fd3474f4a2f17c8d87af2f30c126d4bc26f95e17cabc979dfef0bb9b06cd360406b8062260609a910 +DIST attica-5.20.0.tar.xz 59792 SHA256 7a2968a249b347876f3f32a8c28fde188b68d5fecf0ce638d8a7d898fb4694f8 SHA512 d09e5004e0ee69f164addaad69535d2c6f2aa92aad9c0e020a50e13390a859a24195deccce6ba41ed8ada1f62894556adcf8fb18a7663ac2caf204909971b6c5 WHIRLPOOL cf10cfe3eec47e8fc7dd6d06b124ae4416580949af2b2b159d50815fcbbd12d48c68d9b0f215f3c16a2cf96a244ebd09faf7f0bd9d04bac3928d35292fb3b31a diff --git a/kde-frameworks/attica/attica-5.20.0.ebuild b/kde-frameworks/attica/attica-5.20.0.ebuild new file mode 100644 index 000000000000..f97613dadfed --- /dev/null +++ b/kde-frameworks/attica/attica-5.20.0.ebuild @@ -0,0 +1,17 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Framework providing access to Open Collaboration Services" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_qt_dep qtnetwork) +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest index 67c1bae6361b..7bbedd56cb95 100644 --- a/kde-frameworks/baloo/Manifest +++ b/kde-frameworks/baloo/Manifest @@ -1,2 +1,3 @@ DIST baloo-5.18.0.tar.xz 180692 SHA256 88a2e89a102674e8fab19103e979550ebe2c4b31c05b29f6c18fe500b669b669 SHA512 90d788d40003f64b7a7fcd19a4a1800606cd35cca879d0855e48351b41859f1bf02d21972ca54b7aed1c3143bc250b926a3525011c5e69c8f3b8e4c117d6df3d WHIRLPOOL e66d375ac502d5d826b434de6b98bd58fad3b0f40f62f85c49e8ad00ea6a9c0be07067530bc125f8f093c86dff97fb80515014082ce483532994a52ce07214d6 DIST baloo-5.19.0.tar.xz 183060 SHA256 6f6b94d464fb5da0a2256565d362aca979e3d220f11fa4c8a99d17380207de0b SHA512 966e061a87b122e0f75d5c4f4af6489c5eb859578313843bcb169bb16c61c795d023922055ab187e15ecfa288acdc59d5ef1d99cedefecb1b5464852d73afeb2 WHIRLPOOL f7da7ef8c15e7e347e3e891c3813077dc9fa9cf0281a56c284aec2c8870a2fc4bb4400e3b7fc71c022d73e9d52b1e61a3678991b42a1db17d7cfb7961c5d1d96 +DIST baloo-5.20.0.tar.xz 183772 SHA256 f2f4abe72078b30fd50c6a2d11d3a4f093b2f59582845d6affcf8d9887c6cccb SHA512 0e37647c501ed6deb41e7c4f79a15a54875cf33fe7fc002056f2ca7f7e227c673bc978dc824eee953432396600367d994df472eaf1e375d5ebe2eff87d6d83cf WHIRLPOOL 5757e042098b9750c2ae539f7ed53581fb412e890468e55d59a2ae6ee5839d49fd66ccde460d0a2433f9a26def5718ef81a6bf983203c1ec1530c5d9a23b3f0b diff --git a/kde-frameworks/baloo/baloo-5.20.0.ebuild b/kde-frameworks/baloo/baloo-5.20.0.ebuild new file mode 100644 index 000000000000..a92478ed4f0d --- /dev/null +++ b/kde-frameworks/baloo/baloo-5.20.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="forceoptional" +inherit kde5 + +DESCRIPTION="Framework for searching and managing metadata" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kfilemetadata) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kidletime) + $(add_frameworks_dep kio) + $(add_frameworks_dep solid) + >=dev-db/lmdb-0.9.17 + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +RDEPEND="${DEPEND} + !kde-base/baloo:4[-minimal(-)] +" diff --git a/kde-frameworks/bluez-qt/Manifest b/kde-frameworks/bluez-qt/Manifest index b368626dfe9e..4af1c7eec8fc 100644 --- a/kde-frameworks/bluez-qt/Manifest +++ b/kde-frameworks/bluez-qt/Manifest @@ -1,2 +1,3 @@ DIST bluez-qt-5.18.0.tar.xz 73396 SHA256 79e5c663c2c2287530f9351f108045dad52de0c5576892863fb17147f8397d9f SHA512 6fe887d9001ea348c80c84d79af4a037d4b3a822f84abafcdb38f485a8b0f49627aa227d0ac420088f3406eb6aa31b6ec9f6f2d7cec193dafb026df3689d8034 WHIRLPOOL 7c4443a4ee825144c05be79404b8f87d9621c1242551a4c4c1c98785c5daf6bb043db53bbce28fdb7ea0d84331d7fc1e3ba33958c625856b8172d556ae868b9e DIST bluez-qt-5.19.0.tar.xz 73392 SHA256 db5b1d29f507b1af8ed7854341278ad210e3cde54c738b1db9d65af8f3890918 SHA512 06a03fa37d8a76251957484c4f99841fa1b51d69ad6d87c4fdb709e4bfa3fa000579458e2cbb3c1cbeab8de22b9509801392996a6292722f89536779fba186b8 WHIRLPOOL bb054e4021bffc8cb09a168513e7b3ac32b3acc58e15b9b3dc86af4a64730471e355d950f33a7331d4194aec3dfefa40eca3f3f6416c987b1d5cb26f1bfb1e54 +DIST bluez-qt-5.20.0.tar.xz 73412 SHA256 c3bf51428e188fb6a076d17809d7796f9fe6a8327e86c156e2b84c5f4b7ab252 SHA512 d37f9f5850088905b61f8ae17e9ede69dc894f524d6f496255446797c976ffcde96932400f2468428aa007f56658c85a9790c2c9fe4656bfd45deac3ab2ec630 WHIRLPOOL 5217f7b932592e2f67482237bf21021e146fcd413d60c7f0a59f1b646ca932b35540a19a033b6c63bdab7935f0f71b9feca3ce7b40286e1a56911770981aeb3d diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.20.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.20.0.ebuild new file mode 100644 index 000000000000..33abb8aec67b --- /dev/null +++ b/kde-frameworks/bluez-qt/bluez-qt-5.20.0.ebuild @@ -0,0 +1,29 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 udev + +DESCRIPTION="Qt wrapper for Bluez 5 DBus API" +LICENSE="LGPL-2" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND=" + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtnetwork) +" +RDEPEND="${DEPEND} + !kde-plasma/bluez-qt +" + +src_configure() { + local mycmakeargs=( + -DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d" + ) + + kde5_src_configure +} diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest index a6eb9df95241..f2b83806898b 100644 --- a/kde-frameworks/breeze-icons/Manifest +++ b/kde-frameworks/breeze-icons/Manifest @@ -1,3 +1,4 @@ DIST breeze-5.4.3.tar.xz 36568668 SHA256 fc89d5edcc8c3c13263d1b1759f0f8400ea79c76df0eeafcce91d462d4cf93fa SHA512 3c76d5ccf465c2392dd47a213c70111c3714edcb10f21ce3f44593c9c88feef4bc28b35ca40dc1ac96c62746f219b10c1af114c32163b58dc34c6181b1d57626 WHIRLPOOL ec2d05516929cedb416a905711d28f7bfa9f9aa9a394eb994177a9fdac72604708f041fc82ca499a893689c0768468cb88a91a1cea37f9d97748f2c61495fc39 DIST breeze-icons-5.18.0.tar.xz 1415276 SHA256 9f7007cdc805083812583d575b3ce2880f41f32f5337582c55a6acfc4bc69128 SHA512 38ed12602fc1967dc11481638ccc5407362b510e8f6ef6eba1c7153d1a451ae6a0ddcf73ffd6cf1bd9850574e07ed131692d3cd38d6bff573815803ea964d535 WHIRLPOOL ef24f992b36ddff4bd2a05e5b941e318607e73b3e8ecc7b6f30de178d5f6056ac11f0d82bc9bc77bd5223a57c2ee03760466f8d98cb3b59e19e5996fa047c511 DIST breeze-icons-5.19.0.tar.xz 1525492 SHA256 40eef069527d735d0380e6ef121ee96ec7d46e6ec93e7f96c34cb74025e8912f SHA512 f3a25e3171788560bf2f3e317cd695e56fc8f8395a32c68a3d2ca33471b9909a603519a08e84eb28e1b01ef09d04022bae92a4471b7b356514347042033b24e0 WHIRLPOOL b295665b62cbe01d3ebc68146a834ea05c6ac366eef19440c37ce0edc2bc84a7a52e508b36971f5d198b8a1d5a3acfedd56809c1301ee96c8107c107d7789295 +DIST breeze-icons-5.20.0.tar.xz 1537900 SHA256 445b5cb8774cb224f804abea7864a8bf6307b6a4d1958b4caf1d251f02f98204 SHA512 fd1c6ec0624d5d457bd75dad21a3bf2e86cefcab8797fa0fc2cee6a04199f662fcbfe26f9cf6856bb43eb278d18604886765db34dc4eca061fb91d592ce261a7 WHIRLPOOL 37b518e82f4ff065f206d72cc1a21a26b1f516a7d11c3cb923f834acac0799cd67ec2b8b50c5beb2b7c77709301578af2ee223cde9ededa6586b743435cc2a4b diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.20.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.20.0.ebuild new file mode 100644 index 000000000000..3e766e019485 --- /dev/null +++ b/kde-frameworks/breeze-icons/breeze-icons-5.20.0.ebuild @@ -0,0 +1,18 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_AUTODEPS="false" +KDE_DEBUG="false" +KDE_DOXYGEN="false" +inherit kde5 + +DESCRIPTION="Breeze SVG icon theme" +LICENSE="LGPL-3" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND="$(add_frameworks_dep extra-cmake-modules)" +RDEPEND="! +Date: Thu, 17 Mar 2016 10:28:09 +0100 +Subject: [PATCH] Fix crash in rename dialog +Content-Type: text/plain; charset="utf-8" +Content-Transfer-Encoding: 8bit + +ResizePanels must only be called in case of overwrite, all other cases violate +the preconditions. + +BUG: 360488 +--- + src/widgets/renamedialog.cpp | 11 ++++++++++- + 1 file changed, 10 insertions(+), 1 deletion(-) + +diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp +index 2d456c7..cb3c0fb 100644 +--- a/src/widgets/renamedialog.cpp ++++ b/src/widgets/renamedialog.cpp +@@ -105,6 +105,8 @@ public: + m_destPendingPreview = false; + m_srcPreview = 0; + m_destPreview = 0; ++ m_srcArea = Q_NULLPTR; ++ m_destArea = Q_NULLPTR; + } + + void setRenameBoxText(const QString &fileName) +@@ -385,7 +387,9 @@ RenameDialog::RenameDialog(QWidget *parent, const QString &_caption, + + #if 1 // without kfilemetadata + // don't wait for kfilemetadata, but wait until the layouting is done +- QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection); ++ if (_options & RenameDialog_Overwrite) { ++ QMetaObject::invokeMethod(this, "resizePanels", Qt::QueuedConnection); ++ } + #endif + } + +@@ -584,6 +588,11 @@ void RenameDialog::showDestPreview(const KFileItem &fileitem, const QPixmap &pix + + void RenameDialog::resizePanels() + { ++ Q_ASSERT(d->m_srcArea != Q_NULLPTR); ++ Q_ASSERT(d->m_destArea != Q_NULLPTR); ++ Q_ASSERT(d->m_srcPreview != Q_NULLPTR); ++ Q_ASSERT(d->m_destPreview != Q_NULLPTR); ++ + // using QDesktopWidget geometry as Kephal isn't accessible here in kdelibs + const QSize screenSize = QApplication::desktop()->availableGeometry(this).size(); + QSize halfSize = d->m_srcArea->widget()->sizeHint().expandedTo(d->m_destArea->widget()->sizeHint()); +-- +2.7.3 + diff --git a/kde-frameworks/kio/kio-5.20.0-r1.ebuild b/kde-frameworks/kio/kio-5.20.0-r1.ebuild new file mode 100644 index 000000000000..c778b7419c61 --- /dev/null +++ b/kde-frameworks/kio/kio-5.20.0-r1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="forceoptional" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing transparent file and data management" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="acl +handbook kerberos +kwallet X" + +COMMON_DEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kbookmarks) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork 'ssl') + $(add_qt_dep qtscript) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + dev-libs/libxml2 + dev-libs/libxslt + acl? ( + sys-apps/attr + virtual/acl + ) + kerberos? ( virtual/krb5 ) + kwallet? ( $(add_frameworks_dep kwallet) ) + X? ( $(add_qt_dep qtx11extras) ) +" +DEPEND="${COMMON_DEPEND} + $(add_qt_dep qtconcurrent) + handbook? ( $(add_frameworks_dep kdoctools) ) + test? ( sys-libs/zlib ) + X? ( + x11-libs/libX11 + x11-libs/libXrender + x11-proto/xproto + ) +" +PDEPEND=" + $(add_frameworks_dep kded) +" +RDEPEND="${COMMON_DEPEND}" + +# tests hang +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${P}-rename-crash.patch" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package acl ACL) + $(cmake-utils_use_find_package handbook KF5DocTools) + $(cmake-utils_use_find_package kerberos GSSAPI) + $(cmake-utils_use_find_package kwallet KF5Wallet) + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest index 235f0c53dd22..3de4d163b7ff 100644 --- a/kde-frameworks/kitemmodels/Manifest +++ b/kde-frameworks/kitemmodels/Manifest @@ -1,2 +1,3 @@ DIST kitemmodels-5.18.0.tar.xz 383884 SHA256 84e3b054746921f44c66be76e8ae791a9e71e4c3648af497a114731a543cb964 SHA512 0b1e76479c9ea4371b7fdce8c76e32f23b71285c39421d05feb5706dfc0c38df9c04ed75f1cf7c25e67312bfdc6ecf072a5cae26b1775264f18949f64d78dbef WHIRLPOOL 0619dfc6669460d07cb2f9c0e57fa92a633427f81dc74a287ad5c91acb118836e1affa539190d9845aecdb841054b786fb48bdb464ef736fb36aeef78486cfde DIST kitemmodels-5.19.0.tar.xz 383912 SHA256 c7d255461b62ea1c277b4d384580958164172e0f7513d4fe62d66283528d756a SHA512 b989f9f48700756920da64053e279184eeca872f012cca15ad722c67240309302e5d34433e4180a6dd46409ef1db359e6ec25a981b98ee3feb5760100ca7754c WHIRLPOOL ae1b5e27513208c7500ce67ceebaca10df87fc177290decd2057fc22599daeedf30b65f08d3a5f3ebe36ebc3456fcabc93a17e29121d3cfeb8c500879d7bf06c +DIST kitemmodels-5.20.0.tar.xz 385652 SHA256 2fce8fe2294ec26a1943c44a547cfd1a2b3e7044e5b571bebd0aef5c7812da79 SHA512 92be8133adcb3891aff74d002ab8b499dcfa101a126e2e1d514c90c2e9826c662b055ae4a208e7a51c6f2878828c6c00fe8faec390beb69e4af5e779e6783e5f WHIRLPOOL af80d1dc2db3c6393c7fa3543c57d5e13102ae78d999a300de01e1032a354248298b5631401b935a9cb393b7b0db35ef96e60824b451629412dfebe01c01b16e diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.20.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.20.0.ebuild new file mode 100644 index 000000000000..17eea8f3449f --- /dev/null +++ b/kde-frameworks/kitemmodels/kitemmodels-5.20.0.ebuild @@ -0,0 +1,15 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing data models to help with tasks such as sorting and filtering" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND="test? ( $(add_qt_dep qtwidgets) )" diff --git a/kde-frameworks/kitemviews/Manifest b/kde-frameworks/kitemviews/Manifest index 297a98d98679..88df8a82daaa 100644 --- a/kde-frameworks/kitemviews/Manifest +++ b/kde-frameworks/kitemviews/Manifest @@ -1,2 +1,3 @@ DIST kitemviews-5.18.0.tar.xz 73960 SHA256 6b785b151c5e02e652d25371a133193ca60b9209a8cba6968c00e67f1d80eb82 SHA512 634b73f17fe45ab6f98fda419f65a4883a7fdbf77b379770c492b1d81466787528893ad69134711e064cb61f52be778151c6833cb1a256a4f8af56ed83292241 WHIRLPOOL 9de75674ec6be2f59bd77a375712dfe739c4c4d2b582d014206b3c0b4e61684cf4eaee533b2509a59e237b23678d720fce136d6d824df53034f42dfe1e0f4bc6 DIST kitemviews-5.19.0.tar.xz 73992 SHA256 56f632a57b874abbbb86666877c9b55ca4dd15aa612d03e85edce55d0dd91f85 SHA512 02c6caa43f2d0b0735e9db116006ec2c5cd27e1b5ebd21041ed2ce81e291f8b87bd037a45ed73558d0cf78203da1a9d8d983a4cbd88a5f98cc887de93a9bf0a3 WHIRLPOOL 95b36dc6ec45f6d773fca7033afb105592d2087024a5672f067d8076dcf9c209ef1c8c3c0be576a0d2593d0549a5b7b3dc29637b4bd0dce52230fc764c0d6ae9 +DIST kitemviews-5.20.0.tar.xz 74016 SHA256 3d71897950535b3180966917997320bd7227c503cb9e47356fe01df687d7e596 SHA512 6856e235f217672c3f2bd31e9017ca9a592bfa8b8ffaee95f48b61ae7b79bc0ef9eed80e2e4719b14a051c1c26a49cfb0b832fe92cd91c4db19bee915a3b1083 WHIRLPOOL 690c62b52320aabf7455cee88db901237f537ab3301ccc17ca0b1895d29fb1de1897804ad34d38e379718c74b0ab91beb9b170553a4502799fab77f1033ea0d4 diff --git a/kde-frameworks/kitemviews/kitemviews-5.20.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.20.0.ebuild new file mode 100644 index 000000000000..d1b4880f23ac --- /dev/null +++ b/kde-frameworks/kitemviews/kitemviews-5.20.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing additional widgets for item models" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="nls" + +RDEPEND=" + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) +" diff --git a/kde-frameworks/kjobwidgets/Manifest b/kde-frameworks/kjobwidgets/Manifest index 98e3a860e7b9..acdc105f9c39 100644 --- a/kde-frameworks/kjobwidgets/Manifest +++ b/kde-frameworks/kjobwidgets/Manifest @@ -1,2 +1,3 @@ DIST kjobwidgets-5.18.0.tar.xz 88900 SHA256 4f8be6a0161eca799d481a7b0763ed4377bad329dd1ff653ed793adb7982bb3f SHA512 075b50613c554e9f273fe2f23a5d9a2658fb09403ca1515fcf474640908ee6ca0fa80d885b9b7200a698d991a75bc8ecbc6fa241793430ddf7ace78c2ddbb4b3 WHIRLPOOL 41a000e5cd87380c9fe874e2c5663d8059298c10e6feb1047e80ff5eb50d63172a0fe82e207724d7df12ddd94f9385c40db87a15811d8d4ec12cb9add7243afe DIST kjobwidgets-5.19.0.tar.xz 89004 SHA256 5156a8727a7a8df3632f216071c12e4480c479f6544895a26ab367e4bf45eee3 SHA512 cd7208fda2f94935cedc37f5978325f56fb71511b2b67af241ae72ec8f120d150b3c3ecbcfbf69cb706c8c6f16e4e6d65fd65c0acc4774a76ab55497ae478691 WHIRLPOOL 1f2df42ffe1b3752d8d71b933ceeb167eaa120aedc880eac115a21f05a43bc79bfb0e09c47578ffbae7a6f04f44fe26861cb6e94410ea9d6d318e2398c2d0128 +DIST kjobwidgets-5.20.0.tar.xz 88988 SHA256 1ea106307903a70c34432d9434f77bfb461cdad729470d48b68fbd2d15b9f9ab SHA512 0f4f012443f521d4b6e05dff16869e4fd14a7938f9dbaf8aa1e63a4ba537b5881c5e7677fb013a6260a3c2cb316953969794ef566097e6a1dc5355a47d597781 WHIRLPOOL 508734d73cf39d80c4f1f4e747840b477a380fdd4c8f0bc8247bf938e9d658f3b89c63743f0140b1df79ca71670c4f5ca6c498a3172ec7a5162dd748ac14ac41 diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.20.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.20.0.ebuild new file mode 100644 index 000000000000..eb43c1639c28 --- /dev/null +++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.20.0.ebuild @@ -0,0 +1,36 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Framework providing assorted widgets for showing the progress of jobs" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="nls X" + +RDEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kwidgetsaddons) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + X? ( $(add_qt_dep qtx11extras) ) +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) + X? ( + x11-libs/libX11 + x11-proto/xproto + ) +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/kjs/Manifest b/kde-frameworks/kjs/Manifest index 7be80a048f46..dd17ebf26379 100644 --- a/kde-frameworks/kjs/Manifest +++ b/kde-frameworks/kjs/Manifest @@ -1,2 +1,3 @@ DIST kjs-5.18.0.tar.xz 290720 SHA256 c23439fe7373d5e1e153e7e0f67ee6bb573da901659bb67068740f0dbda0097d SHA512 668ea565dc63d90c2664e86e826fe3f1895950aa6e92804c76cdfcfafb21c8a8bd806ebd27edc5da2fa732002935ce22719e0868123e3b8ddf897cf7f0edccf4 WHIRLPOOL 55bfb750a1a7d8b4b36e43a41a3c3276dea6a561c2e95ecb044ac29066785b33e4e95a23dc7caca34ec6eefe6a978a9a912321ba74dda949e5a8e39dbd5c4c70 DIST kjs-5.19.0.tar.xz 290720 SHA256 4eb91a5337a9d35946a0b810991ddb8f0102d7197b3c2040dd452c28cc09a022 SHA512 f14b9f8344704d96f6d200d7321a46647bff926d5b60998c8bb5a2953e99dbe0dbe02bcbc90e1100b2a2600312bda2b54f928532df3a8c9edf60a5c7b565a6dc WHIRLPOOL 55ef494b32c435084f5894f051094a40626764b039cdfbeadbf66cd57c5e13d0163d5229eb44855683645b49277f5a42761d39d56a03aa11b45e1d7d30f0af4f +DIST kjs-5.20.0.tar.xz 290832 SHA256 0d2f39d4ef2f9c3f4b9a42b1adfb70e25fc912cb535a9798dc9aa49ad0cac4a1 SHA512 5a4812b8793327af60c28551509c4d6cbeb626913d2db8e7c685a18bf853b52c9aa9ca5b9a3e2072e26b60471ee264d19d9cbbb146a5823be4c53903ab070417 WHIRLPOOL 1a836e5b15319fce251a7d9c42932e8b2f9e6dbe3e06f4ac3a090681fd67ead2ce3ee8f15c92740add5932bb96570dc4db3191edc61ab6277154004a41b3e532 diff --git a/kde-frameworks/kjs/kjs-5.20.0.ebuild b/kde-frameworks/kjs/kjs-5.20.0.ebuild new file mode 100644 index 000000000000..ab09cffd10c2 --- /dev/null +++ b/kde-frameworks/kjs/kjs-5.20.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="ECMAScipt compatible parser and engine" +LICENSE="BSD-2 LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + dev-libs/libpcre +" +DEPEND="${RDEPEND} + $(add_frameworks_dep kdoctools) + dev-lang/perl +" + +DOCS=( src/README ) diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest index 802ca5675d57..98f5f6940b16 100644 --- a/kde-frameworks/kjsembed/Manifest +++ b/kde-frameworks/kjsembed/Manifest @@ -1,2 +1,3 @@ DIST kjsembed-5.18.0.tar.xz 165024 SHA256 6dcc5fd2e53230076404e905416369d43f8f746c2267a746a0a65ecdbd3af856 SHA512 28d7948cb97925f46cf0bcef1d76aa4d0c42f49cf2a4a7099dd71f16741cf0e1acf84e7acaf27967cd1e58658f9a047f55a923384559e60590871e4a7c2cca36 WHIRLPOOL 3ab277be60a08401feb7b9f1094245be03acd9c1e524190a2fe46ffd728205442bb125e5791ac733bafcf4855191965b24a198e26e88c7c8d58072d0610601c7 DIST kjsembed-5.19.0.tar.xz 165072 SHA256 8850cef16384aff5ff4447736391a2bdb7247673612fb699f041d427917fb3f2 SHA512 65291dec4773b770dd894f0b9836560717106bfbbcd8a218e55fd1003595cd2c71b3da553fc4370d1cce8c2e4df785ce715af4b403fb4949c69a8a9dfda150f7 WHIRLPOOL 8e8f2bbac78de6f993c79e6c96880eb561d4690531df7d59ea265f8729b7385d9954a7e61e41a66b73f8a25df65d35210564df1c8e911b7017617edd5cba19cf +DIST kjsembed-5.20.0.tar.xz 165040 SHA256 57f7b5ecfc5e4e3dfd39ca67c45bffdb8de3df1352e26ae457db27d79f8ba903 SHA512 9722ea2e7ebda44a1229f24bc5a3f3cca65bef275d28718ed451a395b326e4f5bf3d56db3326f6fa9d6867599876ce54053a747b41e766e4c41f0b6ab87c7484 WHIRLPOOL 562297a485dbdfdc6fe793da4dcef21753878df53fc97fa2eac21993a418bfc1d2ccd42a1b3bd4b56ec2f37f21fe7a94ee90f84b44ce946bdba52f766e829bbd diff --git a/kde-frameworks/kjsembed/kjsembed-5.20.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.20.0.ebuild new file mode 100644 index 000000000000..741898341530 --- /dev/null +++ b/kde-frameworks/kjsembed/kjsembed-5.20.0.ebuild @@ -0,0 +1,26 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="false" +inherit kde5 + +DESCRIPTION="Framework binding JavaScript objects to QObjects" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kjs) + $(add_qt_dep qtgui) + $(add_qt_dep qtsvg) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND} + $(add_frameworks_dep kdoctools) + $(add_qt_dep designer) +" diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest index 64d387fa582b..201dc5459c8c 100644 --- a/kde-frameworks/kmediaplayer/Manifest +++ b/kde-frameworks/kmediaplayer/Manifest @@ -1,2 +1,3 @@ DIST kmediaplayer-5.18.0.tar.xz 9432 SHA256 ab2f02b7efb879f745553130fc21fb33a7c184320ebce99175f5fb71fe53a31e SHA512 4d7f546ac4ea16e7f3db79d7a49fd4862d745f51a937eaef1d470376eac8609c5680577b549ec35decaea9f737c33b063e9064468e824d1c144153db25ce06de WHIRLPOOL be3381535a209ccd90eee6768ecc641e0dd0b8731cf9bcb22b94978d7845cc1270adf69dc6a54ca2129d2cba5f30c3f269f611e135dd3bb940709428e12883ac DIST kmediaplayer-5.19.0.tar.xz 9428 SHA256 5e15a49dd3666d9418b63947e7d2e5882a0f9d74f5ee2464fb7c237c98c818ee SHA512 45fcfece5199a1a69e8fcd87315512397dfe094756ba75ab69f9d83be031d81ece366e1378f320736e4eefeb0b88270c45d0e6b411057cc154499ded6d373040 WHIRLPOOL 953baf8bb375f9779a66c81133a19b9d934eb3b9d7bddd16278687e12913229b2e2b43179079fea763e876361f1e3dc786512ea3a40c8db605ceb7922538eaef +DIST kmediaplayer-5.20.0.tar.xz 9420 SHA256 1a53bbe1aa0fa62f23d4167bd494763b83a638d3a36fa3d3ac4326be2b3af8c2 SHA512 4f4fb69e0a24ca4e9d388b187c217caf07cf4146f831f309c8f7762b2454d82b9263392e54737502a4a583ba2cb06b00248ecb0539d0c6ae38b33c2fd2bc1fe5 WHIRLPOOL 6bd4bf56c1cea9c57547abfa4e540b694eeb78ba44aa72431060e9107f83cf4dd6693494560e9b871afd30c8ec934e825a5c6df9725dae00c5ae675c498398ac diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.20.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.20.0.ebuild new file mode 100644 index 000000000000..8e582bf412a1 --- /dev/null +++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.20.0.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing a common interface for KParts that can play media files" +LICENSE="MIT" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kparts) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtwidgets) +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/knewstuff/Manifest b/kde-frameworks/knewstuff/Manifest index 13baad620d62..6e483e709212 100644 --- a/kde-frameworks/knewstuff/Manifest +++ b/kde-frameworks/knewstuff/Manifest @@ -1,2 +1,3 @@ DIST knewstuff-5.18.0.tar.xz 858248 SHA256 e48578ee71e7604a1ad42dd03fb3d405aa34219cb0fc842e4fd51a7f810daa55 SHA512 3cda233d937f0ca7483f849faa1a8adfd6e66fc778697408deb201e4b6ed29f14df291e90c5d6f0e18ef606936fc73dbec646aa0329d3267a3fc8450196f0108 WHIRLPOOL 1c4d04556b5826234318eebe073f561d7576e201c08e061f51ba1aa1270de89dc432513de5b04a9953c92eeffb4a852aaaa5d6e334bc5399ba33c9bbd64a481e DIST knewstuff-5.19.0.tar.xz 859476 SHA256 64412b66f941333954d290b44fd33fe3a055eba6e8fbf1fe403fcdbe45684c89 SHA512 aa5d2d59d348bfa8e7b97391cb1bbf3072f01c240a35e4f1e112d891cb097612bc7c1b41f31f32f482c3a8ef9908725dafb6ac35bba076847a2b96e9422390a4 WHIRLPOOL 4e6a0830bf7eddeaeb575531328708aa6c803f6a670f7820b628de3415476342729fdec57a0a75fad5de0580317bbe9af7b77440a68dd2c4f216e18653336d1f +DIST knewstuff-5.20.0.tar.xz 859596 SHA256 cd9705fdb57c4b306e19d2780049218dc32a774f20e17076b136d04b157df53d SHA512 10810d8630042e84393be51e35472d3523272d4cdf83fc889a308715fa2fc6b516b0a6fec4eb51b3ad383e0c5e7104764ffb6e1f32cc31046cf255f52264936f WHIRLPOOL 325ce6854621b4f930c562b15aac2bf9c0f0e3874e3b367986ecc8e51b5655bcfc82cb2a45d531a731d1c1db6e8db202ff078e55e975ed9a9d1256d8bd5c5898 diff --git a/kde-frameworks/knewstuff/knewstuff-5.20.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.20.0.ebuild new file mode 100644 index 000000000000..a3c57963dcb7 --- /dev/null +++ b/kde-frameworks/knewstuff/knewstuff-5.20.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="false" +inherit kde5 + +DESCRIPTION="Framework for downloading and sharing additional application data" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep attica) + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kservice) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/knotifications/Manifest b/kde-frameworks/knotifications/Manifest index 5af33fc42c8a..62a23bea6a8c 100644 --- a/kde-frameworks/knotifications/Manifest +++ b/kde-frameworks/knotifications/Manifest @@ -1,2 +1,3 @@ DIST knotifications-5.18.0.tar.xz 93244 SHA256 1f1aa098983c37cab4949c2d79b833986a8446910a18f76b3715e648b6c8f1da SHA512 6e72a43c052197a4ce1beab7d4760a7287d58df753301f88ee518e0312ca09f3dbe3eabbdec53aa3f42e30c6810f6d804314133ca674993f774ee250af33fe19 WHIRLPOOL 151dc46394b29c7a7e7adf373b767348b800804789b6113df0dad9421be6ee7124e57dd2d668ffe4bb4a3e134c81c95f104c61450a9f5ea29abe1a5553abb1fb DIST knotifications-5.19.0.tar.xz 93236 SHA256 5b116ba498ed57dbc33ef9a7f24c0571f52b03bd986a7b8e14f799a039a82f3f SHA512 ec471d4dc1a94358a10912f1972bac1d196b30722b8e18a61064e7a04642a583f4b637268eada058073573b4879b5f68ab9a6981f04f2c7c6e5d525a257dd8ab WHIRLPOOL e581f63ac9453ef2bf8ec5d65bba4ef9991efb943627d2b1dfcb37a0c3f198e0e0a5aeed84f3f50eacfd85db274bf211d987a6a633f2d6a553df7761e0cc864c +DIST knotifications-5.20.0.tar.xz 93204 SHA256 72b60541af670cf45151420e3fbef9526a648efb4a0dcf70229173660b5dd7a8 SHA512 1a6096000db47eb442743505bbabf3b644f1060921fc881fea77aba69a54a55475a115d8bdb25c35ac474a7196c7f036d23efb567408b877c9aed5a698279e42 WHIRLPOOL e2cc9db1faf5e2a86ea125937e1040de43756a97a73460cf48236c9d16193e49c066b52a6760e06b1156f740a33a48ec8aaa51bf323f6a7c55263d511d77dd31 diff --git a/kde-frameworks/knotifications/knotifications-5.20.0.ebuild b/kde-frameworks/knotifications/knotifications-5.20.0.ebuild new file mode 100644 index 000000000000..780a930607dd --- /dev/null +++ b/kde-frameworks/knotifications/knotifications-5.20.0.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="false" +inherit kde5 + +DESCRIPTION="Framework for notifying the user of an event" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="dbus nls speech X" + +RDEPEND=" + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + media-libs/phonon[qt5] + dbus? ( dev-libs/libdbusmenu-qt[qt5] ) + speech? ( $(add_qt_dep qtspeech) ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + x11-libs/libXtst + ) +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) + X? ( x11-proto/xproto ) +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package dbus DBusMenuQt5) + $(cmake-utils_use_find_package speech Qt5TextToSpeech) + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/knotifyconfig/Manifest b/kde-frameworks/knotifyconfig/Manifest index f8a2168a28fb..0fc16b3196f3 100644 --- a/kde-frameworks/knotifyconfig/Manifest +++ b/kde-frameworks/knotifyconfig/Manifest @@ -1,2 +1,3 @@ DIST knotifyconfig-5.18.0.tar.xz 83016 SHA256 6b69c25bcd854ad02ccf3ff5ed0aebf23e7cbc5c9679f2ceb599872a6a194760 SHA512 127e8ca2f3cf398ff061db512f80cad6e32355b3cf3e5eba37400b6cea6d68e6d44b8abdfe2692ae33302222d92e536fc3e7d1d4499ee34cf28f3f9d8e8c59b7 WHIRLPOOL 5b618d38dccddc68289f49d76ba20826fa54e7487473e8f96d4fc21061fe5ae587430b1a33df0a884e60fca45565630386043f7c73177327aa4af97331504792 DIST knotifyconfig-5.19.0.tar.xz 83016 SHA256 d2757b3b283b90575c7b0820260db7d9447f65b02c1aa78fb7b3fdeef3ce2b98 SHA512 bcca112fddad3cb7d6305cbedcb5801e3c6dd177173538d2d2793036074aaee0dd5c5a8abed8b2ab6ef484496c870b8d2ac7f8abb02226454fcf39af9ddd32c6 WHIRLPOOL e3e7e36c653c2f2368802d920aef12c264bdd597309fb28eb04574cc548e9ebc3435600a9ab4981f2c6333477f5e4d8f14a10f5cd15ef1d49cf816d211a1e3bf +DIST knotifyconfig-5.20.0.tar.xz 82984 SHA256 d07268d7e62adaeacd83c4df2fdc394d707a0e02974c1471414a95880de95ff2 SHA512 943600cbd454bc0efe0084de4131310ae6eb2c7a2ac013c408f363229d2d950f03fc185efb26a6769fb11962d7779dda9f01cf61fc8c61f6f4ccb7cf2db9162e WHIRLPOOL fe2554b5b5c5fa852f4b61e7bf570f90f1a3709f2d023ceec06b1b5b92bcd1dee24f28883856ab4bd8d24b510b727db77eb5d11d88d8e4e2ef40f2cbbcaa94e7 diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.20.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.20.0.ebuild new file mode 100644 index 000000000000..66fa9402e272 --- /dev/null +++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.20.0.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_TEST="false" +inherit kde5 + +DESCRIPTION="Framework for configuring desktop notifications" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="phonon" + +RDEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + phonon? ( media-libs/phonon[qt5] ) +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kpackage/Manifest b/kde-frameworks/kpackage/Manifest index 03adc6b7b914..71c0dccdaf5b 100644 --- a/kde-frameworks/kpackage/Manifest +++ b/kde-frameworks/kpackage/Manifest @@ -1,2 +1,3 @@ DIST kpackage-5.18.0.tar.xz 106544 SHA256 29d295d9542ff18b4dd0a4cbe5039858a2babec0091f7cff54929e379cd60293 SHA512 2c75f5f94a6f51afe1ff62792755636032a306756fad9ae29c6f7999c8e8d9cc57818e3ecd71063e7fd8363c67ab86cfe2fe70dfe1ab306a8a3af899fc817b40 WHIRLPOOL 76266e823d350f84a88cf1906aadf12fdd4a20da86577850319fc7e0ba4c31559cf044bc47e78b6417a5cf5453b60173c11a08c909d8cbac141ca39d59585c6b DIST kpackage-5.19.0.tar.xz 107424 SHA256 bbf5efcf905c4217893d4505328edc9f9cc20646447e2bed155752d79fd4a4ce SHA512 1bbf542b2216f9ee4380bc54063b03e4014cc9dcbb06d78c5a80168340981a359398e88de26335af9131f40b32ac390756b8cc547369de273cae82e32fd10817 WHIRLPOOL 778227b7fc3a1a7edc3f0390313053d3094b4d12c5c1a8d11b9e92b57fe994207ee240b2688c97993b8880bb5edfca6f76e5a7c38c4ed9e250c5fc501ff4c97d +DIST kpackage-5.20.0.tar.xz 107604 SHA256 6de10b43e4e1d760699007d87c150d2acf103a135618ef3e5f837388a8e38fb2 SHA512 d76fb920431cfff8c5b5b7d336660b4377f4cf03ef0f1ae515727e84727f7f583af577601127f73111b044078dc0fab13db893a52bdce487ab37298a8ed35eec WHIRLPOOL 328e3e5497e3e4ba9d02792778538ae43d1df8309730118b6be8e94bd017af674d40f98afe0db159590c4b087aa72935e78568b5c3c0d16d13f1502b68baa1b4 diff --git a/kde-frameworks/kpackage/kpackage-5.20.0.ebuild b/kde-frameworks/kpackage/kpackage-5.20.0.ebuild new file mode 100644 index 000000000000..773ed1298f4d --- /dev/null +++ b/kde-frameworks/kpackage/kpackage-5.20.0.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Framework to install and load packages of non binary content" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="man" + +RDEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) +" +DEPEND="${RDEPEND} + man? ( $(add_frameworks_dep kdoctools) ) +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package man KF5DocTools) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/kpackage/metadata.xml b/kde-frameworks/kpackage/metadata.xml index 2fdbf33d963d..ac7f14a78a1d 100644 --- a/kde-frameworks/kpackage/metadata.xml +++ b/kde-frameworks/kpackage/metadata.xml @@ -5,4 +5,7 @@ kde@gentoo.org Gentoo KDE Project + + Build and install man pages + diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest index 9d73f563b768..23d42042b7b2 100644 --- a/kde-frameworks/kparts/Manifest +++ b/kde-frameworks/kparts/Manifest @@ -1,2 +1,3 @@ DIST kparts-5.18.0.tar.xz 153860 SHA256 1e766ce5c386615c926324a99abcd45110117c556ddfb79122b002e21b699de0 SHA512 0a11be9e9f3ea26bf24a56ed9222adcf4071151be90a4e136b2e8fc60d961771e3ea1021e2cf140e2961dc6f1782bd37e953fca1b54218845c370fbad3f4c9bc WHIRLPOOL 8736b79a1d60cdbbbca7ddd7d163166b962c046693cb03554c5caf835a1e93a598ca6805ffc8fe9e6ec9c30fc552afbc033e2c07c71138e3847f9ff614a7c5a7 DIST kparts-5.19.0.tar.xz 154012 SHA256 f4bc12de449160a7cf80ff4e001331d4245be88b833fce3e57cfe35c454fe515 SHA512 d54838c33b2132fe6c4153437402f0ddc7ffd9ac8c35b5c90bba91ba8d4e6105fb48913838c5ff61089b9a8d5ca7409dfe40b7df89e9f183eba8283e86cbdbbe WHIRLPOOL 4a454848e4f8d48cadadb5ae63aa169cf42758b7dbe1e290fb8b4f1547d0d8888794032e282624eec8a949a7dfa86ecdf4cac0bd70d7493660362530d4945cc1 +DIST kparts-5.20.0.tar.xz 153972 SHA256 07bc65a350641f3310bcb00cf432fef39056383eb7468fe88c8555743c74625f SHA512 725d67f1c3940f0825f2dc8789ce47a492eb76ec2149ad115ca852b5e335136dec269247bc0531833dc89771658d1f76cf1be2bdb69ad1443b2a919da87c692f WHIRLPOOL 0cecf8b19d1766a78b4ed20e3973bd8e45e52c8006c4e56f7f0d2f80b96731964b9d82451d66b000c65db4acea1c0d11f6fc0dc2e3dd2b84c20d2b271c384ae0 diff --git a/kde-frameworks/kparts/kparts-5.20.0.ebuild b/kde-frameworks/kparts/kparts-5.20.0.ebuild new file mode 100644 index 000000000000..665f6e43e87c --- /dev/null +++ b/kde-frameworks/kparts/kparts-5.20.0.ebuild @@ -0,0 +1,31 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing elaborate user-interface components" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND} + $(add_frameworks_dep ktextwidgets) +" diff --git a/kde-frameworks/kpeople/Manifest b/kde-frameworks/kpeople/Manifest index d6d7e77c571f..3c7e0a856aca 100644 --- a/kde-frameworks/kpeople/Manifest +++ b/kde-frameworks/kpeople/Manifest @@ -1,2 +1,3 @@ DIST kpeople-5.18.0.tar.xz 57744 SHA256 b3d0cc8e54f16230e01ed3805807b164d70cd8371d71974d9c2bb8f1b1b81534 SHA512 c0e0572090cda4658ee11b8039e9d0191f040a51c7eaafa2ce232d31c3e38b3967e83a1b047e057a39293a1f1826bed95a2c5e22cc957a5eff5c9f46c4f863b6 WHIRLPOOL 7fb39417b213f4762d90b1be16668335ad1cc5241f1a17fb9eb7bfce430edb29f0b045c2d0d15d75ce891cfc2747983143683430cbdc7e92defba3b699483b2c DIST kpeople-5.19.0.tar.xz 57916 SHA256 28717278348fbcc5dd0b7296804417e3a18aaa9a7c339430993d441ace334ecf SHA512 7ca3b94e5a83f113819f923157700776189e847f40c702426d2fafbc1ac190b42346609d64eafcae4a2dacc5d5630ec39faa0ed7d1a1ebbedeebb988b1044089 WHIRLPOOL 44f42633f6e348810f78a78bafefd6f8e855e5fe82f6101e40f0944486b8244d0441c9554396ba9c584a222e8ed6308450e76202e24bfedeb6b4f76117e46778 +DIST kpeople-5.20.0.tar.xz 58116 SHA256 5474dd9e22daf1bb3790bb2b2e852027fab48ca16a879fd6e9a9ef9c20482918 SHA512 d85088b77aa63af062596624d1720facd2d3f04b0aff41ff9b3c2eb404efe00200bc0defbb8a3525734f5de85fd7879ce51f77455a7657112e2ea18c1a29a8c8 WHIRLPOOL be56ae98fa8d14c4e2ac4ecc564ccb6c38ba0e7cdafd0ab47b267c43e69b9e1f9f31282b3fe296b8e0685c69ad0046578c9e8ed623cc244772e17d95e01e320a diff --git a/kde-frameworks/kpeople/kpeople-5.20.0.ebuild b/kde-frameworks/kpeople/kpeople-5.20.0.ebuild new file mode 100644 index 000000000000..7690b56a9b38 --- /dev/null +++ b/kde-frameworks/kpeople/kpeople-5.20.0.ebuild @@ -0,0 +1,33 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="KDE contact person abstraction library" +HOMEPAGE="https://projects.kde.org/projects/frameworks/kpeople" + +LICENSE="LGPL-2.1" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_qt_dep qtdbus) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtsql) + $(add_qt_dep qtwidgets) +" +RDEPEND="${DEPEND} + !net-libs/kpeople:5 + !net-libs/libkpeople[-minimal(-)] +" diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest index c5b5d9721276..f48cd4bac381 100644 --- a/kde-frameworks/kplotting/Manifest +++ b/kde-frameworks/kplotting/Manifest @@ -1,2 +1,3 @@ DIST kplotting-5.18.0.tar.xz 29488 SHA256 8c15aeb060130fb04f5c11d28085ed7bb04fcd85d7aa8da0cb2e99dd5eea38ca SHA512 920ddca57903545edc895ed58455ac8dada55f5dee5846ae67d65d360b7032be28a7b63c249ffef3594f486ea414fd1e1dd3f29da567c235af3d337067874f41 WHIRLPOOL 2e8e1dcfde463c189382c482afa76e82073ce99e7a3573af2933dc208f13cfa83805985bbdec2afe0700720949cfcd60a321e390a9562dfdd2650ea5dc9c8547 DIST kplotting-5.19.0.tar.xz 29500 SHA256 18db8a6766d710d05659e4717ea1c60e3a9b39a296b28f1474d0235d53253d99 SHA512 43631511aa9781a63cb633a00ca44c6e653cd6d50b3125eec8e6e412e8ae318d09d3f494d162a870be26120ecb8af275283a7a03158334db5bed335e7815eba6 WHIRLPOOL 9d8bb0bf03612189a96b88427d8447ce1ffd53c2b25bba68cfc4688d4542b96ae9d48c5200ff3be544d32dce73c1d63151f2dc6e3243ce46cd8044ce9761c8f9 +DIST kplotting-5.20.0.tar.xz 29504 SHA256 0c7ad5b86f5a8e061c941506b30f94fbaf59ea58e8c6bb52007cc538e1726e1e SHA512 08e4ae236d41b9c01356ebfc6405342bc8084001fe36a5a5b3c09d656c4bb1792e5f214c0e36751e516d29009d355e9a15346af1518559b6edd4aded1ffcf973 WHIRLPOOL 22d8cd07fa7be9e10a95e9c727971be2419f144607103f7320256e2b358af7d01cf0e88395f4032827d55338fe380f062aded3c1bd2586e660aa720d6ba42001 diff --git a/kde-frameworks/kplotting/kplotting-5.20.0.ebuild b/kde-frameworks/kplotting/kplotting-5.20.0.ebuild new file mode 100644 index 000000000000..412593fb4484 --- /dev/null +++ b/kde-frameworks/kplotting/kplotting-5.20.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing easy data-plotting functions" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kpty/Manifest b/kde-frameworks/kpty/Manifest index 7a9ec26c5872..43429a1b2c3c 100644 --- a/kde-frameworks/kpty/Manifest +++ b/kde-frameworks/kpty/Manifest @@ -1,2 +1,3 @@ DIST kpty-5.18.0.tar.xz 57160 SHA256 a107df2ed1dba12c6975e17def71042d3bdbab6497634d4ea4986421740f5fad SHA512 56af462fe1ec2adedc37a63641ab6f1defe1b2363da07968c7127a7e432de5fe285ba535f6a75dfac1403b2458720fcef58f48706144c313352c82f33500e5ff WHIRLPOOL 55e6e5f3732577a669486f5bfde5159bf1b603884b9c86bdcc16b23c4f166499520f2d437929179983ca5e5e4792fe6375760dd72c7f5b74e8c8b1f104bd6673 DIST kpty-5.19.0.tar.xz 57184 SHA256 0358a20ccfa7839452860d6218c2efb6a15039fcd40d0093c4fc5e2edddf0909 SHA512 2b66740c45e1b27f92b88d3b4c1a90cea5704e8f91f9bcffbbf853f8510c188b818a78722c06b478cf3ad901e1989f6adfe84c9870d4a9697421d3016d3d7d3b WHIRLPOOL fafccf0bc2239767ee90eff98f5e1751fe430c4983166e04afd1dd6e15038d540b717ac7433b76677093c2e06a5e6c923cb5f13ea8c5df015c7a5612443d9d2f +DIST kpty-5.20.0.tar.xz 57164 SHA256 ab3263f7b934862ff2ac9b8531ea5c3e4896f6c223705cc8c1b0aa2beebcd981 SHA512 d90908caf5dab694c87f7fef300d13cdd3c19790f96943ac3d8c5947f6df41eae8f2f66ede52d7c693a3655ba07c03a549f76b24a83cf42028a7a84603909d43 WHIRLPOOL f1dfb5abcccb959daa891dc2ae55d9154437ff0837e00a1366ed5af61267bb998908430de7a83c0040cbdf0f2edc01bdcce8d8915c1051eb0d0fcb8c328924ea diff --git a/kde-frameworks/kpty/kpty-5.20.0.ebuild b/kde-frameworks/kpty/kpty-5.20.0.ebuild new file mode 100644 index 000000000000..c2bc3657e1be --- /dev/null +++ b/kde-frameworks/kpty/kpty-5.20.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Framework for pseudo terminal devices and running child processes" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +DEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + sys-libs/libutempter +" +RDEPEND="${DEPEND}" diff --git a/kde-frameworks/kross/Manifest b/kde-frameworks/kross/Manifest index 9ff1a1b883c5..134d2187f8d7 100644 --- a/kde-frameworks/kross/Manifest +++ b/kde-frameworks/kross/Manifest @@ -1,2 +1,3 @@ DIST kross-5.18.0.tar.xz 134980 SHA256 26879a11c66a6692928cae8d0bf6d56f66ebe4cd36cb201aeef04dd8b11fc1cf SHA512 997d33a17c31668eae560f1f8f5abc89c40c1fbc819cfc266dcac6f7cbcda8233c88d2cc894f63900db11298a84ec83a65ed5643c10b3241bc5a736a43b86044 WHIRLPOOL 7b170a1145de20e018beab64ab05d7c7b26ff8a127926dc15b12c1be8107c59559fcaed2ed22d7c91f4afd7be283096f9b11276f928f065cd14060fb08c61b05 DIST kross-5.19.0.tar.xz 135040 SHA256 17f0c945dee462571e431af709b79fea8c359a209d98a0845e44f16361ae67db SHA512 78cfae8747420270235d7a8f37a2182e6229d17c011408577957c8dc827ec514333e5c6685bd12a41ca8abaff83658f65e17c20c8199def1e17849e3827fd295 WHIRLPOOL 37eb57c65f1e6bb22c45479c60ad53c0cbc2b7a7a247fdb23cdb542dbc159924e2170612f0e5203dca378b91b8ad1fe5be958336a0b8eacff6027cb1dda90999 +DIST kross-5.20.0.tar.xz 135020 SHA256 2399f03bce17b5aae32f6785bef5017dd8b81caf0541192192c9a794c9c141e4 SHA512 7926921b2f25065f499a65b882b21e825eed529799f0696da160d0c22e1774625ac17cc29194411672fd279392a68a0b6252369d5e5c4ed16713f42c1ef4518f WHIRLPOOL 443e0ee7816ac8847ce3f284779be94e9e70c18b96e4b63cce1a997dd3b380d2cca788896ae834b6035979c399461003d1944dbf587ad0208f981703add17cfc diff --git a/kde-frameworks/kross/kross-5.20.0.ebuild b/kde-frameworks/kross/kross-5.20.0.ebuild new file mode 100644 index 000000000000..dbe5b0960fb1 --- /dev/null +++ b/kde-frameworks/kross/kross-5.20.0.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework for embedding scripting into applications" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kparts) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtgui) + $(add_qt_dep qtscript) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND} + $(add_frameworks_dep kdoctools) + $(add_qt_dep designer) +" diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest index dc8b668bee99..61231f0e1ade 100644 --- a/kde-frameworks/krunner/Manifest +++ b/kde-frameworks/krunner/Manifest @@ -1,2 +1,3 @@ DIST krunner-5.18.0.tar.xz 48440 SHA256 ee2601e916f13e126f19538c2625ba06a6ec6addd178f47a5b2d91cce30c8591 SHA512 72fdf9b510071174c03760eb8f7eec8e3ebf2b95006c892b94d210e591b9fd6ff160a53ca6a85cbf3e24adbdb2c9c397941c191cda93059f0fe8d61ce87b9b45 WHIRLPOOL 31d438ec8c0bee70d5eb1d87cec7eafd8642a579ff1ddbc77d3e023d1002951358b2d0e03c39b7718f63cab77fe9a5ec20b0f299c98ed70d6accdf581de9e945 DIST krunner-5.19.0.tar.xz 48456 SHA256 bd164d588c3e29713f8283f3bf7ee6175cddd97a3e9eb7ee3b22769ac0409a14 SHA512 bbcdd2b1a4948718f4ad2584cb8622efc5207ea08ba0ed4263e2a86fed1a4081cae452bcccee54eb9d549d8c1ce24cc02ea4c6790611d019e8d3929d5d7e1dfd WHIRLPOOL fd4faabd92118cbf14aaa4dbe6435566c763f6834fd774093d48959da3c7e5b51f340384e90289d3eae6f6a82dc836a968fcf09d0480e6c4b17f47e647321f4b +DIST krunner-5.20.0.tar.xz 48480 SHA256 028f547d553bc9ced24b8221db542de7ed5daad071bbbc70ca9d37d75c5fe2f5 SHA512 c0aed61f4b746945db643a3652ea93f51e35031820266e28ab4249698daa98f6d648098844ab5ed1e996cafdf0ef3744a9d5ae8d63152d9403761407d8aff341 WHIRLPOOL 59131abd98a1139e96b402c9dd4c15bcc221568cbca844411a117c4c54eb83bb282dea5d6b0d0776e1869e76d4ce6c718f459ea6b6d68e5bcb7a48333c4e3f08 diff --git a/kde-frameworks/krunner/krunner-5.20.0.ebuild b/kde-frameworks/krunner/krunner-5.20.0.ebuild new file mode 100644 index 000000000000..c8bf7ccbddac --- /dev/null +++ b/kde-frameworks/krunner/krunner-5.20.0.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework for providing different actions given a string query" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kservice) + $(add_frameworks_dep plasma) + $(add_frameworks_dep solid) + $(add_frameworks_dep threadweaver) + $(add_qt_dep qtdeclarative) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kservice/Manifest b/kde-frameworks/kservice/Manifest index cc5f780512a4..52725fe4b046 100644 --- a/kde-frameworks/kservice/Manifest +++ b/kde-frameworks/kservice/Manifest @@ -1,2 +1,3 @@ DIST kservice-5.18.0.tar.xz 268836 SHA256 08e77511cd0e929a10c02aaca8027fb1c8fae743fa1e240f944fee13850d7a5d SHA512 f0262dadfdfd475acadd2ceffb19b447a3a07700e097807dba54a1e1a5cd4353f779fca30c889f9ff2eb5bc3cd51ae83ccf024b4957fdd5fb18c94e7243135f3 WHIRLPOOL 53c21c733aa18787b6aac613701c8e01df2ff7ffd0ec57df0a3dfd5161735d5d117f4aae99fbf13cadb3e82dd05adfee0e6a5cca0ae5b14535aa59e13bcc4c07 DIST kservice-5.19.0.tar.xz 268868 SHA256 35ebb1193f4c2ed47d49e436318ec6d875389decea473db91586886c848a8b0a SHA512 4beeca7c5adb401e87eca5a25390136492e935333574e68abcc0c9acdc8ea8ea404844ced99196def0f1acfa0c7e9c974ddbf2f43941cc6a191bab6874c1461f WHIRLPOOL e51b15c43473a17bb6a078b0105a3d612c861c71d2513ec00c8701cd6b08ef0b16f9b4012b4be147059ad1f7795cc4e1d262b1ce0e55f086c94c469c644efe23 +DIST kservice-5.20.0.tar.xz 268792 SHA256 b7ccc46db55a6782d98b501ead1ebea051ce0c441531a017a285cfcfe8f46087 SHA512 4a7139f1377bce8e3bed60c2a54bdec9c20c3cba48d313916bc9953f037889525ebaa838cef6437750e8b87a774a5c11d2cc87469c4f0c9bb65987a619bce838 WHIRLPOOL 2c33e00f0f2144e96ca5ee34a33fbd9b9ce70826502b7ab78ff128e95d45171193ca85ea98ed27a8276c2e6bde84d850065f17849d628afab1afb28c8f890b59 diff --git a/kde-frameworks/kservice/kservice-5.20.0.ebuild b/kde-frameworks/kservice/kservice-5.20.0.ebuild new file mode 100644 index 000000000000..ecfcb6ef4a11 --- /dev/null +++ b/kde-frameworks/kservice/kservice-5.20.0.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Advanced plugin and service introspection" +LICENSE="LGPL-2 LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+man" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kcrash) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_qt_dep qtdbus) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND} + man? ( $(add_frameworks_dep kdoctools) ) + test? ( $(add_qt_dep qtconcurrent) ) +" + +# requires running kde environment +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package man KF5DocTools) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/ktexteditor/Manifest b/kde-frameworks/ktexteditor/Manifest index 490c823c34ed..439c50a89279 100644 --- a/kde-frameworks/ktexteditor/Manifest +++ b/kde-frameworks/ktexteditor/Manifest @@ -1,2 +1,3 @@ DIST ktexteditor-5.18.0.tar.xz 2869476 SHA256 7b3cce5b1313561edd76113a92f651c9399b5d7d6a606cc61ecaf3e08b16a83b SHA512 7ca2a052ef5a7098ab1b9db4715f8a89ddae120a788b7541c973f1f77d4547e365e31619417c9e0a3f4333bc4c1053c99d553338f3cf18a952024d6c9800c785 WHIRLPOOL f46387c609bbe497ee7b0f093300dcfdbdeabe3ccb88abf7c17af868dd9b44eae87901fc3f0464bd6673b2a31d65e7ab0ee7308ee1fb3036548016bd7241b220 DIST ktexteditor-5.19.0.tar.xz 2871304 SHA256 b79515d2851b257c961cdf2c2aa5caa78ff9353468a01890966a90493821746c SHA512 19610a162d491d331944f639b262ec40b887e221fc393bbccbfb113356b0fa16893f5e7c1ff96c590f55a9da3b21df4f584c664a6ec19ca51c5b5b333f4bd517 WHIRLPOOL 97f19a582e2a9e1b2b23a562243c17f391a3b8a6f901edf9932b21f6e418929952d9fbf50745e62aefa1a3c1d4f92224738a4f23c18b5d4c7cabe3c5824d2375 +DIST ktexteditor-5.20.0.tar.xz 2872068 SHA256 fd243ecd7b7527f9ceeb7362175e800b027d96b65109a1ffa63ac3e6ba272c84 SHA512 a89cfea2d3629422c013144898c3ac3fae29c8bc247610f68145f1cbcae66f9399b71487caa929c4b5269173730af9ba1b411000b01644686c25fca1b8e814ed WHIRLPOOL e518671339184e4a195d92f20606d3c995fc5fb59079837ac4af17db2ce7694726f9bc95ae3366a42de79989f96e6349b374fa56404b69033bce8e68d77369a3 diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.20.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.20.0.ebuild new file mode 100644 index 000000000000..da503f92601c --- /dev/null +++ b/kde-frameworks/ktexteditor/ktexteditor-5.20.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing a full text editor component" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="git" + +RDEPEND=" + $(add_frameworks_dep karchive) + $(add_frameworks_dep kcodecs) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kguiaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kio) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep kjobwidgets) + $(add_frameworks_dep kparts) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep sonnet) + $(add_qt_dep qtgui) + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtscript) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + git? ( dev-libs/libgit2:= ) +" +DEPEND="${RDEPEND} + $(add_qt_dep qtxmlpatterns) + test? ( $(add_frameworks_dep kservice) ) +" + +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package git LibGit2) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/ktextwidgets/Manifest b/kde-frameworks/ktextwidgets/Manifest index be137cf1cc46..a0ba5c68dcf6 100644 --- a/kde-frameworks/ktextwidgets/Manifest +++ b/kde-frameworks/ktextwidgets/Manifest @@ -1,2 +1,3 @@ DIST ktextwidgets-5.18.0.tar.xz 306736 SHA256 e38c6e1458f34fc7a78ed8447ab6df94296662555a0877d5807428fcaac3d4f1 SHA512 ffd6368a390baae36d2116bfb717f09e8a1e194d11918c0131d8f223ae71db5d66d59d492a4da96ac2f4664a3478f0ac0d84a06cc917e086fa47616aba31f646 WHIRLPOOL 7371a459e22af7264dd212e182d57420679c8931f3eff9e1e0c7406bbc7db80d898ba480063bf07a0f3bfc3246859e52787eaacf8af5f4df4769b8c4ff216376 DIST ktextwidgets-5.19.0.tar.xz 306580 SHA256 d74eb97b7184eed70481a029bc3fe2129d56c7c3d48a3c1708377493cd59cdf7 SHA512 8400163cd7dd895d09a90a64181d7c92e620c0c9360cf00359bbb5c12b804c238eca407a2dcb8fbc499e16b5c87acd9b5d9d020bd81098c496db9861b65e8006 WHIRLPOOL f773efb1eed7ee70f11a90359b1f7e109f9b49057728127266c55da872c21a927846211e76f69d90b7d7d3fb56f6e4693ac8e7d0d2945b8b224ac8e56f4cc399 +DIST ktextwidgets-5.20.0.tar.xz 306556 SHA256 47067a16da56d40e87d30977c988700a7121fbfc80384805154039c79726a48c SHA512 a214515d929b35cfd366dff4400bbe4f74e2ae6e123322c597f092644d404e7a4b02d3605f05c316490ecd2f0a08f7330cf63084fde12df4daa89a7f4e2ad5d0 WHIRLPOOL fa5718d4f3436558835c6ace6fde691030440e8556a16fad1b0c61c417c99a000affcb95857b985ed49acbb940a86a944bf90c4917be67a379b1010ae48250d0 diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.20.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.20.0.ebuild new file mode 100644 index 000000000000..dd14783c4ac0 --- /dev/null +++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.20.0.ebuild @@ -0,0 +1,38 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing an assortment of widgets for displaying and editing text" +LICENSE="LGPL-2+ LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="speech" + +RDEPEND=" + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep sonnet) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + speech? ( $(add_qt_dep qtspeech) ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package speech Qt5TextToSpeech) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/kunitconversion/Manifest b/kde-frameworks/kunitconversion/Manifest index 0d66eff674c8..e6c01defd007 100644 --- a/kde-frameworks/kunitconversion/Manifest +++ b/kde-frameworks/kunitconversion/Manifest @@ -1,2 +1,3 @@ DIST kunitconversion-5.18.0.tar.xz 627564 SHA256 d150694ee1b852961c6fe5401b75c818303208062d43e7dd6fe7244f7db3f53e SHA512 911e57abad45d1a745b2af037f39946fe873aadee961104d094352dc860c542f246d48dee589102410d7a250e1e2b6348e3eaf6c4c1efc1226646362b03f77eb WHIRLPOOL 0786fb9036585012bfd6b046b488938434da6af415c3557bdc379cc7e65f879fb1a6a663752f2ca6feb654880ea2904338f86f58f377aa0d28a3fdcdd9ab2552 DIST kunitconversion-5.19.0.tar.xz 620080 SHA256 6b22185ddfe88de2f063954db57c1b8ac9b3d6a4f3c8dc103933ac3c31dce185 SHA512 f2839c0601cd8f41b0fc1946f2b50baf9a5b31d9fea50152b02b155ebe2afbbde9ecca93360472410f4e718e1fffa367dc25af4d48704c2981488407b1798a76 WHIRLPOOL 826f9a4b461a1ad02c00493884691b620d53a0617b3655e15a5afe07eda688826b67f40814d053bd5e52b674ac080a8aa147dddd429fc9481f1258ac93550f5e +DIST kunitconversion-5.20.0.tar.xz 618032 SHA256 92d44a8aaca94a86eddd2649c79dc98939f67cc1bb27cd83731e332ce274f6fa SHA512 3c75144190b401e7ccd03431ff63accd31a9a0346c4f04f6b915fb5ff920f6f70fafd489956794fb75ba77256140b98c34b5ecb889a899673d723e3fa496e081 WHIRLPOOL ce65b86f182ae1cf764a93be0143209d51f30dfb297c059e3072cf3aab606ae97c866994ad08729166a313f0c00f5b4b3f4751502980d35dffea4558d4d8541c diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.20.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.20.0.ebuild new file mode 100644 index 000000000000..39ff39a5f7e4 --- /dev/null +++ b/kde-frameworks/kunitconversion/kunitconversion-5.20.0.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Framework for converting units" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep ki18n) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtxml) +" +DEPEND="${RDEPEND}" diff --git a/kde-frameworks/kwallet/Manifest b/kde-frameworks/kwallet/Manifest index 3507328832d5..3ec22d8f75a5 100644 --- a/kde-frameworks/kwallet/Manifest +++ b/kde-frameworks/kwallet/Manifest @@ -1,2 +1,3 @@ DIST kwallet-5.18.0.tar.xz 286632 SHA256 3af64defd77219f6c128d3e92165dfc5063f803e1f98b09b673befdd3af0c970 SHA512 e82953536a9bb7bd7f20ca59dd2df84f73d9a5573693041176ff3d801d36799b226a39c7bdc0c40538a46923b021ecc60d5daa4bd182eef80a229dd839b3af0d WHIRLPOOL d1eb2f0acc64ed1891db6eb57c0291bedc55daf714c44b10531c9cae40fab0fe3d238691ecfec2b692005baea0e562e434b97ca8c932e2c92b561cd407b19da6 DIST kwallet-5.19.0.tar.xz 287448 SHA256 555e2b499d494819eb808752e66ff7d813a66004739d6f70f63a75d79c300c7c SHA512 0fde73fa7cbdef1c8136abc9e1b83a27035cfdf5962bc56435b36282ab2237001b7cb0e7a14e59057180184dbf70e5b61392781f1c2aebb3df715e358308ef85 WHIRLPOOL 8db779a0676dd122d6101440b781e342fe6cf02a728f0116fd2d9ecc256ce29a9710f87e5851b6464b6e03d7e7792511daebc1df0975823b728dd20eef882ed3 +DIST kwallet-5.20.0.tar.xz 288612 SHA256 909294368aaa493faf51d619b3f2940c2f696251b432889e3d2ce25daf420531 SHA512 4d15f5b4e67f7491a83eebc1f61be4e78af07c597498d8182522636a61844782cf4c1694e192860707253a9eb17aa3ede194596ccd9a20fc2a7bcb896b0687c1 WHIRLPOOL 83d3f006866abfe1d720149c1d97cb0ddcefc3fa3a3b31d01eb52cbf5ce48a10858c3a11230a069a3a86c14a4a37aac4a943c4107310ffc542ccb5bb707b6778 diff --git a/kde-frameworks/kwallet/kwallet-5.20.0-r1.ebuild b/kde-frameworks/kwallet/kwallet-5.20.0-r1.ebuild new file mode 100644 index 000000000000..a9f81521a862 --- /dev/null +++ b/kde-frameworks/kwallet/kwallet-5.20.0-r1.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Framework providing desktop-wide storage for passwords" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="gpg +man" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep knotifications) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + dev-libs/libgcrypt:0= + gpg? ( + $(add_kdeapps_dep gpgmepp) + app-crypt/gpgme + ) +" +DEPEND="${RDEPEND} + man? ( $(add_frameworks_dep kdoctools) ) +" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package gpg Gpgme) + $(cmake-utils_use_find_package gpg KF5Gpgmepp) + $(cmake-utils_use_find_package man KF5DocTools) + ) + kde5_src_configure +} + +pkg_postinst() { + if ! has_version "kde-plasma/kwallet-pam" || ! has_version "kde-apps/kwalletmanager:5" ; then + elog + elog "Install kde-plasma/kwallet-pam for auto-unlocking after account login." + elog "Install kde-apps/kwalletmanager:5 to manage your kwallet." + elog + fi +} diff --git a/kde-frameworks/kwallet/metadata.xml b/kde-frameworks/kwallet/metadata.xml index af757a5a25e0..694709ad8b81 100644 --- a/kde-frameworks/kwallet/metadata.xml +++ b/kde-frameworks/kwallet/metadata.xml @@ -7,5 +7,6 @@ Support wallets with GnuPG encryption in addition to the default blowfish-encrypted file + Build and install man pages diff --git a/kde-frameworks/kwidgetsaddons/Manifest b/kde-frameworks/kwidgetsaddons/Manifest index 1c8ec1e2cdc4..4885a1870d5a 100644 --- a/kde-frameworks/kwidgetsaddons/Manifest +++ b/kde-frameworks/kwidgetsaddons/Manifest @@ -1,2 +1,3 @@ DIST kwidgetsaddons-5.18.0.tar.xz 2130488 SHA256 61eebbe729dba31fccfdd1178e50d4c2c9e4b221f193f2a0d2e57ec6d9f9d819 SHA512 d571ebb313fc8e773b1a0e73889c669cf26d125373685119ad70a8b93dd5ae9dac6f720cbadd8dfc25698e4f312dec61356a179a4d94ef4868cc162b787add9b WHIRLPOOL 8522beaf2b2dcd49921b18d728fa6d027e8f5a1c925dd344db089e8fcd67e9a6d778532b40f87692a710791774fbd51dc2da1a25c32ec9e7e307111d05eecc81 DIST kwidgetsaddons-5.19.0.tar.xz 2129676 SHA256 7547ee8fb0e532fa95bb6e3fd00ede672c1b4c7fdfc38a5dfcf715d9c0b3052d SHA512 016e31554d3882825913fe18c41e1f1e3b3d19160776f4ba942a94b03fbe9747165b372db3d64a60ec6a58a473d0c7de6e4356ad3d3642d295a6996cae57c0d6 WHIRLPOOL 2c04072d00ee9a6461f0ccc9c19144a2b2474c68348fea58f028ab5917aaa3272f64fadd1118356f0b690aa080cf5f699721c7694ede50f9498d04951979bc2b +DIST kwidgetsaddons-5.20.0.tar.xz 2130724 SHA256 a930990de3b090d10c20cb30d764825a551253a7d4b104b4eac9ae73dc81e628 SHA512 22c8d0c39bdfbc44363ed3102643a9a52ae11a621b4f4fb10a52dd69bf7a44defe4a80c1d879358982f78964c6fb05c2978789ea44842bd547454b535b3a8877 WHIRLPOOL ba26f12339dd8941cd9dfae9e9c1fc53257a91af917effb72228f3d7602f31807a71d346f7c1f83db01807b04e91e49a2f6c468bed7e861717b05342efbdaec5 diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.20.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.20.0.ebuild new file mode 100644 index 000000000000..544015905711 --- /dev/null +++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.20.0.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="An assortment of high-level widgets for common tasks" +LICENSE="LGPL-2.1+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="nls" + +RDEPEND=" + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) + test? ( $(add_qt_dep designer) ) +" diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest index 3cd2e5809fda..8348bd30a282 100644 --- a/kde-frameworks/kwindowsystem/Manifest +++ b/kde-frameworks/kwindowsystem/Manifest @@ -1,2 +1,3 @@ DIST kwindowsystem-5.18.0.tar.xz 163260 SHA256 67567ba32268d0a5365106b7e98e69eb77880271580c68adbf0d128f32691f06 SHA512 4c67d23e62de3d34fb9f2055bfa6b8608d52c2faf1129e32426798e6c84d8f9d94452305ed9829b56663c24442c5d0cffc8ecb27fbf55f7a7d45cfa7a9b10691 WHIRLPOOL 48cb7b153d1ab4ca411d3c9ff5289c90b62be8994bb371b0fe62bfedda0503023007dfffc1862872efed4478f03a4033695f3192fbca558ed4c587a9d7249117 DIST kwindowsystem-5.19.0.tar.xz 163636 SHA256 9039b4bc6143ccccb98af60d4bcc813ea6c211b4f425c335fb499293c9d0bd84 SHA512 dceb8da8c4e3f43c60782409cdf7e16c488e1838952001e7713aca82ae66b95deb71e5d345069c3e0ec21e2e31628ad6cd2bf93d06c2827cdb909e216ec0a3f5 WHIRLPOOL b885c70b4d19aef76d7f95f89ef45c980d27895282f3f6dffb74f61b1ec4157a5ab7df53652c20733163292fabb9569f8d989c00c9e3b8700a81ba4591912657 +DIST kwindowsystem-5.20.0.tar.xz 163780 SHA256 b1d7e273b5fc75fbde45fe33179ea884a0b9761af0663279405cfd18d9e4390f SHA512 91a17e0f13aac68403877a34ee8337598eed5151dec124b65f226272906671d9ec6fdc8bcb008e4724e9b582865a9e09797219ca0912c2bcd2ca10d7df2919c2 WHIRLPOOL 1aefbfd0ffedfe23d3e412eed4e80ffcb11ba99c17ed772de6de01e6d2082a0d8028129c3f82c09e829e895b1183bac932f79601b7990bb8982751adb4a876f0 diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.20.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.20.0.ebuild new file mode 100644 index 000000000000..cfcc4942e332 --- /dev/null +++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.20.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework providing access to properties and features of the window manager" +LICENSE="|| ( LGPL-2.1 LGPL-3 ) MIT" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" +IUSE="nls X" + +RDEPEND=" + $(add_qt_dep qtgui) + $(add_qt_dep qtwidgets) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + x11-libs/libXfixes + x11-libs/libxcb + x11-libs/xcb-util-keysyms + ) +" +DEPEND="${RDEPEND} + nls? ( $(add_qt_dep linguist-tools) ) + X? ( x11-proto/xproto ) +" + +RESTRICT="test" + +DOCS=( "docs/README.kstartupinfo" ) + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package X X11) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/kxmlgui/Manifest b/kde-frameworks/kxmlgui/Manifest index 7c7e6cd9113f..4c5a89000cbe 100644 --- a/kde-frameworks/kxmlgui/Manifest +++ b/kde-frameworks/kxmlgui/Manifest @@ -1,2 +1,3 @@ DIST kxmlgui-5.18.0.tar.xz 864752 SHA256 316324910ba63df52de57445b68aaf3f4b1689e86d568039f968eb7132f0357a SHA512 734e54cd39fcd23362dde7f45d2f9ee7bbaae175c8d93aeddb2a7442d2bdc5727f539b62e95ffb8f2d61e5e342f792e970331ef37efe8e35b4eca8b38235bf22 WHIRLPOOL ce3ea2deefd87616ee1b41ee473eac09b722ac5a298e019841fda28a1c7426ba452945673afefdbffe1737c6b2d94d7cfa50ee018973965e14f10d98a43d7523 DIST kxmlgui-5.19.0.tar.xz 865088 SHA256 503d623d793c0b50abaf135a275c7d0e6fb31eba0adba4f6fd836e1f5dec82aa SHA512 7a6572b72eb530c6937c18286d0238387ca720f6045de832dc04e0fed48e2d99038187f352625e9629d69364e4ebe1b5d75a54d0785a0a0ffa7420d505411235 WHIRLPOOL b0aa9960e61edc95610bba613406e8bcd00cfbc4c8c3ad386cc2dffd969270f88fbbbfd340c580ac7fea80c423a5e8f023cb9cbe9d91dbea3a1c53802e3b51f7 +DIST kxmlgui-5.20.0.tar.xz 868316 SHA256 84d186d92969570a47f314c20f7f444d3d82182e47b6f065ab3537bdbc221c14 SHA512 f33b1cb5541ab58f12cec8d0ca24d5311f39dd6e3a2cd22a815480acd495c46c8575cbdea3b91bfc68fd753335301771f0f1b1ea0d58620169cc16c6cb873ad1 WHIRLPOOL 1f951873149d135b2d3d011fd9bf8ae498a0ecf822528a1ceadbc22b95ffb8e9a57da3c7e43731c22662a3bbf85c4712c01d5f611fb1738aa04002176a1fe62f diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.20.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.20.0.ebuild new file mode 100644 index 000000000000..cc57a95159fa --- /dev/null +++ b/kde-frameworks/kxmlgui/kxmlgui-5.20.0.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Framework for managing menu and toolbar actions in an abstract way" +KEYWORDS="~amd64 ~arm ~x86" +LICENSE="LGPL-2+" +IUSE="attica" + +RDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kiconthemes) + $(add_frameworks_dep kitemviews) + $(add_frameworks_dep ktextwidgets) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork 'ssl') + $(add_qt_dep qtprintsupport) + $(add_qt_dep qtwidgets) + $(add_qt_dep qtxml) + attica? ( $(add_frameworks_dep attica) ) +" +DEPEND="${RDEPEND}" + +src_configure() { + local mycmakeargs=( + $(cmake-utils_use_find_package attica KF5Attica) + ) + + kde5_src_configure +} diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest index 7bbf9dcfb774..0c1fe0d1c267 100644 --- a/kde-frameworks/kxmlrpcclient/Manifest +++ b/kde-frameworks/kxmlrpcclient/Manifest @@ -1,2 +1,3 @@ DIST kxmlrpcclient-5.18.0.tar.xz 28260 SHA256 695b33703b1966d9b767f6e7b89c4b17644e6732b6757c162a78fc0207bb0841 SHA512 9f648f1368bf635a5859985a794e7719c9416e0ce7279361ea90bc849604f727e0aa365cf97a2069bb7fd58a6a2613ddc990185da4ef5cad9db3d74b5d3a855d WHIRLPOOL 55d1a9b8e0eae3abc02527a1be5a27459df6015320263570caf0a7acb9a29eca30b706e0f559901463f56567a38c947481befd11959725dbdee44da083680bdf DIST kxmlrpcclient-5.19.0.tar.xz 28268 SHA256 0f25bcc12fd3fdb78b055fcfefb067243f61d2afde742ac897950ab83b3b5152 SHA512 43c88c39bbb7c88901ce58ea441cd04017cea393d0d809a94293ce79477d39353ee99ddc7eabc6ed6bac26d81e753020a58d98823abab96ce19fb9f0b9ef8c8e WHIRLPOOL bad1796c2331537af40add3d313ea4a240e4a13947e2c8f7793c3c78ceb97310e7a9d10a41371a07f3195250ee3a776bd7ed2aca2acb03aefc7f8f17579ba528 +DIST kxmlrpcclient-5.20.0.tar.xz 28288 SHA256 8789d2e438c94e362f1dffbfe2d9bf3026d394e485ed310c223f47cc59d645d9 SHA512 f8c42403f4d1ae0ec4e6e1a84ab71d7660d738949bd2619fee3594fd7f598505efa28a516c842a6581e9b41cff0d8f989ef6c696b3b361b3149b962847aa9493 WHIRLPOOL 808bfa251adeaf530b3ceffd1e339bfc378253d8aa579f340051f4937e7dcae4d7fb3b3442515d8ad4c71bf24a574a5b1c96622b3e56c0b930cef9b8c18007d5 diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.20.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.20.0.ebuild new file mode 100644 index 000000000000..0468bbcad6bb --- /dev/null +++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.20.0.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +KDE_DOXYGEN="true" +KDE_TEST="true" +inherit kde5 + +DESCRIPTION="Framework providing client-side support for the XML-RPC protocol" +LICENSE="BSD-2" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +RDEPEND=" + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_qt_dep qtxml) + ! - selinux@gentoo.org - SELinux Team + kde@gentoo.org + Gentoo KDE Project - Gentoo SELinux policy for gift diff --git a/kde-plasma/kactivitymanagerd/Manifest b/kde-plasma/kactivitymanagerd/Manifest new file mode 100644 index 000000000000..9f41ae53b1a7 --- /dev/null +++ b/kde-plasma/kactivitymanagerd/Manifest @@ -0,0 +1 @@ +DIST kactivitymanagerd-5.5.0.tar.xz 111028 SHA256 4d8ed5a621ac3df49f57249b4651c8e4c5b3d8bef31cd86864c3586cff332acf SHA512 f4dab46a3ca3d5440d14502eeb2e24b329ee5da4eaeb19ab6d8f6c0d5108d048547a4c6c4e0d75229cd736e83f255e5522038f620e6793d2f01767c7acd166de WHIRLPOOL 8d19482514d65e815017455fc5d4abeca5b7cb28c20a257c4451251070d21123e03016a97bced8c85fb1053e780aaedebb07b59bba0fd8e3211a803163b79117 diff --git a/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.5.0.ebuild b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.5.0.ebuild new file mode 100644 index 000000000000..a3f17f3f3c06 --- /dev/null +++ b/kde-plasma/kactivitymanagerd/kactivitymanagerd-5.5.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="System service to manage user's activities, track the usage patterns etc." +SRC_URI="mirror://kde/stable/kactivities/${P}.tar.xz" + +LICENSE="|| ( GPL-2 GPL-3 )" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="" + +COMMON_DEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep kglobalaccel) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kservice) + $(add_frameworks_dep kwindowsystem) + $(add_frameworks_dep kxmlgui) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtsql) + $(add_qt_dep qtwidgets) +" +DEPEND="${COMMON_DEPEND} + >=dev-libs/boost-1.54 +" +RDEPEND="${COMMON_DEPEND} + ! - - games@gentoo.org - Gentoo Games Project - + + kde@gentoo.org + Gentoo KDE Project + diff --git a/licenses/hplip-plugin b/licenses/hplip-plugin new file mode 100644 index 000000000000..e6a624182168 --- /dev/null +++ b/licenses/hplip-plugin @@ -0,0 +1,24 @@ +LICENSE TERMS FOR HP Linux Imaging and Printing (HPLIP) Driver Plug-in + +These License Terms govern your Use of the HPLIP Driver Plug-in Software (the "Software"). USE OF THE SOFTWARE INCLUDING, WITHOUT LIMITATION, ANY DOCUMENTATION, IS SUBJECT TO THESE LICENSE TERMS AND THE APPLICABLE AS-IS WARRANTY STATEMENT. BY DOWNLOADING AND INSTALLING THE SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THESE TERMS. IF YOU DO NOT AGREE TO ALL OF THESE TERMS, DO NOT DOWNLOAD AND INSTALL THE SOFTWARE ON YOUR SYSTEM. + +1. License Grant. HP grants you a license to Use one copy of the Software with HP printing products only. "Use" includes using, storing, loading, installing, executing, and displaying the Software. You may not modify the Software or disable any licensing or control features of the Software. + +2. Ownership. The Software is owned and copyrighted by HP or its third party suppliers. Your license confers no title to, or ownership in, the Software and is not a sale of any rights in the Software. HP's third party suppliers may protect their rights in the Software in the event of any violation of these license terms. + +3. Copies and Adaptations. You may only make copies or adaptations of the Software for archival purposes or when copying or adaptation is an essential step in the authorized Use of the Software. You must reproduce all copyright notices in the original Software on all copies or adaptations. You may not copy the Software onto any public network. + +4. No Disassembly. You may not Disassemble the Software unless HP's prior written consent is obtained. "Disassemble" includes disassembling, decompiling, decrypting, and reverse engineering. In some jurisdictions, HP's consent may not be required for limited Disassembly. Upon request, you will provide HP with reasonably detailed information regarding any Disassembly. + +5. No Transfer. You may not assign, sublicense or otherwise transfer all or any part of these License Terms or the Software. + +6. Termination. HP may terminate your license, upon notice, for failure to comply with any of these License Terms. Upon termination, you must immediately destroy the Software, together with all copies, adaptations and merged portions in any form. + +7. Export Requirements. You may not export or re-export the Software or any copy or adaptation in violation of any applicable laws or regulations. + +8. U.S. Government Restricted Rights. The Software has been developed entirely at private expense. It is delivered and licensed, as defined in any applicable DFARS, FARS, or other equivalent federal agency regulation or contract clause, as either "commercial computer software" or "restricted computer software", whichever is applicable. You have only those rights provided for such Software by the applicable clause or regulation or by these License Terms. + +9. DISCLAIMER OF WARRANTIES. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, HP AND ITS SUPPLIERS PROVIDE THE SOFTWARE "AS IS" AND WITH ALL FAULTS, AND HEREBY DISCLAIM ALL OTHER WARRANTIES AND CONDITIONS, EITHER EXPRESS, IMPLIED, OR STATUTORY, INCLUDING, BUT NOT LIMITED TO, WARRANTIES OF TITLE AND NON-INFRINGEMENT, ANY IMPLIED WARRANTIES, DUTIES OR CONDITIONS OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, AND OF LACK OF VIRUSES ALL WITH REGARD TO THE SOFTWARE. Some states/jurisdictions do not allow exclusion of implied warranties or limitations on the duration of implied warranties, so the above disclaimer may not apply to you in its entirety. + +10. LIMITATION OF LIABILITY. Notwithstanding any damages that you might incur, the entire liability of HP and any of its suppliers under any provision of this agreement and your exclusive remedy for all of the foregoing shall be limited to the greater of the amount actually paid by you separately for the Software or U.S. $5.00. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL HP OR ITS SUPPLIERS BE LIABLE FOR ANY SPECIAL, INCIDENTAL, +INDIRECT, OR CONSEQUENTIAL DAMAGES WHATSOEVER (INCLUDING, BUT NOT LIMITED TO, DAMAGES FOR LOSS OF PROFITS OR CONFIDENTIAL OR OTHER INFORMATION, FOR BUSINESS INTERRUPTION, FOR PERSONAL INJURY, FOR LOSS OF PRIVACY ARISING OUT OF OR IN ANY WAY RELATED TO THE USE OF OR INABILITY TO USE THE SOFTWARE, OR OTHERWISE IN CONNECTION WITH ANY PROVISION OF THIS AGREEMENT, EVEN IF HP OR ANY SUPPLIER HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES AND EVEN IF THE REMEDY FAILS OF ITS ESSENTIAL PURPOSE. Some states/jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so the above limitation or exclusion may not apply to you. diff --git a/licenses/the-Click-license b/licenses/the-Click-license new file mode 100644 index 000000000000..e524ecaea6f6 --- /dev/null +++ b/licenses/the-Click-license @@ -0,0 +1,29 @@ +(c) 1999-2009 Massachusetts Institute of Technology +(c) 2000-2009 Mazu Networks, Inc. +(c) 2001-2009 International Computer Science Institute +(c) 2004-2011 Regents of the University of California +(c) 2006-2013 Meraki, Inc. +(c) 2011-2013 President and Fellows of Harvard College + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the "Software"), +to deal in the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +The name and trademarks of copyright holders may NOT be used in advertising +or publicity pertaining to the Software without specific, written prior +permission. Title to copyright in this Software and any associated +documentation will at all times remain with copyright holders. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +DEALINGS IN THE SOFTWARE. diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest index 46b31f251c66..f5340f8de6b4 100644 --- a/mail-client/claws-mail/Manifest +++ b/mail-client/claws-mail/Manifest @@ -1,3 +1 @@ -DIST claws-mail-3.13.1.tar.xz 5581304 SHA256 ad3cc8227b5f6236445698d9b18b0876ebd887b6828e74439552c20ef2d92a11 SHA512 526458434ca865e05c1201c6125f59cdc6e000b854f7075fd59401ddf1d4ea2d9b17b562de4570469f383b35fce5081d1c69185373bdb588538a498231b00ee3 WHIRLPOOL e002b4b98acf390ec82e6a8b70554be37191761ae7711261100e69000907d9cf90bdc1ac6c6010d749e4f7c16cbb93c0cf95efb1edf28c8625f1b40069e8fd9d DIST claws-mail-3.13.2.tar.xz 5582600 SHA256 6a731052814b3284abeca1662d47817a86e018bc7123ab428f015f0cfab40ad1 SHA512 7356a4286fc76e215746de846f412e80b4d21c3be90ac8edd7719be2874569f953ce5c094e4a20b0c467db994d710135fc14bcb01f8fb4e947bf7d1666261ea3 WHIRLPOOL ec64d157fffd7be2849c92209cf3a5cc29935fa60a9061577c1b0bbcdac28b51f800c731ebf5f9598bc34f56ee9815adddfb5691f5faa81c92252bd182ab5120 -DIST claws-mail-3.9.0.tar.bz2 7425870 SHA256 ed70975a5056b3ffc4fe6e977f0d9606febc1499763c090241b029a73ff24e65 SHA512 5cb17106fee4549464eca03c8630fa4c46ee7b236c51eefbeb00f8a3602937cbe6073617f47a94732983ec3bc8838bc80e567f2e55cce1b30db453f350f590e8 WHIRLPOOL 4f2bef9d2240037eb6fd9b62b48c7173fddbd4fcb7258d4c5e0ee0e322894d741532c2ad716fbac96e465f87fe428fa6e926a04e7e8de1beaf68b8cb0a12c9a4 diff --git a/mail-client/claws-mail/claws-mail-3.13.1.ebuild b/mail-client/claws-mail/claws-mail-3.13.1.ebuild deleted file mode 100644 index 42a689cc5bee..000000000000 --- a/mail-client/claws-mail/claws-mail-3.13.1.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -AUTOTOOLS_AUTORECONF=yes - -inherit autotools-utils multilib gnome2-utils eutils python-single-r1 - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="http://www.claws-mail.org/" - -SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="~alpha ~amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" - -IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface" -REQUIRED_USE="libcanberra? ( notification ) - libindicate? ( notification ) - libnotify? ( notification ) - networkmanager? ( dbus ) - smime? ( pgp )" - -# Plugins are all integrated or dropped since 3.9.1 -PLUGINBLOCK="!!mail-client/claws-mail-acpi-notifier - !!mail-client/claws-mail-archive - !!mail-client/claws-mail-att-remover - !!mail-client/claws-mail-attachwarner - !!mail-client/claws-mail-clamd - !!mail-client/claws-mail-fancy - !!mail-client/claws-mail-fetchinfo - !mail-client/claws-mail-gdata - !!mail-client/claws-mail-geolocation - !!mail-client/claws-mail-gtkhtml - !!mail-client/claws-mail-mailmbox - !!mail-client/claws-mail-newmail - !!mail-client/claws-mail-notification - !!mail-client/claws-mail-perl - !!mail-client/claws-mail-python - !!mail-client/claws-mail-rssyl - !!mail-client/claws-mail-spam-report - !!mail-client/claws-mail-tnef-parse - !!mail-client/claws-mail-vcalendar - !!mail-client/claws-mail-address_keeper - !!mail-client/claws-mail-pdf-viewer" - -COMMONDEPEND=">=sys-devel/gettext-0.12.1 - gdata? ( >=dev-libs/libgdata-0.17.1 ) - gtk3? ( x11-libs/gtk+:3 ) - !gtk3? ( >=x11-libs/gtk+-2.20:2 ) - pda? ( >=app-pda/jpilot-0.99 ) - gnutls? ( >=net-libs/gnutls-2.2.0 ) - ldap? ( >=net-nds/openldap-2.0.7 ) - pgp? ( >=app-crypt/gpgme-0.4.5 ) - valgrind? ( dev-util/valgrind ) - dbus? ( >=dev-libs/dbus-glib-0.60 ) - spell? ( >=app-text/enchant-1.0.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - nntp? ( >=net-libs/libetpan-0.57 ) - startup-notification? ( x11-libs/startup-notification ) - session? ( x11-libs/libSM - x11-libs/libICE ) - archive? ( app-arch/libarchive - >=net-misc/curl-7.9.7 ) - bogofilter? ( mail-filter/bogofilter ) - notification? ( - libnotify? ( x11-libs/libnotify ) - libcanberra? ( media-libs/libcanberra[gtk] ) - libindicate? ( dev-libs/libindicate:3[gtk] ) - dev-libs/glib:2 - ) - smime? ( >=app-crypt/gpgme-0.4.5 ) - calendar? ( >=net-misc/curl-7.9.7 ) - pdf? ( app-text/poppler[cairo] ) - spam-report? ( >=net-misc/curl-7.9.7 ) - webkit? ( >=net-libs/webkit-gtk-1.0:2 ) -" - -DEPEND="${PLUGINBLOCK} - ${COMMONDEPEND} - app-arch/xz-utils - xface? ( >=media-libs/compface-1.4 ) - virtual/pkgconfig" - -RDEPEND="${COMMONDEPEND} - pdf? ( app-text/ghostscript-gpl ) - clamav? ( app-antivirus/clamav ) - networkmanager? ( net-misc/networkmanager ) - perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} - >=dev-python/pygtk-2.10.3 ) - rss? ( net-misc/curl - dev-libs/libxml2 ) - app-misc/mime-types - x11-misc/shared-mime-info" - -src_configure() { - # Don't use libsoup-gnome (bug #565924) - export HAVE_LIBSOUP_GNOME=no - - local myeconfargs=( - $(use_enable debug crash-dialog) - $(use_enable valgrind valgrind) - $(use_enable doc manual) - $(use_enable gtk3) - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable dbus dbus) - $(use_enable networkmanager) - $(use_enable pda jpilot) - $(use_enable session libsm) - $(use_enable spell enchant) - $(use_enable gnutls) - $(use_enable startup-notification) - $(use_enable xface compface) - $(use_enable archive archive-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable calendar vcalendar-plugin) - $(use_enable clamav clamd-plugin) - $(use_enable gdata gdata-plugin) - $(use_enable notification notification-plugin) - $(use_enable pdf pdf_viewer-plugin) - $(use_enable perl perl-plugin) - $(use_enable pgp pgpmime-plugin) - $(use_enable pgp pgpinline-plugin) - $(use_enable pgp pgpcore-plugin) - $(use_enable python python-plugin) - $(use_enable rss rssyl-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable sieve managesieve-plugin) - $(use_enable smime smime-plugin) - $(use_enable spam-report spam_report-plugin) - $(use_enable webkit fancy-plugin) - --enable-alternate-addressbook - --enable-nls - --enable-acpi_notifier-plugin - --enable-address_keeper-plugin - --enable-att_remover-plugin - --enable-attachwarner-plugin - --enable-fetchinfo-plugin - --enable-mailmbox-plugin - --enable-newmail-plugin - --enable-tnef_parse-plugin - --disable-generic-umpc - --disable-bsfilter-plugin - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - autotools-utils_src_configure -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - autotools-utils_src_install - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png - local res resdir - for res in 64x64 128x128 ; do - resdir="/usr/share/icons/hicolor/${res}/apps" - insinto ${resdir} - newins ${PN}-${res}.png ${PN}.png - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh - doexe tb2claws-mail update-po uudec uuooffice - - # kill useless files - rm -f "${D}"/usr/lib*/claws-mail/plugins/*.{a,la} -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - ewarn "When upgrading from version 3.9.0 or below some changes have happened:" - ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags" - ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface" - ewarn "- The gtkhtml2, dillo and trayicon plugins have been dropped entirely" - gnome2_icon_cache_update -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/mail-client/claws-mail/claws-mail-3.13.2.ebuild b/mail-client/claws-mail/claws-mail-3.13.2.ebuild index f26851db3051..7a5c332d8dd1 100644 --- a/mail-client/claws-mail/claws-mail-3.13.2.ebuild +++ b/mail-client/claws-mail/claws-mail-3.13.2.ebuild @@ -16,7 +16,7 @@ SRC_URI="http://www.claws-mail.org/download.php?file=releases/${P}.tar.xz" SLOT="0" LICENSE="GPL-3" -KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 ~arm hppa ~mips ~ppc ~ppc64 sparc x86 ~x86-fbsd" IUSE="archive bogofilter calendar clamav dbus debug doc gdata gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell +gnutls startup-notification valgrind webkit xface" REQUIRED_USE="libcanberra? ( notification ) diff --git a/mail-client/claws-mail/claws-mail-3.9.0.ebuild b/mail-client/claws-mail/claws-mail-3.9.0.ebuild deleted file mode 100644 index ac92d74c67f5..000000000000 --- a/mail-client/claws-mail/claws-mail-3.9.0.ebuild +++ /dev/null @@ -1,135 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="4" - -inherit autotools-utils multilib gnome2-utils eutils - -DESCRIPTION="An email client (and news reader) based on GTK+" -HOMEPAGE="http://www.claws-mail.org/" - -SRC_URI="mirror://sourceforge/sylpheed-claws/${P}.tar.bz2" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="alpha amd64 ~arm hppa ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="bogofilter crypt dbus dillo doc +imap ipv6 ldap nntp pda session smime spamassassin spell +ssl startup-notification xface" - -COMMONDEPEND=">=x11-libs/gtk+-2.20:2 - pda? ( >=app-pda/jpilot-0.99 ) - ssl? ( >=net-libs/gnutls-2.2.0 ) - ldap? ( >=net-nds/openldap-2.0.7 ) - crypt? ( >=app-crypt/gpgme-0.4.5 ) - dbus? ( >=dev-libs/dbus-glib-0.60 ) - dillo? ( www-client/dillo ) - spell? ( >=app-text/enchant-1.0.0 ) - imap? ( >=net-libs/libetpan-0.57 ) - nntp? ( >=net-libs/libetpan-0.57 ) - startup-notification? ( x11-libs/startup-notification ) - bogofilter? ( mail-filter/bogofilter ) - session? ( x11-libs/libSM - x11-libs/libICE ) - smime? ( >=app-crypt/gpgme-0.4.5 )" - -DEPEND="${COMMONDEPEND} - xface? ( >=media-libs/compface-1.4 ) - virtual/pkgconfig" - -RDEPEND="${COMMONDEPEND} - app-misc/mime-types - x11-misc/shared-mime-info" - -PLUGIN_NAMES="acpi-notifier address_keeper archive att-remover attachwarner clamd fancy fetchinfo geolocation gdata gtkhtml mailmbox newmail notification perl python rssyl spam_report tnef_parse vcalendar" - -src_configure() { - local myeconfargs=( - $(use_enable ipv6) - $(use_enable ldap) - $(use_enable dbus) - $(use_enable pda jpilot) - $(use_enable spell enchant) - $(use_enable xface compface) - $(use_enable doc manual) - $(use_enable startup-notification) - $(use_enable session libsm) - $(use_enable crypt pgpmime-plugin) - $(use_enable crypt pgpinline-plugin) - $(use_enable crypt pgpcore-plugin) - $(use_enable dillo dillo-viewer-plugin) - $(use_enable spamassassin spamassassin-plugin) - $(use_enable bogofilter bogofilter-plugin) - $(use_enable smime smime-plugin) - --enable-trayicon-plugin - --disable-maemo - ) - - # libetpan is needed if user wants nntp or imap functionality - if use imap || use nntp; then - myeconfargs+=( --enable-libetpan ) - else - myeconfargs+=( --disable-libetpan ) - fi - - if use ssl; then - myeconfargs+=( --enable-gnutls ) - else - myeconfargs+=( --disable-gnutls ) - fi - - autotools-utils_src_configure -} - -src_install() { - local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* ) - autotools-utils_src_install - - # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps - # => also install it in /usr/share/pixmaps for other desktop envs - # => also install higher resolution icons in /usr/share/icons/hicolor/... - insinto /usr/share/pixmaps - doins ${PN}.png || die - local res resdir - for res in 64x64 128x128 ; do - resdir="/usr/share/icons/hicolor/${res}/apps" - insinto ${resdir} - newins ${PN}-${res}.png ${PN}.png || die - done - - docinto tools - dodoc tools/README* - - domenu ${PN}.desktop - - einfo "Installing extra tools" - cd "${S}"/tools - exeinto /usr/$(get_libdir)/${PN}/tools - doexe *.pl *.py *.conf *.sh || die - doexe tb2claws-mail update-po uudec uuooffice || die -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - gnome2_icon_cache_update - - UPDATE_PLUGINS="" - for x in ${PLUGIN_NAMES}; do - has_version mail-client/${PN}-$x && UPDATE_PLUGINS="${UPDATE_PLUGINS} $x" - done - if [ -n "${UPDATE_PLUGINS}" ]; then - elog - elog "You have to re-emerge or update the following plugins:" - elog - for x in ${UPDATE_PLUGINS}; do - elog " mail-client/${PN}-$x" - done - elog - fi -} - -pkg_postrm() { - gnome2_icon_cache_update -} diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml index 2f3d91c061ec..2cddcb6d4d52 100644 --- a/mail-client/claws-mail/metadata.xml +++ b/mail-client/claws-mail/metadata.xml @@ -19,9 +19,6 @@ reporting to various services Build mail-filter/bogofilter plugin - Enables support for inline HTTP email viewing with a - plugin (which depends on the www-client/dillo - browser) Enable sound notification in connection with USE=notification Enable notification through diff --git a/media-fonts/unifont/unifont-8.0.01.ebuild b/media-fonts/unifont/unifont-8.0.01.ebuild index ccea2d65e06e..a38e010ed0c3 100644 --- a/media-fonts/unifont/unifont-8.0.01.ebuild +++ b/media-fonts/unifont/unifont-8.0.01.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="~alpha amd64 ~arm ia64 ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd" IUSE="fontforge utils" DEPEND=" diff --git a/media-gfx/exiv2/exiv2-0.25-r2.ebuild b/media-gfx/exiv2/exiv2-0.25-r2.ebuild index 7bde800dad1a..bd839b4c4f94 100644 --- a/media-gfx/exiv2/exiv2-0.25-r2.ebuild +++ b/media-gfx/exiv2/exiv2-0.25-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://www.exiv2.org/${P}.tar.gz" LICENSE="GPL-2" SLOT="0/14" -KEYWORDS="alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" +KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" IUSE_LINGUAS="bs de es fi fr gl ms pl pt ru sk sv ug uk vi" IUSE="doc examples nls png webready xmp $(printf 'linguas_%s ' ${IUSE_LINGUAS})" diff --git a/media-gfx/fbida/fbida-2.10.ebuild b/media-gfx/fbida/fbida-2.10.ebuild index 97a0bdb1b54d..3c8a0c3a97cf 100644 --- a/media-gfx/fbida/fbida-2.10.ebuild +++ b/media-gfx/fbida/fbida-2.10.ebuild @@ -13,7 +13,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh ~sparc x86" +KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh sparc x86" IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp" REQUIRED_USE=" pdf? ( tiff ) diff --git a/media-gfx/freecad/Manifest b/media-gfx/freecad/Manifest index 1ce41bca15b2..ef0b5030b8a9 100644 --- a/media-gfx/freecad/Manifest +++ b/media-gfx/freecad/Manifest @@ -1,4 +1 @@ -DIST freecad-0.12.5284.tar.gz 48399004 SHA256 45486c6cc3ae212fd3eba994c603fd97962c7f505bf2a807d1533f9ee6d6026d SHA512 f1fee73ae7b43e7b3a136847f0dbb0b3f3e8f62ad3a9063f759efd8b9ed5a0dfff54961870465f37c0563161c4c5e2821f1f3379ead72dbdeddae36702e2ec0a WHIRLPOOL 7a46119d86a5d43ae8eaec6b5532e4739d54b0443769381630e644aa16c3f4185b63b513e4350c7562beacd86d56a7edbb3b506d10cb54190cbeaab48a504d5f -DIST freecad-0.13.1830.tar.gz 70168706 SHA256 550ed16225e4cd67a463ae9b826f3a64edf7d2819cc8d235b15a89e10be72f13 SHA512 3e8d4eed8cace38da9615965f79a2b0da21d31a6df793ceaf3f732e0abd5666e9715ec9eb162e6ff998718e8d609a7dff2d0993b28f493200b734318a2322160 WHIRLPOOL 6d41565423edf8a0c67901a8559600ff1088f645c3ecb4aad8d7597490522f80d6475af3e7f5a623fc30b4d1571187bf6e6a132e6c480825798b957bea90bb83 -DIST freecad-0.14.3702.tar.gz 66927339 SHA256 ee24cf3542bfb1a887a12d2df52458bcc0e3e82679370c449b9d8b5b473b9dc9 SHA512 6333bc8256728084b492687c5c6a5b3356212cbcab4bf0beb95fcdb0f9ac7c49df8eee0275e83feadc7b2460cf2396e88b0b309cbc1e1c9d46375bcadb334c13 WHIRLPOOL eb7d22f255536d4fde5a182e5b59c63eb38a6d70ecf0b6a7abdf1d76c00c51492c517053d09eb56d5657d8cc3a49bad56e67e8965ce03d27982d36dcd1944982 DIST freecad-0.15.4671.tar.gz 93680347 SHA256 8dda8f355cb59866a55c9c6096f39a3ebc5347892284db4c305352cc9be03bbc SHA512 695081117b5511bbc0b7335b63a8760e164987a6dff2c5b0dc86b6b0a93bb7d7b83aa9f4fab1d66d7d2c917a42b0135af78553b463579873a1d1e52e3dd9aecb WHIRLPOOL 0c351ad9ee360dfd9af54af9cc348a6ba3d8c15b6743667f6943e41aa252cec9bd2149baa32fceeceac65660a9b629aefba3c80a5c3a84c45a8d502323547287 diff --git a/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch b/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch deleted file mode 100644 index 4c9c735598d8..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-boost148.patch +++ /dev/null @@ -1,25 +0,0 @@ -From d6061d30a053617b8127c96e8c6a65e47589a182 Mon Sep 17 00:00:00 2001 -From: Werner Mayer -Date: Sat, 31 Mar 2012 19:22:11 +0200 -Subject: [PATCH] #0000585: bug with boost 1.48 - ---- - CMakeLists.txt | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 920aca7..9e3bbf5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -284,6 +284,8 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X) - # get include dirs - QT4_GET_MOC_FLAGS(moc_flags) - QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) -+ # fixes bug 0000585: bug with boost 1.48 -+ SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - foreach(it ${moc_files}) - get_filename_component(it ${it} ABSOLUTE) --- -1.7.9.2 - diff --git a/media-gfx/freecad/files/freecad-0.12.5284-cmake-2.8.12.patch b/media-gfx/freecad/files/freecad-0.12.5284-cmake-2.8.12.patch deleted file mode 100644 index b38a440a04d9..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-cmake-2.8.12.patch +++ /dev/null @@ -1,294 +0,0 @@ -commit f061b6f7ea667e1d6944590d67b9b5b6659e4ba0 -Author: wmayer -Date: Tue Oct 22 10:33:18 2013 +0200 - - 0001278: No build possible with current CMake version 2.8.12 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 862cd7b..11c9b43 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -270,14 +270,14 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X) - macro(fc_wrap_cpp outfiles ) - # get include dirs - QT4_GET_MOC_FLAGS(moc_includes) -- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) - # fixes bug 0000585: bug with boost 1.48 - SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - foreach(it ${moc_files}) - get_filename_component(it ${it} ABSOLUTE) - QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) -- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_includes}" "${moc_options}") -+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_includes}" "${moc_options}" "${moc_target}") - set(${outfiles} ${${outfiles}} ${outfile}) - add_file_dependencies(${it} ${outfile}) - endforeach(it) -diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake -index 5fa7680..78bc0b8 100644 ---- a/cMake/FreeCadMacros.cmake -+++ b/cMake/FreeCadMacros.cmake -@@ -168,69 +168,6 @@ endmacro(generate_from_py) - #endmacro(qt4_wrap_ui) - - --# This is a special version of the built in macro qt4_add_resources that generates .cpp files --# --#macro(fc_add_resources outfiles ) --# #QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) --# set(ARGN ) --# foreach (it ${rcc_files}) --# get_filename_component(outfilename ${it} NAME_WE) --# get_filename_component(infile ${it} ABSOLUTE) --# get_filename_component(rc_path ${infile} PATH) --# set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) --# # parse file for dependencies --# # all files are absolute paths or relative to the location of the qrc file --# file(READ "${infile}" _RC_FILE_CONTENTS) --# string(REGEX MATCHALL "]*>" "" _RC_FILE "${_RC_FILE}") --# string(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}") --# if(NOT _ABS_PATH_INDICATOR) --# set(_RC_FILE "${rc_path}/${_RC_FILE}") --# endif(NOT _ABS_PATH_INDICATOR) --# set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") --# endforeach(_RC_FILE) --# add_custom_command(OUTPUT ${outfile} --# COMMAND ${QT_RCC_EXECUTABLE} --# ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile} --# MAIN_DEPENDENCY ${infile} --# DEPENDS ${_RC_DEPENDS}) --# set(${outfiles} ${${outfiles}} ${outfile}) --# endforeach (it) --#endmacro(fc_add_resources) -- --MACRO (fc_add_resources outfiles ) -- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) -- -- FOREACH (it ${rcc_files}) -- GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) -- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) -- GET_FILENAME_COMPONENT(rc_path ${infile} PATH) -- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) -- # parse file for dependencies -- # all files are absolute paths or relative to the location of the qrc file -- FILE(READ "${infile}" _RC_FILE_CONTENTS) -- STRING(REGEX MATCHALL "]*>" "" _RC_FILE "${_RC_FILE}") -- STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}") -- IF(NOT _ABS_PATH_INDICATOR) -- SET(_RC_FILE "${rc_path}/${_RC_FILE}") -- ENDIF(NOT _ABS_PATH_INDICATOR) -- SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") -- ENDFOREACH(_RC_FILE) -- ADD_CUSTOM_COMMAND(OUTPUT ${outfile} -- COMMAND ${QT_RCC_EXECUTABLE} -- ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile} -- MAIN_DEPENDENCY ${infile} -- DEPENDS ${_RC_DEPENDS}) -- SET(${outfiles} ${${outfiles}} ${outfile}) -- ENDFOREACH (it) -- --ENDMACRO (fc_add_resources) -- - MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar) - IF(MSVC) - GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE) -diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt -index b9f1939..124c4f8 100644 ---- a/src/Gui/CMakeLists.txt -+++ b/src/Gui/CMakeLists.txt -@@ -608,7 +608,7 @@ SOURCE_GROUP("Widget\\iisTaskPanel\\Mocs" FILES ${iis_MOC_SRCS}) - #SET(Resource_RCS - # Icons/resource.qrc - # Language/translation.qrc) --#fc_add_resources(Resource_SRCS ${Resource_RCS}) -+#qt4_add_resources(Resource_SRCS ${Resource_RCS}) - #SET(Resource_SRCS - # ${Resource_SRCS} - # Icons/resource.qrc -diff --git a/src/Mod/Image/Gui/AppImageGui.cpp b/src/Mod/Image/Gui/AppImageGui.cpp -index c26129e..c817860 100644 ---- a/src/Mod/Image/Gui/AppImageGui.cpp -+++ b/src/Mod/Image/Gui/AppImageGui.cpp -@@ -20,7 +20,6 @@ - #include - #include "Workbench.h" - #include "ViewProviderImagePlane.h" --#include "qrc_Image.cpp" - - // use a different name to CreateCommand() - void CreateImageCommands(void); -diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt -index cc967ee..4edb462 100644 ---- a/src/Mod/Image/Gui/CMakeLists.txt -+++ b/src/Mod/Image/Gui/CMakeLists.txt -@@ -30,8 +30,7 @@ SET(ImageGui_RES_SRCS - Resources/Image.qrc - ) - --fc_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) --#QT4_ADD_RESOURCES(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) -+qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) - - set(ImageGui_UIC_SRCS - ImageOrientationDialog.ui -@@ -40,7 +39,7 @@ qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS}) - - SET(ImageGui_SRCS - # ${ImageGui_MOC_SRCS} --# ${ImageGui_QRC_SRCS} -+ ${ImageGui_QRC_SRCS} - AppImageGui.cpp - AppImageGuiPy.cpp - Command.cpp -diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp -index 624d569..8fb68cf 100644 ---- a/src/Mod/Mesh/Gui/AppMeshGui.cpp -+++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp -@@ -50,7 +50,6 @@ - #include "ViewProviderDefects.h" - #include "ViewProviderPython.h" - #include "Workbench.h" --#include "qrc_Mesh.cpp" - - - // use a different name to CreateCommand() -diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt -index cafca6c..9ef1dae 100644 ---- a/src/Mod/Mesh/Gui/CMakeLists.txt -+++ b/src/Mod/Mesh/Gui/CMakeLists.txt -@@ -75,9 +75,9 @@ SET(Inventor_SRCS - ) - SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS}) - --fc_add_resources(resource_SRCS Resources/Mesh.qrc) -+qt4_add_resources(resource_SRCS Resources/Mesh.qrc) - SET(resource_SRCS --# ${resource_SRCS} -+ ${resource_SRCS} - Resources/Mesh.qrc - ) - SOURCE_GROUP("resource" FILES ${resource_SRCS}) -diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp -index 9c3ebb3..ae84470 100644 ---- a/src/Mod/Part/Gui/AppPartGui.cpp -+++ b/src/Mod/Part/Gui/AppPartGui.cpp -@@ -57,7 +57,6 @@ - #include "Workbench.h" - - #include --#include "qrc_Part.cpp" - - #include "Resources/icons/PartFeature.xpm" - #include "Resources/icons/PartFeatureImport.xpm" -diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt -index 375f6e4..87c4c28 100644 ---- a/src/Mod/Part/Gui/CMakeLists.txt -+++ b/src/Mod/Part/Gui/CMakeLists.txt -@@ -50,7 +50,7 @@ set(PartGui_MOC_HDRS - fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS}) - SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS}) - --fc_add_resources(PartGui_QRC_SRCS Resources/Part.qrc) -+qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc) - - set(PartGui_UIC_SRCS - CrossSections.ui -@@ -77,7 +77,7 @@ set(PartGui_UIC_SRCS - qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS}) - - SET(PartGui_SRCS --# ${PartGui_QRC_SRCS} -+ ${PartGui_QRC_SRCS} - ${PartGui_UIC_HDRS} - AppPartGui.cpp - Command.cpp -diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp -index 9acd98e..953d3e2 100644 ---- a/src/Mod/Points/Gui/AppPointsGui.cpp -+++ b/src/Mod/Points/Gui/AppPointsGui.cpp -@@ -33,7 +33,6 @@ - - #include "ViewProvider.h" - #include "Workbench.h" --#include "qrc_Points.cpp" - - // use a different name to CreateCommand() - void CreatePointsCommands(void); -diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt -index fab12ff..7e30f0d 100644 ---- a/src/Mod/Points/Gui/CMakeLists.txt -+++ b/src/Mod/Points/Gui/CMakeLists.txt -@@ -32,9 +32,9 @@ SET(Dialogs_SRCS - ) - SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS}) - --fc_add_resources(Resource_SRCS Resources/Points.qrc) -+qt4_add_resources(Resource_SRCS Resources/Points.qrc) - SET(Resource_SRCS --# ${Resource_SRCS} -+ ${Resource_SRCS} - Resources/Points.qrc - ) - SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) -diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp -index 156bd90..c59369a 100644 ---- a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp -+++ b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp -@@ -32,7 +32,6 @@ - #include "DlgSettingsRayImp.h" - #include "ViewProvider.h" - #include "Workbench.h" --#include "qrc_Raytracing.cpp" - - - using namespace RaytracingGui; -diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt -index 38aa739..1da30c9 100644 ---- a/src/Mod/Raytracing/Gui/CMakeLists.txt -+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt -@@ -43,8 +43,9 @@ set(RaytracingGui_MOC_HDRS - fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS}) - SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS}) - --fc_add_resources(Resource_SRCS Resources/Raytracing.qrc) -+qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc) - SET(Resource_SRCS -+ ${Resource_SRCS} - Resources/Raytracing.qrc - ) - SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) -diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp -index a027d9d..7c2ef21 100644 ---- a/src/Mod/Test/Gui/AppTestGui.cpp -+++ b/src/Mod/Test/Gui/AppTestGui.cpp -@@ -28,7 +28,6 @@ - - #include "UnitTestPy.h" - #include "UnitTestImp.h" --#include "qrc_Test.cpp" - - #include - #include -diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt -index 9b8b672..eaa0dcd 100644 ---- a/src/Mod/Test/Gui/CMakeLists.txt -+++ b/src/Mod/Test/Gui/CMakeLists.txt -@@ -30,9 +30,9 @@ SET(Dialogs_SRCS - ) - SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS}) - --fc_add_resources(Resource_SRCS Resources/Test.qrc) -+qt4_add_resources(Resource_SRCS Resources/Test.qrc) - SET(Resource_SRCS --# ${Resource_SRCS} -+ ${Resource_SRCS} - Resources/Test.qrc - ) - SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) diff --git a/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch b/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch deleted file mode 100644 index df2fb191a353..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-gcc46.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ruN FreeCAD-0.11.4422.orig/src/zipios++/directory.h FreeCAD-0.11.4422/src/zipios++/directory.h ---- FreeCAD-0.11.4422.orig/src/zipios++/directory.h 2011-02-11 01:48:21.000000000 +0100 -+++ FreeCAD-0.11.4422/src/zipios++/directory.h 2011-11-13 22:11:27.000000000 +0100 -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include - - // #include Contents of boost.h - diff --git a/media-gfx/freecad/files/freecad-0.12.5284-glu.patch b/media-gfx/freecad/files/freecad-0.12.5284-glu.patch deleted file mode 100644 index 95672153022f..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-glu.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp ---- FreeCAD-0.12.5284.orig/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-03 13:24:30.000000000 +0100 -+++ FreeCAD-0.12.5284/src/Mod/Image/Gui/GLImageBox.cpp 2012-01-06 10:26:38.000000000 +0100 -@@ -27,6 +27,8 @@ - # include - #endif - -+#include -+ - #include "GLImageBox.h" - - using namespace ImageGui; diff --git a/media-gfx/freecad/files/freecad-0.12.5284-no-3rdParty.patch b/media-gfx/freecad/files/freecad-0.12.5284-no-3rdParty.patch deleted file mode 100644 index d5797567b2c5..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-no-3rdParty.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- FreeCAD-0.12.5284/src/CMakeLists.txt -+++ FreeCAD-0.12.5284/src/CMakeLists.txt -@@ -1,6 +1,5 @@ - - add_subdirectory(Build) --add_subdirectory(3rdParty) - add_subdirectory(Base) - add_subdirectory(App) - add_subdirectory(Main) diff --git a/media-gfx/freecad/files/freecad-0.12.5284-no-permissive.patch b/media-gfx/freecad/files/freecad-0.12.5284-no-permissive.patch deleted file mode 100644 index d19a92f4d7bc..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-no-permissive.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl -+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query2Filtered.inl -@@ -55,7 +55,7 @@ - Real fLen1 = Math::Sqrt(fX1*fX1 + fY1*fY1); - Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1; - -- Real fDet2 = Det2(fX0,fY0,fX1,fY1); -+ Real fDet2 = this->Det2(fX0,fY0,fX1,fY1); - if (Math::FAbs(fDet2) >= fScaledUncertainty) - { - return (fDet2 > (Real)0.0 ? +1 : (fDet2 < (Real)0.0 ? -1 : 0)); -@@ -93,7 +93,7 @@ - Real fLen2 = Math::Sqrt(fD2x*fD2x + fD2y*fD2y + fZ2*fZ2); - Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2; - -- Real fDet3 = Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2); -+ Real fDet3 = this->Det3(fD0x,fD0y,fZ0,fD1x,fD1y,fZ1,fD2x,fD2y,fZ2); - if (Math::FAbs(fDet3) >= fScaledUncertainty) - { - return (fDet3 < (Real)0.0 ? 1 : (fDet3 > (Real)0.0 ? -1 : 0)); ---- FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.in -+++ FreeCAD-0.12.5284/src/Mod/Mesh/App/WildMagic4/Wm4Query3Filtered.inl -@@ -62,7 +62,7 @@ - Real fLen2 = Math::Sqrt(fX2*fX2 + fY2*fY2 + fZ2*fZ2); - Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2; - -- Real fDet3 = Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2); -+ Real fDet3 = this->Det3(fX0,fY0,fZ0,fX1,fY1,fZ1,fX2,fY2,fZ2); - if (Math::FAbs(fDet3) >= fScaledUncertainty) - { - return (fDet3 > (Real)0.0 ? +1 : (fDet3 < (Real)0.0 ? -1 : 0)); -@@ -115,7 +115,7 @@ - Real fLen3 = Math::Sqrt(fD3x*fD3x+fD3y*fD3y+fD3z*fD3z+fW3*fW3); - Real fScaledUncertainty = m_fUncertainty*fLen0*fLen1*fLen2*fLen3; - -- Real fDet4 = Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x, -+ Real fDet4 = this->Det4(fD0x,fD0y,fD0z,fW0,fD1x,fD1y,fD1z,fW1,fD2x, - fD2y,fD2z,fW2,fD3x,fD3y,fD3z,fW3); - - if (Math::FAbs(fDet4) >= fScaledUncertainty) diff --git a/media-gfx/freecad/files/freecad-0.12.5284-nodir.patch b/media-gfx/freecad/files/freecad-0.12.5284-nodir.patch deleted file mode 100644 index 3e9bbedb47ad..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-nodir.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -ruN FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt FreeCAD-0.12.5284/src/Mod/CMakeLists.txt ---- FreeCAD-0.12.5284.orig/src/Mod/CMakeLists.txt 2012-01-03 13:26:12.000000000 +0100 -+++ FreeCAD-0.12.5284/src/Mod/CMakeLists.txt 2012-01-06 12:19:06.000000000 +0100 -@@ -18,7 +18,7 @@ - MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built") - MESSAGE("Due to the missing Eigen3 library the Robot module won't be built") - ENDIF(EIGEN3_FOUND) --add_subdirectory(Machining_Distortion) -+# add_subdirectory(Machining_Distortion) - - add_subdirectory(ReverseEngineering) - add_subdirectory(MeshPart) -@@ -32,7 +32,7 @@ - - add_subdirectory(Arch) - --add_subdirectory(Assembly) -+# add_subdirectory(Assembly) - - if(FREECAD_BUILD_CAM) - add_subdirectory(Cam) diff --git a/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch b/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch deleted file mode 100644 index 337348aa554c..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-nopivy.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff -ruN FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt ---- FreeCAD-0.12.5284.orig/src/3rdParty/CMakeLists.txt 2012-01-03 13:30:19.000000000 +0100 -+++ FreeCAD-0.12.5284/src/3rdParty/CMakeLists.txt 2012-01-07 15:57:52.000000000 +0100 -@@ -19,13 +19,6 @@ - # add_subdirectory(Pivy) - #endif(MINGW) - # applies for Unix, MinGW and Windows with custom LibPack --elseif(FREECAD_BUILD_GUI) -- find_path(COIN_VERSION3 Inventor/scxml/ScXML.h ${COIN3D_INCLUDE_DIR}) -- if (COIN_VERSION3) -- add_subdirectory(Pivy-0.5) -- else (COIN_VERSION3) -- add_subdirectory(Pivy) -- endif(COIN_VERSION3) - endif(FREECAD_BUILD_GUI AND FREECAD_LIBPACK_CHECKFILE6X) - - # For Windows we have all stuff in the LibPack diff --git a/media-gfx/freecad/files/freecad-0.12.5284-occ-6.5.5.patch b/media-gfx/freecad/files/freecad-0.12.5284-occ-6.5.5.patch deleted file mode 100644 index 1886f8eca952..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-occ-6.5.5.patch +++ /dev/null @@ -1,224 +0,0 @@ ---- FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp -@@ -1370,7 +1370,7 @@ - - //circular profile - Handle(Geom_Circle) aCirc = new Geom_Circle (gp::XOY(), 1.0); -- aCirc->Rotate (gp::OZ(), Standard_PI/2.); -+ aCirc->Rotate (gp::OZ(), M_PI/2.); - - //perpendicular section - Handle(BRepAdaptor_HCurve) myPath = new BRepAdaptor_HCurve(path_adapt); -@@ -1469,12 +1469,12 @@ - } - - gp_Pnt2d aPnt(0, 0); -- gp_Dir2d aDir(2. * PI, pitch); -+ gp_Dir2d aDir(2. * M_PI, pitch); - gp_Ax2d aAx2d(aPnt, aDir); - - Handle(Geom2d_Line) line = new Geom2d_Line(aAx2d); - gp_Pnt2d beg = line->Value(0); -- gp_Pnt2d end = line->Value(sqrt(4.0*PI*PI+pitch*pitch)*(height/pitch)); -+ gp_Pnt2d end = line->Value(sqrt(4.0*M_PI*M_PI+pitch*pitch)*(height/pitch)); - Handle(Geom2d_TrimmedCurve) segm = GCE2d_MakeSegment(beg , end); - - TopoDS_Edge edgeOnSurf = BRepBuilderAPI_MakeEdge(segm , surf); -@@ -1772,7 +1772,7 @@ - Standard_Real x3, y3, z3; - - Handle_StlMesh_Mesh aMesh = new StlMesh_Mesh(); -- StlTransfer::BuildIncrementalMesh(this->_Shape, accuracy, aMesh); -+ StlTransfer::BuildIncrementalMesh(this->_Shape, accuracy, false, aMesh); - StlMesh_MeshExplorer xp(aMesh); - for (Standard_Integer nbd=1;nbd<=aMesh->NbDomains();nbd++) { - for (xp.InitTriangle (nbd); xp.MoreTriangle (); xp.NextTriangle ()) { ---- FreeCAD-0.12.5284/src/Mod/Part/App/FeatureRevolution.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/FeatureRevolution.cpp -@@ -71,7 +71,7 @@ - try { - // Now, let's get the TopoDS_Shape - TopoDS_Shape revolve = base->Shape.getShape().revolve(gp_Ax1(pnt, dir), -- Angle.getValue()/180.0f*Standard_PI); -+ Angle.getValue()/180.0f*M_PI); - if (revolve.IsNull()) - return new App::DocumentObjectExecReturn("Resulting shape is null"); - this->Shape.setValue(revolve); ---- FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp -@@ -263,9 +263,9 @@ - return new App::DocumentObjectExecReturn("Radius of sphere too small"); - try { - BRepPrimAPI_MakeSphere mkSphere(Radius.getValue(), -- Angle1.getValue()/180.0f*Standard_PI, -- Angle2.getValue()/180.0f*Standard_PI, -- Angle3.getValue()/180.0f*Standard_PI); -+ Angle1.getValue()/180.0f*M_PI, -+ Angle2.getValue()/180.0f*M_PI, -+ Angle3.getValue()/180.0f*M_PI); - TopoDS_Shape ResultShape = mkSphere.Shape(); - this->Shape.setValue(ResultShape); - } -@@ -321,9 +321,9 @@ - gp_Ax2 ax2(pnt,dir); - BRepPrimAPI_MakeSphere mkSphere(ax2, - Radius2.getValue(), -- Angle1.getValue()/180.0f*Standard_PI, -- Angle2.getValue()/180.0f*Standard_PI, -- Angle3.getValue()/180.0f*Standard_PI); -+ Angle1.getValue()/180.0f*M_PI, -+ Angle2.getValue()/180.0f*M_PI, -+ Angle3.getValue()/180.0f*M_PI); - Standard_Real scale = Radius1.getValue()/Radius2.getValue(); - gp_Dir xDir = ax2.XDirection(); - gp_Dir yDir = ax2.YDirection(); -@@ -380,7 +380,7 @@ - try { - BRepPrimAPI_MakeCylinder mkCylr(Radius.getValue(), - Height.getValue(), -- Angle.getValue()/180.0f*Standard_PI); -+ Angle.getValue()/180.0f*M_PI); - TopoDS_Shape ResultShape = mkCylr.Shape(); - this->Shape.setValue(ResultShape); - } -@@ -429,7 +429,7 @@ - BRepPrimAPI_MakeCone mkCone(Radius1.getValue(), - Radius2.getValue(), - Height.getValue(), -- Angle.getValue()/180.0f*Standard_PI); -+ Angle.getValue()/180.0f*M_PI); - TopoDS_Shape ResultShape = mkCone.Shape(); - this->Shape.setValue(ResultShape); - } -@@ -498,9 +498,9 @@ - #else - BRepPrimAPI_MakeTorus mkTorus(Radius1.getValue(), - Radius2.getValue(), -- Angle1.getValue()/180.0f*Standard_PI, -- Angle2.getValue()/180.0f*Standard_PI, -- Angle3.getValue()/180.0f*Standard_PI); -+ Angle1.getValue()/180.0f*M_PI, -+ Angle2.getValue()/180.0f*M_PI, -+ Angle3.getValue()/180.0f*M_PI); - const TopoDS_Solid& ResultShape = mkTorus.Solid(); - #endif - this->Shape.setValue(ResultShape); ---- FreeCAD-0.12.5284/src/Mod/Part/App/AppPartPy.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/AppPartPy.cpp -@@ -492,7 +492,7 @@ - d.SetCoord(vec.x, vec.y, vec.z); - } - Handle_Geom_Plane aPlane = new Geom_Plane(p, d); -- BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width); -+ BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width, Precision::Confusion()); - return new TopoShapeFacePy(new TopoShape((Face.Face()))); - } - catch (Standard_DomainError) { ---- FreeCAD-0.12.5284/src/Mod/Part/App/GeometrySurfacePyImp.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/GeometrySurfacePyImp.cpp -@@ -79,7 +79,7 @@ - s->Bounds(u1,u2,v1,v2); - if (!PyArg_ParseTuple(args, "|dddd", &u1,&u2,&v1,&v2)) - return 0; -- BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2); -+ BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion()); - TopoDS_Shape sh = mkBuilder.Shape(); - return new TopoShapeFacePy(new TopoShape(sh)); - } ---- FreeCAD-0.12.5284/src/Mod/Part/App/Geometry.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/Geometry.cpp -@@ -1252,7 +1252,7 @@ - Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle()); - Standard_Real u1,u2,v1,v2; - s->Bounds(u1,u2,v1,v2); -- BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2); -+ BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2, Precision::Confusion()); - return mkBuilder.Shape(); - } - ---- FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/PrimitiveFeature.cpp -@@ -191,7 +191,7 @@ - gp_Pnt pnt(0.0,0.0,0.0); - gp_Dir dir(0.0,0.0,1.0); - Handle_Geom_Plane aPlane = new Geom_Plane(pnt, dir); -- BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W); -+ BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W, Precision::Confusion()); - - const char *error=0; - switch (mkFace.Error()) ---- FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/TopoShape.cpp -@@ -1338,7 +1338,7 @@ - double u1,u2,v1,v2; - surf->Bounds(u1,u2,v1,v2); - -- BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2); -+ BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2, Precision::Confusion()); - return mkBuilder.Face(); - } - -@@ -1391,7 +1391,7 @@ - - Standard_Real u1,u2,v1,v2; - mySurface->Bounds(u1,u2,v1,v2); -- BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2); -+ BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2, Precision::Confusion()); - return mkBuilder.Shape(); - } - -@@ -1443,7 +1443,7 @@ - mkSweep.Perform(tol, Standard_False, GeomAbs_C1, BSplCLib::MaxDegree(), 1000); - - const Handle_Geom_Surface& surf = mkSweep.Surface(); -- BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax); -+ BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax, Precision::Confusion()); - return mkBuilder.Face(); - } - ---- FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeFacePyImp.cpp -+++ FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeFacePyImp.cpp -@@ -135,7 +135,7 @@ - return -1; - } - -- BRepBuilderAPI_MakeFace mkFace(S); -+ BRepBuilderAPI_MakeFace mkFace(S, Precision::Confusion()); - if (bound) { - Py::List list(bound); - for (Py::List::iterator it = list.begin(); it != list.end(); ++it) { ---- FreeCAD-0.12.5284/src/Mod/Fem/App/AppFemPy.cpp -+++ FreeCAD-0.12.5284/src/Mod/Fem/App/AppFemPy.cpp -@@ -498,12 +498,12 @@ - - //Do a Monte Carlo approach and start from the Principal Axis System - //and rotate +/- 60° around each axis in a first iteration -- double angle_range_min_x=-PI/3.0,angle_range_max_x=PI/3.0, -- angle_range_min_y=-PI/3.0,angle_range_max_y=PI/3.0, -- angle_range_min_z=-PI/3.0,angle_range_max_z=PI/3.0; -+ double angle_range_min_x=-M_PI/3.0,angle_range_max_x=M_PI/3.0, -+ angle_range_min_y=-M_PI/3.0,angle_range_max_y=M_PI/3.0, -+ angle_range_min_z=-M_PI/3.0,angle_range_max_z=M_PI/3.0; - - //We rotate until we are 0.1° sure to be in the right position -- for (step_size = (2.0*PI/it_steps);step_size>(2.0*PI/3600.0);step_size=(2.0*PI/it_steps)) -+ for (step_size = (2.0*M_PI/it_steps);step_size>(2.0*M_PI/3600.0);step_size=(2.0*M_PI/it_steps)) - { - for(alpha_x=angle_range_min_x;alpha_x(2.0*PI/360.0);step_size=(2.0*PI/it_steps)) -+ for (step_size = (2.0*M_PI/it_steps);step_size>(2.0*M_PI/360.0);step_size=(2.0*M_PI/it_steps)) - { - for(alpha_x=angle_range_min_x;alpha_x - #include - #include - #include -+#if OCC_VERSION_HEX >= 0x060600 -+#include -+#endif - #include - #include - #include -@@ -161,7 +165,11 @@ - - // get 2 shells - TopoDS_Solid solid = TopoDS::Solid( aShape ); -+#if OCC_VERSION_HEX >= 0x060600 -+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid ); -+#else - TopoDS_Shell outerShell = BRepTools::OuterShell( solid ); -+#endif - TopoDS_Shape innerShell; - int nbShells = 0; - for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells ) -@@ -401,7 +409,11 @@ - { - // get 2 shells - TopoDS_Solid solid = TopoDS::Solid( aShape ); -+#if OCC_VERSION_HEX >= 0x060600 -+ TopoDS_Shell outerShell = BRepClass3d::OuterShell( solid ); -+#else - TopoDS_Shell outerShell = BRepTools::OuterShell( solid ); -+#endif - TopoDS_Shape innerShell; - int nbShells = 0; - for ( TopoDS_Iterator It (solid); It.More(); It.Next(), ++nbShells ) -diff -Naur freecad-0.12.5284-r3-orig/work/FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeSolidPyImp.cpp freecad-0.12.5284-r3/work/FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeSolidPyImp.cpp ---- freecad-0.12.5284-r3-orig/work/FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeSolidPyImp.cpp 2013-09-15 22:53:34.094324180 -0700 -+++ freecad-0.12.5284-r3/work/FreeCAD-0.12.5284/src/Mod/Part/App/TopoShapeSolidPyImp.cpp 2013-09-15 22:54:24.414857241 -0700 -@@ -23,8 +23,12 @@ - - #include "PreCompiled.h" - -+#include - #include - #include -+#if OCC_VERSION_HEX >= 0x060600 -+#include -+#endif - #include - #include - #include -@@ -104,7 +108,11 @@ - TopoDS_Shell shell; - const TopoDS_Shape& shape = getTopoShapePtr()->_Shape; - if (!shape.IsNull() && shape.ShapeType() == TopAbs_SOLID) -+#if OCC_VERSION_HEX >= 0x060600 -+ shell = BRepClass3d::OuterShell(TopoDS::Solid(shape)); -+#else - shell = BRepTools::OuterShell(TopoDS::Solid(shape)); -+#endif - return Py::Object(new TopoShapeShellPy(new TopoShape(shell)),true); - } - diff --git a/media-gfx/freecad/files/freecad-0.12.5284-qt3support.patch b/media-gfx/freecad/files/freecad-0.12.5284-qt3support.patch deleted file mode 100644 index 1548c2f1f89d..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-qt3support.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Arch/Resources/ui/archprefs-base.ui FreeCAD-0.12.5284/src/Mod/Arch/Resources/ui/archprefs-base.ui ---- FreeCAD-0.12.5284.orig/src/Mod/Arch/Resources/ui/archprefs-base.ui 2012-01-03 13:26:11.000000000 +0100 -+++ FreeCAD-0.12.5284/src/Mod/Arch/Resources/ui/archprefs-base.ui 2012-01-07 17:15:29.000000000 +0100 -@@ -133,7 +133,7 @@ - - - -- qPixmapFromMimeSource -+ - - - Gui::ColorButton -diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-base.ui FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-base.ui ---- FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-base.ui 2012-01-03 13:25:30.000000000 +0100 -+++ FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-base.ui 2012-01-07 17:15:11.000000000 +0100 -@@ -957,7 +957,7 @@ - - - -- qPixmapFromMimeSource -+ - - - Gui::FileChooser -diff -ruN FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-import.ui FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-import.ui ---- FreeCAD-0.12.5284.orig/src/Mod/Draft/Resources/ui/userprefs-import.ui 2012-01-03 13:25:30.000000000 +0100 -+++ FreeCAD-0.12.5284/src/Mod/Draft/Resources/ui/userprefs-import.ui 2012-01-07 17:14:50.000000000 +0100 -@@ -411,7 +411,7 @@ - - - -- qPixmapFromMimeSource -+ - - - Gui::FileChooser diff --git a/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch b/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch deleted file mode 100644 index b768178ed78a..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-removeoldswig.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- src/Base/Interpreter.cpp.old 2010-08-27 16:24:16.000000000 +0200 -+++ src/Base/Interpreter.cpp 2011-12-24 00:13:52.356641021 +0100 -@@ -503,11 +503,6 @@ - #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) - namespace Swig_python { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } - #endif --namespace Swig_1_3_25 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } --namespace Swig_1_3_33 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } --namespace Swig_1_3_36 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } --namespace Swig_1_3_38 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } --namespace Swig_1_3_40 { extern int createSWIGPointerObj_T(const char* TypeName, void* obj, PyObject** ptr, int own); } - - PyObject* InterpreterSingleton::createSWIGPointerObj(const char* Module, const char* TypeName, void* Pointer, int own) - { -@@ -517,21 +512,6 @@ - int version = getSWIGVersionFromModule(Module); - switch (version&0xff) - { -- case 25: -- result = Swig_1_3_25::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); -- break; -- case 33: -- result = Swig_1_3_33::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); -- break; -- case 36: -- result = Swig_1_3_36::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); -- break; -- case 38: -- result = Swig_1_3_38::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); -- break; -- case 40: -- result = Swig_1_3_40::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); -- break; - default: - #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) - result = Swig_python::createSWIGPointerObj_T(TypeName, Pointer, &proxy, own); -@@ -550,11 +530,6 @@ - #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) - namespace Swig_python { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } - #endif --namespace Swig_1_3_25 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } --namespace Swig_1_3_33 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } --namespace Swig_1_3_36 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } --namespace Swig_1_3_38 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } --namespace Swig_1_3_40 { extern int convertSWIGPointerObj_T(const char* TypeName, PyObject* obj, void** ptr, int flags); } - - bool InterpreterSingleton::convertSWIGPointerObj(const char* Module, const char* TypeName, PyObject* obj, void** ptr, int flags) - { -@@ -563,21 +538,6 @@ - int version = getSWIGVersionFromModule(Module); - switch (version&0xff) - { -- case 25: -- result = Swig_1_3_25::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); -- break; -- case 33: -- result = Swig_1_3_33::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); -- break; -- case 36: -- result = Swig_1_3_36::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); -- break; -- case 38: -- result = Swig_1_3_38::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); -- break; -- case 40: -- result = Swig_1_3_40::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); -- break; - default: - #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) - result = Swig_python::convertSWIGPointerObj_T(TypeName, obj, ptr, flags); -@@ -596,11 +556,6 @@ - #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) - namespace Swig_python { extern void cleanupSWIG_T(const char* TypeName); } - #endif --namespace Swig_1_3_25 { extern void cleanupSWIG_T(const char* TypeName); } --namespace Swig_1_3_33 { extern void cleanupSWIG_T(const char* TypeName); } --namespace Swig_1_3_36 { extern void cleanupSWIG_T(const char* TypeName); } --namespace Swig_1_3_38 { extern void cleanupSWIG_T(const char* TypeName); } --namespace Swig_1_3_40 { extern void cleanupSWIG_T(const char* TypeName); } - - void InterpreterSingleton::cleanupSWIG(const char* TypeName) - { -@@ -608,9 +563,4 @@ - #if (defined(HAVE_SWIG) && (HAVE_SWIG == 1)) - Swig_python::cleanupSWIG_T(TypeName); - #endif -- Swig_1_3_25::cleanupSWIG_T(TypeName); -- Swig_1_3_33::cleanupSWIG_T(TypeName); -- Swig_1_3_36::cleanupSWIG_T(TypeName); -- Swig_1_3_38::cleanupSWIG_T(TypeName); -- Swig_1_3_40::cleanupSWIG_T(TypeName); - } ---- src/Base/Makefile.am.old 2011-12-24 00:14:25.625540687 +0100 -+++ src/Base/Makefile.am 2010-10-27 12:29:37.000000000 +0200 -@@ -65,16 +65,6 @@ - Swap.cpp \ - swigpyrun.inl \ - swigpyrun.cpp \ -- swigpyrun_1.3.25.cpp \ -- swigpyrun_1.3.25.h \ -- swigpyrun_1.3.33.cpp \ -- swigpyrun_1.3.33.h \ -- swigpyrun_1.3.36.cpp \ -- swigpyrun_1.3.36.h \ -- swigpyrun_1.3.38.cpp \ -- swigpyrun_1.3.38.h \ -- swigpyrun_1.3.40.cpp \ -- swigpyrun_1.3.40.h \ - TimeInfo.cpp \ - Type.cpp \ - Tools.cpp \ diff --git a/media-gfx/freecad/files/freecad-0.12.5284-salomesmesh-occ-6.5.5.patch b/media-gfx/freecad/files/freecad-0.12.5284-salomesmesh-occ-6.5.5.patch deleted file mode 100644 index 50e30e6cfc09..000000000000 --- a/media-gfx/freecad/files/freecad-0.12.5284-salomesmesh-occ-6.5.5.patch +++ /dev/null @@ -1,228 +0,0 @@ ---- FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp -+++ FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/SMESH/SMESH_MeshEditor.cpp -@@ -1374,7 +1374,7 @@ - const SMDS_MeshNode * n1, - const SMDS_MeshNode * n2) - { -- double angle = 2*PI; // bad angle -+ double angle = 2*M_PI; // bad angle - - // get normals - SMESH::Controls::TSequenceOfXYZ P1, P2; ---- FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp -+++ FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/SMESH/SMESH_Pattern.cpp -@@ -1234,7 +1234,7 @@ - maxLen2 = Max( maxLen2, ( n[1]->myUV - n[2]->myUV ).SquareModulus() ); - } - maxLen2 = Max( maxLen2, ( n[2]->myUV - node->myUV ).SquareModulus() ); -- minDiag = sqrt( maxLen2 ) * PI / 60.; // ~ maxLen * Sin( 3 deg ) -+ minDiag = sqrt( maxLen2 ) * M_PI / 60.; // ~ maxLen * Sin( 3 deg ) - } - - // check if newUV is behind 3 dirs: n[0]-n[1], n[1]-n[2] and n[0]-n[2] -@@ -1721,9 +1721,9 @@ - if ( iDir == 1 ) - aNorm[ iDir ].Reverse(); // along iDir isoline - -- double angle = tgt1.Angle( tgt2 ); // [-PI, PI] -+ double angle = tgt1.Angle( tgt2 ); // [-M_PI, M_PI] - // maybe angle is more than |PI| -- if ( Abs( angle ) > PI / 2. ) { -+ if ( Abs( angle ) > M_PI / 2. ) { - // check direction of the last but one perpendicular isoline - TIsoNode* prevNode = bndNode2->GetNext( iDir, 0 ); - bndNode1 = prevNode->GetBoundaryNode( 1 - iDir, 0 ); -@@ -1734,7 +1734,7 @@ - double angle2 = tgt1.Angle( isoDir ); - //cout << " isoDir: "<< isoDir.X() <<" "<myUV.X()<<" "<myUV.Y()<< endl; - // cout << "bndNode2: " << bndNode2->myUV.X()<<" "<myUV.Y()<myDir[0].Angle( node->myDir[1] ); - if ( reversed ) angle = -angle; -- if ( initAngle > angle && initAngle - angle > PI / 2.1 ) { -+ if ( initAngle > angle && initAngle - angle > M_PI / 2.1 ) { - // find a close internal node - TIsoNode* nClose = 0; - list< TIsoNode* > testNodes; ---- FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp -+++ FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/Controls/SMESH_Controls.cpp -@@ -332,12 +332,12 @@ - aMin = Min(aMin,A0); - } - -- return aMin * 180.0 / PI; -+ return aMin * 180.0 / M_PI; - } - - double MinimumAngle::GetBadRate( double Value, int nbNodes ) const - { -- //const double aBestAngle = PI / nbNodes; -+ //const double aBestAngle = M_PI / nbNodes; - const double aBestAngle = 180.0 - ( 360.0 / double(nbNodes) ); - return ( fabs( aBestAngle - Value )); - } -@@ -831,19 +831,19 @@ - gp_XYZ N = GI.Crossed( GJ ); - - if ( N.Modulus() < gp::Resolution() ) -- return PI / 2; -+ return M_PI / 2; - - N.Normalize(); - - double H = ( thePnt2 - theG ).Dot( N ); -- return asin( fabs( H / L ) ) * 180. / PI; -+ return asin( fabs( H / L ) ) * 180. / M_PI; - } - - double Warping::GetBadRate( double Value, int /*nbNodes*/ ) const - { - // the warp is in the range [0.0,PI/2] - // 0.0 = good (no warp) -- // PI/2 = bad (face pliee) -+ // M_PI/2 = bad (face pliee) - return Value; - } - -@@ -915,14 +915,14 @@ - return 0.; - - // Compute skew -- static double PI2 = PI / 2.; -+ static double PI2 = M_PI / 2.; - if ( P.size() == 3 ) - { - double A0 = fabs( PI2 - skewAngle( P( 3 ), P( 1 ), P( 2 ) ) ); - double A1 = fabs( PI2 - skewAngle( P( 1 ), P( 2 ), P( 3 ) ) ); - double A2 = fabs( PI2 - skewAngle( P( 2 ), P( 3 ), P( 1 ) ) ); - -- return Max( A0, Max( A1, A2 ) ) * 180. / PI; -+ return Max( A0, Max( A1, A2 ) ) * 180. / M_PI; - } - else - { -@@ -939,7 +939,7 @@ - if ( A < Precision::Angular() ) - return 0.; - -- return A * 180. / PI; -+ return A * 180. / M_PI; - } - } - ---- FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp -+++ FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_CompositeHexa_3D.cpp -@@ -812,7 +812,7 @@ - int iMyCommon; - if ( mySides.Contain( otherSide, &iMyCommon ) ) { - // check if normals of two faces are collinear at all vertices of a otherSide -- const double angleTol = PI / 180 / 2; -+ const double angleTol = M_PI / 180 / 2; - int iV, nbV = otherSide.NbVertices(), nbCollinear = 0; - for ( iV = 0; iV < nbV; ++iV ) - { ---- FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp -+++ FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_RadialQuadrangle_1D2D.cpp -@@ -355,8 +355,8 @@ - for(; itn != theNodes.end(); itn++ ) { - CNodes.push_back( (*itn).second ); - double ang = (*itn).first - fang; -- if( ang>PI ) ang = ang - 2*PI; -- if( ang<-PI ) ang = ang + 2*PI; -+ if( ang>M_PI ) ang = ang - 2*M_PI; -+ if( ang<-M_PI ) ang = ang + 2*M_PI; - Angles.Append( ang ); - } - } -@@ -404,7 +404,7 @@ - // a segment of line - double fp, lp; - Handle(Geom_Circle) aCirc = Handle(Geom_Circle)::DownCast( getCurve( CircEdge, &fp, &lp )); -- if( fabs(fabs(lp-fp)-PI) > Precision::Confusion() ) { -+ if( fabs(fabs(lp-fp)-M_PI) > Precision::Confusion() ) { - // not half of circle - return error(COMPERR_BAD_SHAPE); - } -@@ -434,8 +434,8 @@ - for(; itn != theNodes.end(); itn++ ) { - CNodes.push_back( (*itn).second ); - double ang = (*itn).first - fang; -- if( ang>PI ) ang = ang - 2*PI; -- if( ang<-PI ) ang = ang + 2*PI; -+ if( ang>M_PI ) ang = ang - 2*M_PI; -+ if( ang<-M_PI ) ang = ang + 2*M_PI; - Angles.Append( ang ); - } - const SMDS_MeshNode* NF = theNodes.begin()->second; -@@ -587,8 +587,8 @@ - for(; itn != theNodes.end(); itn++ ) { - CNodes.push_back( (*itn).second ); - double ang = (*itn).first - fang; -- if( ang>PI ) ang = ang - 2*PI; -- if( ang<-PI ) ang = ang + 2*PI; -+ if( ang>M_PI ) ang = ang - 2*M_PI; -+ if( ang<-M_PI ) ang = ang + 2*M_PI; - Angles.Append( ang ); - } - P1 = gp_Pnt( NF->X(), NF->Y(), NF->Z() ); -@@ -1055,7 +1055,7 @@ - aLine = Handle(Geom_Line)::DownCast(C3); - } - bool ok = !aCirc.IsNull() && !aLine.IsNull(); -- if( fabs(fabs(lp-fp)-PI) > Precision::Confusion() ) { -+ if( fabs(fabs(lp-fp)-M_PI) > Precision::Confusion() ) { - // not half of circle - ok = false; - } ---- FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp -+++ FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_QuadToTriaAdaptor.cpp -@@ -1037,19 +1037,19 @@ - double ang1 = fabs(VN1.Angle(VI1)); - double ang2 = fabs(VN2.Angle(VI2)); - double h1,h2; -- if(ang1>PI/3.) -+ if(ang1>M_PI/3.) - h1 = VI1.Magnitude()/2; - else - h1 = VI1.Magnitude()*cos(ang1); -- if(ang2>PI/3.) -+ if(ang2>M_PI/3.) - h2 = VI2.Magnitude()/2; - else - h2 = VI2.Magnitude()*cos(ang2); - double coef1 = 0.5; -- if(ang1(Ns1[4]); ---- FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp -+++ FreeCAD-0.12.5284/src/3rdParty/salomesmesh/src/StdMeshers/StdMeshers_AutomaticLength.cpp -@@ -116,7 +116,7 @@ - */ - //================================================================================ - -- const double a14divPI = 14. / PI; -+ const double a14divPI = 14. / M_PI; - - inline double segLength(double S0, double edgeLen, double minLen ) - { diff --git a/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch b/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch deleted file mode 100644 index 58e99587f992..000000000000 --- a/media-gfx/freecad/files/freecad-0.13.1830-CMakefile.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- CMakeLists.txt 2014-01-06 13:46:44.516313646 +0100 -+++ CMakeLists.txt.new 2014-01-06 13:58:16.035280554 +0100 -@@ -69,9 +69,15 @@ - SET(INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib") - endif(WIN32) - --SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") --SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") --SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+if(NOT CMAKE_INSTALL_DATADIR) -+ SET(CMAKE_INSTALL_DATADIR data CACHE PATH "Output directory for data and resource files") -+endif(NOT CMAKE_INSTALL_DATADIR) -+if(NOT CMAKE_INSTALL_INCLUDEDIR) -+ SET(CMAKE_INSTALL_INCLUDEDIR include CACHE PATH "Output directory for header files") -+endif(NOT CMAKE_INSTALL_INCLUDEDIR) -+if(NOT CMAKE_INSTALL_DOCDIR) -+ SET(CMAKE_INSTALL_DOCDIR doc CACHE PATH "Output directory for documentation and license files") -+endif(NOT CMAKE_INSTALL_DOCDIR) - - # used as compiler defines - SET(RESOURCEDIR "${CMAKE_INSTALL_DATADIR}") diff --git a/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch b/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch deleted file mode 100644 index 0db660948579..000000000000 --- a/media-gfx/freecad/files/freecad-0.13.1830-avoid-include-salome.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/3rdParty/salomesmesh/CMakeLists.txt 2014-01-06 14:06:05.495258088 +0100 -+++ src/3rdParty/salomesmesh/CMakeLists.txt.new 2014-01-06 15:05:53.316086394 +0100 -@@ -206,8 +206,4 @@ - DESTINATION lib - ) - # Headers are installed by default in /usr/local/include/SMESH-5.1.2.7 -- INSTALL(DIRECTORY inc/ -- DESTINATION include -- FILES_MATCHING PATTERN "*.h*" -- ) - ENDIF(UNIX) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch b/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch deleted file mode 100644 index e0e0e9fc02a7..000000000000 --- a/media-gfx/freecad/files/freecad-0.13.1830-cmake-2.8.12.patch +++ /dev/null @@ -1,294 +0,0 @@ -commit f061b6f7ea667e1d6944590d67b9b5b6659e4ba0 -Author: wmayer -Date: Tue Oct 22 10:33:18 2013 +0200 - - 0001278: No build possible with current CMake version 2.8.12 - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 862cd7b..11c9b43 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -270,14 +270,14 @@ MARK_AS_ADVANCED(FORCE FREECAD_LIBPACK_CHECKFILE6X FREECAD_LIBPACK_CHECKFILE7X) - macro(fc_wrap_cpp outfiles ) - # get include dirs - QT4_GET_MOC_FLAGS(moc_flags) -- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN}) -+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN}) - # fixes bug 0000585: bug with boost 1.48 - SET(moc_options ${moc_options} -DBOOST_TT_HAS_OPERATOR_HPP_INCLUDED) - - foreach(it ${moc_files}) - get_filename_component(it ${it} ABSOLUTE) - QT4_MAKE_OUTPUT_FILE(${it} moc_ cpp outfile) -- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}") -+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}") - set(${outfiles} ${${outfiles}} ${outfile}) - add_file_dependencies(${it} ${outfile}) - endforeach(it) -diff --git a/cMake/FreeCadMacros.cmake b/cMake/FreeCadMacros.cmake -index 5fa7680..78bc0b8 100644 ---- a/cMake/FreeCadMacros.cmake -+++ b/cMake/FreeCadMacros.cmake -@@ -168,69 +168,6 @@ endmacro(generate_from_py) - #endmacro(qt4_wrap_ui) - - --# This is a special version of the built in macro qt4_add_resources that generates .cpp files --# --#macro(fc_add_resources outfiles ) --# #QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) --# set(ARGN ) --# foreach (it ${rcc_files}) --# get_filename_component(outfilename ${it} NAME_WE) --# get_filename_component(infile ${it} ABSOLUTE) --# get_filename_component(rc_path ${infile} PATH) --# set(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) --# # parse file for dependencies --# # all files are absolute paths or relative to the location of the qrc file --# file(READ "${infile}" _RC_FILE_CONTENTS) --# string(REGEX MATCHALL "]*>" "" _RC_FILE "${_RC_FILE}") --# string(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}") --# if(NOT _ABS_PATH_INDICATOR) --# set(_RC_FILE "${rc_path}/${_RC_FILE}") --# endif(NOT _ABS_PATH_INDICATOR) --# set(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") --# endforeach(_RC_FILE) --# add_custom_command(OUTPUT ${outfile} --# COMMAND ${QT_RCC_EXECUTABLE} --# ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile} --# MAIN_DEPENDENCY ${infile} --# DEPENDS ${_RC_DEPENDS}) --# set(${outfiles} ${${outfiles}} ${outfile}) --# endforeach (it) --#endmacro(fc_add_resources) -- --MACRO (fc_add_resources outfiles ) -- QT4_EXTRACT_OPTIONS(rcc_files rcc_options ${ARGN}) -- -- FOREACH (it ${rcc_files}) -- GET_FILENAME_COMPONENT(outfilename ${it} NAME_WE) -- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE) -- GET_FILENAME_COMPONENT(rc_path ${infile} PATH) -- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/qrc_${outfilename}.cpp) -- # parse file for dependencies -- # all files are absolute paths or relative to the location of the qrc file -- FILE(READ "${infile}" _RC_FILE_CONTENTS) -- STRING(REGEX MATCHALL "]*>" "" _RC_FILE "${_RC_FILE}") -- STRING(REGEX MATCH "^/|([A-Za-z]:/)" _ABS_PATH_INDICATOR "${_RC_FILE}") -- IF(NOT _ABS_PATH_INDICATOR) -- SET(_RC_FILE "${rc_path}/${_RC_FILE}") -- ENDIF(NOT _ABS_PATH_INDICATOR) -- SET(_RC_DEPENDS ${_RC_DEPENDS} "${_RC_FILE}") -- ENDFOREACH(_RC_FILE) -- ADD_CUSTOM_COMMAND(OUTPUT ${outfile} -- COMMAND ${QT_RCC_EXECUTABLE} -- ARGS ${rcc_options} -name ${outfilename} -o ${outfile} ${infile} -- MAIN_DEPENDENCY ${infile} -- DEPENDS ${_RC_DEPENDS}) -- SET(${outfiles} ${${outfiles}} ${outfile}) -- ENDFOREACH (it) -- --ENDMACRO (fc_add_resources) -- - MACRO(ADD_MSVC_PRECOMPILED_HEADER PrecompiledHeader PrecompiledSource SourcesVar) - IF(MSVC) - GET_FILENAME_COMPONENT(PrecompiledBasename ${PrecompiledHeader} NAME_WE) -diff --git a/src/Gui/CMakeLists.txt b/src/Gui/CMakeLists.txt -index b9f1939..124c4f8 100644 ---- a/src/Gui/CMakeLists.txt -+++ b/src/Gui/CMakeLists.txt -@@ -608,7 +608,7 @@ SOURCE_GROUP("Widget\\iisTaskPanel\\Mocs" FILES ${iis_MOC_SRCS}) - #SET(Resource_RCS - # Icons/resource.qrc - # Language/translation.qrc) --#fc_add_resources(Resource_SRCS ${Resource_RCS}) -+#qt4_add_resources(Resource_SRCS ${Resource_RCS}) - #SET(Resource_SRCS - # ${Resource_SRCS} - # Icons/resource.qrc -diff --git a/src/Mod/Image/Gui/AppImageGui.cpp b/src/Mod/Image/Gui/AppImageGui.cpp -index c26129e..c817860 100644 ---- a/src/Mod/Image/Gui/AppImageGui.cpp -+++ b/src/Mod/Image/Gui/AppImageGui.cpp -@@ -20,7 +20,6 @@ - #include - #include "Workbench.h" - #include "ViewProviderImagePlane.h" --#include "qrc_Image.cpp" - - // use a different name to CreateCommand() - void CreateImageCommands(void); -diff --git a/src/Mod/Image/Gui/CMakeLists.txt b/src/Mod/Image/Gui/CMakeLists.txt -index cc967ee..4edb462 100644 ---- a/src/Mod/Image/Gui/CMakeLists.txt -+++ b/src/Mod/Image/Gui/CMakeLists.txt -@@ -30,8 +30,7 @@ SET(ImageGui_RES_SRCS - Resources/Image.qrc - ) - --fc_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) --#QT4_ADD_RESOURCES(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) -+qt4_add_resources(ImageGui_QRC_SRCS ${ImageGui_RES_SRCS}) - - set(ImageGui_UIC_SRCS - ImageOrientationDialog.ui -@@ -40,7 +39,7 @@ qt4_wrap_ui(ImageGui_UIC_HDRS ${ImageGui_UIC_SRCS}) - - SET(ImageGui_SRCS - # ${ImageGui_MOC_SRCS} --# ${ImageGui_QRC_SRCS} -+ ${ImageGui_QRC_SRCS} - AppImageGui.cpp - AppImageGuiPy.cpp - Command.cpp -diff --git a/src/Mod/Mesh/Gui/AppMeshGui.cpp b/src/Mod/Mesh/Gui/AppMeshGui.cpp -index 624d569..8fb68cf 100644 ---- a/src/Mod/Mesh/Gui/AppMeshGui.cpp -+++ b/src/Mod/Mesh/Gui/AppMeshGui.cpp -@@ -50,7 +50,6 @@ - #include "ViewProviderDefects.h" - #include "ViewProviderPython.h" - #include "Workbench.h" --#include "qrc_Mesh.cpp" - - - // use a different name to CreateCommand() -diff --git a/src/Mod/Mesh/Gui/CMakeLists.txt b/src/Mod/Mesh/Gui/CMakeLists.txt -index cafca6c..9ef1dae 100644 ---- a/src/Mod/Mesh/Gui/CMakeLists.txt -+++ b/src/Mod/Mesh/Gui/CMakeLists.txt -@@ -75,9 +75,9 @@ SET(Inventor_SRCS - ) - SOURCE_GROUP("Inventor" FILES ${Inventor_SRCS}) - --fc_add_resources(resource_SRCS Resources/Mesh.qrc) -+qt4_add_resources(resource_SRCS Resources/Mesh.qrc) - SET(resource_SRCS --# ${resource_SRCS} -+ ${resource_SRCS} - Resources/Mesh.qrc - ) - SOURCE_GROUP("resource" FILES ${resource_SRCS}) -diff --git a/src/Mod/Part/Gui/AppPartGui.cpp b/src/Mod/Part/Gui/AppPartGui.cpp -index 9c3ebb3..ae84470 100644 ---- a/src/Mod/Part/Gui/AppPartGui.cpp -+++ b/src/Mod/Part/Gui/AppPartGui.cpp -@@ -57,7 +57,6 @@ - #include "Workbench.h" - - #include --#include "qrc_Part.cpp" - - #include "Resources/icons/PartFeature.xpm" - #include "Resources/icons/PartFeatureImport.xpm" -diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt -index 375f6e4..87c4c28 100644 ---- a/src/Mod/Part/Gui/CMakeLists.txt -+++ b/src/Mod/Part/Gui/CMakeLists.txt -@@ -50,7 +50,7 @@ set(PartGui_MOC_HDRS - fc_wrap_cpp(PartGui_MOC_SRCS ${PartGui_MOC_HDRS}) - SOURCE_GROUP("Moc" FILES ${PartGui_MOC_SRCS}) - --fc_add_resources(PartGui_QRC_SRCS Resources/Part.qrc) -+qt4_add_resources(PartGui_QRC_SRCS Resources/Part.qrc) - - set(PartGui_UIC_SRCS - CrossSections.ui -@@ -77,7 +77,7 @@ set(PartGui_UIC_SRCS - qt4_wrap_ui(PartGui_UIC_HDRS ${PartGui_UIC_SRCS}) - - SET(PartGui_SRCS --# ${PartGui_QRC_SRCS} -+ ${PartGui_QRC_SRCS} - ${PartGui_UIC_HDRS} - AppPartGui.cpp - Command.cpp -diff --git a/src/Mod/Points/Gui/AppPointsGui.cpp b/src/Mod/Points/Gui/AppPointsGui.cpp -index 9acd98e..953d3e2 100644 ---- a/src/Mod/Points/Gui/AppPointsGui.cpp -+++ b/src/Mod/Points/Gui/AppPointsGui.cpp -@@ -33,7 +33,6 @@ - - #include "ViewProvider.h" - #include "Workbench.h" --#include "qrc_Points.cpp" - - // use a different name to CreateCommand() - void CreatePointsCommands(void); -diff --git a/src/Mod/Points/Gui/CMakeLists.txt b/src/Mod/Points/Gui/CMakeLists.txt -index fab12ff..7e30f0d 100644 ---- a/src/Mod/Points/Gui/CMakeLists.txt -+++ b/src/Mod/Points/Gui/CMakeLists.txt -@@ -32,9 +32,9 @@ SET(Dialogs_SRCS - ) - SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS}) - --fc_add_resources(Resource_SRCS Resources/Points.qrc) -+qt4_add_resources(Resource_SRCS Resources/Points.qrc) - SET(Resource_SRCS --# ${Resource_SRCS} -+ ${Resource_SRCS} - Resources/Points.qrc - ) - SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) -diff --git a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp -index 156bd90..c59369a 100644 ---- a/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp -+++ b/src/Mod/Raytracing/Gui/AppRaytracingGui.cpp -@@ -32,7 +32,6 @@ - #include "DlgSettingsRayImp.h" - #include "ViewProvider.h" - #include "Workbench.h" --#include "qrc_Raytracing.cpp" - - - using namespace RaytracingGui; -diff --git a/src/Mod/Raytracing/Gui/CMakeLists.txt b/src/Mod/Raytracing/Gui/CMakeLists.txt -index 38aa739..1da30c9 100644 ---- a/src/Mod/Raytracing/Gui/CMakeLists.txt -+++ b/src/Mod/Raytracing/Gui/CMakeLists.txt -@@ -43,8 +43,9 @@ set(RaytracingGui_MOC_HDRS - fc_wrap_cpp(RaytracingGui_MOC_SRCS ${RaytracingGui_MOC_HDRS}) - SOURCE_GROUP("Moc" FILES ${RaytracingGui_MOC_SRCS}) - --fc_add_resources(Resource_SRCS Resources/Raytracing.qrc) -+qt4_add_resources(Resource_SRCS Resources/Raytracing.qrc) - SET(Resource_SRCS -+ ${Resource_SRCS} - Resources/Raytracing.qrc - ) - SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) -diff --git a/src/Mod/Test/Gui/AppTestGui.cpp b/src/Mod/Test/Gui/AppTestGui.cpp -index a027d9d..7c2ef21 100644 ---- a/src/Mod/Test/Gui/AppTestGui.cpp -+++ b/src/Mod/Test/Gui/AppTestGui.cpp -@@ -28,7 +28,6 @@ - - #include "UnitTestPy.h" - #include "UnitTestImp.h" --#include "qrc_Test.cpp" - - #include - #include -diff --git a/src/Mod/Test/Gui/CMakeLists.txt b/src/Mod/Test/Gui/CMakeLists.txt -index 9b8b672..eaa0dcd 100644 ---- a/src/Mod/Test/Gui/CMakeLists.txt -+++ b/src/Mod/Test/Gui/CMakeLists.txt -@@ -30,9 +30,9 @@ SET(Dialogs_SRCS - ) - SOURCE_GROUP("Dialogs" FILES ${Dialogs_SRCS}) - --fc_add_resources(Resource_SRCS Resources/Test.qrc) -+qt4_add_resources(Resource_SRCS Resources/Test.qrc) - SET(Resource_SRCS --# ${Resource_SRCS} -+ ${Resource_SRCS} - Resources/Test.qrc - ) - SOURCE_GROUP("Resource" FILES ${Resource_SRCS}) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch b/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch deleted file mode 100644 index 9e02f1b8b37d..000000000000 --- a/media-gfx/freecad/files/freecad-0.13.1830-no-machdist.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/Mod/CMakeLists.txt 2013-02-02 18:09:17.000000000 +0100 -+++ src/Mod/CMakeLists.txt.new 2014-01-19 18:00:27.215825143 +0100 -@@ -18,7 +18,7 @@ - MESSAGE("Due to the missing Eigen3 library the Sketcher module won't be built") - MESSAGE("Due to the missing Eigen3 library the Robot module won't be built") - ENDIF(EIGEN3_FOUND) --add_subdirectory(Machining_Distortion) -+#add_subdirectory(Machining_Distortion) - - add_subdirectory(ReverseEngineering) - add_subdirectory(MeshPart) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch b/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch deleted file mode 100644 index 410929bec851..000000000000 --- a/media-gfx/freecad/files/freecad-0.13.1830-occ-6.7.patch +++ /dev/null @@ -1,63 +0,0 @@ -commit c1d14eab3c3f9f1141dc0b7fca7cc4441431b50b -Author: wmayer -Date: Sat Dec 28 12:22:31 2013 +0100 - - + Fix OCC 6.7 build failure - -diff --git a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp -index 578f5be..bdc91c3 100644 ---- a/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp -+++ b/src/Mod/Part/App/BRepOffsetAPI_MakePipeShellPyImp.cpp -@@ -29,6 +29,7 @@ - # include - # include - # include -+# include - # include - #endif - -@@ -111,6 +112,36 @@ PyObject* BRepOffsetAPI_MakePipeShellPy::setSpineSupport(PyObject *args) - - PyObject* BRepOffsetAPI_MakePipeShellPy::setAuxiliarySpine(PyObject *args) - { -+#if OCC_VERSION_HEX >= 0x060700 -+ PyObject *spine, *curv, *keep; -+ if (!PyArg_ParseTuple(args, "O!O!O!",&Part::TopoShapePy::Type,&spine -+ ,&PyBool_Type,&curv -+ ,&PyInt_Type,&keep)) -+ return 0; -+ const TopoDS_Shape& s = static_cast(spine)->getTopoShapePtr()->_Shape; -+ if (s.IsNull() || s.ShapeType() != TopAbs_WIRE) { -+ PyErr_SetString(PyExc_TypeError, "spine is not a wire"); -+ return 0; -+ } -+ -+ BRepFill_TypeOfContact typeOfCantact; -+ switch (PyLong_AsLong(keep)) { -+ case 1: -+ typeOfCantact = BRepFill_Contact; -+ break; -+ case 2: -+ typeOfCantact = BRepFill_ContactOnBorder; -+ break; -+ default: -+ typeOfCantact = BRepFill_NoContact; -+ break; -+ } -+ this->getBRepOffsetAPI_MakePipeShellPtr()->SetMode( -+ TopoDS::Wire(s), -+ PyObject_IsTrue(curv) ? Standard_True : Standard_False, -+ typeOfCantact); -+ Py_Return; -+#else - PyObject *spine, *curv, *keep; - if (!PyArg_ParseTuple(args, "O!O!O!",&Part::TopoShapePy::Type,&spine - ,&PyBool_Type,&curv -@@ -127,6 +158,7 @@ PyObject* BRepOffsetAPI_MakePipeShellPy::setAuxiliarySpine(PyObject *args) - PyObject_IsTrue(curv) ? Standard_True : Standard_False, - PyObject_IsTrue(keep) ? Standard_True : Standard_False); - Py_Return; -+#endif - } - - PyObject* BRepOffsetAPI_MakePipeShellPy::add(PyObject *args) diff --git a/media-gfx/freecad/files/freecad-0.13.1830-remove-qt3-support.patch b/media-gfx/freecad/files/freecad-0.13.1830-remove-qt3-support.patch deleted file mode 100644 index 8f761d8796d6..000000000000 --- a/media-gfx/freecad/files/freecad-0.13.1830-remove-qt3-support.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- freecad-0.13.1830/src/Mod/Arch/Resources/ui/archprefs-base.ui -+++ freecad-0.13.1830/src/Mod/Arch/Resources/ui/archprefs-base.ui -@@ -309,7 +309,7 @@ - - - -- qPixmapFromMimeSource -+ - - - Gui::ColorButton ---- freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-base.ui -+++ freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-base.ui -@@ -1185,7 +1185,7 @@ - - - -- qPixmapFromMimeSource -+ - - - Gui::FileChooser ---- freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-import.ui -+++ freecad-0.13.1830/src/Mod/Draft/Resources/ui/userprefs-import.ui -@@ -536,7 +536,7 @@ - - - -- qPixmapFromMimeSource -+ - - - Gui::FileChooser diff --git a/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch b/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch deleted file mode 100644 index f8af21c2b3e3..000000000000 --- a/media-gfx/freecad/files/freecad-0.13.1830-startpage-links.patch +++ /dev/null @@ -1,97 +0,0 @@ -commit dbdff257966c65feed6dd9360bc3d50549d9c4c9 -Author: Yorik van Havre -Date: Thu Sep 12 00:30:59 2013 -0300 - - Startpage: Fixed links - -diff --git a/src/Mod/Start/StartPage/StartPage.py b/src/Mod/Start/StartPage/StartPage.py -index 478bf40..43985f3 100644 ---- a/src/Mod/Start/StartPage/StartPage.py -+++ b/src/Mod/Start/StartPage/StartPage.py -@@ -84,7 +84,7 @@ text34 = translate("StartPage","creation time:") - text35 = translate("StartPage","last modified:") - text36 = translate("StartPage","location:") - text37 = translate("StartPage","User manual") --text38 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Online_Help_Toc") -+text38 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Online_Help_Toc") - text39 = translate("StartPage","Tutorials") - text40 = translate("StartPage","Python resources") - text41 = translate("StartPage","File not found") -@@ -97,7 +97,7 @@ text47 = translate("StartPage","The section of the FreeCAd website dedicate dto - text48 = translate("StartPage","A blog dedicated to teaching FreeCAD, maintained by members of the FreeCAD community") - text49 = translate("StartPage","Getting started") - text50 = translate("StartPage","The FreeCAD interface is divided in workbenches, which are sets of tools suited for a specific task. You can start with one of the workbenches in this list, or with the complete workbench, which presents you with some of the most used tools gathered from other workbenches. Click to read more about workbenches on the FreeCAD website.") --text51 = translate("StartPage","http://sourceforge.net/apps/mediawiki/free-cad/index.php?title=Workbench_Concept") -+text51 = translate("StartPage","http://www.freecadweb.org/wiki/index.php?title=Workbench_Concept") - text52 = translate("StartPage","Ship Design") - text53 = translate("StartPage","Designing and calculating ships") - text54 = translate("StartPage","The Ship Design module offers several tools to help ship designers to view, model and calculate profiles and other specific properties of ship hulls.") -@@ -159,7 +159,7 @@ page = """ - ddiv.innerHTML = "Done fetching"; - ddiv = document.getElementById("news"); - ddiv.innerHTML = "Fetching data from the web..."; -- var tobj=new JSONscriptRequest('http://twitter.com/status/user_timeline/FreeCADNews.json?count=10&callback=showTweets'); -+ var tobj=new JSONscriptRequest('http://pipes.yahoo.com/pipes/pipe.run?_id=da8b612e97a6bb4588b1ce27db30efd9&_render=json&_callback=showTweets'); - tobj.buildScriptTag(); // Build the script tag - tobj.addScriptTag(); // Execute (add) the script tag - ddiv.innerHTML = "Done fetching"; -@@ -182,19 +182,13 @@ page = """ - ddiv = document.getElementById('news'); - ddiv.innerHTML = "Received"; - var html = ['
    ']; -- for (var i = 0; i < Math.min(5,data.length); i++) { -- tf = placeLinks(data[i].text); -- html.push('
  • ',tf,'
  • '); -+ for (var i = 0; i < 8; i++) { -+ html.push('
  • ', data.value.items[i].title, '
  • '); - } - html.push('
'); - ddiv.innerHTML = html.join(''); - } - -- function placeLinks(text) { -- result=text.replace(/(https?:\/\/([-\w\.]+)+(:\d+)?(\/([\w\/_\.]*(\?\S+)?)?)?)/g,'$1'); -- return result; -- } -- - - -