summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2013-06-08 23:20:40 +0200
committerUlrich Müller <ulm@gentoo.org>2013-06-08 23:20:40 +0200
commit5d30d1ec6ce5e84764237c83d48cd6ea95668abc (patch)
treee8edae849143a888d5d0d81037cf260107ae3c21 /app-editors
parentMerge changes from Portage tree. (diff)
downloademacs-5d30d1ec6ce5e84764237c83d48cd6ea95668abc.tar.gz
emacs-5d30d1ec6ce5e84764237c83d48cd6ea95668abc.tar.bz2
emacs-5d30d1ec6ce5e84764237c83d48cd6ea95668abc.zip
Merge some changes from emacs-vcs.
Package-Manager: portage-2.1.12.3
Diffstat (limited to 'app-editors')
-rw-r--r--app-editors/emacs-xwidget/ChangeLog3
-rw-r--r--app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild23
2 files changed, 17 insertions, 9 deletions
diff --git a/app-editors/emacs-xwidget/ChangeLog b/app-editors/emacs-xwidget/ChangeLog
index 763a505..020e55f 100644
--- a/app-editors/emacs-xwidget/ChangeLog
+++ b/app-editors/emacs-xwidget/ChangeLog
@@ -2,6 +2,9 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 08 Jun 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
+ Merge some changes from emacs-vcs.
+
31 Mar 2013; Ulrich Müller <ulm@gentoo.org> emacs-xwidget-24.3.9999.ebuild:
Merge changes from Portage tree.
diff --git a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
index 2eb8544..d7c480e 100644
--- a/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
+++ b/app-editors/emacs-xwidget/emacs-xwidget-24.3.9999.ebuild
@@ -39,13 +39,13 @@ RDEPEND="sys-libs/ncurses
>=app-admin/eselect-emacs-1.2
>=app-emacs/emacs-common-gentoo-1.3-r3[games?,X?]
net-libs/liblockfile
- hesiod? ( net-dns/hesiod )
- kerberos? ( virtual/krb5 )
+ acl? ( virtual/acl )
alsa? ( media-libs/alsa-lib )
- gpm? ( sys-libs/gpm )
dbus? ( sys-apps/dbus )
gnutls? ( net-libs/gnutls )
- acl? ( virtual/acl )
+ gpm? ( sys-libs/gpm )
+ hesiod? ( net-dns/hesiod )
+ kerberos? ( virtual/krb5 )
libxml2? ( >=dev-libs/libxml2-2.2.0 )
selinux? ( sys-libs/libselinux )
X? (
@@ -56,7 +56,7 @@ RDEPEND="sys-libs/ncurses
gsettings? ( >=dev-libs/glib-2.28.6 )
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
- png? ( >=media-libs/libpng-1.4:0 )
+ png? ( >=media-libs/libpng-1.4:0= )
svg? ( >=gnome-base/librsvg-2.0 )
tiff? ( media-libs/tiff )
xpm? ( x11-libs/libXpm )
@@ -98,6 +98,11 @@ DEPEND="${RDEPEND}
gzip-el? ( app-arch/gzip )
pax_kernel? ( sys-apps/paxctl )"
+if [[ ${PV##*.} = 9999 ]]; then
+ DEPEND="${DEPEND}
+ sys-apps/texinfo"
+fi
+
EMACS_SUFFIX="${PN/emacs/emacs-${SLOT}}"
SITEFILE="20${PN}-${SLOT}-gentoo.el"
@@ -231,13 +236,13 @@ src_configure() {
--enable-locallisppath="${EPREFIX}/etc/emacs:${EPREFIX}${SITELISP}" \
--with-gameuser="${GAMES_USER_DED:-games}" \
--without-compress-info \
- $(use_with hesiod) \
- $(use_with kerberos) $(use_with kerberos kerberos5) \
- $(use_with gpm) \
+ $(use_enable acl) \
$(use_with dbus) \
$(use_with gnutls) \
+ $(use_with gpm) \
+ $(use_with hesiod) \
$(use_with inotify) \
- $(use_with acl) \
+ $(use_with kerberos) $(use_with kerberos kerberos5) \
$(use_with libxml2 xml2) \
$(use_with selinux) \
$(use_with wide-int) \