From: Christian Faulhammer Date: Wed, 7 Mar 2007 04:52:19 +0000 (+0000) Subject: straightened update of Emacs files in pkg_postinstall X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=02073f117005406a810ba2f184470c510a256a00;p=gentoo.git straightened update of Emacs files in pkg_postinstall Package-Manager: portage-2.1.2-r9 --- diff --git a/dev-util/subversion/ChangeLog b/dev-util/subversion/ChangeLog index b5c6a1c39a5d..6fa1fbbba0c1 100644 --- a/dev-util/subversion/ChangeLog +++ b/dev-util/subversion/ChangeLog @@ -1,6 +1,10 @@ # 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.250 2007/03/05 04:20:11 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/ChangeLog,v 1.251 2007/03/07 04:52:19 opfer Exp $ + + 07 Mar 2007; Christian Faulhammer + subversion-1.4.3.ebuild: + straightened update of Emacs files in pkg_postinstall 05 Mar 2007; Marius Mauch subversion-1.1.3.ebuild, subversion-1.2.3-r3.ebuild, subversion-1.3.2-r3.ebuild, diff --git a/dev-util/subversion/Manifest b/dev-util/subversion/Manifest index 05bf95845986..f37a45cd2be6 100644 --- a/dev-util/subversion/Manifest +++ b/dev-util/subversion/Manifest @@ -85,14 +85,14 @@ EBUILD subversion-1.3.2-r3.ebuild 11713 RMD160 98d7bebdf4cf2c5e9ac67244c21628799 MD5 4f493a6c3589b4f1d66f5c2a259dbd89 subversion-1.3.2-r3.ebuild 11713 RMD160 98d7bebdf4cf2c5e9ac67244c216287994d0dbb5 subversion-1.3.2-r3.ebuild 11713 SHA256 8154a3d1fb49dce52d50e2dff3d6ac1293c65b67d40952ea4cdebe29e722d8a2 subversion-1.3.2-r3.ebuild 11713 -EBUILD subversion-1.4.3.ebuild 11868 RMD160 cc1399b6a4d6f349afc98136727a16c0a8c46c8a SHA1 621e392c3fd9847ea17938bff89ed48706f63215 SHA256 beac6e53262db57b5ab1321fdb0d05920f7b3ebbe826814ee4cbe6c37ceec51f -MD5 d85225c78ee9bb12409d779c59c370bc subversion-1.4.3.ebuild 11868 -RMD160 cc1399b6a4d6f349afc98136727a16c0a8c46c8a subversion-1.4.3.ebuild 11868 -SHA256 beac6e53262db57b5ab1321fdb0d05920f7b3ebbe826814ee4cbe6c37ceec51f subversion-1.4.3.ebuild 11868 -MISC ChangeLog 43114 RMD160 7c87c8a07e24ab76bcccef0c4c6ad82b7b88449f SHA1 d050262903f81570c68653bcfbfaf6feb77de371 SHA256 093df4aff8034e2553cc45972039b0ab9769b12ef9d4bc1245e5934437eab435 -MD5 36c6c026ac13b24a70d593c402a0beb4 ChangeLog 43114 -RMD160 7c87c8a07e24ab76bcccef0c4c6ad82b7b88449f ChangeLog 43114 -SHA256 093df4aff8034e2553cc45972039b0ab9769b12ef9d4bc1245e5934437eab435 ChangeLog 43114 +EBUILD subversion-1.4.3.ebuild 11798 RMD160 38a783ebd1e7324e9bbed474fa21cb5e8d32db18 SHA1 c373477211539e1cefe4c8f949f9f1d03145fae9 SHA256 26b1f32a74d7a13886569a2b6fcec1f6163f4897338f5366fff9b1fe592e4c3d +MD5 73424dfaa7167624ce067873a1c4df23 subversion-1.4.3.ebuild 11798 +RMD160 38a783ebd1e7324e9bbed474fa21cb5e8d32db18 subversion-1.4.3.ebuild 11798 +SHA256 26b1f32a74d7a13886569a2b6fcec1f6163f4897338f5366fff9b1fe592e4c3d subversion-1.4.3.ebuild 11798 +MISC ChangeLog 43252 RMD160 df2fd24a0d40a17f6254aef5df0c22871f153b55 SHA1 c44d38bb668215e90397346c7e2808a7b5d676aa SHA256 87a4073531710212b0153a62339fcaa1f5ba44629dacab1946f499dc5af70f14 +MD5 f1f89045aaaf8dc5662f1c3609c212c9 ChangeLog 43252 +RMD160 df2fd24a0d40a17f6254aef5df0c22871f153b55 ChangeLog 43252 +SHA256 87a4073531710212b0153a62339fcaa1f5ba44629dacab1946f499dc5af70f14 ChangeLog 43252 MISC metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 SHA1 76e56ef0ec9c71b3032d1c501e358dd80fa1664b SHA256 4710a38e11b23d4355a7a0cba621d9680e2148aa173528491e88903487e93152 MD5 8fbcd267012fd1eef74d5161888cc7b8 metadata.xml 222 RMD160 b21e9d4420a67a847d490dc86a587e1d5f21fff0 metadata.xml 222 @@ -110,9 +110,9 @@ MD5 dbe03357818a0675ab3ff9a0d6afa1fa files/digest-subversion-1.4.3 256 RMD160 062f9c03c0ce5ec74e40294938f796e03d6fa41e files/digest-subversion-1.4.3 256 SHA256 84e50e103dcf562174d9e6337847220a875b7607f73e8307fd60ac18aeb05e27 files/digest-subversion-1.4.3 256 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.2 (GNU/Linux) +Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFF65tu6J2i8a8J4okRAi+8AKCUA5Udc/xF1MmHiy4kETVdc/PGQwCcCHIU -0zscFkB/og4F1GP3EWPwC7U= -=CGkb +iD8DBQFF7kTKNQqtfCuFneMRAvs/AJ9Zg4cCPtEw4KKHHCQ5TZ+KAk291wCgjP5n +8LKU1Zr1urbfFD4fPzFIzVg= +=ZYXN -----END PGP SIGNATURE----- diff --git a/dev-util/subversion/subversion-1.4.3.ebuild b/dev-util/subversion/subversion-1.4.3.ebuild index 10b85e5e3e79..20ad36847809 100644 --- a/dev-util/subversion/subversion-1.4.3.ebuild +++ b/dev-util/subversion/subversion-1.4.3.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.3.ebuild,v 1.6 2007/03/05 04:20:11 genone Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/subversion/subversion-1.4.3.ebuild,v 1.7 2007/03/07 04:52:19 opfer Exp $ inherit elisp-common libtool python eutils bash-completion flag-o-matic depend.apache perl-module java-pkg-opt-2 @@ -174,7 +174,7 @@ src_install () { dobin svn-config if use python; then - make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed" + make install-swig-py DESTDIR=${D} DISTUTIL_PARAM=--prefix=${D} LD_LIBRARY_PATH="-L${D}/usr/$(get_libdir)" || die "Installation of subversion python bindings failed" # move python bindings mkdir -p ${D}${PYTHON_DIR}/site-packages @@ -285,43 +285,43 @@ pkg_postinst() { elog "svnadmin (see man svnadmin) or the following command to create it in" elog "/var/svn:" elog - elog " emerge --config =${CATEGORY}/${PF}" + elog " emerge --config =${CATEGORY}/${PF}" elog elog "If you upgraded from an older version of berkely db and experience" elog "problems with your repository then run the following commands as root:" - elog " db4_recover -h ${SVN_REPOS_LOC}/repos" - elog " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" + elog " db4_recover -h ${SVN_REPOS_LOC}/repos" + elog " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos" elog elog "Subversion has multiple server types, take your pick:" elog elog " - svnserve daemon: " - elog " 1. edit /etc/conf.d/svnserve" - elog " 2. start daemon: /etc/init.d/svnserve start" - elog " 3. make persistent: rc-update add svnserve default" + elog " 1. edit /etc/conf.d/svnserve" + elog " 2. start daemon: /etc/init.d/svnserve start" + elog " 3. make persistent: rc-update add svnserve default" elog elog " - svnserve via xinetd:" - elog " 1. edit /etc/xinetd.d/svnserve (remove disable line)" - elog " 2. restart xinetd.d: /etc/init.d/xinetd restart" + elog " 1. edit /etc/xinetd.d/svnserve (remove disable line)" + elog " 2. restart xinetd.d: /etc/init.d/xinetd restart" elog elog " - svn over ssh:" - elog " 1. Fix the repository permissions:" - elog " groupadd svnusers" - elog " chown -R root:svnusers /var/svn/repos/" - elog " chmod -R g-w /var/svn/repos" - elog " chmod -R g+rw /var/svn/repos/db" - elog " chmod -R g+rw /var/svn/repos/locks" - elog " 2. create an svnserve wrapper in /usr/local/bin to set the umask you" - elog " want, for example:" - elog " #!/bin/bash" - elog " umask 002" - elog " exec /usr/bin/svnserve \"\$@\"" + elog " 1. Fix the repository permissions:" + elog " groupadd svnusers" + elog " chown -R root:svnusers /var/svn/repos/" + elog " chmod -R g-w /var/svn/repos" + elog " chmod -R g+rw /var/svn/repos/db" + elog " chmod -R g+rw /var/svn/repos/locks" + elog " 2. create an svnserve wrapper in /usr/local/bin to set the umask you" + elog " want, for example:" + elog " #!/bin/bash" + elog " umask 002" + elog " exec /usr/bin/svnserve \"\$@\"" elog if use apache2 >/dev/null; then elog " - http-based server:" - elog " 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\"" - elog " 2. create an htpasswd file:" - elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" + elog " 1. edit /etc/conf.d/apache2 to include both \"-D DAV\" and \"-D SVN\"" + elog " 2. create an htpasswd file:" + elog " htpasswd2 -m -c ${SVN_REPOS_LOC}/conf/svnusers USERNAME" elog fi @@ -334,7 +334,7 @@ pkg_postinst() { } pkg_postrm() { - has_version virtual/emacs && elisp-site-regen + use emacs && elisp-site-regen use perl && perl-module_pkg_postrm }