Fix regression of bug #158891.

Package-Manager: portage-2.1.3_rc8

4 files changed, 33 insertions, 17 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/Manifest b/dev-util/subversion/Manifest
index 2cf8d16013ad..e41ae3edcc3d 100644
--- a/dev-util/subversion/Manifest
+++ b/dev-util/subversion/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 70svn-gentoo.el 331 RMD160 1de1310ae7e4bdbecef3c685ef8d7ff95b9aab87 SHA1 48eb99e9d494a4a674de32e599914df234b627cd SHA256 c0d733bd3f7c75c47acaea4fd0c816d45ee2cd765da70dc494666f38c91e3d87
 MD5 23c250f0b440c1df1bc142a7d76b4c62 files/70svn-gentoo.el 331
 RMD160 1de1310ae7e4bdbecef3c685ef8d7ff95b9aab87 files/70svn-gentoo.el 331
@@ -86,14 +89,14 @@ EBUILD subversion-1.3.2-r4.ebuild 11937 RMD160 afc37f3f18275a89fcc144b6bc17fd2a1
 MD5 7181af298477ad78bc1c487f2643acbb subversion-1.3.2-r4.ebuild 11937
 RMD160 afc37f3f18275a89fcc144b6bc17fd2a13373fe5 subversion-1.3.2-r4.ebuild 11937
 SHA256 4ef247bcff92c10bba149598d6d4582b38d9c34d9658340b5df714c9f2caf7ba subversion-1.3.2-r4.ebuild 11937
-EBUILD subversion-1.4.4-r2.ebuild 11942 RMD160 368a42a025475d07c6c181c4db8de352c7d0acf5 SHA1 2e83eb53f57eca2d0bf1a6078203394e0c86a460 SHA256 c1a33970306948b0bcdb245ddd14ac6bcb7dd0091e11aecc22eddb82fb365dd1
-MD5 5c50fc7325702e306eb0d9ba274b4eeb subversion-1.4.4-r2.ebuild 11942
-RMD160 368a42a025475d07c6c181c4db8de352c7d0acf5 subversion-1.4.4-r2.ebuild 11942
-SHA256 c1a33970306948b0bcdb245ddd14ac6bcb7dd0091e11aecc22eddb82fb365dd1 subversion-1.4.4-r2.ebuild 11942
-MISC ChangeLog 47097 RMD160 921807d79b475b3a41b2caa3221c5b1f1d1e44a5 SHA1 4920da4674df375301a53a0afd54d65ab688ea0a SHA256 02d1e8de416635d3ea0cbd24b334f4aaa3590b470af4fdee8de533737a5b0459
-MD5 ee4bbec75164d5c5354bd4f9f0c157c2 ChangeLog 47097
-RMD160 921807d79b475b3a41b2caa3221c5b1f1d1e44a5 ChangeLog 47097
-SHA256 02d1e8de416635d3ea0cbd24b334f4aaa3590b470af4fdee8de533737a5b0459 ChangeLog 47097
+EBUILD subversion-1.4.4-r3.ebuild 11959 RMD160 27092b193ef0a942055bf724fcc16f8b0d1874f3 SHA1 a8f8d98e67b1622352b58e9e435301e9bc747188 SHA256 d6d7012a22329e5a97dba006ad6733830dc3161b76a73dcb9fc5004ab88480f8
+MD5 6ec9b1f42084913048a2a545eae6ba4d subversion-1.4.4-r3.ebuild 11959
+RMD160 27092b193ef0a942055bf724fcc16f8b0d1874f3 subversion-1.4.4-r3.ebuild 11959
+SHA256 d6d7012a22329e5a97dba006ad6733830dc3161b76a73dcb9fc5004ab88480f8 subversion-1.4.4-r3.ebuild 11959
+MISC ChangeLog 47300 RMD160 34520b4513a12ebddee880542b43a9d449603fb1 SHA1 1f6adb63f90e769465f5fa7433dd4f349e41f578 SHA256 162d3db3045cc333b048c8ac3da4c18a34fa7c368b0943a1e2421d19a5af8444
+MD5 c4e4adf850855d5b8efdb83412b5f4bd ChangeLog 47300
+RMD160 34520b4513a12ebddee880542b43a9d449603fb1 ChangeLog 47300
+SHA256 162d3db3045cc333b048c8ac3da4c18a34fa7c368b0943a1e2421d19a5af8444 ChangeLog 47300
 MISC metadata.xml 224 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd SHA1 e096d8a898bd3b957d86654e0e7fb835e2a6a0df SHA256 e6df82c1a36b5df70e15425e6059fb9f486fd31dc453404dfdd2f6b90b7f8aec
 MD5 9d26ecca44906061085842dba1505615 metadata.xml 224
 RMD160 5da25d639360542842990baf18b1ae0f0837c0fd metadata.xml 224
@@ -110,6 +113,13 @@ SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/di
 MD5 f451fb992815e387265f7dd7afb3ddb6 files/digest-subversion-1.3.2-r4 256
 RMD160 2f2fa8d1f158c558014773611365d6488f55ea09 files/digest-subversion-1.3.2-r4 256
 SHA256 b77de6fcac8e868c91fb08f21a08d8e45e26d50f7efa510c9940722746b37cc5 files/digest-subversion-1.3.2-r4 256
-MD5 576f84ed7a5fe7a243604aa6c516d496 files/digest-subversion-1.4.4-r2 256
-RMD160 35c635369a31ed9e54e627d5bca04b2f1154c2ff files/digest-subversion-1.4.4-r2 256
-SHA256 affa1aa33296aa4c7537a386e05b71801ba31437fe10b59dbdab602193315d22 files/digest-subversion-1.4.4-r2 256
+MD5 576f84ed7a5fe7a243604aa6c516d496 files/digest-subversion-1.4.4-r3 256
+RMD160 35c635369a31ed9e54e627d5bca04b2f1154c2ff files/digest-subversion-1.4.4-r3 256
+SHA256 affa1aa33296aa4c7537a386e05b71801ba31437fe10b59dbdab602193315d22 files/digest-subversion-1.4.4-r3 256
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQFGmmLnOeoy/oIi7uwRAmBtAJ9Ij58sZQzwlgf3UDeGoXHWASY0XQCgqcDY
+/D3SepQeF/sWVJ1Wh9yvZVs=
+=yJYO
+-----END PGP SIGNATURE-----
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
 }