summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--eclass/mv_mozextension.eclass2
-rw-r--r--sys-apps/less-select/ChangeLog3
-rw-r--r--sys-apps/less-select/Manifest5
-rw-r--r--sys-apps/less-select/files/less.envd2
-rw-r--r--sys-apps/less-select/less-select-436-r1.ebuild10
-rw-r--r--www-plugins/noscript/ChangeLog6
-rw-r--r--www-plugins/noscript/Manifest6
-rw-r--r--www-plugins/noscript/noscript-1.9.9.87.ebuild (renamed from www-plugins/noscript/noscript-1.9.9.81.ebuild)0
8 files changed, 19 insertions, 15 deletions
diff --git a/eclass/mv_mozextension.eclass b/eclass/mv_mozextension.eclass
index c51699dd..3ce0627d 100644
--- a/eclass/mv_mozextension.eclass
+++ b/eclass/mv_mozextension.eclass
@@ -168,7 +168,7 @@ xpi_install () {
x="${1}"
cd -- "${x}"
# determine id for extension
- emid="$(sed -n -e '/install-manifest/,$ { /<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q }' "${x}"/install.rdf)" \
+ emid="$(sed -n -e '/install-manifest/,$ { /<\?em:id>\?/!d; /{.*}/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q }' "${x}"/install.rdf)" \
&& [ -n "${emid}" ] || die "failed to determine extension id"
insinto "${MOZILLA_FIVE_HOME}/extensions/${emid}"
doins -r "${x}"/* || die "failed to copy extension"
diff --git a/sys-apps/less-select/ChangeLog b/sys-apps/less-select/ChangeLog
index 64a357b9..20297a9e 100644
--- a/sys-apps/less-select/ChangeLog
+++ b/sys-apps/less-select/ChangeLog
@@ -4,6 +4,9 @@
*less-select-436-r1.ebuild (30 Mar 2010)
+ 12 Jun 2010; Martin Väth <martin@mvath.de> :
+ Remove unneeded files/less.envd. Remove arches which I never tested.
+
30 Mar 2010; Martin Väth <martin@mvath.de> :
-less-select-436.ebuild +less-select-436-r1.ebuild files/lesspipe.sh:
Update lesspipe.sh and related changes of sys-apps/less in portage tree.
diff --git a/sys-apps/less-select/Manifest b/sys-apps/less-select/Manifest
index 1f4698c0..8a5742d1 100644
--- a/sys-apps/less-select/Manifest
+++ b/sys-apps/less-select/Manifest
@@ -1,10 +1,9 @@
AUX README.Gentoo 823 RMD160 be59c37906fca17fa25f6781d3f5e7abc114dc57 SHA1 5a1f126af728f5220b97623050e2f9b1ea5ae58e SHA256 3985fd1810f660ea1c1f2732f719b069b6934d62d8d9e8a09287e63f049ba27d
AUX code2color.patch 1110 RMD160 712f7b79c94f92ee62825d5f53627f18fae693d2 SHA1 a82f937f3a923b52adc4f14cfc9b641903884839 SHA256 a3887126826ef0b4b821bd97cf4e7abfc8b1c9280bf2bb18a2a4cec9a2973936
-AUX less.envd 50 RMD160 e9d7b2497aa81e13b740dc765c0fc87d4f1f2f8e SHA1 f903d459e7f0b2c14009304bebb7a045a7cccf9d SHA256 1f186ac4f500c842a9016702b3d7e9d69fe161db23cf56c316ed7f5a51da6a4e
AUX lesspipe.sh 7180 RMD160 460d9b4bd9dd7bbeae05f0441dc47ad5b1f8437f SHA1 8e7baca8239b8b36649bb9d0bb4ab0642b3a3bb6 SHA256 57d0d2022223ac028c2ac65b50944127520c8c1a9129e8ee493746677592c23c
DIST code2color 199875 RMD160 378d340a20c3fe500f19116220d54816fe279225 SHA1 b30526dd52c747b8bd6dcf53cf5cc94824c47feb SHA256 ce63f148293a81b0fe5e072f33285f9bf4f1d832f64b23a2220519674a47091d
DIST less-436.tar.gz 303921 RMD160 b186b76fcdbf38056b32fbc1b54877dccf64a8ec SHA1 f78998a1a79a7e1962c901dd41bdc3d1c2005471 SHA256 57a16ff07431a9af45cf1cd5b374e1066d019304219f0d156e22bb8c4d6734d2
DIST less-select-patch-436.tar.gz 47383 RMD160 5ccbe853d1f6ce5940f283bd8265ce8b75e20363 SHA1 21f3f8b16be8cd0724820c167d6f685d236cec36 SHA256 bbdd0ee9241803b8de719c358090354bde63472d1df6db271a50be51bfc800f3
-EBUILD less-select-436-r1.ebuild 2452 RMD160 9834d44e0766b14f6a8893af47ccc32821bcea51 SHA1 33e307323e914d3eefaa4b09fe5af3ae328beeb0 SHA256 b246728706a4004ca7cf15081e1f6c1f6aa41bdb2dc9cc13f381a1264e4b5bcc
-MISC ChangeLog 1429 RMD160 60b480b860d9391d7010b0c91604704a043d50e0 SHA1 14f5042d244670f39addc6b25dd986c1ef05c9ed SHA256 c700f7088cdf522d2fb0c6a74f1b00c6fca9e424e50d60eeb6085c746e66b14a
+EBUILD less-select-436-r1.ebuild 2345 RMD160 40d6cdaace5f171205ad4608dfa2b15d07f43195 SHA1 2633f4bbd3b71c78133edbe364cc839558d205da SHA256 b91bfb1bacbf0be510a3a262e4435a6ff71d43a4d765ad5701811edc312de966
+MISC ChangeLog 1567 RMD160 87e948eeb23eb84fedcceba67447dcbc5184e2fd SHA1 93e3e978900fc07f7f2c03a155fce25d7b2e8239 SHA256 19901b35b7d07de051320714449eaefc588cf177a5b785ee5740c47376e3708c
MISC metadata.xml 502 RMD160 3e3f84a9d63d37d044acba98f3add536f1dc98a6 SHA1 a45389d6d02b23a47a70a174d4d49b9c24480f62 SHA256 24b8610aa08d7c0ef1f1e84af06ffe327396a5132cb9bf51c426496e4ad8df61
diff --git a/sys-apps/less-select/files/less.envd b/sys-apps/less-select/files/less.envd
deleted file mode 100644
index 200171c0..00000000
--- a/sys-apps/less-select/files/less.envd
+++ /dev/null
@@ -1,2 +0,0 @@
-LESSOPEN="|lesspipe.sh %s"
-LESS="-R -M --shift 5"
diff --git a/sys-apps/less-select/less-select-436-r1.ebuild b/sys-apps/less-select/less-select-436-r1.ebuild
index 76a8099f..d3a7265b 100644
--- a/sys-apps/less-select/less-select-436-r1.ebuild
+++ b/sys-apps/less-select/less-select-436-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/less-${PV}.tar.gz
LICENSE="|| ( GPL-3 BSD-2 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~x86"
IUSE="unicode dummy-less"
DEPEND=">=sys-libs/ncurses-5.2
@@ -24,17 +24,15 @@ S="${WORKDIR}/less-${PV}"
MYSUBDIR="${S}/less-select-patch-${PATCHVER}"
src_unpack() {
- cd "${WORKDIR}"
unpack "less-${PV}.tar.gz"
cd "${S}"
cp "${DISTDIR}"/code2color "${S}"/
epatch "${FILESDIR}"/code2color.patch
unpack "less-select-patch-${PATCHVER}.tar.gz"
mv "${MYSUBDIR}/INSTALL" "${MYSUBDIR}/README.less-select"
- if [ -e "${MYSUBDIR}/less-${PV}-select.patch" ]; then
- epatch "${MYSUBDIR}/less-${PV}-select.patch" || die "Patch less-${PV}-select failed"
- else
- epatch "${MYSUBDIR}/less-${PATCHVER}-select.patch" || die "Patch less-${PATCHVER}-select failed"
+ if test -e "${MYSUBDIR}/less-${PV}-select.patch"
+ then epatch "${MYSUBDIR}/less-${PV}-select.patch" || die "Patch less-${PV}-select failed"
+ else epatch "${MYSUBDIR}/less-${PATCHVER}-select.patch" || die "Patch less-${PATCHVER}-select failed"
fi
"${MYSUBDIR}"/after-patch || die "${MYSUBDIR}/after-patch failed"
}
diff --git a/www-plugins/noscript/ChangeLog b/www-plugins/noscript/ChangeLog
index 9e594dd7..cd094d1a 100644
--- a/www-plugins/noscript/ChangeLog
+++ b/www-plugins/noscript/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
# $Header $
+*noscript-1.9.9.87 (12 Jun 2010)
+
+ 06 Jun 2010; Martin Väth <martin@mvath.de>
+ +noscript-1.9.9.87.ebuild -flashgot-1.9.9.81.ebuild:
+ Version bump, remove old ebuild.
+
*noscript-1.9.9.81 (06 Jun 2010)
06 Jun 2010; Martin Väth <martin@mvath.de>
diff --git a/www-plugins/noscript/Manifest b/www-plugins/noscript/Manifest
index d0bd08dc..035aa571 100644
--- a/www-plugins/noscript/Manifest
+++ b/www-plugins/noscript/Manifest
@@ -1,4 +1,4 @@
-DIST noscript-1.9.9.81.xpi 483545 RMD160 212762c8fef02a6d00e6c975d7600afc25493aca SHA1 182070ba5f9d30666e4d5d25e7bca9e1b2bbafd9 SHA256 fb3fb2583a0e75eba91b7d7917ada95a2ecc4ee5344a1f9b8f3b6e41030d45a0
-EBUILD noscript-1.9.9.81.ebuild 472 RMD160 bf62135764a65da396ca5684c31aa53c7d0cce88 SHA1 2d1843406f6f433202070eeb3c8a9c51f6bb08f2 SHA256 e7a23ac29a1dbc2c2cb0a494f5cdae8ebcb270849f9b46aa35bdc7df095611b7
-MISC ChangeLog 789 RMD160 b827aad7a7a6acb69f4a5fcd53f8520badd8fb36 SHA1 1e7a6cc72176dc5fbcc81a44da5a05ef320b25fe SHA256 5ed0301bb3808a5b2f30e31cbe3ed7fd52f82753e47bd5e279116b3521009fd5
+DIST noscript-1.9.9.87.xpi 484474 RMD160 904257f992d4616ab55a5f500b26b2d517c9f497 SHA1 05dfdbb96422c154464e941dc7dabd494b52fe75 SHA256 a2bf02ee74f9242a4664ace0d889631fc1366c1e4e20a5bea9c662244b02ed9d
+EBUILD noscript-1.9.9.87.ebuild 472 RMD160 bf62135764a65da396ca5684c31aa53c7d0cce88 SHA1 2d1843406f6f433202070eeb3c8a9c51f6bb08f2 SHA256 e7a23ac29a1dbc2c2cb0a494f5cdae8ebcb270849f9b46aa35bdc7df095611b7
+MISC ChangeLog 978 RMD160 0a550fceb990efad5ae00a79f9af522ff0f95fb7 SHA1 5371432f94af3087b69243a8d49836c8736122fd SHA256 19920f02ec1bba4173ed66378991c39bd9ce7f97b0a2287e48eddb57e9e34572
MISC metadata.xml 447 RMD160 4ec5ea6b99ff64f433b133a9347f0a57039b73b7 SHA1 a6af7ca7a606d2ddc4afbb9ba31ac694f22e9abd SHA256 927431d432628bf04ca3f6e6cd0fc9b5e40ac0f2d2ea70e4a795e0df527cba67
diff --git a/www-plugins/noscript/noscript-1.9.9.81.ebuild b/www-plugins/noscript/noscript-1.9.9.87.ebuild
index 46341fff..46341fff 100644
--- a/www-plugins/noscript/noscript-1.9.9.81.ebuild
+++ b/www-plugins/noscript/noscript-1.9.9.87.ebuild