diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest index bde49463fb1c..8dc984872eff 100644 --- a/app-admin/puppet-agent/Manifest +++ b/app-admin/puppet-agent/Manifest @@ -4,3 +4,5 @@ DIST puppet-agent_1.5.2-1xenial_amd64.deb 12979184 SHA256 917c4dfccf6ac08ab62965 DIST puppet-agent_1.5.2-1xenial_i386.deb 14019620 SHA256 b5220616f12408a422ca65f0bab8bfeeb7dab026448c3141d3afe54f4e455899 SHA512 59611a7d4faa75b16dd492f14da3bacb5b50722b773bdd882d7be08e576462412f5aacb7f247492869048e7d1290824652b37b3ba088ca27da08306bb3137f54 WHIRLPOOL b5757c879ca6a2ecb9e9656ca899eabbeb34af3ce93bc078ed9ac41a601a65f1a2a5b4e738b282c7d1e469e2c63df67072a7ea63c7826340da3227ab24816cf7 DIST puppet-agent_1.5.3-1xenial_amd64.deb 13016338 SHA256 208c8a9cd157a1024fae13c87d4bf35dfd15c9acc8ea6422f1a68bdcd3b947a3 SHA512 218898c87fe77367f24dacae0525bf4ade99d5a3a4771f19402ebaf9eb1abee3e40550c6b250c397576e11f0081a7ea5915fd44350ef5f8b50933020c3896709 WHIRLPOOL 43191d00db025f653361ae236a18ded8ba75cb563d04b7ec830db7232d523fbacea8a7a4e7cf001b83ceb1d94e060f20e5189bff5d81afbca43424ee6c95c5e1 DIST puppet-agent_1.5.3-1xenial_i386.deb 14385624 SHA256 9cb6f982ebbba5ae8fe15f65f510990a746a3c3e46360394b4536d82f75a5c7c SHA512 c2a5e8022b4538c1a210493ef50c49dc300d9c5baaf2a98b41fcf165a12685c5e972ce487a18ffcf6b845e50780551036600035ed9675e18761ef16cf29d9abb WHIRLPOOL 31c95dc42eb796f75f380d7936c0d17364c3fea761aec43afa3042c3fdc18c7dcde9334b84fadb7676774f9b77c5f6eb2b424077a2a62bd60d1e3fc6b05a2661 +DIST puppet-agent_1.6.0-1xenial_amd64.deb 13888534 SHA256 dbd1d0607ae995be7805cd6e63316c9aef3dce35980fc3d4a22aca15cc3803e4 SHA512 155ee31fb6d1b97b20db577a8fdad0e0e6b7daacf2bbe64b8983e37e4f086542c825ad2dbb6cfe3fe2e76b6d3329799c215e8de75f6a594dcd0ca54949a1ae60 WHIRLPOOL 939c3e89b03e26c52af165889725dd013ae4a4f63e6c99e4846aeb9ca70d730b9e875733d7bc57e2ecb7a47d08382b91149859d5c544ee3ddd2f90aabc61a6ee +DIST puppet-agent_1.6.0-1xenial_i386.deb 15200484 SHA256 5853238531ccca8c52e320d80603654687e825e342c093ff0c8c633a2dfe9304 SHA512 65acb4c2d9dd249875433d0234f74f4385a04058b76e1f8c9de51223f90373b2f26897b26016ab17bb301ae9216ccdb7a8c4c643d67a204b307ed29c959773e6 WHIRLPOOL 0bc35a68cf2978605a728638000976e868203c2eb924449042536e6f829378332855df10506f40ca0422517db6aa0b3dc6da33f6ae8bb34e18d7b0e705595880 diff --git a/app-admin/puppet-agent/puppet-agent-1.6.0.ebuild b/app-admin/puppet-agent/puppet-agent-1.6.0.ebuild new file mode 100644 index 000000000000..a60350d84b91 --- /dev/null +++ b/app-admin/puppet-agent/puppet-agent-1.6.0.ebuild @@ -0,0 +1,99 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 +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/xenial/PC1/${PN:0:1}/${PN}/${PN}_${PV}-1xenial" +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} + sys-apps/dmidecode + selinux? ( + sys-libs/libselinux[ruby] + sec-policy/selinux-puppet + ) + puppetdb? ( >=dev-ruby/puppetdb-termini-3.1.0 )" + +S=${WORKDIR} + +QA_PREBUILT=" + /opt/puppetlabs/puppet + /opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/* + /opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/* + /opt/puppetlabs/puppet/lib/engines/* + /opt/puppetlabs/puppet/lib/virt-what/* + /opt/puppetlabs/puppet/lib/* + /opt/puppetlabs/puppet/bin/*" + +pkg_setup() { + enewgroup puppet + enewuser puppet -1 -1 /var/run/puppet puppet +} + +src_install() { + # conf.d + doconfd etc/default/puppet + doconfd etc/default/mcollective + # logrotate.d + insinto /etc/logrotate.d + doins etc/logrotate.d/mcollective + # 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 "${FILESDIR}/puppet.service" + systemd_dounit "${FILESDIR}/mcollective.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 + dosym /opt/puppetlabs/puppet/bin/extlookup2hiera /usr/bin/extlookup2hiera +} diff --git a/app-admin/puppetserver/Manifest b/app-admin/puppetserver/Manifest index c531013f12c8..ec8feffe0241 100644 --- a/app-admin/puppetserver/Manifest +++ b/app-admin/puppetserver/Manifest @@ -1,2 +1,3 @@ DIST puppetserver-2.3.2.tar.gz 33673099 SHA256 81e92875c07f73e636143405804f1214f31f0f840d521f03289d93bd7b2a0899 SHA512 3ab750128bd11d1e3d9815a1c9907fc81b673281ec21def56318557c134635bca0418ed445d090da6257da9dd64e65a9c2b9e82257868d5a895459c7458cc731 WHIRLPOOL 55b679e1eed246ad10bea4f973ca51f65b50b2bf112a6d90d8bda600a1d0e4c09abf74756851a4844cf68705d1b94b9f80f688f1523813d9fe14fbc4424d14e0 DIST puppetserver-2.4.0.tar.gz 33822659 SHA256 81d574f7483760bd70cafc079486fe14d243137612f0c130069d94ba7d4fded4 SHA512 c9afab58bb2f432874d302cb63fb213ead561e2bcecc44f776be49dc09eb86deda3019eae1bddb7369bb7bdc1a3d82f47f6053d526b2b28b189358a2bdded852 WHIRLPOOL 079186ecd239a1be1dde847b23a5fe1bc4dedc543b510f2197cd776bc59f943166d3f403727e1cc0ac0232a8519a36944cb4e6ec6bb6bfdc0e822405c4b7fd96 +DIST puppetserver-2.5.0.tar.gz 33907947 SHA256 d058d49133b3adba86c8b01c7ab5c1f4511c191fd50e75be583b28ddfc824cd5 SHA512 c822d320a9ce98c6e96e4838770fc52760f08aab9fee26e62174762947b9ccb09234cb1edba0a5e17f4c08e76adccec83d8353f5aa47d08864c5bb9b2dab2574 WHIRLPOOL 1d2fde7aade7e9e6c5117d8d2c88d787a93d1aacdea81ad3235fdb90384d8578739a54ccfcff28e217a86bd5d29c48c4dbbea4d38d3e34c4099ecf21adc9f995 diff --git a/app-admin/puppetserver/puppetserver-2.5.0.ebuild b/app-admin/puppetserver/puppetserver-2.5.0.ebuild new file mode 100644 index 000000000000..5ee0ed17da3c --- /dev/null +++ b/app-admin/puppetserver/puppetserver-2.5.0.ebuild @@ -0,0 +1,109 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit multilib systemd 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.7.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/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/redhat/puppetserver.service || die + sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/g' ext/bin/puppetserver || die + sed -i 's/sysconfig\/puppetserver/systemd\/system\/puppetserver\.service\.d\/gentoo\.conf/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 +} + +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 + 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/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 + 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 + # 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 + # init type tasks + newconfd ext/default puppetserver + newinitd "${FILESDIR}/puppetserver.initd" puppetserver + # systemd type things + insinto /etc/systemd/system/puppetserver.service.d/ + newins ext/default gentoo.conf + systemd_dounit ext/redhat/puppetserver.service + # 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 +} + +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" +} diff --git a/app-admin/systemrescuecd-x86/Manifest b/app-admin/systemrescuecd-x86/Manifest index 7b24f120e78e..8c7107f0d2bc 100644 --- a/app-admin/systemrescuecd-x86/Manifest +++ b/app-admin/systemrescuecd-x86/Manifest @@ -11,3 +11,4 @@ DIST systemrescuecd-x86-4.7.1.iso 481220608 SHA256 3d99953b14788c5b50d72083c7cc7 DIST systemrescuecd-x86-4.7.2.iso 482217984 SHA256 b0a3333c091ec2f4658e2a150305053a2cf50c63b217465cd504559dee4447a7 SHA512 2340facff40d8f7eaebf75bba771333d21e8951384c34b04dcc5734de3c18e0c8e50e5cc35b93ab91df48f2ba9dc51ebe97a820fdb322d9f169df7067d6a92d6 WHIRLPOOL 3bdbd296a5cee2dc6cd47313bc70c95b65dd4d198cc67907c3215e181b2ffc3366a3fce49561650ce70d9d732a646b039265543da065702c1e6894219d1a438a DIST systemrescuecd-x86-4.7.3.iso 482799616 SHA256 f3a30a11ade9c5dd631522a9bfad4b2d5b7e5b14d9ba65ec94d1cf441635bc7a SHA512 42331496283b981661861e49448b17b0a4fd202f38024990a5aaf2572f300016e67f86ec3ec82adb4dc337a5275da858bf80fbb6a49886682298ffcea6c0d1f0 WHIRLPOOL 6f0ef187624b4a7da11e0a1f7d822ef964889c37bf5b66263ac3ccc83fba3b654c1d67a9831925608ecc20eeb42a40be5b3fc37fdcaedf06e4de30d1db7d7f2a DIST systemrescuecd-x86-4.8.0.iso 488042496 SHA256 06e6847384063bbb67c1c8f0824e995046c9ff125ad07a4214b129efb9b18241 SHA512 bfd3142149a9155e35d1add271265ae54074bfe2a8f658ca366dfdecfa893b683adb6206f11738d972df98cf7026c893d17ecebf8635c3cd5cd38cfd4c0b2e0e WHIRLPOOL 93959e6c55b30c696d82e62d48ea54cdc67f1b8c2951d4a895ebd6d526802ddce21795f4fb787b62f830c10ff549d55360217ce609df9bc486bbf6dd6886d287 +DIST systemrescuecd-x86-4.8.1.iso 483315712 SHA256 144cc9e936c5fa9d11232ac4d1717a8d0ae4b95a2b5f9c8548afab6fbe9cfbd2 SHA512 0424fab36e2caf7e3e9dd7c334d57b7eb9a090e3d79c52ea8e003e05931558b48be5375ac49eaaa78141d179d7153c91c386a42d7ead8d56ef3113363b8ff692 WHIRLPOOL 5ded246b624cad86fa93c244e5b53f6edd28ddc8909c53fcfc8049de47a68a0811a4e83d78d94a95df559bdb99bfc22ef59d3b68326791199cdfe1b414ac6135 diff --git a/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild new file mode 100644 index 000000000000..cb7c7b5a2018 --- /dev/null +++ b/app-admin/systemrescuecd-x86/systemrescuecd-x86-4.8.1.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +DESCRIPTION="The .iso image of SystemRescueCD rescue disk, x86 (+ amd64) variant" +HOMEPAGE="http://www.sysresccd.org/" +# Large ISO mirroring explicitly approved by infra in bug #588766 +SRC_URI="mirror://sourceforge/systemrescuecd/sysresccd-${PN#*-}/${PV}/${P}.iso" + +LICENSE="GPL-2" +SLOT="${PV}" +KEYWORDS="~amd64 ~x86" +IUSE="+isohybrid" + +DEPEND="isohybrid? ( >=sys-boot/syslinux-4 )" + +S=${WORKDIR} + +src_install() { + insinto "/usr/share/${PN%-*}" + doins "${DISTDIR}/${P}.iso" + + if use isohybrid; then + set -- isohybrid -u "${ED}usr/share/${PN%-*}/${P}.iso" + echo "${@}" + "${@}" || die "${*} failed" + fi +} + +pkg_postinst() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # no version newer than ours? we're the newest! + if ! has_version ">${CATEGORY}/${PF}"; then + ln -f -s -v "${P}.iso" "${f}" || die + fi +} + +pkg_postrm() { + local f=${EROOT%/}/usr/share/${PN%-*}/${PN}-newest.iso + + # if there is no version newer than ours installed + if ! has_version ">${CATEGORY}/${PF}"; then + # and we are truly and completely uninstalled... + if [[ ! ${REPLACED_BY_VERSION} ]]; then + # then find an older version to set the symlink to + local newest_version=$(best_version "<${CATEGORY}/${PF}") + + if [[ ${newest_version} ]]; then + # update the symlink + ln -f -s -v "${newest_version%-r*}.iso" "${f}" || die + else + # last version removed? clean up the symlink + rm -v "${f}" || die + # and the parent directory + rmdir "${f%/*}" || die + fi + fi + fi +} diff --git a/app-crypt/pinentry/metadata.xml b/app-crypt/pinentry/metadata.xml index 675913ea2c1a..c66920c94e70 100644 --- a/app-crypt/pinentry/metadata.xml +++ b/app-crypt/pinentry/metadata.xml @@ -1,6 +1,10 @@ + + k_f@gentoo.org + Kristian Fiskerstrand + crypto@gentoo.org Crypto diff --git a/app-i18n/fbterm/fbterm-1.7-r1.ebuild b/app-i18n/fbterm/fbterm-1.7-r1.ebuild index 1375af4d7005..b083f6045436 100644 --- a/app-i18n/fbterm/fbterm-1.7-r1.ebuild +++ b/app-i18n/fbterm/fbterm-1.7-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://fbterm.googlecode.com/files/${P}.0.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="caps gpm video_cards_vesa" RDEPEND="caps? ( sys-libs/libcap ) diff --git a/app-misc/gramps/gramps-3.4.9-r1.ebuild b/app-misc/gramps/gramps-3.4.9-r1.ebuild index dd3a36a1a0f0..89bd31be29e9 100644 --- a/app-misc/gramps/gramps-3.4.9-r1.ebuild +++ b/app-misc/gramps/gramps-3.4.9-r1.ebuild @@ -23,7 +23,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/pygoocanvas[${PYTHON_USEDEP}] >=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}] gnome-base/librsvg:2 - sci-geosciences/osm-gps-map + sci-geosciences/osm-gps-map:2 x11-misc/xdg-utils gnome? ( dev-python/gconf-python[${PYTHON_USEDEP}] diff --git a/app-misc/gramps/gramps-3.4.9.ebuild b/app-misc/gramps/gramps-3.4.9.ebuild index 487be35d554c..034970fe1a45 100644 --- a/app-misc/gramps/gramps-3.4.9.ebuild +++ b/app-misc/gramps/gramps-3.4.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -24,7 +24,7 @@ RDEPEND="${PYTHON_DEPS} dev-python/pygoocanvas[${PYTHON_USEDEP}] >=dev-python/pygtk-2.16.0[${PYTHON_USEDEP}] gnome-base/librsvg:2 - sci-geosciences/osm-gps-map + sci-geosciences/osm-gps-map:2 x11-misc/xdg-utils gnome? ( dev-python/gconf-python[${PYTHON_USEDEP}] diff --git a/app-misc/subsurface/subsurface-3.1.1.ebuild b/app-misc/subsurface/subsurface-3.1.1.ebuild index b180ac025941..d868cf0269e9 100644 --- a/app-misc/subsurface/subsurface-3.1.1.ebuild +++ b/app-misc/subsurface/subsurface-3.1.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -35,7 +35,7 @@ RDEPEND="dev-db/sqlite:3 dev-libs/libxslt dev-libs/libzip gnome-base/gconf:2 - sci-geosciences/osm-gps-map + sci-geosciences/osm-gps-map:2 net-libs/libsoup:2.4 virtual/libusb x11-libs/cairo diff --git a/app-misc/vifm/Manifest b/app-misc/vifm/Manifest index f8d4724d166e..2b053b94db08 100644 --- a/app-misc/vifm/Manifest +++ b/app-misc/vifm/Manifest @@ -1,3 +1,4 @@ DIST vifm-0.7.2.tar.bz2 468086 SHA256 f95e49a8518dd1acc9b7b750658a98bcf1cb538e25520a5a300b5812108fbc8d SHA512 24a5ad44cecd01f489b95008f0b98ad6cd63656bc7fe4a888101f369f9b258cb87b8025efac30237fbaebc7aff14d173d02118839312017276f3f6b62ea4a3b9 WHIRLPOOL 9c954dbe659e3303315642738bafb962f6f20820af0fe587b3c525ad7a93aca3f9090fe5d2d871a291ce95c9add81f7d717ae5adbdcbe2a58d2889e0bf3e50dc DIST vifm-0.8.1a.tar.bz2 832500 SHA256 974fb2aa5e32d2c729ceff678c595070c701bd30a6ccc5cb6ca64807a9dd4422 SHA512 3cd182fd52b8695468ceb9cb812b9b4e336c42ce101119c8423028403839d8b04fe2ece6d30830325d374cda93a82f0e1d4f427d5095545fa888a991dfcbc714 WHIRLPOOL 48ce3ca228aacfcaf36a80bb4440dbaf038785919aaeb19e1f069aea5b1a5941de4abfdb02cbc797e9848d0d746a1bd2df3e485d38bc1130de920a42fb01ed4c +DIST vifm-0.8.2.tar.bz2 892414 SHA256 8b466d766658a24d07fc2039a26fefc6a018f5653684a6035183ca79f02c211f SHA512 e2c9f84b8a24542f7153ef8a27b38ba8c251cb0ded72401f5e93fa92540d51b5c368a73147b9fa4a883dda5f880c1d8585c1b4879d46c0e00dea87eacecfdb25 WHIRLPOOL 26d5ff1249885c3be16d7ea7a09ded43498f60243aa46b5d2b8ed3e0d548b29e305943135bcc50a27cca539a5e3b9e240693b8381bdd9c45737e617641da784c DIST vifm-0.8.tar.bz2 756795 SHA256 69eb6b50dcf462f4233ff987f0b6a295df08a27bc42577ebef725bfe58dbdeeb SHA512 b4727b7a9f577eb05c4e8830849a00759cbeb35457c8fa533136a0a68124312f2bb8c5c21239fbbd34f567ddaca247ede05e48e72b890bb4f15d12adebc23210 WHIRLPOOL 78d030cc9eda292ce75656eedc3ede3e02c87522517d7b7d49f0e993dbfc438a5b5e0dcf8fed531eeb1e045f01d5418d1e7fbc84cb53da800bb54d7ab4a636d7 diff --git a/app-misc/vifm/vifm-0.8.2.ebuild b/app-misc/vifm/vifm-0.8.2.ebuild new file mode 100644 index 000000000000..a4893439203e --- /dev/null +++ b/app-misc/vifm/vifm-0.8.2.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools vim-doc versionator + +DESCRIPTION="Console file manager with vi(m)-like keybindings" +HOMEPAGE="http://vifm.info/" +SRC_URI="mirror://sourceforge/vifm/${PF}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~s390 ~x86" +IUSE="X developer +extended-keys gtk +magic vim vim-syntax" + +DEPEND=" + >=sys-libs/ncurses-5.9-r3:0 + magic? ( sys-apps/file ) + gtk? ( x11-libs/gtk+:2 ) + X? ( x11-libs/libX11 ) +" +RDEPEND=" + ${DEPEND} + vim? ( || ( app-editors/vim app-editors/gvim ) ) + vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) +" + +DOCS="AUTHORS FAQ NEWS README TODO" + +src_prepare() { + sed -i -e '/stat.h/a#include ' "${S}/src/modes/file_info.c" \ + || die + eautoreconf +} + +src_configure() { + econf \ + $(use_enable developer) \ + $(use_enable extended-keys) \ + $(use_with magic libmagic) \ + $(use_with gtk) \ + $(use_with X X11) +} + +src_compile() { + default +} + +src_install() { + einstall + dodoc ${DOCS} + + if use vim; then + local t + for t in app plugin; do + insinto /usr/share/vim/vimfiles/"${t}" + doins "${S}"/data/vim/doc/"${t}"/"${PN}"* + done + fi + + if use vim-syntax; then + local t + for t in ftdetect ftplugin syntax; do + insinto /usr/share/vim/vimfiles/"${t}" + doins "${S}"/data/vim/"${t}"/"${PN}".vim + done + fi +} + +src_test() { + emake check +} + +pkg_postinst() { + if use vim; then + update_vim_helptags + + if [[ -n ${REPLACING_VERSIONS} ]]; then + elog + elog "You don't need to copy or link any files for" + elog " the vim plugin and documentation to work anymore." + elog "If you copied any vifm files to ~/.vim/ manually" + elog " in earlier vifm versions, please delete them." + fi + elog + elog "To use vim in vifm to view the documentation" + elog " edit ~/.vifm/vifmrc and set vimhelp instead of novimhelp" + elog + fi +} + +pkg_postrm() { + use vim && update_vim_helptags +} diff --git a/app-portage/repoman/repoman-2.3.0-r1.ebuild b/app-portage/repoman/repoman-2.3.0-r1.ebuild index fbb8e87425b8..90569222f8c7 100644 --- a/app-portage/repoman/repoman-2.3.0-r1.ebuild +++ b/app-portage/repoman/repoman-2.3.0-r1.ebuild @@ -17,7 +17,7 @@ DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds" HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd" SLOT="0" IUSE="" diff --git a/app-shells/bash-completion/Manifest b/app-shells/bash-completion/Manifest index 6b5d3ffb9275..c95f07d3979d 100644 --- a/app-shells/bash-completion/Manifest +++ b/app-shells/bash-completion/Manifest @@ -1,7 +1,5 @@ -DIST bash-completion-1.3.tar.bz2 211899 SHA256 8ebe30579f0f3e1a521013bcdd183193605dab353d7a244ff2582fb3a36f7bec SHA512 f0c6eb3edce982d1306fdb7ba2cb598c08cff4bde8496fca369b3c4d2d3af0ef48dd494ab96258cc90f30b875a56759aad13a6b1bfb4928bfba4634cce6bf8be WHIRLPOOL 9ea16b019eadcdcf60046b58d2c0f3ab68c189f461842d3d9f585ff25d8ba1bd48bf847868c2cc7e5475320d9c7aeaf21ce74818345c7fe648500549d51f29f8 -DIST bash-completion-2.1.tar.bz2 265329 SHA256 2b606804a7d5f823380a882e0f7b6c8a37b0e768e72c3d4107c51fbe8a46ae4f SHA512 0bc71039ef136b1ccb72527eb40f2ed4068a58dc31b1ac1ee52a40e7c950ea4cfbb4f1bee2f0da6774e56062578fa3653096e6d306eea7f028dd55ff737e92fe WHIRLPOOL 0275d8ac99a0ac5b12637bf2b13561d656b239ba7c166071cb283a481df2fdd904ad1c18608ea35b9af4f0f4db3b034f833f0fd586a0096626d1b268bcd8fc00 DIST bash-completion-2.1_p20141224.tar.xz 257964 SHA256 a76ffdbc9f49f48e290f0e6f3d46060d51c770f91e25b35b014bc16fec76f517 SHA512 94649aad8dbf0f170422605a5f36c5cab61e45ce402a92f89a6eba3bd5d2e976087b35cd0a9b6d4d29ba608cee3bb27b692088c884b766447ee9eafa99c2814a WHIRLPOOL 0ea12dfc8f432ffed598aee65c7080de570ebe9783415c7ebe4bd5d152fc645a132fae3a28986c029d13a4b939e15053204d73ae9b207f4ad62b9c117bf59cba -DIST bash-completion-2.2.tar.xz 271260 SHA256 4d47531b59e7bd3723b356a3977f85a088666de693d3af86fa0e6909166cdfac SHA512 58121bb281b41d6e353ba1e96c8b1890e34fc59375fffc15161d9222f33bbeb0d8c61feb2b6c027eeb44143f4c8e97dd7ffd8012671027980055ef2caeddf150 WHIRLPOOL b03f0cec12cce3e153307e197aadbb37ed02131bc9d26ece8cf22e9ee37b2fa26e723cbd44534b16b33b9fc3f055029546493d8550a839eacd38ba3fc379b2f5 DIST bash-completion-2.3.tar.xz 272252 SHA256 b2e081af317f3da4fff3a332bfdbebeb5514ebc6c2d2a9cf781180acab15e8e9 SHA512 396c060fa39aa05866d26b573d6b9eebdb96e41a17ef723e95f8b01bbda32b0b83bf9e4d978a4f0a1c0590787ae797bb3b6417b95b877f8447037cb873ccf38a WHIRLPOOL fe5ebae1c77dfba504e8f79b130ba0bc80d882a045b980a23f4642e77dfb7bb79b529c1573b13fc0986f486c41696bb94fadef677e0cabfdffe7aeea6e8ff5c0 +DIST bash-completion-2.4.tar.xz 276148 SHA256 c0f76b5202fec9ef8ffba82f5605025ca003f27cfd7a85115f838ba5136890f6 SHA512 b852e0a38417dfc3754a91dae2d107f99a3c2970d835a4bbaa80f2a4db8d670bc3820ddc6ada26f68070f22fb4c1db7abe50ad489b1c0f8497b1e6e91be27627 WHIRLPOOL f38f148dcbca1ee47ec6fa33637ea0673c03816b607bd638605832fb76ec7fb5f24cba35cb559e8a5b06636b1ec0f225e420615b6721074fc405cb79b505b07b DIST bashcomp-2.0.1.tar.bz2 4078 SHA256 142348b61b32fb3f1580ac90b684b1014d6d177f371baadb503340c507f9a992 SHA512 8ac8982f418a2d71dffcf027ffe0b7eefa3ee49413a726a8ee9e758975d8f86c687a64b55cd94e09b7936d1c6990285ddc90a3c2b1989af44322937c5c4fb8d7 WHIRLPOOL b6daa0a93282e9df73635cbdddde97c473fd22aa3baf035c3ffcb5966152e20b26d85979fe8a5ecf9128157422f3f60dc27c82c843b9a0e6e80b7de7da596250 DIST bashcomp-2.0.2.tar.gz 3625 SHA256 6ede58bfbe99f0dca1eb9236492aa20a6755e5731526de56e15d1e2b220165c9 SHA512 46bc1bcc32263135f44be68569459a409250dd2c81c18190735f11e13a26508e9d3cb91d24a8fe7b21bdea678347873b7ac1b67d5e8c78c8444011f85dfdcdce WHIRLPOOL 4b6cb989235d5fed8fd9986c1419ab337df38384fe2b307fd78f08f8696f4a2328845ed4f27913a36e9a544e973690bc0dd2af73816e272c3faf27ff2eafa585 diff --git a/app-shells/bash-completion/bash-completion-1.3-r2.ebuild b/app-shells/bash-completion/bash-completion-1.3-r2.ebuild deleted file mode 100644 index 54f7bf39b263..000000000000 --- a/app-shells/bash-completion/bash-completion-1.3-r2.ebuild +++ /dev/null @@ -1,90 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=3 -inherit prefix - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="http://bash-completion.alioth.debian.org/" -SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -DEPEND="" -RDEPEND="|| ( app-eselect/eselect-bashcomp =app-shells/bash-3.2 app-shells/zsh ) - sys-apps/miscfiles" -PDEPEND="app-shells/gentoo-bashcomp" - -src_prepare() { - cp "${FILESDIR}"/bash-completion.sh-gentoo-1.2 "${T}"/bash-completion.sh || die - eprefixify "${T}"/bash-completion.sh - - find completions -name 'Makefile*' -exec rm -f {} + - - # Part of >=sys-apps/util-linux-2.23 wrt #468544 - rm -f completions/rtcwake -} - -src_configure() { :; } # no-op -src_compile() { :; } # no-op - -src_install() { - # Gentoo specific bash-completion.sh file. - insinto /etc/profile.d - doins "${T}"/bash-completion.sh || die - - # All files from contrib/ in source package get installed - insinto /usr/share/bash-completion - doins -r "${S}"/completions/* || die - - awk -v D="$ED" ' - BEGIN { out=".pre" } - /^# A lot of the following one-liners/ { out="base" } - /^# start of section containing completion functions called by other functions/ { out=".pre" } - /^# start of section containing completion functions for external programs/ { out="base" } - /^# source completion directory/ { out="" } - /^unset -f have/ { out=".post" } - out != "" { print > D"/usr/share/bash-completion/"out }' \ - bash_completion || die "failed to split bash_completion" - - dodoc AUTHORS CHANGES README TODO || die "dodocs failes" - - # This is backported from upstream 2.0 release. You can stop installing - # this file after 2.0 is in Portage and use the one from the tarball - # instead. - # Installed to datadir instead of libdir because bash-completion(s) - # are not ELF files. - insinto /usr/share/pkgconfig - doins "${FILESDIR}"/bash-completion.pc || die -} - -pkg_postinst() { - elog "Any user can enable the module completions without editing their" - elog ".bashrc by running:" - elog - elog " eselect bashcomp enable " - elog - elog "The system administrator can also be enable this globally with" - elog - elog " eselect bashcomp enable --global " - elog - elog "Make sure you at least enable the base module! Additional completion" - elog "modules can be found by running" - elog - elog " eselect bashcomp list" - elog - elog "If you use non-login shells you still need to source" - elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc." - - if has_version 'app-shells/zsh' ; then - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/app-shells/bash-completion/bash-completion-2.1-r2.ebuild b/app-shells/bash-completion/bash-completion-2.1-r2.ebuild deleted file mode 100644 index 4927557710fe..000000000000 --- a/app-shells/bash-completion/bash-completion-2.1-r2.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 -inherit bash-completion-r1 prefix toolchain-funcs - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="http://bash-completion.alioth.debian.org/" -SRC_URI="http://bash-completion.alioth.debian.org/files/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND="|| ( app-eselect/eselect-bashcomp =app-shells/bash-3.2 app-shells/zsh ) - sys-apps/miscfiles" -PDEPEND="app-shells/gentoo-bashcomp" - -src_prepare() { - cp "${FILESDIR}"/bash-completion.sh-gentoo-1.2 "${T}"/bash-completion.sh || die - eprefixify "${T}"/bash-completion.sh - - cp "${FILESDIR}"/bash-completion.pc "${T}"/ || die - # reuse paths from the eclass -- those can come from pkg-config - # or defaults. - sed -i \ - -e "/completionsdir/s@=.*\$@=$(get_bashcompdir)@" \ - -e "/helpersdir/s@=.*\$@=$(get_bashhelpersdir)@" \ - -e "/Version/s@1.3@${PV}@" \ - "${T}"/bash-completion.pc || die - - find -name 'Makefile*' -exec rm -f {} + - - # Part of >=sys-apps/util-linux-2.23 wrt #468544 - local file - for file in cal dmesg eject hexdump hwclock ionice look renice rtcwake; do - rm -f completions/${file} - done - - # app-editors/vim-core: - rm -f completions/xxd - - # net-misc/networkmanager: - rm -f completions/nmcli - - # Forward-compatibility with new install location, for eselect-bashcomp. - echo "ES_BASHCOMP_DIRS=\"${EPREFIX}/usr/share/bash-completion/completions\"" \ - > "${T}"/50bash_completion || die -} - -src_configure() { :; } # no-op -src_compile() { :; } # no-op - -src_install() { - # Gentoo specific bash-completion.sh file. - insinto /etc/profile.d - doins "${T}"/bash-completion.sh - - # All files from contrib/ in source package get installed - dobashcomp "${S}"/completions/* - - awk -v D="$ED" ' - BEGIN { out=".pre" } - /^# A lot of the following one-liners/ { out="base" } - /^# start of section containing completion functions called by other functions/ { out=".pre" } - /^# start of section containing completion functions for external programs/ { out="base" } - /^# source completion directory/ { out="" } - /^unset -f have/ { out=".post" } - out != "" { print > D"/usr/share/bash-completion/"out }' \ - bash_completion || die "failed to split bash_completion" - - # Note: private eclass stuff, don't use it anywhere else! - insinto "$(_bash-completion-r1_get_bashhelpersdir)" - doins "${S}"/helpers/* - - dodoc AUTHORS CHANGES README - - # This is backported from upstream 2.0 release. You can stop installing - # this file after 2.0 is in Portage and use the one from the tarball - # instead. - # Installed to datadir instead of libdir because bash-completion(s) - # are not ELF files. - insinto /usr/share/pkgconfig - doins "${T}"/bash-completion.pc - - doenvd "${T}"/50bash_completion -} - -pkg_postinst() { - if ! has_version "${CATEGORY}/${PN}"; then - elog "Any user can enable the module completions without editing their" - elog ".bashrc by running:" - elog - elog " eselect bashcomp enable " - elog - elog "The system administrator can also be enable this globally with" - elog - elog " eselect bashcomp enable --global " - elog - elog "Make sure you at least enable the base module! Additional completion" - elog "modules can be found by running" - elog - elog " eselect bashcomp list" - elog - elog "If you use non-login shells you still need to source" - elog "/etc/profile.d/bash-completion.sh in your ~/.bashrc." - fi - - if has_version 'app-shells/zsh' ; then - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/app-shells/bash-completion/bash-completion-2.1_p20141224-r2.ebuild b/app-shells/bash-completion/bash-completion-2.1_p20141224-r2.ebuild deleted file mode 100644 index 846afc842d65..000000000000 --- a/app-shells/bash-completion/bash-completion-2.1_p20141224-r2.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -BASHCOMP_P=bashcomp-2.0.2 -inherit versionator - -DESCRIPTION="Programmable Completion for bash" -HOMEPAGE="http://bash-completion.alioth.debian.org/" -SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz - https://bitbucket.org/mgorny/bashcomp2/downloads/${BASHCOMP_P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris" -IUSE="" - -RDEPEND=">=app-shells/bash-4.3_p30-r1 - sys-apps/miscfiles - !app-eselect/eselect-bashcomp" -DEPEND="app-arch/xz-utils" -PDEPEND=">=app-shells/gentoo-bashcomp-20140911" - -# Remove unwanted completions. -STRIP_COMPLETIONS=( - # Slackware package stuff, quite generic names cause collisions - # (e.g. with sys-apps/pacman) - explodepkg installpkg makepkg pkgtool removepkg upgradepkg - - # Debian/Red Hat network stuff - ifdown ifup ifstatus - - # Installed in app-editors/vim-core - xxd - - # Now-dead symlinks to deprecated completions - hd ncal -) - -src_prepare() { - epatch "${WORKDIR}/${BASHCOMP_P}/${P}"-*.patch - # Bug 543100 - epatch "${FILESDIR}/${PN}-2.1-escape-characters.patch" -} - -src_test() { :; } # Skip testsuite because of interactive shell wrt #477066 - -src_install() { - # work-around race conditions, bug #526996 - mkdir -p "${ED}"/usr/share/bash-completion/{completions,helpers} || die - - emake DESTDIR="${D}" profiledir="${EPREFIX}"/etc/bash/bashrc.d install - - local file - for file in "${STRIP_COMPLETIONS[@]}"; do - rm "${ED}"/usr/share/bash-completion/completions/${file} || die - done - # remove deprecated completions (moved to other packages) - rm "${ED}"/usr/share/bash-completion/completions/_* || die - - dodoc AUTHORS CHANGES README - - # install the eselect module - insinto /usr/share/eselect/modules - doins "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect" - doman "${WORKDIR}/${BASHCOMP_P}/bashcomp.eselect.5" -} - -pkg_postinst() { - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 2.1-r90 ${v}; then - ewarn "For bash-completion autoloader to work, all completions need to" - ewarn "be installed in /usr/share/bash-completion/completions. You may" - ewarn "need to rebuild packages that installed completions in the old" - ewarn "location. You can do this using:" - ewarn - ewarn "$ find ${EPREFIX}/usr/share/bash-completion -maxdepth 1 -type f '!' -name 'bash_completion' -exec emerge -1v {} +" - ewarn - ewarn "After the rebuild, you should remove the old setup symlinks:" - ewarn - ewarn "$ find ${EPREFIX}/etc/bash_completion.d -type l -delete" - fi - done - - if has_version 'app-shells/zsh'; then - elog - elog "If you are interested in using the provided bash completion functions with" - elog "zsh, valuable tips on the effective use of bashcompinit are available:" - elog " http://www.zsh.org/mla/workers/2003/msg00046.html" - elog - fi -} diff --git a/app-shells/bash-completion/bash-completion-2.2.ebuild b/app-shells/bash-completion/bash-completion-2.4.ebuild similarity index 97% rename from app-shells/bash-completion/bash-completion-2.2.ebuild rename to app-shells/bash-completion/bash-completion-2.4.ebuild index f403f5199313..27ca2afde607 100644 --- a/app-shells/bash-completion/bash-completion-2.2.ebuild +++ b/app-shells/bash-completion/bash-completion-2.4.ebuild @@ -37,6 +37,9 @@ STRIP_COMPLETIONS=( # Now-dead symlinks to deprecated completions hd ncal + + # Installed by sys-apps/util-linux-2.28 + mount umount mount.linux umount.linux ) src_prepare() { diff --git a/app-shells/bash-completion/files/bash-completion.pc b/app-shells/bash-completion/files/bash-completion.pc deleted file mode 100644 index 0e5921f54496..000000000000 --- a/app-shells/bash-completion/files/bash-completion.pc +++ /dev/null @@ -1,9 +0,0 @@ -prefix=/usr -compatdir=/etc/bash_completion.d -completionsdir=${prefix}/share/bash-completion -helpersdir=${prefix}/share/bash-completion/helpers - -Name: bash-completion -Description: programmable completion for the bash shell -URL: http://bash-completion.alioth.debian.org/ -Version: 1.3 diff --git a/app-shells/bash-completion/files/bash-completion.sh-gentoo-1.2 b/app-shells/bash-completion/files/bash-completion.sh-gentoo-1.2 deleted file mode 100644 index b72bcbd93379..000000000000 --- a/app-shells/bash-completion/files/bash-completion.sh-gentoo-1.2 +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License, v2 or later -# $Id$ - -# Check for interactive bash and that we haven't already been sourced. -[ -z "$BASH_VERSION" -o -z "$PS1" -o -n "$BASH_COMPLETION" ] && return - -# Check for recent enough version of bash. -bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.} -if [ $bmajor -gt 3 ] || [ $bmajor -eq 3 -a $bminor -ge 2 ]; then - _load_completions() { - declare f x loaded_pre=false - for f; do - if [[ -f $f ]]; then - # Prevent loading base twice, initially and via glob - if $loaded_pre && [[ $f == */base ]]; then - continue - fi - - # Some modules, including base, depend on the definitions - # in .pre. See the ebuild for how this is created. - if ! $loaded_pre; then - if [[ ${BASH_COMPLETION-unset} == unset ]]; then - BASH_COMPLETION="@GENTOO_PORTAGE_EPREFIX@/usr/share/bash-completion/base" - fi - source "@GENTOO_PORTAGE_EPREFIX@/usr/share/bash-completion/.pre" - loaded_pre=true - fi - - source "$f" - fi - done - - # Clean up - $loaded_pre && source "@GENTOO_PORTAGE_EPREFIX@/usr/share/bash-completion/.post" - unset -f _load_completions # not designed to be called more than once - } - - # 1. Load base, if eselected. This was previously known as - # /etc/bash_completion - # 2. Load completion modules, maintained via eselect bashcomp --global - # 3. Load user completion modules, maintained via eselect bashcomp - # 4. Load user completion file last, overrides modules at user discretion - # This order is subject to change once upstream decides on something. - _load_completions \ - "@GENTOO_PORTAGE_EPREFIX@/etc/bash_completion.d/base" \ - ~/.bash_completion.d/base \ - "@GENTOO_PORTAGE_EPREFIX@/etc/bash_completion.d/"* \ - ~/.bash_completion.d/* \ - ~/.bash_completion -fi -unset bash bmajor bminor diff --git a/app-text/atril/metadata.xml b/app-text/atril/metadata.xml index f3cdcccad804..c8cc8b332d96 100644 --- a/app-text/atril/metadata.xml +++ b/app-text/atril/metadata.xml @@ -15,7 +15,7 @@ Enable the Type-1 fonts for the build-in DVI viewer (media-libs/t1lib) Enable XPS viewer using - app-text/libxps + app-text/libgxps mate-desktop/atril diff --git a/app-text/gspell/gspell-1.0.3.ebuild b/app-text/gspell/gspell-1.0.3.ebuild index c671014ce61f..7eea78985d0d 100644 --- a/app-text/gspell/gspell-1.0.3.ebuild +++ b/app-text/gspell/gspell-1.0.3.ebuild @@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/gspell" LICENSE="LGPL-2.1+" SLOT="0/1" # subslot = libgspell-1 soname version -KEYWORDS="~alpha ~amd64 ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~x86" IUSE="+introspection vala" REQUIRED_IUSE="vala? ( introspection )" diff --git a/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild new file mode 100644 index 000000000000..4da686912fca --- /dev/null +++ b/app-vim/xquery-syntax/xquery-syntax-0.1-r2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit vim-plugin + +DESCRIPTION="vim plugin: XQuery syntax highlighting" +HOMEPAGE="http://www.vim.org/scripts/script.php?script_id=803" + +LICENSE="vim.org" +KEYWORDS="~alpha ~amd64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +VIM_PLUGIN_HELPTEXT=\ +"This plugin provides syntax highlighting for XQuery files." + +src_prepare() { + default + # use hi def link. Bug #101788, bug #101804. + sed -i -e 's,^hi\(ghlight\)\? link,hi def link,' syntax/xquery.vim \ + || die "sed failed" +} diff --git a/dev-cpp/libjson-rpc-cpp/Manifest b/dev-cpp/libjson-rpc-cpp/Manifest index 3cbe67a89e6f..8dd250f9ef0a 100644 --- a/dev-cpp/libjson-rpc-cpp/Manifest +++ b/dev-cpp/libjson-rpc-cpp/Manifest @@ -1,2 +1,3 @@ DIST libjson-rpc-cpp-0.5.0.tar.gz 124494 SHA256 e6d8d6c20517bb38eba9dba7f372e0a95432c4cbf55ec9b136ba841faa0a6d99 SHA512 9929f76899186f62d3201d3c884a4557e3bd55acfe0533b9a0cf543e01e6d2e5972239df7425c1a43bd59fd205261b91796fdaa1ab54b55cb5765250e473d2d4 WHIRLPOOL 95b51bdfd86e63e84556c490281829d211d937cb30a503b863180cac4a2a0894eb03ed931511e9336903f1ddad6b899921e1e09663af9cc0e5739569ddc14472 DIST libjson-rpc-cpp-0.6.0.tar.gz 130091 SHA256 98baf15e51514339be54c01296f0a51820d2d4f17f8c9d586f1747be1df3290b SHA512 8ad4e30b9ff8b53bde1671067ef6108d0a26a40d3925b2002c2aad9d66a17a51b1ea23b7ce278bcb56a992ff4c9a4616494d62dfe992c7db38341b449e88c777 WHIRLPOOL 0d6b75a29f84386086f070bb1a40e45d02f19dee567c9bd492d61aff84b470aed4d0b83879cfddb13e5109ad5d57a055f9b23b66016eb4319ed7dacd89da8474 +DIST libjson-rpc-cpp-0.7.0.tar.gz 141665 SHA256 669c2259909f11a8c196923a910f9a16a8225ecc14e6c30e2bcb712bab9097eb SHA512 f7547271040382cd2ac96a31eb81d891b016e4d0c33a3ba3e659c2de2e55136e7e243dd2d959c6d8a64ccba7ebd9f9e28070d710a6770c29f81c0750ffad9e3a WHIRLPOOL b54121c95f47654a36623c4267a22f4d563bc6f863b2df205b1ea4142a8230e64e5fc0725f8e8cef7d79abdfdad5de118464993b6b503ff2cec9f4e077014201 diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-0.7.0.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-0.7.0.ebuild new file mode 100644 index 000000000000..eac653e5f934 --- /dev/null +++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-0.7.0.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils + +DESCRIPTION="JSON-RPC (1.0 & 2.0) framework for C++" +HOMEPAGE="https://github.com/cinemast/libjson-rpc-cpp" +SRC_URI="https://github.com/cinemast/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc +http-client +http-server +stubgen test" + +RDEPEND=" + dev-libs/jsoncpp:= + http-client? ( net-misc/curl:= ) + http-server? ( net-libs/libmicrohttpd:= ) + stubgen? ( dev-libs/argtable:= )" +DEPEND="${RDEPEND} + doc? ( app-doc/doxygen ) + test? ( dev-cpp/catch )" + +RESTRICT="!test? ( test )" + +src_configure() { + local mycmakeargs=( + -DHTTP_CLIENT=$(usex http-client) + -DHTTP_SERVER=$(usex http-server) + # they are not installed + -DCOMPILE_EXAMPLES=OFF + -DCOMPILE_STUBGEN=$(usex stubgen) + -DCOMPILE_TESTS=$(usex test) + -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch" + ) + + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + use doc && emake -C "${BUILD_DIR}" doc +} + +src_install() { + cmake-utils_src_install + + use doc && dodoc -r "${BUILD_DIR}"/doc/html +} diff --git a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild index a8d3e54c345e..57baa1052de4 100644 --- a/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild +++ b/dev-cpp/libjson-rpc-cpp/libjson-rpc-cpp-9999.ebuild @@ -32,8 +32,8 @@ src_configure() { local mycmakeargs=( -DHTTP_CLIENT=$(usex http-client) -DHTTP_SERVER=$(usex http-server) - # they are not installed but required for tests to build - -DCOMPILE_EXAMPLES=$(usex test) + # they are not installed + -DCOMPILE_EXAMPLES=OFF -DCOMPILE_STUBGEN=$(usex stubgen) -DCOMPILE_TESTS=$(usex test) -DCATCH_INCLUDE_DIR="${EPREFIX}/usr/include/catch" diff --git a/dev-db/postgresql/postgresql-9.1.23.ebuild b/dev-db/postgresql/postgresql-9.1.23.ebuild index 8b01b60c2dd7..3b4f8597ce85 100644 --- a/dev-db/postgresql/postgresql-9.1.23.ebuild +++ b/dev-db/postgresql/postgresql-9.1.23.ebuild @@ -13,7 +13,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.2.18.ebuild b/dev-db/postgresql/postgresql-9.2.18.ebuild index a1be27eed985..a3c1e832a0ac 100644 --- a/dev-db/postgresql/postgresql-9.2.18.ebuild +++ b/dev-db/postgresql/postgresql-9.2.18.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.3.14.ebuild b/dev-db/postgresql/postgresql-9.3.14.ebuild index 345841d0b262..b94387d09ca0 100644 --- a/dev-db/postgresql/postgresql-9.3.14.ebuild +++ b/dev-db/postgresql/postgresql-9.3.14.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.4.9.ebuild b/dev-db/postgresql/postgresql-9.4.9.ebuild index 031720c7f5ea..52b0f6091ca4 100644 --- a/dev-db/postgresql/postgresql-9.4.9.ebuild +++ b/dev-db/postgresql/postgresql-9.4.9.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-db/postgresql/postgresql-9.5.4.ebuild b/dev-db/postgresql/postgresql-9.5.4.ebuild index f538452df5af..10f5813b7fa7 100644 --- a/dev-db/postgresql/postgresql-9.5.4.ebuild +++ b/dev-db/postgresql/postgresql-9.5.4.ebuild @@ -9,7 +9,7 @@ PYTHON_COMPAT=( python{2_7,3_4,3_5} ) inherit eutils flag-o-matic linux-info multilib pam prefix python-single-r1 \ systemd user versionator -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris" SLOT="$(get_version_component_range 1-2)" diff --git a/dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild b/dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild index 1057a915e476..170807342528 100644 --- a/dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild +++ b/dev-java/icedtea-bin/icedtea-bin-3.1.0.ebuild @@ -7,7 +7,7 @@ EAPI="5" inherit java-vm-2 multilib-build toolchain-funcs MULTILIB_COMPAT=( abi_ppc_64 abi_x86_{32,64} ) -KEYWORDS="-* amd64 ~arm ~ppc64 ~x86" +KEYWORDS="-* amd64 ~arm ppc64 ~x86" BASE_URI="https://dev.gentoo.org/~chewi/distfiles" SRC_URI="doc? ( ${BASE_URI}/${PN}-doc-${PV}.tar.xz ) diff --git a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild index 3a48053fd8bc..681cca1ba85e 100644 --- a/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild +++ b/dev-java/javatoolkit/javatoolkit-0.3.0-r9.ebuild @@ -7,7 +7,7 @@ EAPI="5" PYTHON_COMPAT=(python2_7) PYTHON_REQ_USE="xml(+)" -inherit distutils-r1 eutils multilib +inherit distutils-r1 eutils multilib prefix DESCRIPTION="Collection of Gentoo-specific tools for Java" HOMEPAGE="https://www.gentoo.org/proj/en/java/" @@ -23,6 +23,7 @@ python_prepare_all() { "${FILESDIR}/${P}-python2.6.patch" "${FILESDIR}/${P}-no-pyxml.patch" ) + hprefixify setup.py distutils-r1_python_prepare_all } diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest index 4085c8160424..48e30cbf871a 100644 --- a/dev-libs/check/Manifest +++ b/dev-libs/check/Manifest @@ -1,5 +1,3 @@ DIST check-0.10.0.tar.gz 769119 SHA256 f5f50766aa6f8fe5a2df752666ca01a950add45079aa06416b83765b1cf71052 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5 WHIRLPOOL d3399a2500a4a1f6fa8865fe75af67e98a22587edd2525d144f4f403dd313cc59b7622cd77cfd885b9e3dfd737e2bef5366d28062b2975c882ffac6253b02b29 DIST check-0.9.11.tar.gz 691146 SHA256 ea4e8c7ffb00bb4ffb3f59f11744a71f1cc4212c79f3083c7d9a4b0953976936 SHA512 10883709463b76f6650197db989c348d9d07ccaa2cacc0bd6bd177bbcc1e9e0d88746c2e110e620ab18c23cb5f41b95797d60d77de279af1a810a42b355b742e WHIRLPOOL 9559104a68b2f1215e9b00affb4711a69bf3e4e94e0ec894de66f0f77b5637187bb183560e29d0a889ff04d0e07f2785fc407128dee1ba74d584ce9a0ff9a3b1 -DIST check-0.9.12.tar.gz 730404 SHA256 c7d47e55e133a0ca19a52e08a99333ac55cb22618b53719b7f4117a1875b1ea3 SHA512 698e6cfdf24b07340fb4fa77f49811053f8307d3baca8bdcdde5e3dfe1f910bbadb6a393f03020d8b18c22e7e164d40f6bbbeb9659908b0df8459e5c4850fa50 WHIRLPOOL 4994c444532e1337bcda5e632d532ffd6aae59de866009b5bce3d1f25988dd203d04136dd451b6d24c6e32775159772d1c98097ff618a5cc559fca9725ad18ed -DIST check-0.9.13.tar.gz 752880 SHA256 ca6589c34f9c60ffd4c3e198ce581e944a9f040ca9352ed54068dd61bebb5cb7 SHA512 a0ff64110c52fd600a8a956c2d56589e6e65ff0072b34f33e0299b4f9a2ac0a93a330b0c8cbf3645c02d0c9c748c71704bd3a8825eec22eb2f22ad99bcffa551 WHIRLPOOL 9f7f42ca4106deabe57051e84cec4f0a838847c45308baaf8cb4441e30667016fa95b1b2705b42dc494af8e9a22aea5d6733de71cd99ec0025652da53756275d DIST check-0.9.8.tar.gz 558943 SHA256 82acf956bb07584ffea2bf04d5989fe939c3e74ecf93133a21037fd0f7996a7f SHA512 a8ef659411c18f8af77006a51fe14741b990e7486c3e5c1e97cd2a100a603483ba9854c2f23bd9a5e834e133ca0dcc3ae15f41856339ab3b82a75ad769a872a2 WHIRLPOOL fdc06bd44f041153f655c577c55825afb2d2b79ff066427cd224b5a6d351f9da076d39807f434d2e22e1b6b54c6bc774744c8210dc318e493b9241bb5d7ded84 diff --git a/dev-libs/check/check-0.10.0.ebuild b/dev-libs/check/check-0.10.0-r1.ebuild similarity index 74% rename from dev-libs/check/check-0.10.0.ebuild rename to dev-libs/check/check-0.10.0-r1.ebuild index 2d86028f27b5..f0c21e31e6bc 100644 --- a/dev-libs/check/check-0.10.0.ebuild +++ b/dev-libs/check/check-0.10.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -6,7 +6,7 @@ EAPI=5 AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" -inherit autotools autotools-multilib eutils +inherit autotools autotools-multilib DESCRIPTION="A unit test framework for C" HOMEPAGE="https://sourceforge.net/projects/check/" @@ -17,8 +17,9 @@ SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="static-libs subunit" -DEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" +RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + virtual/pkgconfig" pkg_setup() { # See multilib_src_test(), disable sleep()-based tests because they @@ -27,14 +28,12 @@ pkg_setup() { } src_prepare() { - sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die + sed -i -e '/^docdir =/d' {.,doc}/Makefile.am \ + || die 'failed to unset docdir in Makefile.am' # fix out-of-sourcedir build having inconsistent check.h files, for # example breaks USE=subunit. - rm src/check.h || die - - # Fix automake warnings being treated as errors, bug #420373 - sed -i -e s/-Werror// configure.ac || die + rm src/check.h || die 'failed to remove src/check.h' eautoreconf } @@ -43,7 +42,7 @@ src_configure() { local myeconfargs=( --disable-dependency-tracking $(use_enable subunit) - --docdir="${EPREFIX}"/usr/share/doc/${PF} + --docdir="${EPREFIX}/usr/share/doc/${PF}" ) autotools-multilib_src_configure } @@ -59,5 +58,6 @@ src_install() { autotools-multilib_src_install dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO - rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die + rm -f "${ED}/usr/share/doc/${PF}"/COPYING* || \ + die 'failed to remove COPYING files' } diff --git a/dev-libs/check/check-0.9.12.ebuild b/dev-libs/check/check-0.9.12.ebuild deleted file mode 100644 index 5481c5206b8a..000000000000 --- a/dev-libs/check/check-0.9.12.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" - -inherit autotools autotools-multilib eutils - -DESCRIPTION="A unit test framework for C" -HOMEPAGE="https://sourceforge.net/projects/check/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs subunit" - -DEPEND="subunit? ( dev-python/subunit )" -RDEPEND="${DEPEND}" - -src_prepare() { - epatch \ - "${FILESDIR}"/${PN}-0.9.10-AM_PATH_CHECK.patch - - sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die - - # fix out-of-sourcedir build having inconsistent check.h files, for - # example breaks USE=subunit. - rm src/check.h || die - - # Fix automake warnings being treated as errors, bug #420373 - sed -i -e s/-Werror// configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-dependency-tracking - $(use_enable subunit) - --docdir="${EPREFIX}"/usr/share/doc/${PF} - ) - autotools-multilib_src_configure -} - -src_install() { - autotools-multilib_src_install - dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO - - rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die -} diff --git a/dev-libs/check/check-0.9.13-r1.ebuild b/dev-libs/check/check-0.9.13-r1.ebuild deleted file mode 100644 index 53d1b6bbb46f..000000000000 --- a/dev-libs/check/check-0.9.13-r1.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" - -inherit autotools autotools-multilib eutils - -DESCRIPTION="A unit test framework for C" -HOMEPAGE="https://sourceforge.net/projects/check/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs subunit" - -DEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )" -RDEPEND="${DEPEND}" - -pkg_setup() { - # See multilib_src_test(), disable sleep()-based tests because they - # just take a long time doing pretty much nothing. - export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}" -} - -src_prepare() { - sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die - - # fix out-of-sourcedir build having inconsistent check.h files, for - # example breaks USE=subunit. - rm src/check.h || die - - # Fix automake warnings being treated as errors, bug #420373 - sed -i -e s/-Werror// configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-dependency-tracking - $(use_enable subunit) - --docdir="${EPREFIX}"/usr/share/doc/${PF} - ) - autotools-multilib_src_configure -} - -multilib_src_test() { - elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the" - elog "entire testsuite for dev-libs/check, ensure that" - elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS." - default_src_test -} - -src_install() { - autotools-multilib_src_install - dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO - - rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die -} diff --git a/dev-libs/check/check-0.9.13.ebuild b/dev-libs/check/check-0.9.13.ebuild deleted file mode 100644 index fada9ede4107..000000000000 --- a/dev-libs/check/check-0.9.13.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -AUTOTOOLS_PRUNE_LIBTOOL_FILES="all" - -inherit autotools autotools-multilib eutils - -DESCRIPTION="A unit test framework for C" -HOMEPAGE="https://sourceforge.net/projects/check/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs subunit" - -DEPEND="subunit? ( dev-python/subunit )" -RDEPEND="${DEPEND}" - -pkg_setup() { - # See multilib_src_test(), disable sleep()-based tests because they - # just take a long time doing pretty much nothing. - export CPPFLAGS="-DTIMEOUT_TESTS_ENABLED=0 ${CPPFLAGS}" -} - -src_prepare() { - sed -i -e '/^docdir =/d' {.,doc}/Makefile.am || die - - # fix out-of-sourcedir build having inconsistent check.h files, for - # example breaks USE=subunit. - rm src/check.h || die - - # Fix automake warnings being treated as errors, bug #420373 - sed -i -e s/-Werror// configure.ac || die - - eautoreconf -} - -src_configure() { - local myeconfargs=( - --disable-dependency-tracking - $(use_enable subunit) - --docdir="${EPREFIX}"/usr/share/doc/${PF} - ) - autotools-multilib_src_configure -} - -multilib_src_test() { - elog "-DTIMEOUT_TESTS_ENABLED=0 has been prepended to CPPFLAGS. To run the" - elog "entire testsuite for dev-libs/check, ensure that" - elog "-DTIMEOUT_TESTS_ENABLED=1 is in your CPPFLAGS." - default_src_test -} - -src_install() { - autotools-multilib_src_install - dodoc AUTHORS *ChangeLog* NEWS README THANKS TODO - - rm -f "${ED}"/usr/share/doc/${PF}/COPYING* || die -} diff --git a/dev-libs/libmateweather/libmateweather-1.12.1-r1.ebuild b/dev-libs/libmateweather/libmateweather-1.12.1-r2.ebuild similarity index 97% rename from dev-libs/libmateweather/libmateweather-1.12.1-r1.ebuild rename to dev-libs/libmateweather/libmateweather-1.12.1-r2.ebuild index 5d18c0d61f32..80cf76e3de09 100644 --- a/dev-libs/libmateweather/libmateweather-1.12.1-r1.ebuild +++ b/dev-libs/libmateweather/libmateweather-1.12.1-r2.ebuild @@ -60,7 +60,7 @@ src_configure() { } src_compile() { - mate_py_cond_func_wrap mate_src_compile + mate_py_cond_func_wrap default } src_install() { diff --git a/dev-libs/libpcre-debian/Manifest b/dev-libs/libpcre-debian/Manifest new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/dev-libs/libpcre-debian/libpcre-debian-8.ebuild b/dev-libs/libpcre-debian/libpcre-debian-8.ebuild new file mode 100644 index 000000000000..7ceb215b4a54 --- /dev/null +++ b/dev-libs/libpcre-debian/libpcre-debian-8.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit multilib multilib-minimal + +DESCRIPTION="libpcre.so.3 symlink for compatibility with Debian" +HOMEPAGE="http://www.pcre.org/" +LICENSE="BSD" +SLOT="3" +KEYWORDS="~amd64 ~x86" + +RDEPEND="dev-libs/libpcre:${SLOT}[${MULTILIB_USEDEP}]" + +S="${WORKDIR}" + +multilib_src_install() { + dosym $(multilib_is_native_abi || echo /usr)/$(get_libdir)/libpcre.so.1 \ + /usr/$(get_libdir)/debiancompat/libpcre.so.3 +} diff --git a/dev-libs/mingw-libgnurx/metadata.xml b/dev-libs/libpcre-debian/metadata.xml similarity index 56% rename from dev-libs/mingw-libgnurx/metadata.xml rename to dev-libs/libpcre-debian/metadata.xml index 6f49eba8f496..54be7ff7e5d6 100644 --- a/dev-libs/mingw-libgnurx/metadata.xml +++ b/dev-libs/libpcre-debian/metadata.xml @@ -1,5 +1,8 @@ - + + chewi@gentoo.org + James Le Cuirot + diff --git a/dev-libs/mingw-libgnurx/Manifest b/dev-libs/mingw-libgnurx/Manifest deleted file mode 100644 index e8a4514a18b5..000000000000 --- a/dev-libs/mingw-libgnurx/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST mingw-libgnurx-2.5.1-src.tar.gz 125941 SHA256 7147b7f806ec3d007843b38e19f42a5b7c65894a57ffc297a76b0dcd5f675d76 SHA512 b86e5580b82ac17c68c0d2c7239a4e4d59310d357f599c4c4688e605b2f2209a40f8affce85bfd30fa2edde9ced482c433eba07b5b5adf068cd56dbf94224ba3 WHIRLPOOL a8570b9a13307e27d9fc375d41402e13c9557d995e731c6b39c993f0305d02e3dbb10f74bb19463cc48852fc05244c46c90f3356ece06dc930e3815cb3a81b08 diff --git a/dev-libs/mingw-libgnurx/mingw-libgnurx-2.5.1.ebuild b/dev-libs/mingw-libgnurx/mingw-libgnurx-2.5.1.ebuild deleted file mode 100644 index b410a734d191..000000000000 --- a/dev-libs/mingw-libgnurx/mingw-libgnurx-2.5.1.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -inherit autotools - -DESCRIPTION="GNU regex library ripped out of glibc for use with mingw apps" -HOMEPAGE="http://mingw.sourceforge.net/" -SRC_URI="mirror://sourceforge/mingw/${P}-src.tar.gz" - -LICENSE="LGPL-2.1+" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="static-libs" - -# Installs regex.h which most C libs provide. -RDEPEND="!sys-libs/glibc - !sys-libs/uclibc - !sys-libs/musl" - -src_prepare() { - default - - # Refresh the autotools to modern ones as the bundled ones are ancient. - rm aclocal.m4 - cat <configure.ac -AC_INIT(libgnurx, ${PV}) -AM_INIT_AUTOMAKE -LT_INIT([dlopen win32-dll]) -AC_OUTPUT([Makefile]) -EOF - cat <Makefile.am -include_HEADERS = regex.h -lib_LTLIBRARIES = libgnurx.la -libgnurx_la_SOURCES = regex.c -libgnurx_la_LDFLAGS = -no-undefined -version-info 0:0:0 -export-dynamic -EOF - - eautoreconf -} - -src_configure() { - econf $(use_enable static-libs static) -} - -src_install() { - default - find "${ED}" -name '*.la' -delete -} diff --git a/dev-libs/nettle/nettle-3.2-r1.ebuild b/dev-libs/nettle/nettle-3.2-r1.ebuild index 3ed9631f1863..51be425856ff 100644 --- a/dev-libs/nettle/nettle-3.2-r1.ebuild +++ b/dev-libs/nettle/nettle-3.2-r1.ebuild @@ -12,7 +12,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="|| ( LGPL-3 LGPL-2.1 )" SLOT="0/6" # subslot = libnettle soname version -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x86-solaris" IUSE="doc +gmp neon static-libs test cpu_flags_x86_aes" DEPEND="gmp? ( >=dev-libs/gmp-5.0:0[${MULTILIB_USEDEP}] )" diff --git a/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild b/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild new file mode 100644 index 000000000000..d3bbbde4799a --- /dev/null +++ b/dev-ml/ANSITerminal/ANSITerminal-0.7.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +OASIS_BUILD_DOCS=1 + +inherit oasis eutils + +DESCRIPTION="Module which offers basic control of ANSI compliant terminals" +HOMEPAGE="https://github.com/Chris00/ANSITerminal" +SRC_URI="https://github.com/Chris00/ANSITerminal/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="LGPL-3-with-linking-exception" +SLOT="0/${PV}" +KEYWORDS="~amd64" +RDEPEND="" +DEPEND="${DEPEND} dev-ml/oasis" +IUSE="" + +DOCS=( "README.txt" "AUTHORS.txt" ) + +src_prepare() { + oasis setup || die +} diff --git a/dev-ml/ANSITerminal/Manifest b/dev-ml/ANSITerminal/Manifest index 8515473878ec..0c38e9bf9cc8 100644 --- a/dev-ml/ANSITerminal/Manifest +++ b/dev-ml/ANSITerminal/Manifest @@ -1 +1,2 @@ DIST ANSITerminal-0.6.5.tar.gz 52473 SHA256 26874e1bd737f803f84acdc2256b48c76c88bea12c0ce06172db8428367533c9 SHA512 43a059cc2a947a70409e19b8c6d01e1b5aa495290967f984a6d707e5ff329dd88e82ba68e08b6262da4a19bb24be2e61154fcf8781ee5cbad98240276d7b060d WHIRLPOOL cefe7f713ff06df0a5ecf583a53e4d2efc75e041c980e20768eab9c54dd26e3865bb60851034a96e795e41174b884b50cf43f0771c4b2a8c376e2ec8b8a9a187 +DIST ANSITerminal-0.7.tar.gz 16763 SHA256 0ce1b3089fdab267a67f2efc840d4438ed3fb27c94b832805617fc7f09930585 SHA512 986f9d7fd862741ac7039cbd92c19b847d7b2d03edfb2d0851fe46ecc9678bf4617d1e687a61af3d3b28e2cfe347a80312f9bf5c84f957de0d6c169ca4209566 WHIRLPOOL d48fd7248a5ed57ba233f14c69eb811baf4546c294ca04e5074c88c1fda95e27c60913aa2a7b43b866911cd1ac73d9da00b3e3ba120fa6c2bc31d42a8ed9b6a6 diff --git a/dev-ml/dose3/Manifest b/dev-ml/dose3/Manifest index 693252965a87..e98c6fc12dc1 100644 --- a/dev-ml/dose3/Manifest +++ b/dev-ml/dose3/Manifest @@ -1,2 +1,3 @@ DIST dose3-4.2.tar.gz 281555 SHA256 ed37414baded4a175b47d4e2856c1e827fc7fb9939cc9e176a1d46e5048d8526 SHA512 d64443899f874254834165c44d0400eff5fa80e1d1d41f76b94fbb11ae0b34aa75dcbb8cc9a5e510e2f91d147e11391f36c45ef0fb24536fffcfc68d686c5fa1 WHIRLPOOL cce3baa6dfe922a3b04e8683aea785bbfd3050a70a0c0b533457fe41f274eca1e62343bca34e08307e9818252d09c2d6b24b4b2fb0efb1321fd38fd478b7428e DIST dose3-4.3.tar.gz 293844 SHA256 269dd817d7130ae9289eab2aea540a7f1f00ceac6644320cf8119dc5b597b6e4 SHA512 96e0ef2d884214efc4cf140582d9fedc15b1fe33d21b6b23309cd2d745bafd5871b58b0234fb0b76711bcd07087d04f07fabd1c2c1c757157c9e50b90931357d WHIRLPOOL 4cb42a3b2bd63aca1d0270a62ea7d2a174e7c4bd389109071e80167b4218676919c69fd5f19d4c63fbd186cb62c239155e8dadcb2145b08ac24579e031d4419f +DIST dose3-5.0.1.tar.gz 297433 SHA256 558af92b0ec5dd219e67802c95a850cab9582df381bddd2cfe431049aaf3db03 SHA512 e66526319446054041f138ee2633043d0832089f6a554cf566a28de899d10383acfb1aa6bf1a368811602939676510933a7d2404fd34dbeba15045b458f5af84 WHIRLPOOL d8f3e58841b73c4b33f5e308c428778d1040e12b1394d6eb4f934f61ae321d4805485b0182362fec8ecb95500d180580df6fb27585aec1fe5e38f9d6da72e1cd diff --git a/dev-ml/dose3/dose3-5.0.1.ebuild b/dev-ml/dose3/dose3-5.0.1.ebuild new file mode 100644 index 000000000000..8a516281b1b5 --- /dev/null +++ b/dev-ml/dose3/dose3-5.0.1.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit eutils + +MY_P="${P/_beta/-beta}" +DESCRIPTION="Library and a collection of tools to perform la large spectrum of analysis on package repositories" +HOMEPAGE="http://www.mancoosi.org/software/ https://gforge.inria.fr/projects/dose" +SRC_URI="https://gforge.inria.fr/frs/download.php/file/36063/${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0/${PV}" +KEYWORDS="~amd64" +IUSE="+ocamlopt parmap zip bzip2 xml curl rpm4 test" + +RDEPEND=" + >=dev-lang/ocaml-3.12:=[ocamlopt?] + dev-ml/cudf:= + >=dev-ml/extlib-1.7.0:= + dev-ml/ocaml-re:= + dev-ml/cppo:= + parmap? ( dev-ml/parmap:= ) + zip? ( dev-ml/camlzip:= ) + bzip2? ( dev-ml/camlbz2:= ) + >=dev-ml/ocamlgraph-1.8.6:= + xml? ( dev-ml/ocaml-expat:= dev-ml/xml-light:= ) + curl? ( dev-ml/ocurl:= ) + rpm4? ( app-arch/rpm ) +" +DEPEND="${RDEPEND} + dev-ml/findlib + dev-ml/ocamlbuild + test? ( dev-python/pyyaml[libyaml] ) +" +# missing test data +RESTRICT="test" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + sed -e 's/INSTALLOPTS=-s/INSTALLOPTS=/' -i Makefile.config.in || die +} + +src_configure() { + econf \ + $(use ocamlopt || echo "--with-bytecodeonly") \ + $(use parmap && echo "--with-parmap") \ + $(use zip && echo "--with-zip") \ + $(use bzip2 && echo "--with-bz2") \ + $(use xml && echo "--with-xml") \ + $(use curl && echo "--with-curl") \ + $(use rpm4 && echo "--with-rpm4") +} + +src_compile() { + emake -j1 +} + +src_install() { + emake DESTDIR="${D}" BINDIR="${ED}/usr/bin" install || die + dodoc CHANGES CREDITS README.architecture TODO +} diff --git a/dev-ml/eliom/eliom-5.0.0.ebuild b/dev-ml/eliom/eliom-5.0.0-r1.ebuild similarity index 84% rename from dev-ml/eliom/eliom-5.0.0.ebuild rename to dev-ml/eliom/eliom-5.0.0-r1.ebuild index e0d8cb71f0ea..8aaec1f4701e 100644 --- a/dev-ml/eliom/eliom-5.0.0.ebuild +++ b/dev-ml/eliom/eliom-5.0.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -26,11 +26,19 @@ RDEPEND=">=dev-lang/ocaml-4.00:=[ocamlopt?] dev-ml/ocaml-ssl:= >=dev-ml/lwt-2.5.0:= dev-ml/calendar:= + dev-ml/camlp4:= ppx? ( >=dev-ml/ppx_tools-0.99.3:= )" DEPEND="${RDEPEND} dev-ml/ocamlbuild dev-ml/opam" +src_prepare() { + if has_version '>=dev-lang/ocaml-4.03' ; then + epatch "${FILESDIR}/"{camlp4,oc43}.patch + fi + has_version '>=dev-ml/tyxml-4' && epatch "${FILESDIR}/tyxml4.patch" +} + src_compile() { if use ocamlopt ; then emake PPX=$(usex ppx true false) all diff --git a/dev-ml/eliom/files/camlp4.patch b/dev-ml/eliom/files/camlp4.patch new file mode 100644 index 000000000000..59e94ab462a2 --- /dev/null +++ b/dev-ml/eliom/files/camlp4.patch @@ -0,0 +1,48 @@ +commit f157a5b913451b85e8cfe7549c66e5c98669233b +Author: Vasilis Papavasileiou +Date: Wed Mar 2 14:23:02 2016 +0100 + + Compile against Camlp4 4.02+7 + +diff --git a/src/syntax/pa_eliom_seed.ml b/src/syntax/pa_eliom_seed.ml +index c101ff8..dc31caa 100644 +--- a/src/syntax/pa_eliom_seed.ml ++++ b/src/syntax/pa_eliom_seed.ml +@@ -632,8 +632,26 @@ module Register(Id : sig val name: string end)(Pass : Pass) = struct + | None -> + Printf.ksprintf (Syntax_error.raise loc) fmt + +- module E2 = Camlp4.ErrorHandler.Register(Syntax_error) +- DELETE_RULE Gram expr: "{"; TRY [label_expr_list; "}"] END; ++ module E2 = Camlp4.ErrorHandler.Register(Syntax_error) ;; ++ ++ try ++ DELETE_RULE Gram expr: "{"; TRY [label_expr_list; "}"] END ++ with Camlp4.Struct.Grammar.Delete.Rule_not_found _ -> ++ (let test_record_field = ++ Gram.Entry.of_parser "record_field" (fun strm -> ++ let rec loop = function ++ | [] -> () ++ | (UIDENT _, _) :: (KEYWORD ".", _) :: rest -> loop rest ++ | (LIDENT _, _) :: (KEYWORD "=", _) :: _ -> () ++ | (LIDENT _, _) :: (KEYWORD ";", _) :: _ -> () ++ | [LIDENT _, _] -> () ++ | _ -> raise Stream.Failure ++ in ++ loop (Stream.npeek 100 strm)) ++ in ++ DELETE_RULE Gram expr: ++ "{"; test_record_field; label_expr_list; "}" END) ;; ++ + DELETE_RULE Gram expr: "{"; TRY [expr LEVEL "."; "with"]; label_expr_list; "}" END; + + (* Extending syntax *) +@@ -812,7 +830,7 @@ module Register(Id : sig val name: string end)(Pass : Pass) = struct + expr: LEVEL "simple" + + [ [ KEYWORD "{"; lel = TRY [lel = label_expr_list; "}" -> lel] -> +- <:expr< { $lel$ } >> ++ Ast.ExRec (_loc, lel, Ast.ExNil _loc) + | KEYWORD "{shared#"; + typ = TRY [ typ = OPT ctyp; KEYWORD "{" -> typ]; + opt_lvl = dummy_set_level_shared_value_expr ; diff --git a/dev-ml/eliom/files/oc43.patch b/dev-ml/eliom/files/oc43.patch new file mode 100644 index 000000000000..07d2729928a4 --- /dev/null +++ b/dev-ml/eliom/files/oc43.patch @@ -0,0 +1,37 @@ +Index: eliom-5.0.0/src/lib/eliom_lib.client.mli +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_lib.client.mli ++++ eliom-5.0.0/src/lib/eliom_lib.client.mli +@@ -43,7 +43,6 @@ type 'a shared_value = 'a + + val create_shared_value : 'a -> 'a client_value -> 'a shared_value + +-exception Eliom_Internal_Error of string + + (** This exception is raised (in Lwt) on the client if a call to a + server function {% < <:sig_item< >> + | si -> super#sig_item si + method ctyp ty = match ty with diff --git a/dev-ml/eliom/files/tyxml4.patch b/dev-ml/eliom/files/tyxml4.patch new file mode 100644 index 000000000000..bf749e4f3ad0 --- /dev/null +++ b/dev-ml/eliom/files/tyxml4.patch @@ -0,0 +1,1642 @@ +Index: eliom-5.0.0/src/lib/eliom_content.client.mli +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_content.client.mli ++++ eliom-5.0.0/src/lib/eliom_content.client.mli +@@ -292,7 +292,7 @@ module Html5 : sig + See {% <> %} *) + + (** Cf. {% <> %}. *) +- module Raw : Html5_sigs.Make(Xml)(Svg.F.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.F.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -313,7 +313,7 @@ module Html5 : sig + See {% <> %} *) + + (** Cf. {% <> %}. *) +- module Raw : Html5_sigs.Make(Xml)(Svg.D.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.D.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -352,7 +352,7 @@ module Html5 : sig + val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib + + (** Cf. {% <> %}. *) +- module Raw : Html5_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T ++ module Raw : Html_sigs.Make(Eliom_content_core.Xml_wed)(Svg.R.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +Index: eliom-5.0.0/src/lib/eliom_content.server.mli +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_content.server.mli ++++ eliom-5.0.0/src/lib/eliom_content.server.mli +@@ -309,7 +309,7 @@ module Html5 : sig + {{:http://ocsigen.org/howto/forms/}"how to make forms"} *) + + (** See {% <> %}. *) +- module Raw : Html5_sigs.Make(Xml)(Svg.F.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.F.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -337,7 +337,7 @@ module Html5 : sig + {{:http://ocsigen.org/howto/forms/}"how to make forms"} *) + + (** See {% <> %}. *) +- module Raw : Html5_sigs.Make(Xml)(Svg.D.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.D.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -406,7 +406,7 @@ module Html5 : sig + {% <> %}. *) + module R : sig + +- include Html5_sigs.Make(Xml_shared)(Svg.R.Raw).T ++ include Html_sigs.Make(Xml_shared)(Svg.R.Raw).T + with type 'a elt = 'a elt + and type 'a attrib = 'a attrib + +@@ -414,7 +414,7 @@ module Html5 : sig + [\[> Html5_types.span\] elt] + out of the string signal [s]. *) + val pcdata : +- string Eliom_shared.React.S.t -> [> Html5_types.span] elt ++ string Eliom_shared.React.S.t -> [> Html_types.span] elt + + (** [node s] produces an ['a elt] out of the shared reactive + signal [s]. *) +Index: eliom-5.0.0/src/lib/eliom_content_core.client.ml +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_content_core.client.ml ++++ eliom-5.0.0/src/lib/eliom_content_core.client.ml +@@ -175,7 +175,7 @@ end + + module Xml_wed = + struct +- module W = Tyxml_js.Xml_wrap ++ module W = Tyxml_js.Wrap + type 'a wrap = 'a W.t + type 'a list_wrap = 'a W.tlist + type uri = Xml.uri +@@ -188,7 +188,7 @@ struct + type attrib = Xml.attrib + + let float_attrib name s : attrib = +- name, Xml.RAReact (Tyxml_js.Xml_wrap.fmap (fun f -> Some (Xml.AFloat f)) s) ++ name, Xml.RAReact (Tyxml_js.Wrap.fmap (fun f -> Some (Xml.AFloat f)) s) + let int_attrib name s = + name, Xml.RAReact (React.S.map (fun f -> Some (Xml.AInt f)) s) + let string_attrib name s = +@@ -320,7 +320,7 @@ module Html5 = struct + let lazy_node ?(a = []) name children = + make (Node (name, a, Eliom_lazy.force children)) + end +- module Raw = Html5_f.Make(Xml')(Svg.D.Raw) ++ module Raw = Html_f.Make(Xml')(Svg.D.Raw) + + include Raw + +@@ -340,7 +340,7 @@ module Html5 = struct + + let node s = Xml.make_react s + +- module Raw = Html5_f.Make(Xml_wed)(Svg.R) ++ module Raw = Html_f.Make(Xml_wed)(Svg.R) + let filter_attrib (name,a) on = + let v = match a with + | Xml.RA a -> Xml.RAReact (React.S.map (function +@@ -365,7 +365,7 @@ module Html5 = struct + module F = struct + + module Xml' = Xml +- module Raw = Html5_f.Make(Xml')(Svg.F.Raw) ++ module Raw = Html_f.Make(Xml')(Svg.F.Raw) + include Raw + + type ('a, 'b, 'c) lazy_star = +Index: eliom-5.0.0/src/lib/eliom_content_core.client.mli +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_content_core.client.mli ++++ eliom-5.0.0/src/lib/eliom_content_core.client.mli +@@ -22,7 +22,10 @@ + + module Xml : sig + +- module W : Xml_wrap.T with type 'a t = 'a and type 'a tlist = 'a list ++ module W : Xml_wrap.T ++ with type 'a t = 'a ++ and type 'a tlist = 'a list ++ and type (-'a, 'b) ft = 'a -> 'b + + type uri = string + val uri_of_string : uri -> string +@@ -153,7 +156,7 @@ end + + module Xml_wed : sig + +- include Xml_sigs.T with module W = Tyxml_js.Xml_wrap ++ include Xml_sigs.T with module W = Tyxml_js.Wrap + and type elt = Xml.elt + and type aname = Xml.aname + and type attrib = Xml.attrib +@@ -281,7 +284,7 @@ module Html5 : sig + See {% <> %}. *) + module F : sig + +- module Raw : Html5_sigs.Make(Xml)(Svg.F.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.F.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -293,7 +296,7 @@ module Html5 : sig + ?a: (('a attrib) list) -> ('b elt) list Eliom_lazy.request -> 'c elt + + val lazy_form: +- ([< Html5_types.form_attrib ], [< Html5_types.form_content_fun ], [> Html5_types.form ]) lazy_star ++ ([< Html_types.form_attrib ], [< Html_types.form_content_fun ], [> Html_types.form ]) lazy_star + + end + +@@ -302,7 +305,7 @@ module Html5 : sig + {% <> %}. *) + module D: sig + +- module Raw : Html5_sigs.Make(Xml)(Svg.D.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.D.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -313,7 +316,7 @@ module Html5 : sig + ?a: (('a attrib) list) -> ('b elt) list Eliom_lazy.request -> 'c elt + + val lazy_form: +- ([< Html5_types.form_attrib ], [< Html5_types.form_content_fun ], [> Html5_types.form ]) lazy_star ++ ([< Html_types.form_attrib ], [< Html_types.form_content_fun ], [> Html_types.form ]) lazy_star + + end + +@@ -332,7 +335,7 @@ module Html5 : sig + + val filter_attrib : 'a attrib -> bool React.signal -> 'a attrib + +- module Raw : Html5_sigs.Make(Xml_wed)(Svg.R.Raw).T ++ module Raw : Html_sigs.Make(Xml_wed)(Svg.R.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +Index: eliom-5.0.0/src/lib/eliom_content_core.server.ml +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_content_core.server.ml ++++ eliom-5.0.0/src/lib/eliom_content_core.server.ml +@@ -289,8 +289,7 @@ module Svg = struct + module Make + (Xml : Xml_sigs.T with type elt = Xml.elt + and type attrib = Xml.attrib) +- (C : Svg_sigs.Wrapped_functions +- with type ('a, 'b) ft = ('a, 'b) Xml.W.ft) = ++ (C : Svg_sigs.Wrapped_functions with module Xml = Xml) = + Svg_f.Make_with_wrapped_functions(Xml)(C) + + type +'a elt = 'a F.elt +@@ -341,7 +340,7 @@ module Html5 = struct + + end + +- module Raw = Html5_f.Make(Xml')(Svg.D.Raw) ++ module Raw = Html_f.Make(Xml')(Svg.D.Raw) + let client_attrib ?init (x : 'a Raw.attrib Eliom_lib.client_value) = + Xml.client_attrib ?init x + +@@ -359,7 +358,7 @@ module Html5 = struct + module F = struct + + module Xml' = Xml +- module Raw = Html5_f.Make(Xml')(Svg.F.Raw) ++ module Raw = Html_f.Make(Xml')(Svg.F.Raw) + include Raw + + type ('a, 'b, 'c) lazy_star = +@@ -376,10 +375,9 @@ module Html5 = struct + (Xml : Xml_sigs.T + with type elt = Xml.elt + and type attrib = Xml.attrib) +- (C : Html5_sigs.Wrapped_functions +- with type ('a, 'b) ft = ('a, 'b) Xml.W.ft) ++ (C : Html_sigs.Wrapped_functions with module Xml = Xml) + (Svg : Svg_sigs.T with module Xml := Xml) = +- Html5_f.Make_with_wrapped_functions(Xml)(C)(Svg) ++ Html_f.Make_with_wrapped_functions(Xml)(C)(Svg) + + type +'a elt = 'a F.elt + type 'a wrap = 'a +Index: eliom-5.0.0/src/lib/eliom_content_core.server.mli +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_content_core.server.mli ++++ eliom-5.0.0/src/lib/eliom_content_core.server.mli +@@ -116,8 +116,7 @@ module Svg : sig + (Xml : Xml_sigs.T + with type elt = Xml.elt + and type attrib = Xml.attrib) +- (C : Svg_sigs.Wrapped_functions +- with type ('a, 'b) ft = ('a, 'b) Xml.W.ft) : ++ (C : Svg_sigs.Wrapped_functions with module Xml = Xml) : + Svg_sigs.Make(Xml).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib +@@ -156,7 +155,7 @@ module Html5 : sig + + module F : sig + +- module Raw : Html5_sigs.Make(Xml)(Svg.F.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.F.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -167,12 +166,12 @@ module Html5 : sig + ?a: (('a attrib) list) -> ('b elt) list Eliom_lazy.request -> 'c elt + + val lazy_form: +- ([< Html5_types.form_attrib ], [< Html5_types.form_content_fun ], [> Html5_types.form ]) lazy_star ++ ([< Html_types.form_attrib ], [< Html_types.form_content_fun ], [> Html_types.form ]) lazy_star + end + + module D : sig + +- module Raw : Html5_sigs.Make(Xml)(Svg.D.Raw).T ++ module Raw : Html_sigs.Make(Xml)(Svg.D.Raw).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +@@ -185,7 +184,7 @@ module Html5 : sig + ?a: (('a attrib) list) -> ('b elt) list Eliom_lazy.request -> 'c elt + + val lazy_form: +- ([< Html5_types.form_attrib ], [< Html5_types.form_content_fun ], [> Html5_types.form ]) lazy_star ++ ([< Html_types.form_attrib ], [< Html_types.form_content_fun ], [> Html_types.form ]) lazy_star + + end + +@@ -193,10 +192,9 @@ module Html5 : sig + (Xml : Xml_sigs.T + with type elt = Xml.elt + and type attrib = Xml.attrib) +- (C : Html5_sigs.Wrapped_functions +- with type ('a, 'b) ft = ('a, 'b) Xml.W.ft) ++ (C : Html_sigs.Wrapped_functions with module Xml = Xml) + (Svg : Svg_sigs.T with module Xml := Xml) : +- Html5_sigs.Make(Xml)(Svg).T ++ Html_sigs.Make(Xml)(Svg).T + with type +'a elt = 'a elt + and type +'a attrib = 'a attrib + +Index: eliom-5.0.0/src/lib/eliom_content_sigs.shared.mli +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_content_sigs.shared.mli ++++ eliom-5.0.0/src/lib/eliom_content_sigs.shared.mli +@@ -31,9 +31,9 @@ module type LINKS_AND_FORMS = sig + 'c elt + + val lazy_form: +- ([< Html5_types.form_attrib ], +- [< Html5_types.form_content_fun ], +- [> Html5_types.form ]) lazy_star ++ ([< Html_types.form_attrib ], ++ [< Html_types.form_content_fun ], ++ [> Html_types.form ]) lazy_star + + include Eliom_form_sigs.LINKS + with type +'a elt := 'a elt +Index: eliom-5.0.0/src/lib/eliom_form.eliom +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_form.eliom ++++ eliom-5.0.0/src/lib/eliom_form.eliom +@@ -21,7 +21,7 @@ + {shared{ + module type Html5 = sig + +- include Html5_sigs.T ++ include Html_sigs.T + with type 'a Xml.W.t = 'a + and type 'a Xml.W.tlist = 'a list + and type Xml.mouse_event_handler = +@@ -33,9 +33,9 @@ module type Html5 = sig + 'c elt + + val lazy_form: +- ([< Html5_types.form_attrib ], +- [< Html5_types.form_content_fun ], +- [> Html5_types.form ]) lazy_star ++ ([< Html_types.form_attrib ], ++ [< Html_types.form_content_fun ], ++ [> Html_types.form ]) lazy_star + + val uri_of_fun : (unit -> string) -> Xml.uri + +@@ -44,7 +44,7 @@ module type Html5 = sig + ([ `A | `Form_get | `Form_post] * + (bool * string list) option * + string option) option Eliom_lazy.request -> +- Html5_types.form_attrib attrib ++ Html_types.form_attrib attrib + + end + +@@ -174,7 +174,7 @@ module Make (Html5 : Html5) = struct + | None -> a + | Some src -> a_src src :: a + in +- let a = if checked then a_checked `Checked :: a else a in ++ let a = if checked then a_checked () :: a else a in + let a = a_input_type typ :: a in + input ~a () + +@@ -194,7 +194,7 @@ module Make (Html5 : Html5) = struct + textarea ~a (pcdata value) + + let make_select ?(a = []) ~multiple ~name elt elts = +- let a = if multiple then a_multiple `Multiple :: a else a in ++ let a = if multiple then a_multiple () :: a else a in + let a = a_name name :: a in + select ~a (elt :: elts) + +@@ -203,7 +203,7 @@ module Make (Html5 : Html5) = struct + | None -> a + | Some v -> a_text_value v :: a + in +- let a = if selected then a_selected `Selected :: a else a in ++ let a = if selected then a_selected () :: a else a in + option ~a c + + let make_optgroup ?(a = []) ~label elt elts = +@@ -364,7 +364,7 @@ module Make (Html5 : Html5) = struct + + let string_radio_required ?a ?checked ~name ~value () = + let a = +- let required = Html5.a_required `Required in ++ let required = Html5.a_required () in + match a with + | None -> [required] + | Some a -> required :: a +@@ -385,14 +385,14 @@ module Make (Html5 : Html5) = struct + make_textarea ?a ~name:(Eliom_parameter.string_of_param_name name) + + type 'a soption = +- Html5_types.option_attrib attrib list ++ Html_types.option_attrib attrib list + * 'a (* Content (or value if the following is present) *) +- * Html5_types.pcdata elt option (* if content different from value *) ++ * Html_types.pcdata elt option (* if content different from value *) + * bool (* selected *) + + type 'a select_opt = + | Optgroup of +- [ Html5_types.common | `Disabled ] attrib list ++ [ Html_types.common | `Disabled ] attrib list + * string (* label *) + * 'a soption + * 'a soption list +@@ -404,7 +404,7 @@ module Make (Html5 : Html5) = struct + let a = match required with + | None -> a + | Some _ -> +- let required = Html5.a_required `Required in ++ let required = Html5.a_required () in + match a with + | Some a -> Some (required :: a) + | None -> Some [required] +Index: eliom-5.0.0/src/lib/eliom_form.eliomi +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_form.eliomi ++++ eliom-5.0.0/src/lib/eliom_form.eliomi +@@ -22,7 +22,7 @@ + + module type Html5 = sig + +- include Html5_sigs.T ++ include Html_sigs.T + with type 'a Xml.W.t = 'a + and type 'a Xml.W.tlist = 'a list + and type Xml.mouse_event_handler = +@@ -34,9 +34,9 @@ module type Html5 = sig + 'c elt + + val lazy_form : +- ([< Html5_types.form_attrib ], +- [< Html5_types.form_content_fun ], +- [> Html5_types.form ]) lazy_star ++ ([< Html_types.form_attrib ], ++ [< Html_types.form_content_fun ], ++ [> Html_types.form ]) lazy_star + + val uri_of_fun : (unit -> string) -> Xml.uri + +@@ -45,7 +45,7 @@ module type Html5 = sig + ([ `A | `Form_get | `Form_post] * + (bool * string list) option * + string option) option Eliom_lazy.request -> +- Html5_types.form_attrib attrib ++ Html_types.form_attrib attrib + + end + +Index: eliom-5.0.0/src/lib/eliom_form_sigs.shared.mli +=================================================================== +--- eliom-5.0.0.orig/src/lib/eliom_form_sigs.shared.mli ++++ eliom-5.0.0/src/lib/eliom_form_sigs.shared.mli +@@ -136,8 +136,8 @@ module type LINKS = sig + The optional parameter [~a] allows one to add extra HTML + attributes to the generated node. *) + val css_link : +- ?a:Html5_types.link_attrib attrib list -> +- uri:uri -> unit -> [> Html5_types.link] elt ++ ?a:Html_types.link_attrib attrib list -> ++ uri:uri -> unit -> [> Html_types.link] elt + + (** The function [js_script ~uri ()] creates a [