summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-apps/less/ChangeLog3
-rw-r--r--sys-apps/less/Manifest2
-rw-r--r--sys-apps/less/files/code2color-0.2.patch (renamed from sys-apps/less/files/code2color.patch)8
-rw-r--r--sys-apps/less/files/lesspipe.sh4
-rw-r--r--sys-apps/less/less-457.ebuild10
-rw-r--r--www-plugins/noscript/ChangeLog5
-rw-r--r--www-plugins/noscript/Manifest2
-rw-r--r--www-plugins/noscript/noscript-2.6.5.7.ebuild (renamed from www-plugins/noscript/noscript-2.6.5.6.ebuild)0
8 files changed, 18 insertions, 16 deletions
diff --git a/sys-apps/less/ChangeLog b/sys-apps/less/ChangeLog
index 48b046b7..17564da5 100644
--- a/sys-apps/less/ChangeLog
+++ b/sys-apps/less/ChangeLog
@@ -4,6 +4,9 @@
*less-457.ebuild (10 Dec 2012)
+ 20 Feb 2013; Martin Väth <martin@mvath.de>
+ Update code2color handling from main tree.
+
10 Dec 2012; Martin Väth <martin@mvath.de>
Bump less version.
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index 7eaf573b..ddec58c4 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -1,3 +1,3 @@
-DIST code2color 199875 SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d SHA512 d9cf24434bf105a138ee82652867aedb83dfe6bfea14d20337f97cf9d37ff9f370a4a7dd58bc7eb69de0f3b944d47c7d7e075f50098b0966e753f42b1b35c22f WHIRLPOOL cdb748e04663a6a109310da454ff5a245e6562ec8cdae03a35ca93095e40511707662c4743dcd922049838cac646d930e6b2d2878f26c328916bb3c9c60c5e8c
+DIST code2color-0.2 200711 SHA256 2365c9009b1cc3c30430b88775ec402164df105fd12364871d05dcaed20be954 SHA512 c0ab9f411d5a106c81334343e3c4a63b67d27b95e2d128145e3ac1ee46cd6c228c61796cf96e51826e69b3e465e7bdaa81b1a48cad934c23b310f2ea2ebd8e75 WHIRLPOOL d0207e84a5849c554b1dfc5882ab46d8afc411c7d26e912235ec05565880e6ed0db8449133502234a01ae8f59feae211486b6a523e37859d8404f72fff9b8f93
DIST less-457.tar.gz 311207 SHA256 63c9c421df5c64439babc3aa44861512c298af394c932672b3e5aeb53580eed8 SHA512 6baa27996f36ccef965eee1bdc05c0e247d41e2af95a44fed93212b5608410e44c5a24e73d6c8a5aa542bb7aa41820d490febe14ffb4c9f13af5112708315db2 WHIRLPOOL 80669631eff59abcc3dfdd07021bb504a70575b930e68cbd4495a376db15e3120907f275ad28af834230c5b4f9b7eefb59d4563f6b07ab99fb8a6855157dedab
DIST less-select-2.2.tar.gz 25047 SHA256 b9a35194fd6c188a9aedc6835b233f0e8078df0e309e39067c893b8b1f73141f SHA512 5ce36fa4e404ae626f9c96ffcf58b9188e0f12c6db0321d3f0ed8fe47593951d072e1da53b874e80fc39041ae8aa85d06d646215d7ad63c611cb096ff5ca9136 WHIRLPOOL ec5341dbb4292f3e776e32ba996ef2efe2aa89438d4f0907efecdcf234d27b2b0e149d43ebd6dee089365c20f2a0796497e5cceebf3f25b846c14e8f0d9e762e
diff --git a/sys-apps/less/files/code2color.patch b/sys-apps/less/files/code2color-0.2.patch
index 5d4ac7fe..f8a78250 100644
--- a/sys-apps/less/files/code2color.patch
+++ b/sys-apps/less/files/code2color-0.2.patch
@@ -15,14 +15,6 @@
push @CONFIG_FILES,
split(/:/,$params{'langfile'}) if $params{'langfile'};
-@@ -446,7 +446,6 @@
-
- $_[2] = $langmode;
- $_[3] = $alt_langmode;
-- print "==> append : to filename to switch off syntax highlighting\n";
- return \$code;
- };
-
@@ -3192,7 +3192,7 @@
#
diff --git a/sys-apps/less/files/lesspipe.sh b/sys-apps/less/files/lesspipe.sh
index 81bee026..0d46c9d4 100644
--- a/sys-apps/less/files/lesspipe.sh
+++ b/sys-apps/less/files/lesspipe.sh
@@ -218,7 +218,7 @@ lesspipe() {
# 1: ... or we know less will handle raw codes -- this will
# not detect -seiRM, so set LESSCOLORIZER yourself
if [[ ${LESSCOLOR} == "2" ]] || [[ " ${LESS} " == *" -"[rR]" "* ]] ; then
- ${LESSCOLORIZER} "$1"
+ LESSQUIET=true ${LESSCOLORIZER} "$1"
fi
fi
@@ -233,7 +233,7 @@ if [[ -z $1 ]] ; then
elif [[ $1 == "-V" || $1 == "--version" ]] ; then
Id="cvsid"
cat <<-EOF
- $Id: lesspipe.sh,v 1.49 2012/11/22 04:20:15 vapier Exp $
+ $Id: lesspipe.sh,v 1.50 2013/01/30 07:08:38 vapier Exp $
Copyright 2001-2010 Gentoo Foundation
Mike Frysinger <vapier@gentoo.org>
(with plenty of ideas stolen from other projects/distros)
diff --git a/sys-apps/less/less-457.ebuild b/sys-apps/less/less-457.ebuild
index 62bc572e..f2e6a8b7 100644
--- a/sys-apps/less/less-457.ebuild
+++ b/sys-apps/less/less-457.ebuild
@@ -6,6 +6,8 @@ EAPI=5
inherit eutils
+CODE2COLOR_PV="0.2"
+CODE2COLOR_P="code2color-${CODE2COLOR_PV}"
DESCRIPTION="Excellent text file viewer, optionally with additional selection feature"
PATCHN="less-select"
PATCHV="2.2"
@@ -14,11 +16,11 @@ PATCHBALL="${PATCHN}-${PATCHV}.tar.gz"
HOMEPAGE="http://www.greenwoodsoftware.com/less/ https://github.com/vaeth/${PATCHN}"
SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz
less-select? ( http://github.com/vaeth/${PATCHN}/tarball/release-${PATCHV} -> ${PATCHBALL} )
- http://www-zeuthen.desy.de/~friebel/unix/less/code2color"
+ http://www-zeuthen.desy.de/~friebel/unix/less/code2color -> ${CODE2COLOR_P}"
LICENSE="|| ( GPL-3 BSD-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+lesspipe +less-select pcre original-gentoo source unicode"
DEPEND=">=app-misc/editor-wrapper-3
@@ -35,7 +37,7 @@ pkg_setup() {
src_unpack() {
unpack ${P}.tar.gz
- cp "${DISTDIR}"/code2color "${S}"/
+ cp "${DISTDIR}/${CODE2COLOR_P}" "${S}"/code2color || die
if use less-select
then unpack ${PATCHBALL}
cd *"${PATCHN}"-*
@@ -50,7 +52,7 @@ src_prepare() {
sed -i -e 's|\([^a-zA-Z]\)/etc/less-select-key.bin|\1'"${EPREFIX%/}"'/etc/less/select-key.bin|g' \
"${SELECTDIR}/bin/less-select" || die
fi
- epatch "${FILESDIR}"/code2color.patch
+ epatch "${FILESDIR}/${CODE2COLOR_P}.patch"
epatch_user
}
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 926c641b..5a8626d1 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*noscript-2.6.5.7 (20 Feb 2013)
+
+ 20 Feb 2013; Martin Väth <martin@mvath.de>
+ Version bump, remove old ebuild.
+
*noscript-2.6.5.6 (13 Feb 2013)
13 Feb 2013; Martin Väth <martin@mvath.de>
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index 2336aec2..37824d65 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1 +1 @@
-DIST noscript-2.6.5.6.xpi 530992 SHA256 3af54c612e7c5dd3c013022076dcf9e2000b5a430fef5006313490c0309ecf37 SHA512 f3f6cf9bb3d552ae0c84be7325ae2eac5fe87ee0360c53142e2ab5bfbc1824fe160af749a7d31b267fdfd94760fe7961afdb1fe2716cce27655f2c38f3978050 WHIRLPOOL 926aa2bf17f0a6d382522f670992e70a15005f577400855dab388bf8670ab59a38ddc6d36415d7c9e72e55952c6da139b5af02f99013f18f22071d8eb7d95be2
+DIST noscript-2.6.5.7.xpi 530982 SHA256 7af142eeb270f26dc71c64fbe3882a950be35a568609466a4ab4c705b4ca9c71 SHA512 0978fb2b8c0c8a218b24e539d5dec66172cde10c89c8c9fb48ae8be9e401291f900dbb90dd6728429e62700eda50e3421ff1db2622bc20bd1d49e83f5b7235fc WHIRLPOOL b37d1cd40aa5ba87a0cc2fed3cc8e513bdfb15c85a99d25f75126adf3ad549677b38f183e37478dc80ed42824c0557d9edf069edc39ef514d52d32e6351c2b4c
diff --git a/www-plugins/noscript/noscript-2.6.5.6.ebuild b/www-plugins/noscript/noscript-2.6.5.7.ebuild
index 64528ac0..64528ac0 100644
--- a/www-plugins/noscript/noscript-2.6.5.6.ebuild
+++ b/www-plugins/noscript/noscript-2.6.5.7.ebuild