* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-06-25 17:46 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-06-25 17:46 UTC (permalink / raw
To: gentoo-commits
ulm 10/06/25 17:46:48
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Workaround for gcc 4.4 on ia64, bug 325373.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.2 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.1&r2=1.2
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-vcs-23.2.9999.ebuild 8 May 2010 07:52:53 -0000 1.1
+++ emacs-vcs-23.2.9999.ebuild 25 Jun 2010 17:46:48 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.1 2010/05/08 07:52:53 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.2 2010/06/25 17:46:48 ulm Exp $
EAPI=2
@@ -118,6 +118,8 @@
#unset LDFLAGS
if use sh; then
replace-flags -O[1-9] -O0 #262359
+ elif use ia64; then
+ replace-flags -O[2-9] -O1 #325373
else
replace-flags -O[3-9] -O2
fi
1.21 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.20&r2=1.21
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- ChangeLog 18 May 2010 08:41:19 -0000 1.20
+++ ChangeLog 25 Jun 2010 17:46:48 -0000 1.21
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.20 2010/05/18 08:41:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.21 2010/06/25 17:46:48 ulm Exp $
+
+ 25 Jun 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+ emacs-vcs-24.0.9999.ebuild:
+ Workaround for gcc 4.4 on ia64, bug 325373.
18 May 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild:
Version information is now in src/emacs.c, thanks to Tassilo Horn
1.7 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.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.0.9999.ebuild?r1=1.6&r2=1.7
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-vcs-24.0.9999.ebuild 18 May 2010 08:41:19 -0000 1.6
+++ emacs-vcs-24.0.9999.ebuild 25 Jun 2010 17:46:48 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.6 2010/05/18 08:41:19 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.7 2010/06/25 17:46:48 ulm Exp $
EAPI=2
@@ -127,6 +127,8 @@
#unset LDFLAGS
if use sh; then
replace-flags -O[1-9] -O0 #262359
+ elif use ia64; then
+ replace-flags -O[2-9] -O1 #325373
else
replace-flags -O[3-9] -O2
fi
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-09-25 11:32 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-09-25 11:32 UTC (permalink / raw
To: gentoo-commits
ulm 10/09/25 11:32:26
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Move regeneration of Info dir to pkg_preinst.
(Portage version: 2.2_rc86/cvs/Linux x86_64)
Revision Changes Path
1.3 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.2&r2=1.3
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-vcs-23.2.9999.ebuild 25 Jun 2010 17:46:48 -0000 1.2
+++ emacs-vcs-23.2.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.3
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.2 2010/06/25 17:46:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.3 2010/09/25 11:32:26 ulm Exp $
EAPI=2
@@ -260,20 +260,21 @@
dodoc README BUGS || die "dodoc failed"
}
-emacs-infodir-rebuild() {
- # Depending on the Portage version, the Info dir file is compressed
- # or removed. It is only rebuilt by Portage if our directory is in
- # INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
+pkg_preinst() {
+ # Depending on Portage version and user's settings, the Info dir file
+ # may have been compressed or removed. We rebuild it in both cases.
local infodir=/usr/share/info/${EMACS_SUFFIX} f
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
- einfo "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ROOT}"${infodir}/dir{,.*}
- for f in "${ROOT}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
- done
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
+ if [ -f "${D}"${infodir}/dir.info ]; then
+ # prefer existing file if it has survived to here
+ mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed"
+ else
+ einfo "Regenerating Info directory index in ${infodir} ..."
+ rm -f "${D}"${infodir}/dir{,.*}
+ for f in "${D}"${infodir}/*.info*; do
+ [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
+ && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
+ done
+ fi
}
pkg_postinst() {
@@ -284,7 +285,6 @@
chown games:games "${ROOT}"/var/lib/games/emacs
elisp-site-regen
- emacs-infodir-rebuild
eselect emacs update ifunset
if use X; then
@@ -309,6 +309,5 @@
pkg_postrm() {
elisp-site-regen
- emacs-infodir-rebuild
eselect emacs update ifunset
}
1.26 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.25&r2=1.26
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ChangeLog 22 Sep 2010 20:35:57 -0000 1.25
+++ ChangeLog 25 Sep 2010 11:32:26 -0000 1.26
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.25 2010/09/22 20:35:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.26 2010/09/25 11:32:26 ulm Exp $
+
+ 25 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+ emacs-vcs-24.0.9999.ebuild:
+ Move regeneration of Info dir to pkg_preinst.
22 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild:
Add messages to "die" commands.
1.12 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.11&r2=1.12
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- emacs-vcs-24.0.9999.ebuild 22 Sep 2010 20:35:57 -0000 1.11
+++ emacs-vcs-24.0.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.11 2010/09/22 20:35:57 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.12 2010/09/25 11:32:26 ulm Exp $
EAPI=2
@@ -273,20 +273,21 @@
dodoc README BUGS || die "dodoc failed"
}
-emacs-infodir-rebuild() {
- # Depending on the Portage version, the Info dir file is compressed
- # or removed. It is only rebuilt by Portage if our directory is in
- # INFOPATH, which is not guaranteed. So we rebuild it ourselves.
-
+pkg_preinst() {
+ # Depending on Portage version and user's settings, the Info dir file
+ # may have been compressed or removed. We rebuild it in both cases.
local infodir=/usr/share/info/${EMACS_SUFFIX} f
- [ -d "${ROOT}"${infodir} ] || return # may occur with FEATURES=noinfo
- einfo "Regenerating Info directory index in ${infodir} ..."
- rm -f "${ROOT}"${infodir}/dir{,.*}
- for f in "${ROOT}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${ROOT}"${infodir} "${f}" &>/dev/null
- done
- rmdir "${ROOT}"${infodir} 2>/dev/null # remove dir if it is empty
+ if [ -f "${D}"${infodir}/dir.info ]; then
+ # prefer existing file if it has survived to here
+ mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed"
+ else
+ einfo "Regenerating Info directory index in ${infodir} ..."
+ rm -f "${D}"${infodir}/dir{,.*}
+ for f in "${D}"${infodir}/*.info*; do
+ [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
+ && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
+ done
+ fi
}
pkg_postinst() {
@@ -297,7 +298,6 @@
chown games:games "${ROOT}"/var/lib/games/emacs
elisp-site-regen
- emacs-infodir-rebuild
eselect emacs update ifunset
if use X; then
@@ -322,6 +322,5 @@
pkg_postrm() {
elisp-site-regen
- emacs-infodir-rebuild
eselect emacs update ifunset
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-10-10 10:39 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-10-10 10:39 UTC (permalink / raw
To: gentoo-commits
ulm 10/10/10 10:39:30
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Don't rename GNU Info files, bug 306445.
(Portage version: 2.1.9.14/cvs/Linux x86_64)
Revision Changes Path
1.4 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.3&r2=1.4
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-vcs-23.2.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.3
+++ emacs-vcs-23.2.9999.ebuild 10 Oct 2010 10:39:30 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.3 2010/09/25 11:32:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.4 2010/10/10 10:39:30 ulm Exp $
EAPI=2
@@ -212,16 +212,15 @@
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
- # move info documentation to the correct place
- for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
- mv "${i}" "${i}.info" || die "mv info failed"
- done
-
# move man pages to the correct place
for m in "${D}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
+ # move info dir to avoid collisions with the dir file generated by portage
+ mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+ || die "moving info dir failed"
+
# avoid collision between slots, see bug #169033 e.g.
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${D}"/usr/share/{applications,icons}
@@ -264,15 +263,17 @@
# Depending on Portage version and user's settings, the Info dir file
# may have been compressed or removed. We rebuild it in both cases.
local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [ -f "${D}"${infodir}/dir.info ]; then
+ if [ -f "${D}"${infodir}/dir.orig ]; then
# prefer existing file if it has survived to here
- mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed"
+ mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
else
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${D}"${infodir}/dir{,.*}
- for f in "${D}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
+ for f in "${D}"${infodir}/*; do
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+ install-info --info-dir="${D}"${infodir} "${f}" \
+ || die "install-info failed"
+ fi
done
fi
}
1.27 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.26&r2=1.27
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ChangeLog 25 Sep 2010 11:32:26 -0000 1.26
+++ ChangeLog 10 Oct 2010 10:39:30 -0000 1.27
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.26 2010/09/25 11:32:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.27 2010/10/10 10:39:30 ulm Exp $
+
+ 10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+ emacs-vcs-24.0.9999.ebuild:
+ Don't rename GNU Info files, bug 306445.
25 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
emacs-vcs-24.0.9999.ebuild:
1.13 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.12&r2=1.13
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- emacs-vcs-24.0.9999.ebuild 25 Sep 2010 11:32:26 -0000 1.12
+++ emacs-vcs-24.0.9999.ebuild 10 Oct 2010 10:39:30 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.12 2010/09/25 11:32:26 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.13 2010/10/10 10:39:30 ulm Exp $
EAPI=2
@@ -225,16 +225,15 @@
mv "${D}"/usr/bin/emacs-${EMACS_SUFFIX} "${D}"/usr/bin/${EMACS_SUFFIX} \
|| die "moving Emacs executable failed"
- # move info documentation to the correct place
- for i in "${D}"/usr/share/info/${EMACS_SUFFIX}/*; do
- mv "${i}" "${i}.info" || die "mv info failed"
- done
-
# move man pages to the correct place
for m in "${D}"/usr/share/man/man1/* ; do
mv "${m}" "${m%.1}-${EMACS_SUFFIX}.1" || die "mv man failed"
done
+ # move info dir to avoid collisions with the dir file generated by portage
+ mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
+ || die "moving info dir failed"
+
# avoid collision between slots, see bug #169033 e.g.
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
rm -rf "${D}"/usr/share/{applications,icons}
@@ -277,15 +276,17 @@
# Depending on Portage version and user's settings, the Info dir file
# may have been compressed or removed. We rebuild it in both cases.
local infodir=/usr/share/info/${EMACS_SUFFIX} f
- if [ -f "${D}"${infodir}/dir.info ]; then
+ if [ -f "${D}"${infodir}/dir.orig ]; then
# prefer existing file if it has survived to here
- mv "${D}"${infodir}/dir{.info,} || die "mv dir.info failed"
+ mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
else
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${D}"${infodir}/dir{,.*}
- for f in "${D}"${infodir}/*.info*; do
- [[ ${f##*/} != *[0-9].info* && -e ${f} ]] \
- && install-info --info-dir="${D}"${infodir} "${f}" &>/dev/null
+ for f in "${D}"${infodir}/*; do
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+ install-info --info-dir="${D}"${infodir} "${f}" \
+ || die "install-info failed"
+ fi
done
fi
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-10-10 17:06 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-10-10 17:06 UTC (permalink / raw
To: gentoo-commits
ulm 10/10/10 17:06:18
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Fix openmotif dependency.
(Portage version: 2.1.9.14/cvs/Linux x86_64)
Revision Changes Path
1.5 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.4&r2=1.5
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emacs-vcs-23.2.9999.ebuild 10 Oct 2010 10:39:30 -0000 1.4
+++ emacs-vcs-23.2.9999.ebuild 10 Oct 2010 17:06:17 -0000 1.5
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.4 2010/10/10 10:39:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.5 2010/10/10 17:06:17 ulm Exp $
EAPI=2
@@ -62,7 +62,7 @@
gtk? ( x11-libs/gtk+:2 )
!gtk? (
Xaw3d? ( x11-libs/Xaw3d )
- !Xaw3d? ( motif? ( x11-libs/openmotif ) )
+ !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
)
)"
1.28 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.28&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.28&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.27&r2=1.28
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ChangeLog 10 Oct 2010 10:39:30 -0000 1.27
+++ ChangeLog 10 Oct 2010 17:06:17 -0000 1.28
@@ -1,10 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.27 2010/10/10 10:39:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.28 2010/10/10 17:06:17 ulm Exp $
10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
emacs-vcs-24.0.9999.ebuild:
- Don't rename GNU Info files, bug 306445.
+ Don't rename GNU Info files, bug 306445. Fix openmotif dependency.
25 Sep 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
emacs-vcs-24.0.9999.ebuild:
1.14 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.13&r2=1.14
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- emacs-vcs-24.0.9999.ebuild 10 Oct 2010 10:39:30 -0000 1.13
+++ emacs-vcs-24.0.9999.ebuild 10 Oct 2010 17:06:17 -0000 1.14
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.13 2010/10/10 10:39:30 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.14 2010/10/10 17:06:17 ulm Exp $
EAPI=2
@@ -64,7 +64,7 @@
gtk? ( x11-libs/gtk+:2 )
!gtk? (
Xaw3d? ( x11-libs/Xaw3d )
- !Xaw3d? ( motif? ( x11-libs/openmotif ) )
+ !Xaw3d? ( motif? ( >=x11-libs/openmotif-2.3:0 ) )
)
)"
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-10-11 21:52 Christian Faulhammer (fauli)
0 siblings, 0 replies; 9+ messages in thread
From: Christian Faulhammer (fauli) @ 2010-10-11 21:52 UTC (permalink / raw
To: gentoo-commits
fauli 10/10/11 21:52:45
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Update to new Bazaar smartserver repository URIs
(Portage version: 2.1.8.3/cvs/Linux i686)
Revision Changes Path
1.6 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.5&r2=1.6
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-vcs-23.2.9999.ebuild 10 Oct 2010 17:06:17 -0000 1.5
+++ emacs-vcs-23.2.9999.ebuild 11 Oct 2010 21:52:45 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.5 2010/10/10 17:06:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.6 2010/10/11 21:52:45 fauli Exp $
EAPI=2
@@ -9,7 +9,7 @@
if [ "${PV##*.}" = "9999" ]; then
inherit bzr
EMACS_BRANCH="emacs-23"
- EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/"
+ EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/"
EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}"
SRC_URI=""
else
1.29 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.29&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.29&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.28&r2=1.29
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ChangeLog 10 Oct 2010 17:06:17 -0000 1.28
+++ ChangeLog 11 Oct 2010 21:52:45 -0000 1.29
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.28 2010/10/10 17:06:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.29 2010/10/11 21:52:45 fauli Exp $
+
+ 11 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
+ emacs-vcs-23.2.9999.ebuild, emacs-vcs-24.0.9999.ebuild:
+ Update to new Bazaar smartserver repository URIs
10 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
emacs-vcs-24.0.9999.ebuild:
1.15 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.14&r2=1.15
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- emacs-vcs-24.0.9999.ebuild 10 Oct 2010 17:06:17 -0000 1.14
+++ emacs-vcs-24.0.9999.ebuild 11 Oct 2010 21:52:45 -0000 1.15
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.14 2010/10/10 17:06:17 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.15 2010/10/11 21:52:45 fauli Exp $
EAPI=2
@@ -9,7 +9,7 @@
if [ "${PV##*.}" = "9999" ]; then
inherit bzr
EMACS_BRANCH="trunk"
- EBZR_REPO_URI="http://bzr.savannah.gnu.org/r/emacs/${EMACS_BRANCH}/"
+ EBZR_REPO_URI="bzr://bzr.savannah.gnu.org/emacs/${EMACS_BRANCH}/"
EBZR_CACHE_DIR="emacs-${EMACS_BRANCH#emacs-}"
SRC_URI=""
else
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-10-13 14:41 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-10-13 14:41 UTC (permalink / raw
To: gentoo-commits
ulm 10/10/13 14:41:48
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Update timestamp of Info dir file.
(Portage version: 2.1.9.16/cvs/Linux x86_64)
Revision Changes Path
1.7 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.6&r2=1.7
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-vcs-23.2.9999.ebuild 11 Oct 2010 21:52:45 -0000 1.6
+++ emacs-vcs-23.2.9999.ebuild 13 Oct 2010 14:41:48 -0000 1.7
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.6 2010/10/11 21:52:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.7 2010/10/13 14:41:48 ulm Exp $
EAPI=2
@@ -266,6 +266,7 @@
if [ -f "${D}"${infodir}/dir.orig ]; then
# prefer existing file if it has survived to here
mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
+ touch "${D}"${infodir}/dir
else
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${D}"${infodir}/dir{,.*}
1.30 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.30&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.30&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.29&r2=1.30
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- ChangeLog 11 Oct 2010 21:52:45 -0000 1.29
+++ ChangeLog 13 Oct 2010 14:41:48 -0000 1.30
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.29 2010/10/11 21:52:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.30 2010/10/13 14:41:48 ulm Exp $
+
+ 13 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+ emacs-vcs-24.0.9999.ebuild:
+ Update timestamp of Info dir file.
11 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
emacs-vcs-23.2.9999.ebuild, emacs-vcs-24.0.9999.ebuild:
1.16 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.16&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.15&r2=1.16
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- emacs-vcs-24.0.9999.ebuild 11 Oct 2010 21:52:45 -0000 1.15
+++ emacs-vcs-24.0.9999.ebuild 13 Oct 2010 14:41:48 -0000 1.16
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.15 2010/10/11 21:52:45 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.16 2010/10/13 14:41:48 ulm Exp $
EAPI=2
@@ -279,6 +279,7 @@
if [ -f "${D}"${infodir}/dir.orig ]; then
# prefer existing file if it has survived to here
mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
+ touch "${D}"${infodir}/dir
else
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${D}"${infodir}/dir{,.*}
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-10-13 21:36 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-10-13 21:36 UTC (permalink / raw
To: gentoo-commits
ulm 10/10/13 21:36:09
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Create .keepinfodir file to prevent portage from rebuilding the Info dir,
bug 257260.
(Portage version: 2.1.9.16/cvs/Linux x86_64)
Revision Changes Path
1.8 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.7&r2=1.8
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-vcs-23.2.9999.ebuild 13 Oct 2010 14:41:48 -0000 1.7
+++ emacs-vcs-23.2.9999.ebuild 13 Oct 2010 21:36:09 -0000 1.8
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.7 2010/10/13 14:41:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.8 2010/10/13 21:36:09 ulm Exp $
EAPI=2
@@ -220,6 +220,7 @@
# move info dir to avoid collisions with the dir file generated by portage
mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
+ touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
# avoid collision between slots, see bug #169033 e.g.
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -266,7 +267,6 @@
if [ -f "${D}"${infodir}/dir.orig ]; then
# prefer existing file if it has survived to here
mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
- touch "${D}"${infodir}/dir
else
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${D}"${infodir}/dir{,.*}
1.31 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.30&r2=1.31
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog 13 Oct 2010 14:41:48 -0000 1.30
+++ ChangeLog 13 Oct 2010 21:36:09 -0000 1.31
@@ -1,10 +1,11 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.30 2010/10/13 14:41:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.31 2010/10/13 21:36:09 ulm Exp $
13 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
emacs-vcs-24.0.9999.ebuild:
- Update timestamp of Info dir file.
+ Create .keepinfodir file to prevent portage from rebuilding the Info dir,
+ bug 257260.
11 Oct 2010; Christian Faulhammer <fauli@gentoo.org>
emacs-vcs-23.2.9999.ebuild, emacs-vcs-24.0.9999.ebuild:
1.17 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.16&r2=1.17
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- emacs-vcs-24.0.9999.ebuild 13 Oct 2010 14:41:48 -0000 1.16
+++ emacs-vcs-24.0.9999.ebuild 13 Oct 2010 21:36:09 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.16 2010/10/13 14:41:48 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.17 2010/10/13 21:36:09 ulm Exp $
EAPI=2
@@ -233,6 +233,7 @@
# move info dir to avoid collisions with the dir file generated by portage
mv "${D}"/usr/share/info/${EMACS_SUFFIX}/dir{,.orig} \
|| die "moving info dir failed"
+ touch "${D}"/usr/share/info/${EMACS_SUFFIX}/.keepinfodir
# avoid collision between slots, see bug #169033 e.g.
rm "${D}"/usr/share/emacs/site-lisp/subdirs.el
@@ -279,7 +280,6 @@
if [ -f "${D}"${infodir}/dir.orig ]; then
# prefer existing file if it has survived to here
mv "${D}"${infodir}/dir{.orig,} || die "moving info dir failed"
- touch "${D}"${infodir}/dir
else
einfo "Regenerating Info directory index in ${infodir} ..."
rm -f "${D}"${infodir}/dir{,.*}
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-10-25 21:31 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-10-25 21:31 UTC (permalink / raw
To: gentoo-commits
ulm 10/10/25 21:31:10
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Filter -fstack-protector and -fstack-protector-all flags, bug 285778.
(Portage version: 2.1.9.21/cvs/Linux x86_64)
Revision Changes Path
1.9 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.8&r2=1.9
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- emacs-vcs-23.2.9999.ebuild 13 Oct 2010 21:36:09 -0000 1.8
+++ emacs-vcs-23.2.9999.ebuild 25 Oct 2010 21:31:09 -0000 1.9
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.8 2010/10/13 21:36:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.9 2010/10/25 21:31:09 ulm Exp $
EAPI=2
@@ -91,7 +91,8 @@
# EPATCH_SUFFIX=patch epatch
fi
- sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+ sed -i \
+ -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
@@ -115,7 +116,8 @@
src_configure() {
ALLOWED_FLAGS=""
strip-flags
- #unset LDFLAGS
+ filter-flags -fstack-protector -fstack-protector-all #285778
+
if use sh; then
replace-flags -O[1-9] -O0 #262359
elif use ia64; then
1.33 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.33&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.33&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.32&r2=1.33
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- ChangeLog 21 Oct 2010 20:41:46 -0000 1.32
+++ ChangeLog 25 Oct 2010 21:31:09 -0000 1.33
@@ -1,6 +1,11 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.32 2010/10/21 20:41:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.33 2010/10/25 21:31:09 ulm Exp $
+
+ 25 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+ emacs-vcs-24.0.9999.ebuild:
+ Filter -fstack-protector and -fstack-protector-all flags that cause
+ segmentation faults in hardened profiles. Bug 285778.
21 Oct 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-24.0.9999.ebuild:
New USE flags: gnutls and selinux.
1.19 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.18&r2=1.19
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emacs-vcs-24.0.9999.ebuild 21 Oct 2010 20:41:46 -0000 1.18
+++ emacs-vcs-24.0.9999.ebuild 25 Oct 2010 21:31:09 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.18 2010/10/21 20:41:46 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.19 2010/10/25 21:31:09 ulm Exp $
EAPI=2
@@ -104,7 +104,8 @@
# EPATCH_SUFFIX=patch epatch
fi
- sed -i -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
+ sed -i \
+ -e "s:/usr/lib/crtbegin.o:$(`tc-getCC` -print-file-name=crtbegin.o):g" \
-e "s:/usr/lib/crtend.o:$(`tc-getCC` -print-file-name=crtend.o):g" \
"${S}"/src/s/freebsd.h || die "unable to sed freebsd.h settings"
@@ -128,7 +129,8 @@
src_configure() {
ALLOWED_FLAGS=""
strip-flags
- #unset LDFLAGS
+ filter-flags -fstack-protector -fstack-protector-all #285778
+
if use sh; then
replace-flags -O[1-9] -O0 #262359
elif use ia64; then
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild
@ 2010-11-07 22:19 Ulrich Mueller (ulm)
0 siblings, 0 replies; 9+ messages in thread
From: Ulrich Mueller (ulm) @ 2010-11-07 22:19 UTC (permalink / raw
To: gentoo-commits
ulm 10/11/07 22:19:08
Modified: emacs-vcs-23.2.9999.ebuild ChangeLog
emacs-vcs-24.0.9999.ebuild
Log:
Depend on virtual/jpeg wrt bug 327487.
(Portage version: 2.1.9.24/cvs/Linux x86_64)
Revision Changes Path
1.11 app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild?r1=1.10&r2=1.11
Index: emacs-vcs-23.2.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- emacs-vcs-23.2.9999.ebuild 3 Nov 2010 20:16:40 -0000 1.10
+++ emacs-vcs-23.2.9999.ebuild 7 Nov 2010 22:19:08 -0000 1.11
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.10 2010/11/03 20:16:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.2.9999.ebuild,v 1.11 2010/11/07 22:19:08 ulm Exp $
EAPI=2
@@ -45,7 +45,7 @@
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg:0 )
+ jpeg? ( virtual/jpeg )
png? ( media-libs/libpng )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
1.35 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.35&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.35&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.34&r2=1.35
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- ChangeLog 3 Nov 2010 20:16:40 -0000 1.34
+++ ChangeLog 7 Nov 2010 22:19:08 -0000 1.35
@@ -1,6 +1,10 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.34 2010/11/03 20:16:40 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.35 2010/11/07 22:19:08 ulm Exp $
+
+ 07 Nov 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild,
+ emacs-vcs-24.0.9999.ebuild:
+ Depend on virtual/jpeg wrt bug 327487.
03 Nov 2010; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.2.9999.ebuild:
Pass the --with-crt-dir option to configure, as it was backported upstream.
1.20 app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild?r1=1.19&r2=1.20
Index: emacs-vcs-24.0.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- emacs-vcs-24.0.9999.ebuild 25 Oct 2010 21:31:09 -0000 1.19
+++ emacs-vcs-24.0.9999.ebuild 7 Nov 2010 22:19:08 -0000 1.20
@@ -1,6 +1,6 @@
# Copyright 1999-2010 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.ebuild,v 1.19 2010/10/25 21:31:09 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999.ebuild,v 1.20 2010/11/07 22:19:08 ulm Exp $
EAPI=2
@@ -48,7 +48,7 @@
gconf? ( >=gnome-base/gconf-2.26.2 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
gif? ( media-libs/giflib )
- jpeg? ( media-libs/jpeg:0 )
+ jpeg? ( virtual/jpeg )
png? ( media-libs/libpng )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2010-11-07 22:19 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-10 10:39 [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-23.2.9999.ebuild ChangeLog emacs-vcs-24.0.9999.ebuild Ulrich Mueller (ulm)
-- strict thread matches above, loose matches on Subject: below --
2010-11-07 22:19 Ulrich Mueller (ulm)
2010-10-25 21:31 Ulrich Mueller (ulm)
2010-10-13 21:36 Ulrich Mueller (ulm)
2010-10-13 14:41 Ulrich Mueller (ulm)
2010-10-11 21:52 Christian Faulhammer (fauli)
2010-10-10 17:06 Ulrich Mueller (ulm)
2010-09-25 11:32 Ulrich Mueller (ulm)
2010-06-25 17:46 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