Improve pkg_preinst

Package-Manager: portage-2.1.1-r2

diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index 3a36009a2f2ecaa87cdaed997cec7fe7103df0be..2bc4328c16930bff613435512f44b68bda621e5a 100644 (file)
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/dmenu
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.2 2006/12/29 23:12:51 cedk Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.3 2007/01/07 14:53:07 cedk Exp $
+
+  07 Jan 2007; Cedric Krier <cedk@gentoo.org> dmenu-1.8-r1.ebuild:
+  Improve pkg_preinst
 
 *dmenu-1.8-r1 (29 Dec 2006)
 

diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 931aa0174ff54665ba246a99b961616dc609b9c4..7e1615908fb1662f287ecba182f186d706d6d288 100644 (file)
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,16 +1,16 @@
 DIST dmenu-1.8.tar.gz 7729 RMD160 4d25ecdbb5badd4e8123c1e72ba4dee2619e654f SHA1 f6db2a347bf797f35f1661b74486d0e469ef80a9 SHA256 1928dc70ed14216899fafdca598a27aeae7175ff0614d14091ab48d3dd1fc413
-EBUILD dmenu-1.8-r1.ebuild 2131 RMD160 a5eb64e476bfeec0918c4e7e64ba14fdc8665713 SHA1 bf83116cf2f54e5ccbed8c99d5673abb5236108d SHA256 b4b5c5721dd54a6d5d8839acef9383d4dd1b1a20a8a160b4405834122b7f6188
-MD5 dcaf422f0388090712a4b688bb5cff5f dmenu-1.8-r1.ebuild 2131
-RMD160 a5eb64e476bfeec0918c4e7e64ba14fdc8665713 dmenu-1.8-r1.ebuild 2131
-SHA256 b4b5c5721dd54a6d5d8839acef9383d4dd1b1a20a8a160b4405834122b7f6188 dmenu-1.8-r1.ebuild 2131
+EBUILD dmenu-1.8-r1.ebuild 2162 RMD160 9d0c71a23ef9fc4dbb33c086f7c4303cf7ec34f9 SHA1 2e0595091c82a918d57d1e9d743a2595bd0aa666 SHA256 2d049a2ef55673a70cfeac8e8836c9fb93b3aecbbae33b2a72c266ea51cb03d2
+MD5 2adb14066a16d580536b2043967e21d4 dmenu-1.8-r1.ebuild 2162
+RMD160 9d0c71a23ef9fc4dbb33c086f7c4303cf7ec34f9 dmenu-1.8-r1.ebuild 2162
+SHA256 2d049a2ef55673a70cfeac8e8836c9fb93b3aecbbae33b2a72c266ea51cb03d2 dmenu-1.8-r1.ebuild 2162
 EBUILD dmenu-1.8.ebuild 852 RMD160 92cb29816220431e717f4c7aa0e7b2171a4cdbd8 SHA1 8c4f077d2c1c95c5d3f2897fd8390f06e9956c7e SHA256 7a020dd940e066edcd88d7f6517b36dd4aa688d89e25e0de49adad78e3c856df
 MD5 708f6cabf88bd367d7c43c19c0b892c2 dmenu-1.8.ebuild 852
 RMD160 92cb29816220431e717f4c7aa0e7b2171a4cdbd8 dmenu-1.8.ebuild 852
 SHA256 7a020dd940e066edcd88d7f6517b36dd4aa688d89e25e0de49adad78e3c856df dmenu-1.8.ebuild 852
-MISC ChangeLog 451 RMD160 7a191e9ad5f4ba09a1eedf0bb7aff993ad81fdd0 SHA1 df00b9d3f1eb8e7c938f7a3822c3918d7d7190a5 SHA256 c37ba139b5df5fcf0cc6f707a4888883c1eee6ee9902caa4c9acfdbf158651c9
-MD5 75939485a21f43a27935b713a9b2eed4 ChangeLog 451
-RMD160 7a191e9ad5f4ba09a1eedf0bb7aff993ad81fdd0 ChangeLog 451
-SHA256 c37ba139b5df5fcf0cc6f707a4888883c1eee6ee9902caa4c9acfdbf158651c9 ChangeLog 451
+MISC ChangeLog 541 RMD160 52318cd4412bdf95ab4c05d10b23bc981b186481 SHA1 399310c98732b70ee84b9bf0c5f97aa5194983be SHA256 5067bf8cc36df9b8789b0157d31ac7e86a8eba60c54edbce14a736e8db67409b
+MD5 bbefed7798f528dc2c10431ab7cd6185 ChangeLog 541
+RMD160 52318cd4412bdf95ab4c05d10b23bc981b186481 ChangeLog 541
+SHA256 5067bf8cc36df9b8789b0157d31ac7e86a8eba60c54edbce14a736e8db67409b ChangeLog 541
 MISC metadata.xml 362 RMD160 5f550b91126dc9e09be2d8bbdc20eaca796bbc0f SHA1 ef592e4169ca16e31a24d264c480722112b740e2 SHA256 341ef52d92764d360158c96773c3d73939970d958b8dd066204741f43ee7dd92
 MD5 cebc51f16b631fdc38e0f97ffefe8ea4 metadata.xml 362
 RMD160 5f550b91126dc9e09be2d8bbdc20eaca796bbc0f metadata.xml 362

diff --git a/x11-misc/dmenu/dmenu-1.8-r1.ebuild b/x11-misc/dmenu/dmenu-1.8-r1.ebuild
index 28501548777697fca6816b29e138b5aa9bf7adf3..a58132f0bed034f37a2f6f035c81b45b022695c8 100644 (file)
--- a/x11-misc/dmenu/dmenu-1.8-r1.ebuild
+++ b/x11-misc/dmenu/dmenu-1.8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-1.8-r1.ebuild,v 1.1 2006/12/29 23:12:51 cedk Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-1.8-r1.ebuild,v 1.2 2007/01/07 14:53:07 cedk Exp $
 
 inherit toolchain-funcs
 
@@ -61,7 +61,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}"/
+       fi
 }
 
 pkg_postinst() {