Improve pkg_preinst

Package-Manager: portage-2.1.1-r2

diff --git a/x11-wm/dwm/ChangeLog b/x11-wm/dwm/ChangeLog
index bda954cf0628adede3f0162f359e99bf0f54fb3e..3c0eec531178e50d8c8474546530e8d185c9b0ca 100644 (file)
--- a/x11-wm/dwm/ChangeLog
+++ b/x11-wm/dwm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/dwm
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.1 2007/01/07 14:21:14 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/ChangeLog,v 1.2 2007/01/07 14:51:25 cedk Exp $
+
+  07 Jan 2007; Cedric Krier <cedk@gentoo.org> dwm-2.8.ebuild:
+  Improve pkg_preinst
 
 *dwm-2.8 (07 Jan 2007)
 

diff --git a/x11-wm/dwm/Manifest b/x11-wm/dwm/Manifest
index 07234220489ff997c56501a104e49fae034ffca3..07530c53587d2cb9414267bf86972972713d3c14 100644 (file)
--- a/x11-wm/dwm/Manifest
+++ b/x11-wm/dwm/Manifest
@@ -3,14 +3,14 @@ MD5 be5c842ec4259bd3546b8d6568a000f4 files/dwm-session 312
 RMD160 6d3792a0f5374ba6bd8aeb84aa31a86b598e2416 files/dwm-session 312
 SHA256 bc0e60687f719f2613492f15180c3327b7b9560f53f09a52f0e763548f2221ac files/dwm-session 312
 DIST dwm-2.8.tar.gz 17669 RMD160 6f111b3ae52ea81142eb1a943725bad797ba4237 SHA1 2e0f53b72b2ab31b23c46546f236669e14906bb8 SHA256 b11c325132de4e95e81eaee23fe041c998fe16994912963d211bfc74e011aa19
-EBUILD dwm-2.8.ebuild 2458 RMD160 dc56fb18a9b8b38fe8fe04177bdd0915cc273847 SHA1 200fbcee9f7631353b203b9829c615b66a119db1 SHA256 37dacc4782ebbdb0d8dfe3582d8ad429f89e0ba26d4355a3de4dae538cae337a
-MD5 0025a13079c628337beb63673c49fec9 dwm-2.8.ebuild 2458
-RMD160 dc56fb18a9b8b38fe8fe04177bdd0915cc273847 dwm-2.8.ebuild 2458
-SHA256 37dacc4782ebbdb0d8dfe3582d8ad429f89e0ba26d4355a3de4dae538cae337a dwm-2.8.ebuild 2458
-MISC ChangeLog 325 RMD160 f926d6a31008999ee0b13ff2947647b669d5d9dd SHA1 9466456d2df2fbb83d0b0c78f8e897fd6aae7cd0 SHA256 230d63bf1069ea083edb1ecbbfcdf367a97f14dec90d50222154ff826d6e8c90
-MD5 5378633928218994f32b1ba20c83a333 ChangeLog 325
-RMD160 f926d6a31008999ee0b13ff2947647b669d5d9dd ChangeLog 325
-SHA256 230d63bf1069ea083edb1ecbbfcdf367a97f14dec90d50222154ff826d6e8c90 ChangeLog 325
+EBUILD dwm-2.8.ebuild 2496 RMD160 bdc6333cd3a2c86293282aa06ee2666f072b0a77 SHA1 00efdc70feed754039e2f2b88a84f85f0ae9804f SHA256 46f7e1d76f875fe665f5868df16d849208f6aaaaf5683d58b1ce1cfec943fea9
+MD5 dc1940c0fa09e79ecb3fc58d4d4e24fd dwm-2.8.ebuild 2496
+RMD160 bdc6333cd3a2c86293282aa06ee2666f072b0a77 dwm-2.8.ebuild 2496
+SHA256 46f7e1d76f875fe665f5868df16d849208f6aaaaf5683d58b1ce1cfec943fea9 dwm-2.8.ebuild 2496
+MISC ChangeLog 410 RMD160 f277344f04fb9a2b2ef740f3b9d3a5eec96079fe SHA1 cfaad2f4b20798f694bbd3ec7c566fd4849ba7e2 SHA256 9b4581da4e9a86d9e6f7bbc67e10b5bfadf38a3de581ee3ec7cd59daef98ee09
+MD5 6f4bff21995468d4f1a82aaf79d55036 ChangeLog 410
+RMD160 f277344f04fb9a2b2ef740f3b9d3a5eec96079fe ChangeLog 410
+SHA256 9b4581da4e9a86d9e6f7bbc67e10b5bfadf38a3de581ee3ec7cd59daef98ee09 ChangeLog 410
 MISC metadata.xml 461 RMD160 65756f7110f56fca05c3ede6d6f7123612ef1f37 SHA1 734881954c3c1fbef561df9eead496a99380e3d1 SHA256 35951214ca9ebfcb9bbc2822914bcef50153fac707e629ccadb6bee455b6a9bc
 MD5 b352d398a2b30d946f2ad2f2ae6c308c metadata.xml 461
 RMD160 65756f7110f56fca05c3ede6d6f7123612ef1f37 metadata.xml 461

diff --git a/x11-wm/dwm/dwm-2.8.ebuild b/x11-wm/dwm/dwm-2.8.ebuild
index dfae8906fb4b41d5652816fcdbe35532cad1b0dd..e06597e59baffd8725333f84b305f9f742042511 100644 (file)
--- a/x11-wm/dwm/dwm-2.8.ebuild
+++ b/x11-wm/dwm/dwm-2.8.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/x11-wm/dwm/dwm-2.8.ebuild,v 1.1 2007/01/07 14:21:14 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/dwm/dwm-2.8.ebuild,v 1.2 2007/01/07 14:51:25 cedk Exp $
 
 inherit toolchain-funcs
 
@@ -65,7 +65,9 @@ src_install() {
 }
 
 pkg_preinst() {
-       mv "${D}"/usr/share/${PN}/${PF}.config.h "${T}"/
+       if use savedconfig; then
+               mv "${D}"/usr/share/${PN}/${PF}.config.h "${T}"/ || die
+       fi
 }
 
 pkg_postinst() {