* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.0.9999-r2.ebuild ChangeLog emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild emacs-vcs-24.0.91.ebuild
@ 2011-12-15 6:33 Ulrich Mueller (ulm)
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2011-12-15 6:33 UTC (permalink / raw
To: gentoo-commits
ulm 11/12/15 06:33:51
Modified: emacs-vcs-24.0.9999-r2.ebuild ChangeLog
emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild
emacs-vcs-24.0.91.ebuild
Log:
Add EPREFIX to locallisppath, bug 394707.
(Portage version: 2.1.10.40/cvs/Linux x86_64)
Revision Changes Path
1.2 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.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.9999-r2.ebuild?r1=1.1&r2=1.2
Index: emacs-vcs-24.0.9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- emacs-vcs-24.0.9999-r2.ebuild 13 Dec 2011 22:20:56 -0000 1.1
+++ emacs-vcs-24.0.9999-r2.ebuild 15 Dec 2011 06:33:51 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/12/13 22:20:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.2 2011/12/15 06:33:51 ulm Exp $
EAPI=4
@@ -204,7 +204,7 @@
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --enable-locallisppath="/etc/emacs:${SITELISP}" \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
1.72 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.72&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.72&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.71&r2=1.72
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- ChangeLog 13 Dec 2011 22:20:56 -0000 1.71
+++ ChangeLog 15 Dec 2011 06:33:51 -0000 1.72
@@ -1,6 +1,11 @@
# ChangeLog for app-editors/emacs-vcs
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.71 2011/12/13 22:20:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.72 2011/12/15 06:33:51 ulm Exp $
+
+ 15 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+ emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
+ emacs-vcs-24.0.9999-r2.ebuild:
+ Add EPREFIX to locallisppath, bug 394707.
*emacs-vcs-24.0.9999-r2 (13 Dec 2011)
1.4 app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.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.92.ebuild?r1=1.3&r2=1.4
Index: emacs-vcs-24.0.92.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-vcs-24.0.92.ebuild 13 Dec 2011 22:20:56 -0000 1.3
+++ emacs-vcs-24.0.92.ebuild 15 Dec 2011 06:33:51 -0000 1.4
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.92.ebuild,v 1.3 2011/12/13 22:20:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.4 2011/12/15 06:33:51 ulm Exp $
EAPI=4
@@ -204,7 +204,7 @@
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --enable-locallisppath="/etc/emacs:${SITELISP}" \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
1.17 app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.17&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?r1=1.16&r2=1.17
Index: emacs-vcs-23.3.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- emacs-vcs-23.3.9999.ebuild 13 Dec 2011 22:20:56 -0000 1.16
+++ emacs-vcs-23.3.9999.ebuild 15 Dec 2011 06:33:51 -0000 1.17
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.3.9999.ebuild,v 1.16 2011/12/13 22:20:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.17 2011/12/15 06:33:51 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -202,7 +202,7 @@
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --enable-locallisppath="/etc/emacs:${SITELISP}" \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
$(use_with hesiod) \
$(use_with kerberos) $(use_with kerberos kerberos5) \
1.6 app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.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.91.ebuild?r1=1.5&r2=1.6
Index: emacs-vcs-24.0.91.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-vcs-24.0.91.ebuild 13 Dec 2011 22:20:56 -0000 1.5
+++ emacs-vcs-24.0.91.ebuild 15 Dec 2011 06:33:51 -0000 1.6
@@ -1,6 +1,6 @@
# Copyright 1999-2011 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.91.ebuild,v 1.5 2011/12/13 22:20:56 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.6 2011/12/15 06:33:51 ulm Exp $
EAPI=4
@@ -204,7 +204,7 @@
econf \
--program-suffix=-${EMACS_SUFFIX} \
--infodir="${EPREFIX}"/usr/share/info/${EMACS_SUFFIX} \
- --enable-locallisppath="/etc/emacs:${SITELISP}" \
+ --enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-crt-dir="${crtdir}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.0.9999-r2.ebuild ChangeLog emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild emacs-vcs-24.0.91.ebuild
@ 2012-01-05 23:43 Ulrich Mueller (ulm)
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2012-01-05 23:43 UTC (permalink / raw
To: gentoo-commits
ulm 12/01/05 23:43:15
Modified: emacs-vcs-24.0.9999-r2.ebuild ChangeLog
emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild
emacs-vcs-24.0.91.ebuild
Log:
Move libxml2 out of the USE=X conditional.
A build-time dependency on pkgconfig is needed only in some configurations.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.3 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?r1=1.2&r2=1.3
Index: emacs-vcs-24.0.9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-vcs-24.0.9999-r2.ebuild 15 Dec 2011 06:33:51 -0000 1.2
+++ emacs-vcs-24.0.9999-r2.ebuild 5 Jan 2012 23:43:15 -0000 1.3
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-r2.ebuild,v 1.2 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.3 2012/01/05 23:43:15 ulm Exp $
EAPI=4
@@ -41,6 +41,7 @@
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
+ libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
x11-libs/libXmu
@@ -48,7 +49,6 @@
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4:0 )
@@ -79,7 +79,11 @@
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
+ alsa? ( dev-util/pkgconfig )
+ dbus? ( dev-util/pkgconfig )
+ gnutls? ( dev-util/pkgconfig )
+ libxml2? ( dev-util/pkgconfig )
+ X? ( dev-util/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
@@ -143,7 +147,6 @@
myconf="${myconf} --with-x"
myconf="${myconf} $(use_with gconf)"
myconf="${myconf} $(use_with gsettings)"
- myconf="${myconf} $(use_with libxml2 xml2)"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with wide-int)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
@@ -214,6 +217,7 @@
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
+ $(use_with libxml2 xml2) \
$(use_with selinux) \
${myconf}
}
1.73 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.73&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.73&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.72&r2=1.73
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- ChangeLog 15 Dec 2011 06:33:51 -0000 1.72
+++ ChangeLog 5 Jan 2012 23:43:15 -0000 1.73
@@ -1,6 +1,12 @@
# ChangeLog for app-editors/emacs-vcs
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.72 2011/12/15 06:33:51 ulm Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.73 2012/01/05 23:43:15 ulm Exp $
+
+ 05 Jan 2012; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+ emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
+ emacs-vcs-24.0.9999-r2.ebuild:
+ Move libxml2 out of the USE=X conditional. A build-time dependency on
+ pkgconfig is needed only in some configurations.
15 Dec 2011; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
1.5 app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?rev=1.5&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?rev=1.5&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?r1=1.4&r2=1.5
Index: emacs-vcs-24.0.92.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- emacs-vcs-24.0.92.ebuild 15 Dec 2011 06:33:51 -0000 1.4
+++ emacs-vcs-24.0.92.ebuild 5 Jan 2012 23:43:15 -0000 1.5
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.92.ebuild,v 1.4 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.5 2012/01/05 23:43:15 ulm Exp $
EAPI=4
@@ -41,6 +41,7 @@
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
+ libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
x11-libs/libXmu
@@ -48,7 +49,6 @@
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4:0 )
@@ -79,7 +79,11 @@
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
+ alsa? ( dev-util/pkgconfig )
+ dbus? ( dev-util/pkgconfig )
+ gnutls? ( dev-util/pkgconfig )
+ libxml2? ( dev-util/pkgconfig )
+ X? ( dev-util/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
@@ -143,7 +147,6 @@
myconf="${myconf} --with-x"
myconf="${myconf} $(use_with gconf)"
myconf="${myconf} $(use_with gsettings)"
- myconf="${myconf} $(use_with libxml2 xml2)"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with wide-int)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
@@ -214,6 +217,7 @@
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
+ $(use_with libxml2 xml2) \
$(use_with selinux) \
${myconf}
}
1.18 app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?r1=1.17&r2=1.18
Index: emacs-vcs-23.3.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- emacs-vcs-23.3.9999.ebuild 15 Dec 2011 06:33:51 -0000 1.17
+++ emacs-vcs-23.3.9999.ebuild 5 Jan 2012 23:43:15 -0000 1.18
@@ -1,6 +1,7 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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-23.3.9999.ebuild,v 1.17 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.18 2012/01/05 23:43:15 ulm Exp $
+
EAPI=4
WANT_AUTOMAKE="none"
@@ -71,7 +72,9 @@
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
+ alsa? ( dev-util/pkgconfig )
+ dbus? ( dev-util/pkgconfig )
+ X? ( dev-util/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
1.7 app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.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.91.ebuild?r1=1.6&r2=1.7
Index: emacs-vcs-24.0.91.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- emacs-vcs-24.0.91.ebuild 15 Dec 2011 06:33:51 -0000 1.6
+++ emacs-vcs-24.0.91.ebuild 5 Jan 2012 23:43:15 -0000 1.7
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# 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.91.ebuild,v 1.6 2011/12/15 06:33:51 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.7 2012/01/05 23:43:15 ulm Exp $
EAPI=4
@@ -41,6 +41,7 @@
gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
+ libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
x11-libs/libXmu
@@ -48,7 +49,6 @@
x11-misc/xbitmaps
gconf? ( >=gnome-base/gconf-2.26.2 )
gsettings? ( >=dev-libs/glib-2.28.6 )
- libxml2? ( >=dev-libs/libxml2-2.2.0 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( >=media-libs/libpng-1.4:0 )
@@ -79,7 +79,11 @@
)"
DEPEND="${RDEPEND}
- dev-util/pkgconfig
+ alsa? ( dev-util/pkgconfig )
+ dbus? ( dev-util/pkgconfig )
+ gnutls? ( dev-util/pkgconfig )
+ libxml2? ( dev-util/pkgconfig )
+ X? ( dev-util/pkgconfig )
gzip-el? ( app-arch/gzip )"
RDEPEND="${RDEPEND}
@@ -143,7 +147,6 @@
myconf="${myconf} --with-x"
myconf="${myconf} $(use_with gconf)"
myconf="${myconf} $(use_with gsettings)"
- myconf="${myconf} $(use_with libxml2 xml2)"
myconf="${myconf} $(use_with toolkit-scroll-bars)"
myconf="${myconf} $(use_with wide-int)"
myconf="${myconf} $(use_with gif) $(use_with jpeg)"
@@ -214,6 +217,7 @@
$(use_with gpm) \
$(use_with dbus) \
$(use_with gnutls) \
+ $(use_with libxml2 xml2) \
$(use_with selinux) \
${myconf}
}
^ permalink raw reply [flat|nested] 3+ messages in thread
* [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.0.9999-r2.ebuild ChangeLog emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild emacs-vcs-24.0.91.ebuild
@ 2012-01-08 21:29 Ulrich Mueller (ulm)
0 siblings, 0 replies; 3+ messages in thread
From: Ulrich Mueller (ulm) @ 2012-01-08 21:29 UTC (permalink / raw
To: gentoo-commits
ulm 12/01/08 21:29:32
Modified: emacs-vcs-24.0.9999-r2.ebuild ChangeLog
emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild
emacs-vcs-24.0.91.ebuild
Log:
Restore fallback code in pkg_preinst because of failures with paludis.
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Revision Changes Path
1.4 app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.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-r2.ebuild?r1=1.3&r2=1.4
Index: emacs-vcs-24.0.9999-r2.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- emacs-vcs-24.0.9999-r2.ebuild 5 Jan 2012 23:43:15 -0000 1.3
+++ emacs-vcs-24.0.9999-r2.ebuild 8 Jan 2012 21:29:32 -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-r2.ebuild,v 1.3 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.9999-r2.ebuild,v 1.4 2012/01/08 21:29:32 ulm Exp $
EAPI=4
@@ -300,8 +300,20 @@
pkg_preinst() {
# move Info dir file to correct name
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
- || die "moving info dir failed"
+ 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
+ # this should not happen in EAPI 4
+ ewarn "Regenerating Info directory index in ${infodir} ..."
+ rm -f "${ED}"${infodir}/dir{,.*}
+ for f in "${ED}"${infodir}/*; do
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+ install-info --info-dir="${ED}"${infodir} "${f}" \
+ || die "install-info failed"
+ fi
+ done
+ fi
}
pkg_postinst() {
1.74 app-editors/emacs-vcs/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.74&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?rev=1.74&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/ChangeLog?r1=1.73&r2=1.74
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- ChangeLog 5 Jan 2012 23:43:15 -0000 1.73
+++ ChangeLog 8 Jan 2012 21:29:32 -0000 1.74
@@ -1,6 +1,11 @@
# 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.73 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/ChangeLog,v 1.74 2012/01/08 21:29:32 ulm Exp $
+
+ 08 Jan 2012; Ulrich Müller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
+ emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
+ emacs-vcs-24.0.9999-r2.ebuild:
+ Restore fallback code in pkg_preinst because of failures with paludis.
05 Jan 2012; Ulrich Mueller <ulm@gentoo.org> emacs-vcs-23.3.9999.ebuild,
emacs-vcs-24.0.91.ebuild, emacs-vcs-24.0.92.ebuild,
1.6 app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.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.92.ebuild?r1=1.5&r2=1.6
Index: emacs-vcs-24.0.92.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- emacs-vcs-24.0.92.ebuild 5 Jan 2012 23:43:15 -0000 1.5
+++ emacs-vcs-24.0.92.ebuild 8 Jan 2012 21:29:32 -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.92.ebuild,v 1.5 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.92.ebuild,v 1.6 2012/01/08 21:29:32 ulm Exp $
EAPI=4
@@ -300,8 +300,20 @@
pkg_preinst() {
# move Info dir file to correct name
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
- || die "moving info dir failed"
+ 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
+ # this should not happen in EAPI 4
+ ewarn "Regenerating Info directory index in ${infodir} ..."
+ rm -f "${ED}"${infodir}/dir{,.*}
+ for f in "${ED}"${infodir}/*; do
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+ install-info --info-dir="${ED}"${infodir} "${f}" \
+ || die "install-info failed"
+ fi
+ done
+ fi
}
pkg_postinst() {
1.19 app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild?r1=1.18&r2=1.19
Index: emacs-vcs-23.3.9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- emacs-vcs-23.3.9999.ebuild 5 Jan 2012 23:43:15 -0000 1.18
+++ emacs-vcs-23.3.9999.ebuild 8 Jan 2012 21:29:32 -0000 1.19
@@ -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-23.3.9999.ebuild,v 1.18 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-23.3.9999.ebuild,v 1.19 2012/01/08 21:29:32 ulm Exp $
EAPI=4
WANT_AUTOMAKE="none"
@@ -293,8 +293,20 @@
pkg_preinst() {
# move Info dir file to correct name
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
- || die "moving info dir failed"
+ 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
+ # this should not happen in EAPI 4
+ ewarn "Regenerating Info directory index in ${infodir} ..."
+ rm -f "${ED}"${infodir}/dir{,.*}
+ for f in "${ED}"${infodir}/*; do
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+ install-info --info-dir="${ED}"${infodir} "${f}" \
+ || die "install-info failed"
+ fi
+ done
+ fi
}
pkg_postinst() {
1.8 app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?rev=1.8&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?rev=1.8&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild?r1=1.7&r2=1.8
Index: emacs-vcs-24.0.91.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- emacs-vcs-24.0.91.ebuild 5 Jan 2012 23:43:15 -0000 1.7
+++ emacs-vcs-24.0.91.ebuild 8 Jan 2012 21:29:32 -0000 1.8
@@ -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.91.ebuild,v 1.7 2012/01/05 23:43:15 ulm Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/emacs-vcs/emacs-vcs-24.0.91.ebuild,v 1.8 2012/01/08 21:29:32 ulm Exp $
EAPI=4
@@ -300,8 +300,20 @@
pkg_preinst() {
# move Info dir file to correct name
- mv "${ED}"/usr/share/info/${EMACS_SUFFIX}/dir{.orig,} \
- || die "moving info dir failed"
+ 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
+ # this should not happen in EAPI 4
+ ewarn "Regenerating Info directory index in ${infodir} ..."
+ rm -f "${ED}"${infodir}/dir{,.*}
+ for f in "${ED}"${infodir}/*; do
+ if [[ ${f##*/} != *-[0-9]* && -e ${f} ]]; then
+ install-info --info-dir="${ED}"${infodir} "${f}" \
+ || die "install-info failed"
+ fi
+ done
+ fi
}
pkg_postinst() {
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-08 21:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-05 23:43 [gentoo-commits] gentoo-x86 commit in app-editors/emacs-vcs: emacs-vcs-24.0.9999-r2.ebuild ChangeLog emacs-vcs-24.0.92.ebuild emacs-vcs-23.3.9999.ebuild emacs-vcs-24.0.91.ebuild Ulrich Mueller (ulm)
-- strict thread matches above, loose matches on Subject: below --
2012-01-08 21:29 Ulrich Mueller (ulm)
2011-12-15 6:33 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