summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Müller <ulm@gentoo.org>2007-07-15 18:09:45 +0000
committerUlrich Müller <ulm@gentoo.org>2007-07-15 18:09:45 +0000
commit86e3fd4a1d3f001dc840b6b64f8e4ee576476223 (patch)
tree4b93823808da76297fccac8614e8b493c27a7fae /dev-util
parentFix SCTP compile error (diff)
downloadgentoo-2-86e3fd4a1d3f001dc840b6b64f8e4ee576476223.tar.gz
gentoo-2-86e3fd4a1d3f001dc840b6b64f8e4ee576476223.tar.bz2
gentoo-2-86e3fd4a1d3f001dc840b6b64f8e4ee576476223.zip
Fix regression of bug #158891.
(Portage version: 2.1.3_rc8)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/subversion/ChangeLog8
-rw-r--r--dev-util/subversion/files/digest-subversion-1.4.4-r3 (renamed from dev-util/subversion/files/digest-subversion-1.4.4-r2)0
-rw-r--r--dev-util/subversion/subversion-1.4.4-r3.ebuild (renamed from dev-util/subversion/subversion-1.4.4-r2.ebuild)10
3 files changed, 12 insertions, 6 deletions
diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog
index 22e99fbbe379..69aa030a88d6 100644
--- a/dev-util/subversion/ChangeLog
+++ b/dev-util/subversion/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/subversion
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.270 2007/06/27 20:04:21 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.271 2007/07/15 18:09:45 ulm Exp $
+
+*subversion-1.4.4-r3 (15 Jul 2007)
+
+ 15 Jul 2007; Ulrich Mueller <ulm@gentoo.org> -subversion-1.4.4-r2.ebuild,
+ +subversion-1.4.4-r3.ebuild:
+ Fix regression of bug #158891, see entry from 03 Mar 2007.
27 Jun 2007; Lars Weiler <pylon@gentoo.org> subversion-1.3.2-r4.ebuild:
Stable on ppc; bug #178264.
diff --git a/dev-util/subversion/files/digest-subversion-1.4.4-r2 b/dev-util/subversion/files/digest-subversion-1.4.4-r3
index e3c9fe8133a5..e3c9fe8133a5 100644
--- a/dev-util/subversion/files/digest-subversion-1.4.4-r2
+++ b/dev-util/subversion/files/digest-subversion-1.4.4-r3
diff --git a/dev-util/subversion/subversion-1.4.4-r2.ebuild b/dev-util/subversion/subversion-1.4.4-r3.ebuild
index 0b60cd183637..b4568e8ec8d9 100644
--- a/dev-util/subversion/subversion-1.4.4-r2.ebuild
+++ b/dev-util/subversion/subversion-1.4.4-r3.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r2.ebuild,v 1.2 2007/06/22 15:19:39 chtekk Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.4-r3.ebuild,v 1.1 2007/07/15 18:09:45 ulm Exp $
inherit elisp-common libtool python eutils multilib bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2
@@ -268,9 +268,9 @@ EOF
# Install emacs lisps
if use emacs ; then
- insinto /usr/share/emacs/site-lisp/subversion
- doins contrib/client-side/psvn/psvn.el*
- doins contrib/client-side/vc-svn.el*
+ elisp-install ${PN} contrib/client-side/psvn/psvn.el*
+ elisp-install ${PN}/compat contrib/client-side/vc-svn.el*
+ touch "${D}${SITELISP}/${PN}/compat/.nosearch"
elisp-site-file-install "${FILESDIR}"/70svn-gentoo.el
fi
@@ -341,7 +341,7 @@ pkg_postinst() {
}
pkg_postrm() {
- has_version virtual/emacs && elisp-site-regen
+ use emacs && elisp-site-regen
use perl && perl-module_pkg_postrm
}