root
6 years ago
parent
998588207e
commit
7af288647c
Binary file not shown.
Binary file not shown.
@ -0,0 +1,69 @@
|
||||
--- a/CMakeLists.txt 2018-08-11 09:54:05.000000000 +0200
|
||||
+++ b/CMakeLists.txt 2018-08-22 10:48:06.422755215 +0200
|
||||
@@ -91,6 +91,7 @@
|
||||
# Configurable options:
|
||||
option (NO_YUBI "Set ON to disable YubiKey support" OFF)
|
||||
option (NO_GTEST "Set ON to disable gtest unit testing" OFF)
|
||||
+option (SYSTEM_GTEST "Set ON to use gtest provided by the system" OFF)
|
||||
|
||||
if (WIN32)
|
||||
option (WX_WINDOWS "Build wxWidget under Windows" OFF)
|
||||
@@ -256,31 +257,36 @@
|
||||
endif (MSVC)
|
||||
|
||||
if (NOT NO_GTEST)
|
||||
- # Download and unpack googletest at configure time
|
||||
- # See https://crascit.com/2015/07/25/cmake-gtest/
|
||||
- configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
|
||||
- execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
||||
+ if (NOT SYSTEM_GTEST)
|
||||
+ # Download and unpack googletest at configure time
|
||||
+ # See https://crascit.com/2015/07/25/cmake-gtest/
|
||||
+ configure_file(Misc/CMakeLists.gtest.txt.in googletest-download/CMakeLists.txt)
|
||||
+ execute_process(COMMAND "${CMAKE_COMMAND}" -G "${CMAKE_GENERATOR}" .
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
|
||||
- execute_process(COMMAND "${CMAKE_COMMAND}" --build .
|
||||
+ execute_process(COMMAND "${CMAKE_COMMAND}" --build .
|
||||
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/googletest-download" )
|
||||
+ # Prevent GoogleTest from overriding our compiler/linker options
|
||||
+ # when building with Visual Studio
|
||||
+ set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||||
+ # Set some other gtest configurations:
|
||||
+ set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
|
||||
+ set(BUILD_GTEST ON CACHE BOOL "" FORCE)
|
||||
+ set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
|
||||
+
|
||||
+ # Add googletest directly to our build. This adds
|
||||
+ # the following targets: gtest, gtest_main, gmock
|
||||
+ # and gmock_main
|
||||
+ add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
|
||||
+ "${CMAKE_BINARY_DIR}/googletest-build")
|
||||
+
|
||||
+ include_directories("${gtest_SOURCE_DIR}/include"
|
||||
+# "${gmock_SOURCE_DIR}/include"
|
||||
+ )
|
||||
+ else (NOT SYSTEM_GTEST)
|
||||
+ find_package(GTest REQUIRED)
|
||||
+ set(GTEST_LIBRARIES ${GTEST_BOTH_LIBRARIES})
|
||||
+ endif(NOT SYSTEM_GTEST)
|
||||
|
||||
- # Prevent GoogleTest from overriding our compiler/linker options
|
||||
- # when building with Visual Studio
|
||||
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
||||
- # Set some other gtest configurations:
|
||||
- set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
|
||||
- set(BUILD_GTEST ON CACHE BOOL "" FORCE)
|
||||
- set(INSTALL_GTEST OFF CACHE BOOL "" FORCE)
|
||||
-
|
||||
- # Add googletest directly to our build. This adds
|
||||
- # the following targets: gtest, gtest_main, gmock
|
||||
- # and gmock_main
|
||||
- add_subdirectory("${CMAKE_BINARY_DIR}/googletest-src"
|
||||
- "${CMAKE_BINARY_DIR}/googletest-build")
|
||||
-
|
||||
- include_directories("${gtest_SOURCE_DIR}/include"
|
||||
-# "${gmock_SOURCE_DIR}/include"
|
||||
- )
|
||||
endif(NOT NO_GTEST)
|
||||
|
||||
if (WIN32 AND NOT WX_WINDOWS)
|
||||
@ -0,0 +1,85 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
inherit eutils systemd unpacker user
|
||||
|
||||
DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
|
||||
HOMEPAGE="https://puppetlabs.com/"
|
||||
SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
|
||||
SRC_URI="
|
||||
amd64? ( ${SRC_BASE}_amd64.deb )
|
||||
x86? ( ${SRC_BASE}_i386.deb )"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="puppetdb selinux"
|
||||
RESTRICT="strip"
|
||||
|
||||
CDEPEND="!app-admin/augeas
|
||||
!app-admin/mcollective
|
||||
!app-admin/puppet
|
||||
!dev-ruby/hiera
|
||||
!dev-ruby/facter
|
||||
!app-emulation/virt-what"
|
||||
|
||||
DEPEND="
|
||||
${CDEPEND}"
|
||||
RDEPEND="${CDEPEND}
|
||||
app-portage/eix
|
||||
sys-apps/dmidecode
|
||||
sys-libs/glibc
|
||||
sys-libs/readline:0/7
|
||||
sys-libs/ncurses:0[tinfo]
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
|
||||
|
||||
S=${WORKDIR}
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/run/puppet puppet
|
||||
}
|
||||
|
||||
src_install() {
|
||||
# conf.d
|
||||
doconfd etc/default/puppet
|
||||
doconfd etc/default/mcollective
|
||||
doconfd etc/default/pxp-agent
|
||||
# logrotate.d
|
||||
insinto /etc/logrotate.d
|
||||
doins etc/logrotate.d/pxp-agent
|
||||
# puppet itself
|
||||
insinto /etc/puppetlabs
|
||||
doins -r etc/puppetlabs/*
|
||||
# logdir for systemd
|
||||
dodir var/log/puppetlabs/puppet/
|
||||
fperms 0750 var/log/puppetlabs/puppet/
|
||||
# the rest
|
||||
insinto /opt
|
||||
dodir opt/puppetlabs/puppet/cache
|
||||
doins -r opt/*
|
||||
fperms 0750 /opt/puppetlabs/puppet/cache
|
||||
# init
|
||||
newinitd "${FILESDIR}/puppet.initd" puppet
|
||||
newinitd "${FILESDIR}/mcollective.initd" mcollective
|
||||
systemd_dounit lib/systemd/system/puppet.service
|
||||
systemd_dounit lib/systemd/system/mcollective.service
|
||||
systemd_dounit lib/systemd/system/pxp-agent.service
|
||||
systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
|
||||
# symlinks
|
||||
chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
|
||||
chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
|
||||
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
|
||||
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
|
||||
dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
|
||||
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
|
||||
dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
|
||||
dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
|
||||
dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
|
||||
}
|
||||
@ -0,0 +1,144 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
USE_RUBY="ruby23 ruby24 ruby25"
|
||||
|
||||
RUBY_FAKEGEM_RECIPE_TEST="rspec3"
|
||||
|
||||
RUBY_FAKEGEM_TASK_DOC="doc:all"
|
||||
|
||||
RUBY_FAKEGEM_EXTRAINSTALL="locales"
|
||||
|
||||
inherit eutils user ruby-fakegem versionator
|
||||
|
||||
DESCRIPTION="A system automation and configuration management software."
|
||||
HOMEPAGE="http://puppetlabs.com/"
|
||||
SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0 GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
|
||||
IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
|
||||
RESTRICT="test"
|
||||
|
||||
ruby_add_rdepend "
|
||||
dev-ruby/hiera
|
||||
dev-ruby/json:=
|
||||
>=dev-ruby/facter-3.0.0
|
||||
augeas? ( dev-ruby/ruby-augeas )
|
||||
diff? ( dev-ruby/diff-lcs )
|
||||
doc? ( dev-ruby/rdoc )
|
||||
ldap? ( dev-ruby/ruby-ldap )
|
||||
shadow? ( dev-ruby/ruby-shadow )
|
||||
sqlite? ( dev-ruby/sqlite3 )
|
||||
virtual/ruby-ssl
|
||||
dev-ruby/hocon"
|
||||
|
||||
ruby_add_bdepend "
|
||||
doc? ( dev-ruby/yard )
|
||||
test? (
|
||||
dev-ruby/mocha
|
||||
dev-ruby/rack
|
||||
dev-ruby/rspec-its
|
||||
)"
|
||||
# this should go in the above lists, but isn't because of test deps not being keyworded
|
||||
# dev-ruby/rspec-collection_matchers
|
||||
|
||||
RDEPEND+=" ${RDEPEND}
|
||||
rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] )
|
||||
selinux? (
|
||||
sys-libs/libselinux[ruby]
|
||||
sec-policy/selinux-puppet
|
||||
)
|
||||
vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 )
|
||||
>=app-portage/eix-0.18.0"
|
||||
PDEPEND="emacs? ( >=app-emacs/puppet-mode-0.3-r1 )"
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /var/lib/puppet puppet
|
||||
}
|
||||
|
||||
all_ruby_prepare() {
|
||||
# Avoid spec that require unpackaged json-schema.
|
||||
rm spec/lib/matchers/json.rb $( grep -Rl matchers/json spec) || die
|
||||
|
||||
# can't be run within portage.
|
||||
epatch "${FILESDIR}/puppet-fix-tests-4.7.0.patch"
|
||||
|
||||
# fix systemd path
|
||||
epatch "${FILESDIR}/puppet-systemd.patch"
|
||||
|
||||
# Avoid specs that can only run in the puppet.git repository. This
|
||||
# should be narrowed down to the specific specs.
|
||||
rm spec/integration/parser/compiler_spec.rb || die
|
||||
|
||||
# Avoid failing spec that need further investigation.
|
||||
rm spec/unit/module_tool/metadata_spec.rb || die
|
||||
}
|
||||
|
||||
each_ruby_install() {
|
||||
each_fakegem_install
|
||||
# dosym "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${P}" "/usr/$(get_libdir)/ruby/gems/$(ruby_get_version)/gems/${PN}"
|
||||
}
|
||||
|
||||
all_ruby_install() {
|
||||
all_fakegem_install
|
||||
|
||||
# systemd stuffs
|
||||
insinto /usr/lib/systemd/system
|
||||
doins "${WORKDIR}/all/${P}/ext/systemd/puppet.service"
|
||||
|
||||
# tmpfiles stuff
|
||||
insinto /usr/lib/tmpfiles.d
|
||||
newins "${FILESDIR}/tmpfiles.d" "puppet.conf"
|
||||
|
||||
# openrc init stuff
|
||||
newinitd "${FILESDIR}"/puppet.init-4.x puppet
|
||||
newinitd "${FILESDIR}"/puppetmaster.init-4.x puppetmaster
|
||||
newconfd "${FILESDIR}"/puppetmaster.confd puppetmaster
|
||||
|
||||
keepdir /etc/puppetlabs/puppet/ssl
|
||||
|
||||
keepdir /var/lib/puppet/facts
|
||||
keepdir /var/lib/puppet/files
|
||||
fowners -R puppet:puppet /var/lib/puppet
|
||||
|
||||
fperms 0750 /var/lib/puppet
|
||||
|
||||
fperms 0750 /etc/puppetlabs
|
||||
fperms 0750 /etc/puppetlabs/puppet
|
||||
fperms 0750 /etc/puppetlabs/puppet/ssl
|
||||
fowners -R :puppet /etc/puppetlabs
|
||||
fowners -R :puppet /var/lib/puppet
|
||||
|
||||
if use ldap ; then
|
||||
insinto /etc/openldap/schema; doins ext/ldap/puppet.schema
|
||||
fi
|
||||
|
||||
# ext and examples files
|
||||
for f in $(find ext examples -type f) ; do
|
||||
docinto "$(dirname ${f})"; dodoc "${f}"
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog
|
||||
elog "Please, *don't* include the --ask option in EMERGE_EXTRA_OPTS as this could"
|
||||
elog "cause puppet to hang while installing packages."
|
||||
elog
|
||||
elog "Portage Puppet module with Gentoo-specific resources:"
|
||||
elog "http://forge.puppetlabs.com/gentoo/portage"
|
||||
elog
|
||||
|
||||
for v in ${REPLACING_VERSIONS}; do
|
||||
if [ "$(get_major_version $v)" = "4" ]; then
|
||||
elog
|
||||
elog "Please see the following url for the release notes for puppet-5"
|
||||
elog "https://docs.puppet.com/puppet/5.0/release_notes.html#if-youre-upgrading-from-puppet-4x"
|
||||
elog
|
||||
fi
|
||||
done
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST puppetserver-5.3.3.tar.gz 67238194 BLAKE2B 0a0b235f26ab15c8f461f6663c26531d3ae469c4467ae33caa98f70d94a02fb89eb0399405be6b1f65f65b2fe4add7a24129f367ae1ab028189d250b087d0915 SHA512 dced3a7b7b3acb8966e4eb6f35aa82c84d0bba81487fa0cffc60fa0751b5d5c633be925471145a3e21b8f74bcffaa74f02310644ecc8bf8ebef0222d967fa86a
|
||||
DIST puppetserver-5.3.4.tar.gz 67238476 BLAKE2B a92bdf77ffefc7c65c5cfd39431aa6b485bd92c617c4e32a281bfa431fbb428209b8834ef464a521e00d07f3ce0a443fe8a187f3a235c3200531533a1efa242d SHA512 edfa121d64fdbca9a8eef201fe6744e2694141deb318bec64c942bb1ebe6ea61ba1aaa15aee4f4e59913f79247b1c833c6633d3ff121eee836a83ccbaaece900
|
||||
DIST puppetserver-5.3.5.tar.gz 67238513 BLAKE2B 075d6101a29b57a1693a76ba557e4cff3b5689a7bd38cc9f0f116962081ec71a29c31dbd22be9bad49897f94fe0f309d87780d2edcdd6c02e9f403e4b0a631c2 SHA512 4d7546ed845cfc9b37e2db094cb0a7340bb344dbbf52eba9cac7e54b277302449e2c9c464243c0804c8d14c00d146e74725e0e46bde0297104c394ae19f2095c
|
||||
|
||||
@ -0,0 +1,130 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
inherit multilib systemd tmpfiles user
|
||||
|
||||
DESCRIPTION="Puppet Server is the next-generation application for managing Puppet agents."
|
||||
HOMEPAGE="http://docs.puppetlabs.com/puppetserver/"
|
||||
SRC_URI="https://downloads.puppetlabs.com/puppet/${P}.tar.gz"
|
||||
|
||||
LICENSE="Apache-2.0"
|
||||
SLOT="0"
|
||||
IUSE="puppetdb"
|
||||
# will need the same keywords as puppet
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
|
||||
RDEPEND+="
|
||||
>=virtual/jdk-1.8.0
|
||||
app-admin/puppet-agent[puppetdb?]"
|
||||
DEPEND+=""
|
||||
|
||||
pkg_setup() {
|
||||
enewgroup puppet
|
||||
enewuser puppet -1 -1 /opt/puppetlabs/server/data/puppetserver "puppet"
|
||||
}
|
||||
|
||||
src_prepare() {
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' ext/bin/puppetserver || die
|
||||
sed -i 's/sysconfig\/puppetserver/default\/puppetserver/g' install.sh || die
|
||||
sed -i 's/var\/run/run/g' ext/config/conf.d/puppetserver.conf || die
|
||||
sed -i 's/var\/run/run/g' ext/redhat/puppetserver.service || die
|
||||
sed -i 's/var\/run/run/g' install.sh || die
|
||||
default
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
einfo "not compiling"
|
||||
}
|
||||
|
||||
src_install() {
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver
|
||||
insopts -m0774
|
||||
doins ext/ezbake-functions.sh
|
||||
insopts -m0644
|
||||
doins ext/ezbake.manifest
|
||||
doins puppet-server-release.jar
|
||||
doins jruby-9k.jar
|
||||
doins jruby-1_7.jar
|
||||
insinto /etc/puppetlabs/puppetserver
|
||||
doins ext/config/logback.xml
|
||||
doins ext/config/request-logging.xml
|
||||
insinto /etc/puppetlabs/puppetserver/services.d
|
||||
doins ext/system-config/services.d/bootstrap.cfg
|
||||
doins ext/config/services.d/ca.cfg
|
||||
insinto /etc/puppetlabs/puppetserver/conf.d
|
||||
doins ext/config/conf.d/puppetserver.conf
|
||||
doins ext/config/conf.d/auth.conf
|
||||
doins ext/config/conf.d/global.conf
|
||||
doins ext/config/conf.d/web-routes.conf
|
||||
doins ext/config/conf.d/metrics.conf
|
||||
doins ext/config/conf.d/webserver.conf
|
||||
insopts -m0755
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/scripts
|
||||
doins install.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli/apps
|
||||
doins ext/cli/irb
|
||||
doins ext/cli/foreground
|
||||
doins ext/cli/gem
|
||||
doins ext/cli/ruby
|
||||
doins ext/cli/reload
|
||||
doins ext/cli/start
|
||||
doins ext/cli/stop
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/cli
|
||||
doins ext/cli_defaults/cli-defaults.sh
|
||||
insinto /opt/puppetlabs/server/apps/puppetserver/bin
|
||||
doins ext/bin/puppetserver
|
||||
insopts -m0644
|
||||
dodir /opt/puppetlabs/server/bin
|
||||
dosym ../apps/puppetserver/bin/puppetserver /opt/puppetlabs/server/bin/puppetserver
|
||||
dodir /opt/puppetlabs/bin
|
||||
dosym ../server/apps/puppetserver/bin/puppetserver /opt/puppetlabs/bin/puppetserver
|
||||
dosym ../../opt/puppetlabs/server/apps/puppetserver/bin/puppetserver /usr/bin/puppetserver
|
||||
dodir /opt/puppetlabs/server/apps/puppetserver/config/services.d
|
||||
# other sys stuff
|
||||
dodir /etc/puppetlabs/code
|
||||
# needed for systemd
|
||||
dodir /var/log/puppetlabs/puppetserver
|
||||
dodir /etc/puppetlabs/puppet/ssl
|
||||
fowners -R puppet:puppet /etc/puppetlabs/puppet/ssl
|
||||
fperms -R 771 /etc/puppetlabs/puppet/ssl
|
||||
# systemd type things
|
||||
insinto /etc/systemd/system/puppetserver.service.d/
|
||||
systemd_dounit ext/redhat/puppetserver.service
|
||||
insinto /etc/default
|
||||
newins ext/default puppetserver
|
||||
# normal init type tasks
|
||||
dosym ../default/puppetserver /etc/conf.d/puppetserver
|
||||
newinitd "${FILESDIR}/puppetserver.init" puppetserver
|
||||
# misc
|
||||
insinto /etc/logrotate.d
|
||||
newins ext/puppetserver.logrotate.conf puppetserver
|
||||
# cleanup
|
||||
dodir /opt/puppetlabs/server/data/puppetserver/jruby-gems
|
||||
fowners -R puppet:puppet /opt/puppetlabs/server/data
|
||||
fperms -R 775 /opt/puppetlabs/server/data/puppetserver
|
||||
fperms -R 700 /var/log/puppetlabs/puppetserver
|
||||
insinto /opt/puppetlabs/server/data
|
||||
newins ext/build-scripts/gem-list.txt puppetserver-gem-list.txt
|
||||
newtmpfiles ext/puppetserver.tmpfiles.conf puppetserver.conf
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
elog "to install you may want to run the following:"
|
||||
elog
|
||||
elog "puppet config set --section master vardir /opt/puppetlabs/server/data/puppetserver"
|
||||
elog "puppet config set --section master logdir /var/log/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master rundir /run/puppetlabs/puppetserver"
|
||||
elog "puppet config set --section master pidfile /run/puppetlabs/puppetserver/puppetserver.pid"
|
||||
elog "puppet config set --section master codedir /etc/puppetlabs/code"
|
||||
elog
|
||||
elog "# install puppetserver gems"
|
||||
elog "cd /opt/puppetlabs/server/apps/puppetserver"
|
||||
elog "echo "jruby-puppet: { gem-home: ${DESTDIR}/opt/puppetlabs/server/data/puppetserver/vendored-jruby-gems }" > jruby.conf"
|
||||
elog "while read LINE"
|
||||
elog "do"
|
||||
elog " java -cp puppet-server-release.jar:jruby-1_7.jar clojure.main -m puppetlabs.puppetserver.cli.gem --config jruby.conf -- install \$(echo \$LINE |awk '{print \$1}') --version \$(echo \$LINE |awk '{print \$2}')"
|
||||
elog "done < /opt/puppetlabs/server/data/puppetserver-gem-list.txt"
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,366 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
WANT_AUTOMAKE="none"
|
||||
|
||||
inherit autotools elisp-common flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
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-21.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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
|
||||
IUSE="alsa aqua athena dbus games gconf gif gpm gtk gzip-el jpeg kerberos livecd m17n-lib motif 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
|
||||
kerberos? ( virtual/krb5 )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
gpm? ( sys-libs/gpm )
|
||||
dbus? ( sys-apps/dbus )
|
||||
X? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gif? ( media-libs/giflib:0= )
|
||||
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
|
||||
x11-libs/libXrender
|
||||
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
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXext
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!motif? (
|
||||
Xaw3d? (
|
||||
x11-libs/libXaw3d
|
||||
x11-libs/libXext
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!Xaw3d? ( athena? (
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXext
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-base/xorg-proto )"
|
||||
|
||||
BDEPEND="alsa? ( virtual/pkgconfig )
|
||||
dbus? ( virtual/pkgconfig )
|
||||
X? ( virtual/pkgconfig )
|
||||
gzip-el? ( app-arch/gzip )"
|
||||
# pax_kernel? ( sys-apps/attr )
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
|
||||
src_prepare() {
|
||||
eapply ../patch
|
||||
eapply_user
|
||||
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
if ! use alsa; then
|
||||
# ALSA is detected even if not requested by its USE flag.
|
||||
# Suppress it by supplying pkg-config with a wrong library name.
|
||||
sed -i -e "/ALSA_MODULES=/s/alsa/DiSaBlEaLsA/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
if ! use gzip-el; then
|
||||
# Emacs' build system automatically detects the gzip binary and
|
||||
# compresses el files. We don't want that so confuse it with a
|
||||
# wrong binary name
|
||||
sed -i -e "s/ gzip/ PrEvEnTcOmPrEsSiOn/" configure.in \
|
||||
|| die "unable to sed configure.in"
|
||||
fi
|
||||
|
||||
mv configure.in configure.ac || die
|
||||
eautoreconf
|
||||
touch src/stamp-h.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -fstrict-aliasing -pie
|
||||
append-flags $(test-flags -fno-strict-aliasing)
|
||||
append-ldflags $(test-flags -no-pie) #639568
|
||||
|
||||
if use sh; then
|
||||
replace-flags "-O[1-9]" -O0 #262359
|
||||
elif use ia64; then
|
||||
replace-flags "-O[2-9]" -O1 #325373
|
||||
else
|
||||
replace-flags "-O[3-9]" -O2
|
||||
fi
|
||||
|
||||
# Don't trigger a floating point exception for NaNs on alpha
|
||||
use alpha && append-flags -mieee
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa && ! use sound; then
|
||||
einfo "Although sound USE flag is disabled you chose to have alsa,"
|
||||
einfo "so sound is switched on anyway."
|
||||
myconf+=" --with-sound"
|
||||
else
|
||||
myconf+=" $(use_with sound)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
# GTK+ is the default toolkit if USE=gtk is chosen with other
|
||||
# possibilities. Emacs upstream thinks this should be standard
|
||||
# policy on all distributions
|
||||
local f
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
myconf+=" --with-x-toolkit=gtk"
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
# According to configure, this option is only used for GNU/Linux
|
||||
# (x86_64 and s390). For Gentoo Prefix we have to explicitly spell
|
||||
# out the location because $(get_libdir) does not necessarily return
|
||||
# something that matches the host OS's libdir naming (e.g. RHEL).
|
||||
local crtdir=$($(tc-getCC) -print-file-name=crt1.o)
|
||||
crtdir=${crtdir%/*}
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-crt-dir="${crtdir}" \
|
||||
--with-gameuser=":gamestat" \
|
||||
--without-hesiod \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with gpm) \
|
||||
$(use_with dbus) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Disable sandbox when dumping. For the unbelievers, see bug #131505
|
||||
emake CC="$(tc-getCC)" \
|
||||
AR="$(tc-getAR) cq" \
|
||||
RANLIB="$(tc-getRANLIB)" \
|
||||
RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" install
|
||||
|
||||
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
|
||||
|| die "removing duplicate emacs executable failed"
|
||||
mv "${ED}"/usr/bin/emacs-${EMACS_SUFFIX} "${ED}"/usr/bin/${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
|
||||
# move man pages to the correct place
|
||||
local m
|
||||
mv "${ED}"/usr/share/man/man1/{emacs,${EMACS_SUFFIX}}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
for m in b2m ctags ebrowse emacsclient etags grep-changelog rcs-checkin; do
|
||||
mv "${ED}"/usr/share/man/man1/${m}{,-${EMACS_SUFFIX}}.1 \
|
||||
|| die "moving ${m} man page failed"
|
||||
done
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|
||||
|| die "moving info dir failed"
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
|
||||
rm -rf "${ED}"/usr/share/{applications,icons}
|
||||
rm -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/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 || die
|
||||
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
|
||||
}
|
||||
@ -0,0 +1,360 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit autotools elisp-common eutils flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-4.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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="acl alsa aqua athena dbus games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
|
||||
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
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gpm? ( sys-libs/gpm )
|
||||
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
|
||||
kerberos? ( virtual/krb5 )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( net-libs/gnutls:0= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
X? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gsettings? ( >=dev-libs/glib-2.28.6 )
|
||||
gif? ( media-libs/giflib:0= )
|
||||
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 )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
x11-libs/libXrender
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
gtk2? ( x11-libs/gtk+:2 )
|
||||
!gtk2? ( x11-libs/gtk+:3 )
|
||||
)
|
||||
!gtk? (
|
||||
motif? (
|
||||
>=x11-libs/motif-2.3:0
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!motif? (
|
||||
Xaw3d? (
|
||||
x11-libs/libXaw3d
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!Xaw3d? ( athena? (
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-base/xorg-proto )"
|
||||
|
||||
BDEPEND="virtual/pkgconfig
|
||||
gzip-el? ( app-arch/gzip )"
|
||||
# pax_kernel? ( sys-apps/attr )
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
|
||||
src_prepare() {
|
||||
eapply ../patch
|
||||
eapply_user
|
||||
|
||||
# Fix filename reference in redirected man page
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
AT_M4DIR=m4 eautoreconf
|
||||
touch src/stamp-h.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -pie #526948
|
||||
append-ldflags $(test-flags -no-pie) #639570
|
||||
|
||||
if use sh; then
|
||||
replace-flags "-O[1-9]" -O0 #262359
|
||||
elif use ia64; then
|
||||
replace-flags "-O[2-9]" -O1 #325373
|
||||
else
|
||||
replace-flags "-O[3-9]" -O2
|
||||
fi
|
||||
|
||||
# Don't trigger a floating point exception for NaNs on alpha
|
||||
use alpha && append-flags -mieee
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa; then
|
||||
use sound || ewarn \
|
||||
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
|
||||
myconf+=" --with-sound=alsa"
|
||||
else
|
||||
myconf+=" --with-sound=$(usex sound oss)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with gsettings)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
myconf+=" $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
local f line
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
while read line; do ewarn "${line}"; done <<-EOF
|
||||
Your version of GTK+ will have problems with closing open
|
||||
displays. This is no problem if you just use one display, but
|
||||
if you use more than one and close one of them Emacs may crash.
|
||||
See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
|
||||
If you intend to use more than one display, then it is strongly
|
||||
recommended that you compile Emacs with the Athena/Lucid or the
|
||||
Motif toolkit instead.
|
||||
EOF
|
||||
myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)"
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
! use gtk && use gtk2 && ewarn \
|
||||
"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-gameuser=":gamestat" \
|
||||
--without-compress-install \
|
||||
--without-hesiod \
|
||||
--with-file-notification=$(usev inotify || usev gfile || echo no) \
|
||||
$(use_enable acl) \
|
||||
$(use_with dbus) \
|
||||
$(use_with gpm) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with selinux) \
|
||||
$(use_with ssl gnutls) \
|
||||
$(use_with wide-int) \
|
||||
$(use_with zlib) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Disable sandbox when dumping. For the unbelievers, see bug #131505
|
||||
emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" NO_BIN_LINK=t install
|
||||
|
||||
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|
||||
|| die "moving info dir failed"
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
|
||||
rm -rf "${ED}"/usr/share/{applications,icons}
|
||||
rm -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/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
|
||||
|
||||
if use gzip-el; then
|
||||
# compress .el files when a corresponding .elc exists
|
||||
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
|
||||
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
|
||||
assert "gzip .el failed"
|
||||
fi
|
||||
|
||||
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}
|
||||
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 || die
|
||||
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 Emacs version 24.2 or earlier, 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
|
||||
}
|
||||
@ -0,0 +1,368 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit elisp-common flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="25"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos libxml2 livecd m17n-lib motif png selinux sound source ssl svg tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm zlib"
|
||||
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
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gpm? ( sys-libs/gpm )
|
||||
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
|
||||
kerberos? ( virtual/krb5 )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( net-libs/gnutls:0= )
|
||||
zlib? ( sys-libs/zlib )
|
||||
X? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libxcb
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gsettings? ( >=dev-libs/glib-2.28.6 )
|
||||
gif? ( media-libs/giflib:0= )
|
||||
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 )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
x11-libs/libXrender
|
||||
cairo? ( >=x11-libs/cairo-1.12.18 )
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
gtk2? ( x11-libs/gtk+:2 )
|
||||
!gtk2? ( x11-libs/gtk+:3 )
|
||||
)
|
||||
!gtk? (
|
||||
motif? (
|
||||
>=x11-libs/motif-2.3:0
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!motif? (
|
||||
Xaw3d? (
|
||||
x11-libs/libXaw3d
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!Xaw3d? ( athena? (
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-base/xorg-proto )"
|
||||
|
||||
BDEPEND="virtual/pkgconfig
|
||||
gzip-el? ( app-arch/gzip )"
|
||||
# pax_kernel? ( sys-apps/attr )
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
|
||||
src_prepare() {
|
||||
eapply ../patch
|
||||
eapply_user
|
||||
|
||||
# Fix filename reference in redirected man page
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
#AT_M4DIR=m4 eautoreconf
|
||||
#touch src/stamp-h.in || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -pie #526948
|
||||
|
||||
if use sh; then
|
||||
replace-flags "-O[1-9]" -O0 #262359
|
||||
elif use ia64; then
|
||||
replace-flags "-O[2-9]" -O1 #325373
|
||||
else
|
||||
replace-flags "-O[3-9]" -O2
|
||||
fi
|
||||
|
||||
# Don't trigger a floating point exception for NaNs on alpha
|
||||
use alpha && append-flags -mieee
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa; then
|
||||
use sound || ewarn \
|
||||
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
|
||||
myconf+=" --with-sound=alsa"
|
||||
else
|
||||
myconf+=" --with-sound=$(usex sound oss)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with gsettings)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
myconf+=" $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with cairo)"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-cairo"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use cairo && ewarn \
|
||||
"USE flag \"cairo\" has no effect if \"xft\" is not set."
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
local f line
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
while read line; do ewarn "${line}"; done <<-EOF
|
||||
Your version of GTK+ will have problems with closing open
|
||||
displays. This is no problem if you just use one display, but
|
||||
if you use more than one and close one of them Emacs may crash.
|
||||
See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
|
||||
If you intend to use more than one display, then it is strongly
|
||||
recommended that you compile Emacs with the Athena/Lucid or the
|
||||
Motif toolkit instead.
|
||||
EOF
|
||||
myconf+=" --with-x-toolkit=$(usex gtk2 gtk2 gtk3)"
|
||||
myconf+=" --without-xwidgets"
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
! use gtk && use gtk2 && ewarn \
|
||||
"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--with-gameuser=":gamestat" \
|
||||
--without-compress-install \
|
||||
--without-hesiod \
|
||||
--with-file-notification=$(usev inotify || usev gfile || echo no) \
|
||||
$(use_enable acl) \
|
||||
$(use_with dbus) \
|
||||
$(use_with dynamic-loading modules) \
|
||||
$(use_with gpm) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with selinux) \
|
||||
$(use_with ssl gnutls) \
|
||||
$(use_with wide-int) \
|
||||
$(use_with zlib) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Disable sandbox when dumping. For the unbelievers, see bug #131505
|
||||
emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" NO_BIN_LINK=t install
|
||||
|
||||
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|
||||
|| die "moving info dir failed"
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
|
||||
rm -rf "${ED}"/usr/share/{appdata,applications,icons}
|
||||
rm -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/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
|
||||
|
||||
if use gzip-el; then
|
||||
# compress .el files when a corresponding .elc exists
|
||||
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
|
||||
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
|
||||
assert "gzip .el failed"
|
||||
fi
|
||||
|
||||
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}
|
||||
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 || die
|
||||
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 CONTRIBUTE
|
||||
|
||||
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 Emacs version 24.2 or earlier, 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
|
||||
}
|
||||
@ -0,0 +1,391 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
inherit elisp-common flag-o-matic multilib readme.gentoo-r1
|
||||
|
||||
DESCRIPTION="The extensible, customizable, self-documenting real-time display editor"
|
||||
HOMEPAGE="https://www.gnu.org/software/emacs/"
|
||||
SRC_URI="mirror://gnu/emacs/${P}.tar.xz
|
||||
https://dev.gentoo.org/~ulm/emacs/${P}-patches-1.tar.xz"
|
||||
|
||||
LICENSE="GPL-3+ FDL-1.3+ BSD HPND MIT W3C unicode PSF-2"
|
||||
SLOT="26"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
|
||||
IUSE="acl alsa aqua athena cairo dbus dynamic-loading games gconf gfile gif gpm gsettings gtk gtk2 gzip-el imagemagick +inotify jpeg kerberos lcms libxml2 livecd m17n-lib mailutils motif png selinux sound source ssl svg systemd +threads tiff toolkit-scroll-bars wide-int X Xaw3d xft +xpm xwidgets zlib"
|
||||
REQUIRED_USE="?? ( aqua X )"
|
||||
|
||||
RDEPEND="sys-libs/ncurses:0=
|
||||
>=app-eselect/eselect-emacs-1.16
|
||||
>=app-emacs/emacs-common-gentoo-1.5[games?,X?]
|
||||
acl? ( virtual/acl )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
dbus? ( sys-apps/dbus )
|
||||
gpm? ( sys-libs/gpm )
|
||||
!inotify? ( gfile? ( >=dev-libs/glib-2.28.6 ) )
|
||||
kerberos? ( virtual/krb5 )
|
||||
lcms? ( media-libs/lcms:2 )
|
||||
libxml2? ( >=dev-libs/libxml2-2.2.0 )
|
||||
mailutils? ( net-mail/mailutils[clients] )
|
||||
!mailutils? ( net-libs/liblockfile )
|
||||
selinux? ( sys-libs/libselinux )
|
||||
ssl? ( net-libs/gnutls:0= )
|
||||
systemd? ( sys-apps/systemd )
|
||||
zlib? ( sys-libs/zlib )
|
||||
X? (
|
||||
x11-libs/libICE
|
||||
x11-libs/libSM
|
||||
x11-libs/libX11
|
||||
x11-libs/libXext
|
||||
x11-libs/libXfixes
|
||||
x11-libs/libXinerama
|
||||
x11-libs/libXrandr
|
||||
x11-libs/libxcb
|
||||
x11-misc/xbitmaps
|
||||
gconf? ( >=gnome-base/gconf-2.26.2 )
|
||||
gsettings? ( >=dev-libs/glib-2.28.6 )
|
||||
gif? ( media-libs/giflib:0= )
|
||||
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 )
|
||||
imagemagick? ( >=media-gfx/imagemagick-6.6.2:0= )
|
||||
xft? (
|
||||
media-libs/fontconfig
|
||||
media-libs/freetype
|
||||
x11-libs/libXft
|
||||
x11-libs/libXrender
|
||||
cairo? ( >=x11-libs/cairo-1.12.18 )
|
||||
m17n-lib? (
|
||||
>=dev-libs/libotf-0.9.4
|
||||
>=dev-libs/m17n-lib-1.5.1
|
||||
)
|
||||
)
|
||||
gtk? (
|
||||
gtk2? ( x11-libs/gtk+:2 )
|
||||
!gtk2? (
|
||||
x11-libs/gtk+:3
|
||||
xwidgets? (
|
||||
net-libs/webkit-gtk:4=
|
||||
x11-libs/libXcomposite
|
||||
)
|
||||
)
|
||||
)
|
||||
!gtk? (
|
||||
motif? (
|
||||
>=x11-libs/motif-2.3:0
|
||||
x11-libs/libXpm
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!motif? (
|
||||
Xaw3d? (
|
||||
x11-libs/libXaw3d
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
)
|
||||
!Xaw3d? ( athena? (
|
||||
x11-libs/libXaw
|
||||
x11-libs/libXmu
|
||||
x11-libs/libXt
|
||||
) )
|
||||
)
|
||||
)
|
||||
)"
|
||||
|
||||
DEPEND="${RDEPEND}
|
||||
X? ( x11-base/xorg-proto )"
|
||||
|
||||
BDEPEND="virtual/pkgconfig
|
||||
gzip-el? ( app-arch/gzip )"
|
||||
# pax_kernel? ( sys-apps/attr )
|
||||
|
||||
RDEPEND="${RDEPEND}
|
||||
!<app-editors/emacs-vcs-${PV}"
|
||||
|
||||
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
|
||||
SITEFILE="20${PN}-${SLOT}-gentoo.el"
|
||||
# FULL_VERSION keeps the full version number, which is needed in
|
||||
# order to determine some path information correctly for copy/move
|
||||
# operations later on
|
||||
FULL_VERSION="${PV%%_*}"
|
||||
S="${WORKDIR}/emacs-${FULL_VERSION}"
|
||||
|
||||
src_prepare() {
|
||||
eapply ../patch
|
||||
eapply_user
|
||||
|
||||
# Fix filename reference in redirected man page
|
||||
sed -i -e "/^\\.so/s/etags/&-${EMACS_SUFFIX}/" doc/man/ctags.1 \
|
||||
|| die "unable to sed ctags.1"
|
||||
|
||||
#AT_M4DIR=m4 eautoreconf
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
strip-flags
|
||||
filter-flags -pie #526948
|
||||
|
||||
if use sh; then
|
||||
replace-flags "-O[1-9]" -O0 #262359
|
||||
elif use ia64; then
|
||||
replace-flags "-O[2-9]" -O1 #325373
|
||||
else
|
||||
replace-flags "-O[3-9]" -O2
|
||||
fi
|
||||
|
||||
# Don't trigger a floating point exception for NaNs on alpha
|
||||
use alpha && append-flags -mieee
|
||||
|
||||
local myconf
|
||||
|
||||
if use alsa; then
|
||||
use sound || ewarn \
|
||||
"USE flag \"alsa\" overrides \"-sound\"; enabling sound support."
|
||||
myconf+=" --with-sound=alsa"
|
||||
else
|
||||
myconf+=" --with-sound=$(usex sound oss)"
|
||||
fi
|
||||
|
||||
if use X; then
|
||||
myconf+=" --with-x --without-ns"
|
||||
myconf+=" $(use_with gconf)"
|
||||
myconf+=" $(use_with gsettings)"
|
||||
myconf+=" $(use_with toolkit-scroll-bars)"
|
||||
myconf+=" $(use_with gif)"
|
||||
myconf+=" $(use_with jpeg)"
|
||||
myconf+=" $(use_with png)"
|
||||
myconf+=" $(use_with svg rsvg)"
|
||||
myconf+=" $(use_with tiff)"
|
||||
myconf+=" $(use_with xpm)"
|
||||
myconf+=" $(use_with imagemagick)"
|
||||
|
||||
if use xft; then
|
||||
myconf+=" --with-xft"
|
||||
myconf+=" $(use_with cairo)"
|
||||
myconf+=" $(use_with m17n-lib libotf)"
|
||||
myconf+=" $(use_with m17n-lib m17n-flt)"
|
||||
else
|
||||
myconf+=" --without-xft"
|
||||
myconf+=" --without-cairo"
|
||||
myconf+=" --without-libotf --without-m17n-flt"
|
||||
use cairo && ewarn \
|
||||
"USE flag \"cairo\" has no effect if \"xft\" is not set."
|
||||
use m17n-lib && ewarn \
|
||||
"USE flag \"m17n-lib\" has no effect if \"xft\" is not set."
|
||||
fi
|
||||
|
||||
local f line
|
||||
if use gtk; then
|
||||
einfo "Configuring to build with GIMP Toolkit (GTK+)"
|
||||
while read line; do ewarn "${line}"; done <<-EOF
|
||||
Your version of GTK+ will have problems with closing open
|
||||
displays. This is no problem if you just use one display, but
|
||||
if you use more than one and close one of them Emacs may crash.
|
||||
See <https://bugzilla.gnome.org/show_bug.cgi?id=85715>.
|
||||
If you intend to use more than one display, then it is strongly
|
||||
recommended that you compile Emacs with the Athena/Lucid or the
|
||||
Motif toolkit instead.
|
||||
EOF
|
||||
if use gtk2; then
|
||||
myconf+=" --with-x-toolkit=gtk2 --without-xwidgets"
|
||||
use xwidgets && ewarn \
|
||||
"USE flag \"xwidgets\" has no effect if \"gtk2\" is set."
|
||||
else
|
||||
myconf+=" --with-x-toolkit=gtk3 $(use_with xwidgets)"
|
||||
fi
|
||||
for f in motif Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"gtk\" is set."
|
||||
done
|
||||
elif use motif; then
|
||||
einfo "Configuring to build with Motif toolkit"
|
||||
myconf+=" --with-x-toolkit=motif"
|
||||
for f in Xaw3d athena; do
|
||||
use ${f} && ewarn \
|
||||
"USE flag \"${f}\" has no effect if \"motif\" is set."
|
||||
done
|
||||
elif use athena || use Xaw3d; then
|
||||
einfo "Configuring to build with Athena/Lucid toolkit"
|
||||
myconf+=" --with-x-toolkit=lucid $(use_with Xaw3d xaw3d)"
|
||||
else
|
||||
einfo "Configuring to build with no toolkit"
|
||||
myconf+=" --with-x-toolkit=no"
|
||||
fi
|
||||
if ! use gtk; then
|
||||
use gtk2 && ewarn \
|
||||
"USE flag \"gtk2\" has no effect if \"gtk\" is not set."
|
||||
use xwidgets && ewarn \
|
||||
"USE flag \"xwidgets\" has no effect if \"gtk\" is not set."
|
||||
fi
|
||||
elif use aqua; then
|
||||
einfo "Configuring to build with Nextstep (Cocoa) support"
|
||||
myconf+=" --with-ns --disable-ns-self-contained"
|
||||
myconf+=" --without-x"
|
||||
else
|
||||
myconf+=" --without-x --without-ns"
|
||||
fi
|
||||
|
||||
econf \
|
||||
--program-suffix="-${EMACS_SUFFIX}" \
|
||||
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
|
||||
--localstatedir="${EPREFIX}"/var \
|
||||
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
|
||||
--without-compress-install \
|
||||
--without-hesiod \
|
||||
--without-pop \
|
||||
--with-file-notification=$(usev inotify || usev gfile || echo no) \
|
||||
$(use_enable acl) \
|
||||
$(use_with dbus) \
|
||||
$(use_with dynamic-loading modules) \
|
||||
$(use_with games gameuser ":gamestat") \
|
||||
$(use_with gpm) \
|
||||
$(use_with kerberos) $(use_with kerberos kerberos5) \
|
||||
$(use_with lcms lcms2) \
|
||||
$(use_with libxml2 xml2) \
|
||||
$(use_with mailutils) \
|
||||
$(use_with selinux) \
|
||||
$(use_with ssl gnutls) \
|
||||
$(use_with systemd libsystemd) \
|
||||
$(use_with threads) \
|
||||
$(use_with wide-int) \
|
||||
$(use_with zlib) \
|
||||
${myconf}
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
# Disable sandbox when dumping. For the unbelievers, see bug #131505
|
||||
emake RUN_TEMACS="SANDBOX_ON=0 LD_PRELOAD= env ./temacs"
|
||||
}
|
||||
|
||||
src_install () {
|
||||
emake DESTDIR="${D}" NO_BIN_LINK=t install
|
||||
|
||||
mv "${ED}"/usr/bin/{emacs-${FULL_VERSION}-,}${EMACS_SUFFIX} \
|
||||
|| die "moving emacs executable failed"
|
||||
mv "${ED}"/usr/share/man/man1/{emacs-,}${EMACS_SUFFIX}.1 \
|
||||
|| die "moving emacs man page failed"
|
||||
|
||||
# move info dir to avoid collisions with the dir file generated by portage
|
||||
mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|
||||
|| die "moving info dir failed"
|
||||
touch "${ED}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
|
||||
docompress -x /usr/share/info/${EMACS_SUFFIX}/dir.orig
|
||||
|
||||
# avoid collision between slots, see bug #169033 e.g.
|
||||
rm "${ED}"/usr/share/emacs/site-lisp/subdirs.el
|
||||
rm -rf "${ED}"/usr/share/{appdata,applications,icons}
|
||||
rm -rf "${ED}/usr/$(get_libdir)"
|
||||
rm -rf "${ED}"/var
|
||||
|
||||
# remove unused <version>/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
|
||||
|
||||
if use gzip-el; then
|
||||
# compress .el files when a corresponding .elc exists
|
||||
find "${ED}"/usr/share/emacs/${FULL_VERSION}/lisp -type f \
|
||||
-name "*.elc" -print | sed 's/\.elc$/.el/' | xargs gzip -9n
|
||||
assert "gzip .el failed"
|
||||
fi
|
||||
|
||||
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}
|
||||
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 || die
|
||||
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 CONTRIBUTE
|
||||
|
||||
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 Emacs version 24.2 or earlier, 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
|
||||
}
|
||||
Binary file not shown.
@ -0,0 +1,29 @@
|
||||
Author: Larry Finger
|
||||
Origin: https://www.mail-archive.com/vbox-dev@virtualbox.org/msg09363.html
|
||||
|
||||
--- a/src/VBox/Additions/linux/sharedfolders/utils.c
|
||||
+++ b/src/VBox/Additions/linux/sharedfolders/utils.c
|
||||
@@ -50,7 +50,11 @@ static void sf_timespec_from_ftime(RTTIMESPEC *ts, time_t *time)
|
||||
RTTimeSpecSetNano(ts, t);
|
||||
}
|
||||
#else /* >= 2.6.0 */
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
|
||||
+static void sf_ftime_from_timespec(struct timespec64 *tv, RTTIMESPEC *ts)
|
||||
+#else
|
||||
static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
|
||||
+#endif
|
||||
{
|
||||
int64_t t = RTTimeSpecGetNano(ts);
|
||||
int64_t nsec;
|
||||
@@ -60,7 +64,11 @@ static void sf_ftime_from_timespec(struct timespec *tv, RTTIMESPEC *ts)
|
||||
tv->tv_nsec = nsec;
|
||||
}
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0)
|
||||
+static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec64 *tv)
|
||||
+#else
|
||||
static void sf_timespec_from_ftime(RTTIMESPEC *ts, struct timespec *tv)
|
||||
+#endif
|
||||
{
|
||||
int64_t t = (int64_t)tv->tv_nsec + (int64_t)tv->tv_sec * 1000000000;
|
||||
RTTimeSpecSetNano(ts, t);
|
||||
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST radeontop-1.0.tar.gz 32677 BLAKE2B e3445c400dff0f8afaa743d349477b67ccc4da187cbf979fe42c63b9e60f246f54e5fa2076ef6af789fea093c175d0ec66fa9f0f30bfb926a28f1aa12f2b10cf SHA512 bd7e8ecff962d8ac3072f3f1fa7a5d9981e2da28b38a1f234f6fe550511c3fbda2c1c6e9a6d1120bf99ef3ae621a91ff67c451eaf98dfa1264e9e6a59ae55e08
|
||||
DIST radeontop-1.1.tar.gz 33527 BLAKE2B 920376e5fb8acffb181b7a9e1362f46bad2de66fcf3665dc212f931d9b6fb9bf3f6765e2f8de78f8b2ba7d13cc5baae3e4d3b0612a1097f917420a43b3215f8d SHA512 abf4e51582cc668e1abbcd87bfa6ec5f16a301c3327a276a6f27fe928f780acf1442a696bb00bdbd3e8cad21a1416ffcf500a865dd4bac9517fac1a43d851c5a
|
||||
@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
|
||||
<pkgmetadata>
|
||||
<maintainer type="person">
|
||||
<email>bu9zilla@gmail.com</email>
|
||||
<name>Michael Mair-Keimberger</name>
|
||||
</maintainer>
|
||||
<maintainer type="project">
|
||||
<email>proxy-maint@gentoo.org</email>
|
||||
<name>Proxy Maintainers</name>
|
||||
</maintainer>
|
||||
<upstream>
|
||||
<remote-id type="github">clbr/radeontop</remote-id>
|
||||
</upstream>
|
||||
</pkgmetadata>
|
||||
@ -0,0 +1,54 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
inherit toolchain-funcs
|
||||
|
||||
DESCRIPTION="Utility to view Radeon GPU utilization"
|
||||
HOMEPAGE="https://github.com/clbr/radeontop"
|
||||
SRC_URI="https://github.com/clbr/radeontop/archive/v${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="GPL-3"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="nls"
|
||||
|
||||
RDEPEND="
|
||||
sys-libs/ncurses:0=
|
||||
x11-libs/libdrm
|
||||
x11-libs/libpciaccess
|
||||
x11-libs/libxcb
|
||||
nls? (
|
||||
sys-libs/ncurses:0=[unicode]
|
||||
virtual/libintl
|
||||
)
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )
|
||||
"
|
||||
BDEPEND="virtual/pkgconfig"
|
||||
|
||||
src_prepare() {
|
||||
default
|
||||
|
||||
cat > include/version.h <<-EOF || die
|
||||
#ifndef VER_H
|
||||
#define VER_H
|
||||
|
||||
#define VERSION "${PV}"
|
||||
|
||||
#endif
|
||||
EOF
|
||||
>getver.sh || die
|
||||
touch .git || die
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
tc-export CC
|
||||
export LIBDIR=$(get_libdir)
|
||||
export nls=$(usex nls 1 0)
|
||||
export amdgpu=1
|
||||
export xcb=1
|
||||
# Do not add -g or -s to CFLAGS
|
||||
export plain=1
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1,2 +1 @@
|
||||
DIST coolreader-3.1.2.71.tar.bz2 10141514 BLAKE2B 143a69082a2dcabbb7a246df575e7ed2fddb4b11c542910faa2f6d44155f0de8ba6d7e0fd321b53fc0eda47c8d2867bfec02af3b95edbcb623f6a15fa6c4bc72 SHA512 2859eabfc8ba603d1cb09b07358887135b6968268a5f2fa7f874a1e8613d1b5ebe69d9b133f16e84321d1a460eae5088a7947433c6fb340a47bde9ceee415735
|
||||
DIST coolreader-3.2.2.1.tar.gz 12463566 BLAKE2B 208026a87b36a06cd0a2e83b60bb506174b2edec4e3f4d1663c9d630cf316afd54aa0dbd0fdf0d3e44e03277d39692bbada8b03376a22970321928e594632997 SHA512 c2e3ea139ff3969c16985a56a9605a59ae31c59f9dc962abcc4aae5d87b8c48c8d7ed716a7077dd9da93cefc0d9ba0fe8a43c50e33e3d58acbcdfc35b73b3538
|
||||
|
||||
@ -1,91 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
WX_GTK_VER="3.0"
|
||||
PLOCALES="bg cs de es hu pl ru uk"
|
||||
inherit cmake-utils wxwidgets l10n xdg-utils gnome2-utils
|
||||
|
||||
if [ "${PV}" == 9999 ]
|
||||
then
|
||||
inherit git-r3
|
||||
# github mirror has some new commits to fix page margins settings
|
||||
# sourceforge mirror saved as backup
|
||||
#EGIT_REPO_URI="git://git.code.sf.net/p/crengine/crengine"
|
||||
EGIT_REPO_URI="https://github.com/buggins/coolreader.git"
|
||||
SRC_URI=""
|
||||
else
|
||||
# git tag cr3.1.2-71
|
||||
SRC_URI="https://dev.gentoo.org/~grozin/${P}.tar.bz2"
|
||||
fi
|
||||
|
||||
DESCRIPTION="CoolReader - reader of eBook files (fb2,epub,htm,rtf,txt)"
|
||||
HOMEPAGE="https://sourceforge.net/projects/crengine/"
|
||||
|
||||
LICENSE="GPL-2"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="wxwidgets"
|
||||
|
||||
DEPEND="sys-libs/zlib
|
||||
media-libs/libpng:0
|
||||
virtual/jpeg:0
|
||||
media-libs/freetype
|
||||
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER} )
|
||||
!wxwidgets? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )"
|
||||
RDEPEND="${DEPEND}
|
||||
wxwidgets? ( || ( media-fonts/liberation-fonts media-fonts/corefonts ) )"
|
||||
|
||||
# 1st patch: To save cr3.ini to ~homedir.
|
||||
# 2nd patch: To build QT5 and WX GUI version of coolreader3;
|
||||
# setting correct vesrion number and years of cr3qt/cr3wx;
|
||||
# internal switching between wxGTK 2.8 or 3.0 version;
|
||||
# show wxWidgets version in "About" dialog window;
|
||||
# disabling "iCCP: known incorrect sRGB profile" warning popup window for wxwidgets GUI
|
||||
|
||||
PATCHES=( "${FILESDIR}/cr3ini.diff" "${FILESDIR}/cr3.1.2.71-r1_qt5_wx.diff" )
|
||||
|
||||
for lang in ${PLOCALES}; do
|
||||
IUSE="${IUSE} l10n_${lang}"
|
||||
done
|
||||
|
||||
src_prepare() {
|
||||
cmake-utils_src_prepare
|
||||
|
||||
# locales
|
||||
l10n_find_plocales_changes "${S}"/cr3qt/src/i18n 'cr3_' '.ts'
|
||||
local lang langs
|
||||
langs=""
|
||||
for lang in ${PLOCALES}; do
|
||||
if use l10n_${lang}; then
|
||||
langs="${langs} ${lang}"
|
||||
fi
|
||||
done
|
||||
sed -e "s|SET(LANGUAGES .*)|SET(LANGUAGES ${langs})|" \
|
||||
-i "${S}"/cr3qt/CMakeLists.txt \
|
||||
|| die "sed CMakeLists.txt failed"
|
||||
}
|
||||
|
||||
src_configure() {
|
||||
CMAKE_USE_DIR="${S}"
|
||||
CMAKE_BUILD_TYPE="Release"
|
||||
if use wxwidgets; then
|
||||
setup-wxwidgets
|
||||
local mycmakeargs=(-D GUI=WX)
|
||||
else
|
||||
local mycmakeargs=(-D GUI=QT5)
|
||||
fi
|
||||
cmake-utils_src_configure
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
|
||||
pkg_postrm() {
|
||||
xdg_desktop_database_update
|
||||
xdg_mimeinfo_database_update
|
||||
gnome2_icon_cache_update
|
||||
}
|
||||
@ -1,242 +0,0 @@
|
||||
diff -Naur old/CMakeLists.txt new/CMakeLists.txt
|
||||
--- old/CMakeLists.txt 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/CMakeLists.txt 2017-09-02 23:43:38.000000000 +0300
|
||||
@@ -29,7 +29,7 @@
|
||||
endif()
|
||||
elseif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
|
||||
# Update if necessary
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic")
|
||||
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-long-long -pedantic -std=c++11 -fPIC")
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED GUI)
|
||||
@@ -323,7 +323,7 @@
|
||||
message("Will make CR3/WX")
|
||||
ADD_DEFINITIONS( ${DESKTOP_DEFS} -DCR_WX_SUPPORT=1 )
|
||||
SET(wxWidgets_USE_LIBS base core )
|
||||
- FIND_PACKAGE(wxWidgets)
|
||||
+ FIND_PACKAGE(wxWidgets 2.8)
|
||||
IF (wxWidgets_FOUND)
|
||||
INCLUDE(${wxWidgets_USE_FILE})
|
||||
include_directories( ${wxWidgets_INCLUDE_DIRS} )
|
||||
diff -Naur old/cr3qt/CMakeLists.txt new/cr3qt/CMakeLists.txt
|
||||
--- old/cr3qt/CMakeLists.txt 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/cr3qt/CMakeLists.txt 2017-09-03 00:53:38.000000000 +0300
|
||||
@@ -173,7 +173,11 @@
|
||||
SET (EXTRA_LIBS ${QT_LIBRARIES} ${STD_LIBS} )
|
||||
#${QT_LIBRARIES}
|
||||
ELSEIF (UNIX)
|
||||
- SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
|
||||
+ IF( ${GUI} STREQUAL QT )
|
||||
+ SET (EXTRA_LIBS ${QT_LIBRARIES} fontconfig ${STD_LIBS} )
|
||||
+ ELSE()
|
||||
+ SET (EXTRA_LIBS fontconfig ${STD_LIBS} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES})
|
||||
+ ENDIF()
|
||||
ELSE()
|
||||
SET (EXTRA_LIBS ${STD_LIBS} ${QT_LIBRARIES} ${Qt5Core_LIBRARIES} ${Qt5Widgets_LIBRARIES} )
|
||||
ENDIF(MAC)
|
||||
diff -Naur old/cr3qt/src/aboutdlg.ui new/cr3qt/src/aboutdlg.ui
|
||||
--- old/cr3qt/src/aboutdlg.ui 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/cr3qt/src/aboutdlg.ui 2017-09-03 00:56:14.000000000 +0300
|
||||
@@ -56,7 +56,7 @@
|
||||
<item>
|
||||
<widget class="QLabel" name="label_2">
|
||||
<property name="text">
|
||||
- <string notr="true">(c) 1998-2010 Vadim Lopatin</string>
|
||||
+ <string notr="true">(c) 1998-2015 Vadim Lopatin</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
diff -Naur old/cr3wx/CMakeLists.txt new/cr3wx/CMakeLists.txt
|
||||
--- old/cr3wx/CMakeLists.txt 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/cr3wx/CMakeLists.txt 2017-09-03 00:54:59.000000000 +0300
|
||||
@@ -10,7 +10,7 @@
|
||||
)
|
||||
LINK_DIRECTORIES(${wxWidgets_LIBRARY_DIRS})
|
||||
ADD_EXECUTABLE(cr3 ${CR3_SOURCES})
|
||||
-SET (EXTRA_LIBS ${wxWidgets_LIBRARIES} ${STD_LIBS})
|
||||
+SET (EXTRA_LIBS ${wxWidgets_LIBRARIES} fontconfig ${STD_LIBS})
|
||||
TARGET_LINK_LIBRARIES(cr3 crengine tinydict ${EXTRA_LIBS})
|
||||
|
||||
IF (UNIX)
|
||||
@@ -22,6 +22,9 @@
|
||||
INSTALL( DIRECTORY ../cr3qt/data/hyph DESTINATION share/cr3
|
||||
FILES_MATCHING PATTERN "*.pattern" )
|
||||
INSTALL( DIRECTORY ../cr3qt/data/skins DESTINATION share/cr3/skins )
|
||||
+ INSTALL( FILES ../cr3qt/src/desktop/cr3.desktop DESTINATION share/applications )
|
||||
+ INSTALL( FILES ../cr3qt/src/desktop/cr3.png DESTINATION share/pixmaps )
|
||||
+ INSTALL( FILES ../cr3qt/src/desktop/cr3.xpm DESTINATION share/pixmaps )
|
||||
ELSE()
|
||||
INSTALL( TARGETS cr3 RUNTIME DESTINATION . )
|
||||
INSTALL( DIRECTORY ../cr3qt/data/ DESTINATION .
|
||||
diff -Naur old/cr3wx/src/cr3.cpp new/cr3wx/src/cr3.cpp
|
||||
--- old/cr3wx/src/cr3.cpp 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/cr3wx/src/cr3.cpp 2017-09-03 02:30:35.000000000 +0300
|
||||
@@ -395,7 +395,11 @@
|
||||
|
||||
lString16 GetConfigFileName()
|
||||
{
|
||||
- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
|
||||
+ #else
|
||||
+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
|
||||
+ #endif
|
||||
if ( !wxDirExists( cfgdir.c_str() ) )
|
||||
::wxMkdir( wxString( cfgdir.c_str() ) );
|
||||
lChar16 slash = detectSlash( cfgdir );
|
||||
@@ -520,6 +524,7 @@
|
||||
|
||||
wxBitmap cr3Frame::getIcon16x16( const lChar16 * name )
|
||||
{
|
||||
+ wxLogNull logNo; // Temporary disable warnings ( see: http://trac.wxwidgets.org/ticket/15331 )
|
||||
lString16 dir;
|
||||
if ( _toolbarSize==2 )
|
||||
dir = "icons/22x22/";
|
||||
@@ -531,7 +536,7 @@
|
||||
if ( icon.IsOk() )
|
||||
return icon;
|
||||
return wxNullBitmap;
|
||||
-}
|
||||
+} // ~wxLogNull called, old log sink restored
|
||||
|
||||
#if (USE_FREETYPE==1)
|
||||
bool getDirectoryFonts( lString16Collection & pathList, lString16 ext, lString16Collection & fonts, bool absPath )
|
||||
@@ -622,7 +627,11 @@
|
||||
wxImage::AddHandler(new wxPNGHandler);
|
||||
resources = new ResourceContainer();
|
||||
|
||||
- lString16 appname( argv[0] );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ lString16 appname( argv[0].wx_str() );
|
||||
+ #else
|
||||
+ lString16 appname( argv[0] );
|
||||
+ #endif
|
||||
int lastSlash=-1;
|
||||
lChar16 slashChar = '/';
|
||||
for ( int p=0; p<(int)appname.length(); p++ ) {
|
||||
@@ -777,7 +786,11 @@
|
||||
int argc = wxGetApp().argc;
|
||||
lString16 fnameToOpen;
|
||||
for ( int i=1; i<argc; i++ ) {
|
||||
- lString16 param = lString16( wxGetApp().argv[1] );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ lString16 param = lString16( wxGetApp().argv[1].wx_str() );
|
||||
+ #else
|
||||
+ lString16 param = lString16( wxGetApp().argv[1] );
|
||||
+ #endif
|
||||
if ( param[0]!='-' )
|
||||
fnameToOpen = param;
|
||||
}
|
||||
@@ -1193,7 +1206,11 @@
|
||||
lString16 outFile;
|
||||
bool convert = false;
|
||||
for ( int i=1; i<argc; i++ ) {
|
||||
- lString16 param = lString16( wxGetApp().argv[i] );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ lString16 param = lString16( wxGetApp().argv[i].wx_str() );
|
||||
+ #else
|
||||
+ lString16 param = lString16( wxGetApp().argv[i] );
|
||||
+ #endif
|
||||
if ( param[0]!='-' )
|
||||
fnameToOpen = param;
|
||||
else if (param.startsWith("--convert"))
|
||||
@@ -1470,7 +1487,11 @@
|
||||
wxCursor hg( wxCURSOR_WAIT );
|
||||
this->SetCursor( hg );
|
||||
wxSetCursor( hg );
|
||||
- _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ _view->getDocView()->exportWolFile( dlg.GetPath().wx_str(), opts.getMode()==0, opts.getLevels() );
|
||||
+ #else
|
||||
+ _view->getDocView()->exportWolFile( dlg.GetPath(), opts.getMode()==0, opts.getLevels() );
|
||||
+ #endif
|
||||
wxSetCursor( wxNullCursor );
|
||||
this->SetCursor( wxNullCursor );
|
||||
}
|
||||
@@ -1479,7 +1500,7 @@
|
||||
void
|
||||
cr3Frame::OnAbout( wxCommandEvent& WXUNUSED( event ) )
|
||||
{
|
||||
- wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2007 Vadim Lopatin\nwxWidgets version\n") )
|
||||
+ wxMessageBox( wxT( "Cool Reader " wxT(CR3_VERSION) wxT("\n(c) 1998-2015 Vadim Lopatin\n" wxVERSION_STRING"\n") )
|
||||
wxT("\nBased on CREngine library " wxT(CR_ENGINE_VERSION) )
|
||||
wxT("\nThird party libraries used:")
|
||||
wxT("\nzlib, libpng, libjpeg, freetype2,")
|
||||
diff -Naur old/cr3wx/src/optdlg.cpp new/cr3wx/src/optdlg.cpp
|
||||
--- old/cr3wx/src/optdlg.cpp 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/cr3wx/src/optdlg.cpp 2017-09-03 02:36:51.000000000 +0300
|
||||
@@ -41,7 +41,11 @@
|
||||
if ( v==_choices[i] )
|
||||
tb = i;
|
||||
if ( _storeStringValues ) {
|
||||
- props->setString( _option, lString16(_choices[tb]) );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ props->setString( _option, lString16(_choices[tb].wx_str()) );
|
||||
+ #else
|
||||
+ props->setString( _option, lString16(_choices[tb]) );
|
||||
+ #endif
|
||||
} else {
|
||||
props->setInt( _option, tb );
|
||||
}
|
||||
@@ -50,7 +54,11 @@
|
||||
{
|
||||
unsigned tb = _defvalue;
|
||||
if ( _storeStringValues ) {
|
||||
- lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue].wx_str()) );
|
||||
+ #else
|
||||
+ lString8 s8 = UnicodeToUtf8( lString16(_choices[_defvalue]) );
|
||||
+ #endif
|
||||
lString16 s16 = props->getStringDef( _option, s8.c_str() );
|
||||
wxString v = s16.c_str();
|
||||
for ( unsigned i=0; i<_choices.GetCount(); i++ )
|
||||
diff -Naur old/cr3wx/src/view.cpp new/cr3wx/src/view.cpp
|
||||
--- old/cr3wx/src/view.cpp 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/cr3wx/src/view.cpp 2017-09-03 02:40:42.000000000 +0300
|
||||
@@ -353,7 +353,11 @@
|
||||
|
||||
lString16 cr3view::GetHistoryFileName()
|
||||
{
|
||||
- lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().wx_str() );
|
||||
+ #else
|
||||
+ lString16 cfgdir( wxStandardPaths::Get().GetUserDataDir().c_str() );
|
||||
+ #endif
|
||||
if ( !wxDirExists( cfgdir.c_str() ) )
|
||||
::wxMkdir( wxString( cfgdir.c_str() ) );
|
||||
lChar16 slash = detectSlash( cfgdir );
|
||||
@@ -667,13 +671,21 @@
|
||||
//===========================================
|
||||
GetParent()->Update();
|
||||
//printf(" loading... ");
|
||||
- bool res = getDocView()->LoadDocument( fname.c_str() );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ bool res = getDocView()->LoadDocument( fname.wx_str() );
|
||||
+ #else
|
||||
+ bool res = getDocView()->LoadDocument( fname.c_str() );
|
||||
+ #endif
|
||||
//printf(" done. \n");
|
||||
//DEBUG
|
||||
//_docview->exportWolFile( "test.wol", true );
|
||||
//_docview->SetPos(0);
|
||||
if ( !res )
|
||||
- getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() );
|
||||
+ #if wxCHECK_VERSION(3, 0, 0)
|
||||
+ getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.wx_str() );
|
||||
+ #else
|
||||
+ getDocView()->createDefaultDocument(lString16("File open error"), lString16("Cannot open file ") + fname.c_str() );
|
||||
+ #endif
|
||||
lString16 title = getDocView()->getAuthors();
|
||||
if ( !title.empty() && !getDocView()->getTitle().empty() )
|
||||
title << L". ";
|
||||
diff -Naur old/crengine/include/cr3version.h new/crengine/include/cr3version.h
|
||||
--- old/crengine/include/cr3version.h 2017-08-30 18:31:28.000000000 +0300
|
||||
+++ new/crengine/include/cr3version.h 2017-09-03 00:55:28.000000000 +0300
|
||||
@@ -1,2 +1,2 @@
|
||||
-#define CR_ENGINE_VERSION "3.1.2-52"
|
||||
-#define CR_ENGINE_BUILD_DATE "2014-11-19"
|
||||
+#define CR_ENGINE_VERSION "3.1.2-71"
|
||||
+#define CR_ENGINE_BUILD_DATE "2015-07-02"
|
||||
@ -1,35 +0,0 @@
|
||||
# Patch to allow creating cr3.ini file in the home directory of user
|
||||
# instead to trying save it in /usr/share/cr3/cr3.ini
|
||||
# Bug: https://sourceforge.net/p/crengine/bugs/179/
|
||||
# Patch was proposed by "Olexandr" (see bug report)
|
||||
diff --git a/cr3qt/src/mainwindow.cpp b/cr3qt/src/mainwindow.cpp
|
||||
index 142242a..0401f71 100644
|
||||
--- a/cr3qt/src/mainwindow.cpp
|
||||
+++ b/cr3qt/src/mainwindow.cpp
|
||||
@@ -77,8 +77,8 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
#endif
|
||||
QString cacheDir = homeDir + "cache";
|
||||
QString bookmarksDir = homeDir + "bookmarks";
|
||||
- QString histFile = exeDir + "cr3hist.bmk";
|
||||
- QString histFile2 = homeDir + "cr3hist.bmk";
|
||||
+ QString histFile2 = exeDir + "cr3hist.bmk";
|
||||
+ QString histFile = homeDir + "cr3hist.bmk";
|
||||
QString iniFile2 = exeDir + "cr3.ini";
|
||||
QString iniFile = homeDir + "cr3.ini";
|
||||
QString cssFile = homeDir + "fb2.css";
|
||||
@@ -92,9 +92,13 @@ MainWindow::MainWindow(QWidget *parent)
|
||||
ldomDocCache::init( qt2cr( cacheDir ), DOC_CACHE_SIZE );
|
||||
ui->view->setPropsChangeCallback( this );
|
||||
if ( !ui->view->loadSettings( iniFile ) )
|
||||
- ui->view->loadSettings( iniFile2 );
|
||||
+ if ( !ui->view->loadSettings( iniFile2 ) )
|
||||
+ ui->view->saveSettings( iniFile );
|
||||
+
|
||||
if ( !ui->view->loadHistory( histFile ) )
|
||||
- ui->view->loadHistory( histFile2 );
|
||||
+ if ( !ui->view->loadHistory( histFile2 ) )
|
||||
+ ui->view->saveHistory( histFile );
|
||||
+
|
||||
if ( !ui->view->loadCSS( cssFile ) )
|
||||
ui->view->loadCSS( cssFile2 );
|
||||
#if ENABLE_BOOKMARKS_DIR==1
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST libatomic_ops-7.6.4.tar.gz 497571 BLAKE2B 151cd518a346dcf2540c2e8229c2309aa83a7cecc3d66e3e8bab3d09c8688d725e26b27c836c0a3a3a46cde40fedfe26b0cca53cf2b2017f67e72d4a4993371f SHA512 2e6ef0bfd4b77e9260383feb2865c96388fb1ebed9d37605eeb83ac87e3b6a565495d588808129ac7b3ee5f6a58a37440da7784b680cc6590842b09c2625983b
|
||||
DIST libatomic_ops-7.6.6.tar.gz 498187 BLAKE2B 343ebda3a37aef6541efae9e646778cf8b1ea74e722979de4336d6819007f3fb37121d53c7e789f69fe6411c05ca2557a18d10db47c68e95e59c92c991bf9fa7 SHA512 ea6e4e2f8f369f5af18435a6ab8ee18c28832c367d24875cccc5e743761109036894260b4296feec5e269a74934df24a90f0fc4868937e1f36605fca082fbde8
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI="6"
|
||||
|
||||
inherit multilib-minimal
|
||||
|
||||
DESCRIPTION="Implementation for atomic memory update operations"
|
||||
HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
|
||||
SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT boehm-gc GPL-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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
|
||||
IUSE=""
|
||||
|
||||
multilib_src_configure() {
|
||||
ECONF_SOURCE=${S} econf
|
||||
}
|
||||
|
||||
multilib_src_install() {
|
||||
default
|
||||
find "${D}" -name '*.la' -delete || die
|
||||
}
|
||||
Binary file not shown.
Binary file not shown.
@ -1 +1,2 @@
|
||||
DIST colorlog-2.7.0.tar.gz 10153 BLAKE2B 5e3c1fb3dce5b9a925739777b3f7569cd10094e02385888cdc2865e47bae4dfa0cb9960a3144794fa6cd09c5143adf4df8f18af1c0d9cf561165595e10322053 SHA512 765923004a2e2b0c0e34f7cbf2d79ac7232a13e9aba68166c8ba295303cd7187317d9a34a405a78cc5f7ca0281fc3b653848e419c0b3a0dd473ad0b859216703
|
||||
DIST colorlog-3.1.4.tar.gz 14424 BLAKE2B 0434c92044c623dc4b9be4ae3ddc491ccda3db7725894d07125ed19e8f8ae184d8cae27a7adb424e799cf092e66c17089eb193686ef710b5a4789f2f7c75dde6 SHA512 9333e8e5a3237cf3f43d0a86cf93c6252ed52031e685342a1afc411568407a77840946620da429dc384c8f77f7e540339632f15a417ce00a13b40b2d51f1c730
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( pypy{,3} python{2_7,3_{4,5,6,7}} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Log formatting with colors"
|
||||
HOMEPAGE="https://pypi.org/project/colorlog/ https://github.com/borntyping/python-colorlog"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND=""
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? ( dev-python/pytest[${PYTHON_USEDEP}] )
|
||||
"
|
||||
|
||||
python_test() {
|
||||
py.test -vv -p no:logging || die
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST dask-0.10.2.tar.gz 357356 BLAKE2B 6d00529eb550de682221875d8c4fbf4c0447168b6c87327b02d0320cdd37e6490f67e7f0a09f814b9cdb453080785b011cdc50ba9b063c6569b4825833df92b4 SHA512 92bd671ff1483fe87edd34330dce321b88362d80ef4d836ab4eede87fdad5f657c51d03a9885a53924fb3becb504a8843cf852be08c88f5389f04c3f1b8aefe2
|
||||
DIST dask-0.15.1.tar.gz 2147022 BLAKE2B 79c3355e8f3c202e598b32ca057c237d07db283b04b99ea713a820869207af9f46cb80ab58c0a058ac327873851f2d89050a4b9d7ecac3c1e1173f6be5349848 SHA512 44e7119c2a8d15efb89e265e5752edb117dd06da8a5e7511b68c5859e9068aedb3595540645304f0322f869c83df79a497d731bcade79612f8fd3f4eaaf3763b
|
||||
DIST dask-0.18.2.tar.gz 2324709 BLAKE2B c74507b63299388b05c94b1e59cc45051a55ccc70e89eb6eaafeba7aed2aa496c03ff9468467a9303f4ab630810838a8a7ea75b96d6a85d665d0cc2744792a54 SHA512 d5d59f13c33e7d70fe63da1f40a82296dfed34a009f70dae9db6157f8a20dbf7a7913e667882eb21191d5c3e3e8c440a3686d8d1b2bc206fedd025f24b23f005
|
||||
|
||||
@ -0,0 +1,49 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
|
||||
HOMEPAGE="http://dask.pydata.org/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="BSD"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="distributed test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/cloudpickle-0.2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/numpy-1.11[${PYTHON_USEDEP}]
|
||||
>=dev-python/pandas-0.23.4[${PYTHON_USEDEP}]
|
||||
>=dev-python/partd-0.3.8[${PYTHON_USEDEP}]
|
||||
dev-python/psutil[${PYTHON_USEDEP}]
|
||||
>=dev-python/toolz-0.7.3[${PYTHON_USEDEP}]
|
||||
distributed? (
|
||||
>=dev-python/distributed-1.16[${PYTHON_USEDEP}]
|
||||
>=dev-python/s3fs-0.0.8[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
DEPEND="
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/toolz[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
${RDEPEND}
|
||||
dev-python/numexpr[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pyyaml[${PYTHON_USEDEP}]
|
||||
sci-libs/scipy[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.18.2-skip-broken-test.patch"
|
||||
)
|
||||
|
||||
python_test() {
|
||||
pytest -v dask || die
|
||||
}
|
||||
@ -0,0 +1,36 @@
|
||||
diff --git a/dask/bytes/tests/test_local.py b/dask/bytes/tests/test_local.py
|
||||
index dbe58ae0..072a1ee7 100644
|
||||
--- a/dask/bytes/tests/test_local.py
|
||||
+++ b/dask/bytes/tests/test_local.py
|
||||
@@ -141,6 +141,7 @@ def test_with_urls():
|
||||
assert sum(map(len, values)) == len(files)
|
||||
|
||||
|
||||
+@pytest.mark.skip("Fails on Gentoo")
|
||||
@pytest.mark.skipif(sys.platform == 'win32',
|
||||
reason="pathlib and moto clash on windows")
|
||||
def test_with_paths():
|
||||
diff --git a/dask/dataframe/tests/test_dataframe.py b/dask/dataframe/tests/test_dataframe.py
|
||||
index f5a080d4..de9c0a90 100644
|
||||
--- a/dask/dataframe/tests/test_dataframe.py
|
||||
+++ b/dask/dataframe/tests/test_dataframe.py
|
||||
@@ -2388,6 +2388,7 @@ def _assert_info(df, ddf, memory_usage=True):
|
||||
assert stdout_pd == stdout_da
|
||||
|
||||
|
||||
+@pytest.mark.skip("Fails on Gentoo")
|
||||
def test_info():
|
||||
from io import StringIO
|
||||
from dask.compatibility import unicode
|
||||
diff --git a/dask/tests/test_base.py b/dask/tests/test_base.py
|
||||
index 8e5b0118..1cf56e31 100644
|
||||
--- a/dask/tests/test_base.py
|
||||
+++ b/dask/tests/test_base.py
|
||||
@@ -595,6 +595,7 @@ def test_visualize():
|
||||
assert os.path.exists(os.path.join(d, 'mydask.png'))
|
||||
|
||||
|
||||
+@pytest.mark.skip("Fails on Gentoo")
|
||||
@pytest.mark.skipif('not da')
|
||||
@pytest.mark.skipif(sys.flags.optimize,
|
||||
reason="graphviz exception with Python -OO flag")
|
||||
@ -1,2 +1 @@
|
||||
DIST json-rpc-1.10.1.tar.gz 25410 BLAKE2B bb543dc9987d7aa4880d1981fad888ae9374f51958a2b7934e2779fc835705c03946cb3378ca60a914a130ae78741cda75da40ee8ce76e6b4af17a2e98498089 SHA512 bb69cbb12c0a64286fb1e98db21ca75cb19daf20c6d6f5721f82891a17e44d2cda172e73bd389a02077d094b8f6deb0959952b0498b0c1b4a0acfaa5e3ba3922
|
||||
DIST json-rpc-1.11.0.tar.gz 29442 BLAKE2B b2a77bdcc2f5efe64527feb29b28c0add90b9fdbd5aa73dce18c33e9a10342c1e6b04ed5d53c110e3f1b6287cf1fdca9db77e38a04651e0a522b76c0351ec993 SHA512 aa5a467ef0e6e556612f77855d38f0dfb76b22556490fac5f0989d27b7608aed8389042ded1a0d8fcbee1f20294c78a6af3c030f41c4e30ec1effae8e51530fb
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
# Copyright 1999-2017 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=5
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="JSON-RPC transport implementation for python"
|
||||
HOMEPAGE="https://github.com/pavlov99/json-rpc"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="MIT"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64"
|
||||
IUSE="test"
|
||||
|
||||
RDEPEND="dev-python/six[${PYTHON_USEDEP}]"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
test? (
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/mock[${PYTHON_USEDEP}]
|
||||
dev-python/flask[${PYTHON_USEDEP}]
|
||||
)"
|
||||
|
||||
python_prepare_all() {
|
||||
cat > jsonrpc/six.py <<- EOF
|
||||
from __future__ import absolute_import
|
||||
from six import *
|
||||
EOF
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_test() {
|
||||
esetup.py test
|
||||
}
|
||||
@ -1 +1,2 @@
|
||||
DIST mechanize-0.2.5.tar.gz 383918 BLAKE2B c9951f47067798861de0f153e02985c8d00fb4070960993f2ea1c32ee52d6c937af51cd6e3d291273877da0bb9bee2106b92d3518b180ebfd74eafc764136a10 SHA512 23de1d9a5fba63d76fd577889594dacf5412fb2fccb58908a10ab350a81dd16a7a31019d0b4a59a5ed4115320c7e3585c77eef88dcd80a88a9c3c2da3c28fa68
|
||||
DIST mechanize-0.3.6.tar.gz 201845 BLAKE2B be2abf0e573ca41c0b9a8f0632be4d630a4c122cdd6402209619367a01629768fb2b4eb55164f1f511f1549444c015942bcfde2a075514748fbfd56149240dcd SHA512 bc838d826dd8b08f699d4788fae8962746dbc266d892b34eff2f11b16a28ff22357d011fa1b177e813e4d879b36cd83f464173297ba58208a6ba37f9f2f130be
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=7
|
||||
|
||||
PYTHON_COMPAT=( python2_7 pypy )
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="Stateful programmatic web browsing in Python"
|
||||
HOMEPAGE="https://github.com/python-mechanize/mechanize"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="|| ( BSD ZPL )"
|
||||
SLOT="0"
|
||||
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
|
||||
IUSE="doc"
|
||||
|
||||
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
RDEPEND="${DEPEND}"
|
||||
|
||||
python_test() {
|
||||
"${PYTHON}" run_tests.py || die
|
||||
}
|
||||
@ -1,2 +1,3 @@
|
||||
DIST pandas-0.19.1.tar.gz 8360233 BLAKE2B 82611ca1a3e3169ac2d084f4dcd9c4d4d74e9e9c9913a41acad48ae68a208a884dfd877445a7d658a7ff098ef383cedae7e79a4900baa8d56c032ce9aaad96eb SHA512 6451990a7fae8c6db8ab0b014a13b4f1828754d3998f13c17b111f891fb9fd23f8e09b907623096dfa55668c42298eee1373210a9fddb95f56dd7d552b964e6f
|
||||
DIST pandas-0.23.0.tar.gz 13092442 BLAKE2B e11ae088c9a4be481f516d83797b1b1d5e9c82f7d9fa98f1ea65e3405e33c99e1e1cf7a35f56a21d9dc922c1d0828b4947d9c6189a5f76ad5c1b28618293f9da SHA512 c9dc7bf843e3392b8b1b4d46c6aa6dd12435aa974abc875574a7a8794abe6ea531fa92d8a635153839fd3fef9059d96a4512831b86b1fb6fb69588c8b29a95d6
|
||||
DIST pandas-0.23.4.tar.gz 10490077 BLAKE2B 28a78860e0aa5de8def7bb529fc98b9121a516b7fd7620e31e000ae14217165e6677ce26b56da0b9c603930ab1304725c644426a135d8f9b2a84921b88f3d23d SHA512 0c89db820a49e0cfb9764e64589ff9af819f9a53c01bd0254cd1b6dbd1e9fd452b2ff7c7330ede7623c7576589113e831a19a57c735562b55f90506df15805b9
|
||||
|
||||
@ -0,0 +1,24 @@
|
||||
diff --git a/pandas/tests/io/formats/test_format.py b/pandas/tests/io/formats/test_format.py
|
||||
index 191e3f37f..8a1d89197 100644
|
||||
--- a/pandas/tests/io/formats/test_format.py
|
||||
+++ b/pandas/tests/io/formats/test_format.py
|
||||
@@ -1585,6 +1585,7 @@ c 10 11 12 13 14\
|
||||
with option_context('display.max_rows', 60, 'display.max_columns', 20):
|
||||
assert '...' in df._repr_html_()
|
||||
|
||||
+ @pytest.mark.skip("Fails in Gentoo")
|
||||
def test_info_repr(self):
|
||||
max_rows = 60
|
||||
max_cols = 20
|
||||
diff --git a/pandas/tests/io/json/test_ujson.py b/pandas/tests/io/json/test_ujson.py
|
||||
index 89acbfdc9..9c4b5c291 100644
|
||||
--- a/pandas/tests/io/json/test_ujson.py
|
||||
+++ b/pandas/tests/io/json/test_ujson.py
|
||||
@@ -1097,6 +1097,7 @@ class TestNumpyJSONTests(object):
|
||||
outp = ujson.decode(ujson.encode(arr), numpy=True, dtype=np.float32)
|
||||
tm.assert_almost_equal(arr, outp)
|
||||
|
||||
+ @pytest.mark.skip("Fails on Gentoo")
|
||||
def test_OdArray(self):
|
||||
def will_raise():
|
||||
ujson.encode(np.array(1))
|
||||
@ -0,0 +1,171 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{5,6} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
VIRTUALX_REQUIRED="manual"
|
||||
|
||||
inherit distutils-r1 eutils flag-o-matic virtualx
|
||||
|
||||
DESCRIPTION="Powerful data structures for data analysis and statistics"
|
||||
HOMEPAGE="http://pandas.pydata.org/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P/_/}.tar.gz"
|
||||
|
||||
SLOT="0"
|
||||
LICENSE="BSD"
|
||||
KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
|
||||
IUSE="doc full-support minimal test X"
|
||||
|
||||
RECOMMENDED_DEPEND="
|
||||
>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/numexpr-2.1[${PYTHON_USEDEP}]
|
||||
"
|
||||
OPTIONAL_DEPEND="
|
||||
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
|
||||
dev-python/blosc[${PYTHON_USEDEP}]
|
||||
dev-python/boto[${PYTHON_USEDEP}]
|
||||
>=dev-python/google-api-python-client-1.2.0[$(python_gen_usedep python2_7 pypy)]
|
||||
|| (
|
||||
dev-python/html5lib[${PYTHON_USEDEP}]
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
)
|
||||
dev-python/httplib2[${PYTHON_USEDEP}]
|
||||
dev-python/jinja[${PYTHON_USEDEP}]
|
||||
dev-python/matplotlib[${PYTHON_USEDEP}]
|
||||
|| (
|
||||
>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
|
||||
dev-python/xlsxwriter[${PYTHON_USEDEP}]
|
||||
)
|
||||
>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
|
||||
dev-python/python-gflags[$(python_gen_usedep python2_7 pypy)]
|
||||
dev-python/rpy[${PYTHON_USEDEP}]
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
dev-python/statsmodels[${PYTHON_USEDEP}]
|
||||
>=dev-python/sqlalchemy-0.8.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/xarray-0.10.8[${PYTHON_USEDEP}]
|
||||
dev-python/xlrd[${PYTHON_USEDEP}]
|
||||
dev-python/xlwt[${PYTHON_USEDEP}]
|
||||
sci-libs/scipy[${PYTHON_USEDEP}]
|
||||
X? (
|
||||
|| (
|
||||
dev-python/PyQt5[${PYTHON_USEDEP}]
|
||||
dev-python/pygtk[$(python_gen_usedep python2_7)]
|
||||
)
|
||||
|| (
|
||||
x11-misc/xclip
|
||||
x11-misc/xsel
|
||||
)
|
||||
)
|
||||
"
|
||||
COMMON_DEPEND="
|
||||
>dev-python/numpy-1.7[${PYTHON_USEDEP}]
|
||||
>=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}]
|
||||
dev-python/pytz[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${COMMON_DEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
>=dev-python/cython-0.23[${PYTHON_USEDEP}]
|
||||
doc? (
|
||||
${VIRTUALX_DEPEND}
|
||||
app-text/pandoc
|
||||
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
|
||||
dev-python/html5lib[${PYTHON_USEDEP}]
|
||||
dev-python/ipython[${PYTHON_USEDEP}]
|
||||
dev-python/lxml[${PYTHON_USEDEP}]
|
||||
dev-python/matplotlib[${PYTHON_USEDEP}]
|
||||
dev-python/nbsphinx[${PYTHON_USEDEP}]
|
||||
>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
|
||||
dev-python/pytz[${PYTHON_USEDEP}]
|
||||
dev-python/rpy[${PYTHON_USEDEP}]
|
||||
>=dev-python/sphinx-1.2.1[${PYTHON_USEDEP}]
|
||||
dev-python/xlrd[${PYTHON_USEDEP}]
|
||||
dev-python/xlwt[${PYTHON_USEDEP}]
|
||||
sci-libs/scipy[${PYTHON_USEDEP}]
|
||||
x11-misc/xclip
|
||||
)
|
||||
test? (
|
||||
${VIRTUALX_DEPEND}
|
||||
${RECOMMENDED_DEPEND}
|
||||
${OPTIONAL_DEPEND}
|
||||
dev-python/beautifulsoup:4[${PYTHON_USEDEP}]
|
||||
dev-python/nose[${PYTHON_USEDEP}]
|
||||
dev-python/pymysql[${PYTHON_USEDEP}]
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/psycopg:2[${PYTHON_USEDEP}]
|
||||
x11-misc/xclip
|
||||
x11-misc/xsel
|
||||
)
|
||||
"
|
||||
# dev-python/statsmodels invokes a circular dep
|
||||
# hence rm from doc? ( ), again
|
||||
RDEPEND="${COMMON_DEPEND}
|
||||
!<dev-python/numexpr-2.1[${PYTHON_USEDEP}]
|
||||
!~dev-python/openpyxl-1.9.0[${PYTHON_USEDEP}]
|
||||
!minimal? ( ${RECOMMENDED_DEPEND} )
|
||||
full-support? ( ${OPTIONAL_DEPEND} )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/${P/_/}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}/${PN}-0.23.4-skip-broken-test.patch"
|
||||
)
|
||||
|
||||
python_prepare_all() {
|
||||
# Prevent un-needed download during build
|
||||
sed -e "/^ 'sphinx.ext.intersphinx',/d" \
|
||||
-i doc/source/conf.py || die
|
||||
|
||||
distutils-r1_python_prepare_all
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
# To build docs the need be located in $BUILD_DIR,
|
||||
# else PYTHONPATH points to unusable modules.
|
||||
if use doc; then
|
||||
cd "${BUILD_DIR}"/lib || die
|
||||
cp -ar "${S}"/doc . && cd doc || die
|
||||
LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html || die
|
||||
fi
|
||||
}
|
||||
|
||||
python_test() {
|
||||
pushd "${BUILD_DIR}"/lib > /dev/null
|
||||
"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
|
||||
PYTHONPATH=. virtx pytest pandas -v --skip-slow --skip-network \
|
||||
-m "not single"
|
||||
popd > /dev/null
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
if use doc; then
|
||||
dodoc -r "${BUILD_DIR}"/lib/doc/build/html
|
||||
einfo "An initial build of docs is absent of references to statsmodels"
|
||||
einfo "due to circular dependency. To have them included, emerge"
|
||||
einfo "statsmodels next and re-emerge pandas with USE doc"
|
||||
fi
|
||||
|
||||
distutils-r1_python_install_all
|
||||
}
|
||||
|
||||
pkg_postinst() {
|
||||
optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
|
||||
optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
|
||||
optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup:4 dev-python/html5lib dev-python/lxml
|
||||
optfeature "for msgpack compression using blosc" dev-python/blosc
|
||||
optfeature "necessary for Amazon S3 access" dev-python/boto
|
||||
optfeature "needed for pandas.io.gbq" dev-python/httplib2 dev-python/setuptools dev-python/python-gflags ">=dev-python/google-api-python-client-1.2.0"
|
||||
optfeature "Template engine for conditional HTML formatting" dev-python/jinja
|
||||
optfeature "Plotting support" dev-python/matplotlib
|
||||
optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-1.6.1" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
|
||||
optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
|
||||
optfeature "R I/O support" dev-python/rpy
|
||||
optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
|
||||
optfeature "SQL database support" ">=dev-python/sqlalchemy-0.8.1"
|
||||
optfeature "miscellaneous statistical functions" sci-libs/scipy
|
||||
optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
|
||||
}
|
||||
@ -1,5 +1,2 @@
|
||||
DIST paramiko-2.1.2.tar.gz 1196746 BLAKE2B c184e171fe550fc231d67473867db283b706a93aebbd13ffb2503e10d69e43b9ab712237e6698fccae13472f0cb8135b6c015381ac687c4c20d4d1cb1620ae00 SHA512 465c5381b1b0a472d2ad8e690f0916a5f51713880486c7b94cadcf85ea0a52569e18337ccfee5440869e4a0c76bd2b1bc15c414128c07326b40ecd36ea021466
|
||||
DIST paramiko-2.2.1.tar.gz 1205818 BLAKE2B 6b9007c2f653d6e640de4051bb16e5b9a4d039b59b38cb3500d6b2935e4e9e4acddecb0b1eb404f8bc6c5ea94a90cbc9a405ae5189efa0b9026d0550fcd9f259 SHA512 6aa2cce301f32c15d66e2137bc8a5c10ea4a667c599b24047a1e176b10636fe3abd28c7b2974befdde432a86c924acceace056c0572ea3006d3e4a8160b725c3
|
||||
DIST paramiko-2.3.1.tar.gz 282553 BLAKE2B 298bf73d2ecbb47506a7e3b7a03ddd650c8f126ef21b0e443602327a7011ee55c146aa3b6e4d160b47680b50dab3fcf04843597a290ccb166f88fc129bd85a67 SHA512 b63a177f1f03937d5650d6f2a3ca4c00e0c3ffb0080e5e5a8141aab435c3ad415f5af8c61cb2894d176544b854ff26ee510eaa41081b452dfa6213cdc0566665
|
||||
DIST paramiko-2.4.0.tar.gz 283484 BLAKE2B b0f7c99d8083aae5f70605cead265c060af29937fd5b97e3606fe9319e5b982dea4efce8e5e823c584ea9a046a08e29cbabe2304d069ba07b435acbf6c3224e4 SHA512 9c8deec2041c3756206b03c932be102383ad35077513f51f3d85573d4081a81c110e483375eb28b174b89c8703b38123d7e74f5b784b697ab0046dae083b9f41
|
||||
DIST paramiko-2.4.1.tar.gz 285151 BLAKE2B 767c4ad11da77c5c6796165057715f318cab417c5bae72cd97b51af94ecbf233316fd4286e35b2f855027e05bcf195c869b45a87f66954bee3bb98ae9d0ef1a9 SHA512 5a580d25e7911937f228ef4a2b89b5a1efd771f576c6c68cf1c36e1abbc38adbc6ad5dc91400de7112238fcf7803f5f26c13fe10be4af8a2a86af9398da7a8de
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="SSH2 protocol library"
|
||||
HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
|
||||
SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="amd64 ~arm64 hppa ia64 ppc ppc64 ~sparc x86"
|
||||
IUSE="doc examples"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/cryptography-1.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
# Required for testsuite
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
|
||||
python_test() {
|
||||
"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( docs/. )
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins demos/*
|
||||
fi
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="SSH2 protocol library"
|
||||
HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
|
||||
# pypi tarballs are missing test data
|
||||
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
|
||||
IUSE="doc examples"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]"
|
||||
|
||||
# Required for testsuite
|
||||
DISTUTILS_IN_SOURCE_BUILD=1
|
||||
|
||||
python_test() {
|
||||
"${PYTHON}" test.py --verbose || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
use doc && esetup.py build_sphinx -s sites/docs
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( build/sphinx/html/. )
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins demos/*
|
||||
fi
|
||||
}
|
||||
@ -1,54 +0,0 @@
|
||||
# Copyright 1999-2018 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=6
|
||||
|
||||
PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
|
||||
PYTHON_REQ_USE="threads(+)"
|
||||
|
||||
inherit distutils-r1
|
||||
|
||||
DESCRIPTION="SSH2 protocol library"
|
||||
HOMEPAGE="http://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/"
|
||||
# pypi tarballs are missing test data
|
||||
#SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
|
||||
SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
|
||||
|
||||
LICENSE="LGPL-2.1"
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd"
|
||||
IUSE="doc examples test"
|
||||
|
||||
RDEPEND="
|
||||
>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
|
||||
>=dev-python/cryptography-1.5[${PYTHON_USEDEP}]
|
||||
>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
|
||||
>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
|
||||
"
|
||||
DEPEND="${RDEPEND}
|
||||
dev-python/setuptools[${PYTHON_USEDEP}]
|
||||
doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
|
||||
test? (
|
||||
dev-python/pytest[${PYTHON_USEDEP}]
|
||||
dev-python/pytest-relaxed[${PYTHON_USEDEP}]
|
||||
)
|
||||
"
|
||||
|
||||
python_test() {
|
||||
py.test -v || die "Tests fail with ${EPYTHON}"
|
||||
}
|
||||
|
||||
python_compile_all() {
|
||||
use doc && esetup.py build_sphinx -s sites/docs
|
||||
}
|
||||
|
||||
python_install_all() {
|
||||
use doc && local HTML_DOCS=( "${BUILD_DIR}"/sphinx/html/. )
|
||||
|
||||
distutils-r1_python_install_all
|
||||
|
||||
if use examples; then
|
||||
insinto /usr/share/doc/${PF}/examples
|
||||
doins demos/*
|
||||
fi
|
||||
}
|
||||
@ -0,0 +1,12 @@
|
||||
diff --git a/xarray/tests/test_variable.py b/xarray/tests/test_variable.py
|
||||
index 290c7a6e..d49a048e 100644
|
||||
--- a/xarray/tests/test_variable.py
|
||||
+++ b/xarray/tests/test_variable.py
|
||||
@@ -373,6 +373,7 @@ class VariableSubclassTestCases(object):
|
||||
assert v[0].values == np.asarray(data)[0]
|
||||
assert np.asarray(v[0]) == np.asarray(data)[0]
|
||||
|
||||
+ @pytest.mark.skip("Fails on Gentoo")
|
||||
def test_equals_all_dtypes(self):
|
||||
for v, _ in self.example_1d_objects():
|
||||
v2 = v.copy()
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue