* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.1.9999.ebuild ChangeLog emacs-vcs-24.0.97.ebuild emacs-vcs-24.0.9999-r4.ebuild
@ 2012-05-19 15:58 Ulrich Mueller (ulm)
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Mueller (ulm) @ 2012-05-19 15:58 UTC (permalink / raw
To: gentoo-commits
ulm 12/05/19 15:58:54
Modified: emacs-vcs-24.1.9999.ebuild ChangeLog
emacs-vcs-24.0.97.ebuild
emacs-vcs-24.0.9999-r4.ebuild
Log:
Don't try to rebuild the Info dir file if /usr/share/info doesn't exist.
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Revision Changes Path
1.4 app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild?r1=1.3&r2=1.4
Index: emacs-vcs-24.1.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-vcs-24.1.9999.ebuild 3 May 2012 07:29:55 -0000 1.3
+++ emacs-vcs-24.1.9999.ebuild 19 May 2012 15:58:54 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.3 2012/05/03 07:29:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
EAPI=4
@@ -304,7 +304,7 @@
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- else
+ elif [[ -d "${ED}"${infodir} ]]; then
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
1.93 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.92&r2=1.93
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog 17 May 2012 09:26:05 -0000 1.92
+++ ChangeLog 19 May 2012 15:58:54 -0000 1.93
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.92 2012/05/17 09:26:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.93 2012/05/19 15:58:54 ulm Exp $
+
+ 19 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.0.97.ebuild,
+ emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild:
+ Don't try to rebuild the Info dir file if /usr/share/info doesn't exist.
*emacs-vcs-24.0.97 (17 May 2012)
1.2 app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild?r1=1.1&r2=1.2
Index: emacs-vcs-24.0.97.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-vcs-24.0.97.ebuild 17 May 2012 09:26:05 -0000 1.1
+++ emacs-vcs-24.0.97.ebuild 19 May 2012 15:58:54 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.1 2012/05/17 09:26:05 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.2 2012/05/19 15:58:54 ulm Exp $
EAPI=4
@@ -320,7 +320,7 @@
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- else
+ elif [[ -d "${ED}"${infodir} ]]; then
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
1.4 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild?r1=1.3&r2=1.4
Index: emacs-vcs-24.0.9999-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-vcs-24.0.9999-r4.ebuild 3 May 2012 07:29:55 -0000 1.3
+++ emacs-vcs-24.0.9999-r4.ebuild 19 May 2012 15:58:54 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.3 2012/05/03 07:29:55 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.4 2012/05/19 15:58:54 ulm Exp $
EAPI=4
@@ -304,7 +304,7 @@
local infodir=/usr/share/info/${EMACS_SUFFIX} f
if [[ -f ${ED}${infodir}/dir.orig ]]; then
mv "${ED}"${infodir}/dir{.orig,} || die "moving info dir failed"
- else
+ elif [[ -d "${ED}"${infodir} ]]; then
# this should not happen in EAPI 4
ewarn "Regenerating Info directory index in ${infodir} ..."
rm -f "${ED}"${infodir}/dir{,.*}
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.1.9999.ebuild ChangeLog emacs-vcs-24.0.97.ebuild emacs-vcs-24.0.9999-r4.ebuild
@ 2012-05-24 21:12 Ulrich Mueller (ulm)
0 siblings, 0 replies; 2+ messages in thread
From: Ulrich Mueller (ulm) @ 2012-05-24 21:12 UTC (permalink / raw
To: gentoo-commits
ulm 12/05/24 21:12:55
Modified: emacs-vcs-24.1.9999.ebuild ChangeLog
emacs-vcs-24.0.97.ebuild
emacs-vcs-24.0.9999-r4.ebuild
Log:
Delete unused local variable.
(Portage version: 2.1.10.62/cvs/Linux x86_64)
Revision Changes Path
1.7 app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild?r1=1.6&r2=1.7
Index: emacs-vcs-24.1.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-vcs-24.1.9999.ebuild 22 May 2012 20:33:37 -0000 1.6
+++ emacs-vcs-24.1.9999.ebuild 24 May 2012 21:12:55 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.6 2012/05/22 20:33:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.1.9999.ebuild,v 1.7 2012/05/24 21:12:55 ulm Exp $
EAPI=4
@@ -238,8 +238,6 @@
}
src_install () {
- local i m
-
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
@@ -248,6 +246,7 @@
|| die "moving Emacs executable failed"
# move man pages to the correct place
+ local m
for m in "${ED}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
1.96 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.96&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.96&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.95&r2=1.96
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- ChangeLog 22 May 2012 20:33:37 -0000 1.95
+++ ChangeLog 24 May 2012 21:12:55 -0000 1.96
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.95 2012/05/22 20:33:37 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.96 2012/05/24 21:12:55 ulm Exp $
+
+ 24 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.0.97.ebuild,
+ emacs-vcs-24.0.9999-r4.ebuild, emacs-vcs-24.1.9999.ebuild:
+ Delete unused local variable.
22 May 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-24.1.9999.ebuild:
Directory src/m is gone.
1.4 app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild?r1=1.3&r2=1.4
Index: emacs-vcs-24.0.97.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-vcs-24.0.97.ebuild 22 May 2012 20:29:31 -0000 1.3
+++ emacs-vcs-24.0.97.ebuild 24 May 2012 21:12:55 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.3 2012/05/22 20:29:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.97.ebuild,v 1.4 2012/05/24 21:12:55 ulm Exp $
EAPI=4
@@ -244,8 +244,6 @@
}
src_install () {
- local i m
-
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
@@ -254,6 +252,7 @@
|| die "moving Emacs executable failed"
# move man pages to the correct place
+ local m
for m in "${ED}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
1.6 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild?r1=1.5&r2=1.6
Index: emacs-vcs-24.0.9999-r4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-vcs-24.0.9999-r4.ebuild 22 May 2012 20:29:31 -0000 1.5
+++ emacs-vcs-24.0.9999-r4.ebuild 24 May 2012 21:12:55 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.5 2012/05/22 20:29:31 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r4.ebuild,v 1.6 2012/05/24 21:12:55 ulm Exp $
EAPI=4
@@ -238,8 +238,6 @@
}
src_install () {
- local i m
-
emake install DESTDIR="${D}"
rm "${ED}"/usr/bin/emacs-${FULL_VERSION}-${EMACS_SUFFIX} \
@@ -248,6 +246,7 @@
|| die "moving Emacs executable failed"
# move man pages to the correct place
+ local m
for m in "${ED}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-05-24 21:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-24 21:12 [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.1.9999.ebuild ChangeLog emacs-vcs-24.0.97.ebuild emacs-vcs-24.0.9999-r4.ebuild Ulrich Mueller (ulm)
-- strict thread matches above, loose matches on Subject: below --
2012-05-19 15:58 Ulrich Mueller (ulm)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox