diff options
-rw-r--r-- | dev-tex/chklref/ChangeLog | 7 | ||||
-rw-r--r-- | dev-tex/chklref/Manifest | 2 | ||||
-rw-r--r-- | dev-tex/chklref/chklref-2.5.2.ebuild (renamed from dev-tex/chklref/chklref-2.5.1-r1.ebuild) | 3 | ||||
-rw-r--r-- | dev-util/ccache/ChangeLog | 3 | ||||
-rw-r--r-- | dev-util/ccache/ccache-99999999-r3.ebuild (renamed from dev-util/ccache/ccache-99999999-r2.ebuild) | 17 | ||||
-rw-r--r-- | dev-util/ccache/files/ccache-config-3 (renamed from dev-util/ccache/files/ccache-config-2) | 31 | ||||
-rw-r--r-- | www-plugins/noscript/ChangeLog | 5 | ||||
-rw-r--r-- | www-plugins/noscript/Manifest | 2 | ||||
-rw-r--r-- | www-plugins/noscript/noscript-2.6.9.8.ebuild (renamed from www-plugins/noscript/noscript-2.6.9.7.ebuild) | 0 |
9 files changed, 45 insertions, 25 deletions
diff --git a/dev-tex/chklref/ChangeLog b/dev-tex/chklref/ChangeLog index 813e4a5a..83bbd29d 100644 --- a/dev-tex/chklref/ChangeLog +++ b/dev-tex/chklref/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*chkltex-2.5.2 (23 Dec 2014) + + 23 Dec 2014; Martin Väth <martin@mvath.de>: + Version bump, remove old ebuild + *chkltex-2.5.1-r1 (14 Aug 2013) 14 Aug 2013; Martin Väth <martin@mvath.de>: @@ -31,7 +36,7 @@ 16 Aug 2010; Martin Väth <martin@mvath.de>: Bump. Removing patch since it is now in upstream package :) - Cleanup ebuild since DISTDIR is now supported by upstream. + Cleanup ebuild since DISTDIR is now supported by upstream *chkltex-2.4 (23 Apr 2010) diff --git a/dev-tex/chklref/Manifest b/dev-tex/chklref/Manifest index 4865be59..d3d26a68 100644 --- a/dev-tex/chklref/Manifest +++ b/dev-tex/chklref/Manifest @@ -1 +1 @@ -DIST chklref-2.5.1.tar.gz 55535 SHA256 719e3aa2c4539831d87a799f34c4529d42f0f464a497439611bc7dbedc420b19 SHA512 7357687ad1675092c551d15ad2b70a720893cdf52b1b59a5131b6b12f58cade062221f978396f2fddbce12755ff079d3f9bdf7b4b09b6acfa91ad98f7d1bf28e WHIRLPOOL a9d0592a6e6472680f33cb7a7ef67f047d7c9f5caa445f57fb9ce7c3eb54cab0aff8cab4daf22ddc01bcdb81a80e59f49760397e4547b7a1138fc4373f7a8d66 +DIST chklref-2.5.2.tar.gz 60609 SHA256 b9a0e3d38d76532a86abffd220c559a9702bba80be999bfa20d1285b9814c9c4 SHA512 7c140bb9c067c5dc9560fe305da9fd73cd643486b5b5b8dfd4f550e1881e398677cffb3bff306a2a40d6e49349342b8bdb0a8cfb3672c3f72204dcaf4c28da94 WHIRLPOOL fcb450182dfb1efa9e6738de15110c5bf9e9ec64a97df1a2bebab9942b9950b4050a7194b771d6eef09ca62fbbbe743b7a6fa3eecaa4dbed4929a9dbadc302ef diff --git a/dev-tex/chklref/chklref-2.5.1-r1.ebuild b/dev-tex/chklref/chklref-2.5.2.ebuild index d68ebbe3..e1a10183 100644 --- a/dev-tex/chklref/chklref-2.5.1-r1.ebuild +++ b/dev-tex/chklref/chklref-2.5.2.ebuild @@ -20,6 +20,9 @@ RDEPEND="virtual/latex-base DEPEND="${RDEPEND}" src_prepare() { + use prefix || sed -i \ + -e '1s"^#!/usr/bin/env sh$"#!'"${EPREFIX}/bin/sh"'"' \ + -- "${S}"/src/chklref.in || die epatch_user } diff --git a/dev-util/ccache/ChangeLog b/dev-util/ccache/ChangeLog index d0609052..838c6a64 100644 --- a/dev-util/ccache/ChangeLog +++ b/dev-util/ccache/ChangeLog @@ -2,6 +2,9 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 23 Dec 2014; Martin Väth <martin@mvath.de>: + Bump ebuild from tree + 20 Nov 2014; Martin Väth <martin@mvath.de>: Update ebuild from tree diff --git a/dev-util/ccache/ccache-99999999-r2.ebuild b/dev-util/ccache/ccache-99999999-r3.ebuild index 0c941ce2..1f235967 100644 --- a/dev-util/ccache/ccache-99999999-r2.ebuild +++ b/dev-util/ccache/ccache-99999999-r3.ebuild @@ -16,25 +16,26 @@ SLOT="0" KEYWORDS="" IUSE="" -RDEPEND="sys-libs/zlib" -DEPEND="${RDEPEND} - app-arch/xz-utils" +DEPEND="app-arch/xz-utils + sys-libs/zlib" +RDEPEND="${DEPEND} + sys-apps/gentoo-functions" src_prepare() { # make sure we always use system zlib - rm -rf zlib + rm -rf zlib || die epatch "${FILESDIR}"/${PN}-3.1.7-no-perl.patch #421609 epatch "${FILESDIR}"/${PN}-3.1.10-size-on-disk.patch #456178 sed \ -e "/^EPREFIX=/s:'':'${EPREFIX}':" \ - "${FILESDIR}"/ccache-config-2 > ccache-config || die + "${FILESDIR}"/ccache-config-3 > ccache-config || die epatch_user eautoreconf } src_install() { + DOCS=( AUTHORS.txt MANUAL.txt NEWS.txt README.txt ) default - dodoc AUTHORS.txt MANUAL.txt NEWS.txt README.txt dobin ccache-config @@ -64,8 +65,8 @@ pkg_postinst() { "${EROOT}"/usr/bin/ccache-config --install-links ${CHOST} # nuke broken symlinks from previous versions that shouldn't exist - rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc - rm -rf "${EROOT}"/usr/lib/ccache.backup + rm -f "${EROOT}"/usr/lib/ccache/bin/${CHOST}-cc || die + rm -rf "${EROOT}"/usr/lib/ccache.backup || die readme.gentoo_print_elog } diff --git a/dev-util/ccache/files/ccache-config-2 b/dev-util/ccache/files/ccache-config-3 index 5d31d86c..7f604f00 100644 --- a/dev-util/ccache/files/ccache-config-2 +++ b/dev-util/ccache/files/ccache-config-3 @@ -3,7 +3,7 @@ # ccache-config - helper script for ccache and its ebuild # # Copyright 2003-2014 Superlucidity Services, LLC -# Copyright 2013 Gentoo Foundation +# Copyright 2013-2014 Gentoo Foundation # This program licensed under the GNU GPL version 2. # # This script developed by Zachary T Welch at Superlucidity Services, LLC @@ -13,7 +13,7 @@ EPREFIX='' -. "${EPREFIX}"/etc/init.d/functions.sh 2>/dev/null || { +. "${EPREFIX}"/lib/gentoo/functions.sh 2>/dev/null || { ebegin() { echo " * $* ..."; } eend() { local r=${1:-$?} @@ -48,16 +48,23 @@ cc_remove_link() { c_ebegin "Removing ${t}" rm -f "${t}" c_eend + + # Trim the empty dir if possible. #517242 + t=${t%/*} + if rmdir "${t}" 2>/dev/null; then + rmdir "${t%/*}" 2>/dev/null + fi + : fi } cc_install_link() { # Search the PATH for the specified compiler # then create shadow link in /usr/lib/ccache/bin to ccache - if [ -n "$(type -p ${1})" ]; then + if command -v "$1" >/dev/null ; then # first be sure any old link is removed _CC_QUIET=1 - cc_remove_link "${1}" + cc_remove_link "$1" unset _CC_QUIET # then create the new link @@ -69,26 +76,22 @@ cc_install_link() { } cc_links() { local a - for a in gcc cc c++ g++ ; do - eval "cc_${1}_link" "${2}${2:+-}${a}" - done - [ "${1}" = install ] && [ -n "${2}" ] && return - for a in icc icpc clang clang++ ; do - eval "cc_${1}_link" "${2}${2:+-}${a}" + for a in gcc cc c++ g++ icc icpc clang clang++ ; do + "cc_${1}_link" "${2}${2:+-}${a}" done } ### # main routine -case "${1}" in +case $1 in --install-links ) - cc_links install "${2}" + cc_links install "$2" ;; --remove-links ) - cc_links remove "${2}" + cc_links remove "$2" ;; * ) - echo "usage: ${0} {--install-links|--remove-links} [ CHOST ]" + echo "usage: $0 {--install-links|--remove-links} [ CHOST ]" ;; esac diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog index 8a6c4654..b2c1cbda 100644 --- a/www-plugins/noscript/ChangeLog +++ b/www-plugins/noscript/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*noscript-2.6.9.8 (23 Dec 2014) + + 23 Dec 2014; Martin Väth <martin@mvath.de>: + Version bump, remove old ebuild + *noscript-2.6.9.7 (16 Dec 2014) 16 Dec 2014; Martin Väth <martin@mvath.de>: diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest index 0e23c022..d1b37acf 100644 --- a/www-plugins/noscript/Manifest +++ b/www-plugins/noscript/Manifest @@ -1 +1 @@ -DIST noscript-2.6.9.7.xpi 543953 SHA256 076698ebc51f14c8efcde06a5d478764f5f4bc669c0271f78114eede72baee3a SHA512 748d6c405c98f1028b6ca128422fd597f9c73fc09ac45bdc5192df3c66ebc55ed139cb919ba7aa05d118f0536889de8db6f1e542e3c067ede60e29cc8222e01c WHIRLPOOL 5a1cc85314f6da600d5e8b907a1e89744df4f5637aa41deda70ac621dfb208716ba4653380b5367ea5304c70a402ad6d26e76766334fb88e00cef3ebc9a55d3f +DIST noscript-2.6.9.8.xpi 544215 SHA256 71c87a108ed08eadc900e8e543bd79c1abd79a9839cec4be759f5d143be76115 SHA512 f7ffff0bc1cfd111de67cf1d2c3904772b921c489c98df24025e10b231f05e3ecf7575b93524884f8042d75c736197a9f80ab4f86f7c57b4859a98190a7f76f3 WHIRLPOOL 738e79b688fc8e5ae42e1dbbe2d0b7802ab3e7531988d3ebc043d36d3d65c114a933387b06d48ff88e6a81838d5b45e4fd536f607b659e1225c1afce90376ea3 diff --git a/www-plugins/noscript/noscript-2.6.9.7.ebuild b/www-plugins/noscript/noscript-2.6.9.8.ebuild index a55df7be..a55df7be 100644 --- a/www-plugins/noscript/noscript-2.6.9.7.ebuild +++ b/www-plugins/noscript/noscript-2.6.9.8.ebuild |