Bug #226505 - For compatibility with phase execution order in

>=portage-2.1.5, call has_version inside pkg_preinst instead of
pkg_postinst.
Package-Manager: portage-2.2_pre10652/cvs/Linux 2.6.25-0518-x86-64 i686

13 files changed, 103 insertions, 38 deletions

diff --git a/media-plugins/vdr-epgsearch/ChangeLog b/media-plugins/vdr-epgsearch/ChangeLog
index 36b1db7ba6a2..63d629b3640e 100644
--- a/media-plugins/vdr-epgsearch/ChangeLog
+++ b/media-plugins/vdr-epgsearch/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-plugins/vdr-epgsearch
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.34 2008/05/02 14:03:00 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/ChangeLog,v 1.35 2008/06/15 07:29:36 zmedico Exp $
+
+  15 Jun 2008; Zac Medico <zmedico@gentoo.org> vdr-epgsearch-0.9.19.ebuild,
+  vdr-epgsearch-0.9.20.ebuild, vdr-epgsearch-0.9.21.ebuild,
+  vdr-epgsearch-0.9.22.ebuild, vdr-epgsearch-0.9.23.ebuild,
+  vdr-epgsearch-0.9.24_beta19.ebuild, vdr-epgsearch-0.9.24_beta22.ebuild,
+  vdr-epgsearch-0.9.24_beta23.ebuild, vdr-epgsearch-0.9.24_beta26.ebuild,
+  vdr-epgsearch-0.9.24_rc2.ebuild, vdr-epgsearch-0.9.24.ebuild:
+  Bug #226505 - For compatibility with phase execution order in
+  >=portage-2.1.5, call has_version inside pkg_preinst instead of
+  pkg_postinst.
 
   02 May 2008; Matthias Schwarzott <zzam@gentoo.org> Manifest:
   Fix tarball checksum another time.
diff --git a/media-plugins/vdr-epgsearch/Manifest b/media-plugins/vdr-epgsearch/Manifest
index fc6b7079ea68..e67becb9d281 100644
--- a/media-plugins/vdr-epgsearch/Manifest
+++ b/media-plugins/vdr-epgsearch/Manifest
@@ -14,23 +14,23 @@ DIST vdr-epgsearch-0.9.24.beta26.tgz 717788 RMD160 a8fb03781c9be3ddf090f6ae55521
 DIST vdr-epgsearch-0.9.24.rc2.tgz 717697 RMD160 c50ca569d241cdf266f535d30f7688dba7b44ca0 SHA1 a738629c87bb6fe24bc54e3e4f399e372f5c9310 SHA256 b063ef47b0253e08735ecca7bad2a283fb33eeb7591f8eb8e6f1e4b188d447dc
 DIST vdr-epgsearch-0.9.24.tgz 599266 RMD160 391578356319974411a15c6df4e122d05f2d12f4 SHA1 b38c534bb8b1cc719c6fce87d7d0ab93ee4f872f SHA256 cb19e271a6acddff43ba4db796e73a42081fed3869d22c0ce4cce16967380423
 EBUILD vdr-epgsearch-0.9.17d.ebuild 620 RMD160 13c14cb03664d31cba75526d9d59ac5de13ab626 SHA1 46cffb780dc08a758784c62e2be795ede63f6c11 SHA256 90828efa6fce13526655ce62b721fff6591fb261451570ee0ebf82a7f673c14f
-EBUILD vdr-epgsearch-0.9.19.ebuild 1233 RMD160 5675f3bb084439fbe06c0464be5c63be11fcb238 SHA1 e88fb9939afd1d29178ac44e789b53cff22c47e1 SHA256 05e3008b5df7fb688c82df341ec120c5e89ae762911c83dfeecc09f6b4fa8038
-EBUILD vdr-epgsearch-0.9.20.ebuild 1232 RMD160 69d8113c5ce22feae53e9553b7fe89fcc08b53a1 SHA1 48f1560eefdd7720cec3ee9ef09cc10f8af1d89f SHA256 4965834731222b64968f90b560d6d2fb1012acdc2cddc693b3d9481dda80436c
-EBUILD vdr-epgsearch-0.9.21.ebuild 1233 RMD160 cb7728ccc9aacde43ae61a5b126a07a24c2d2405 SHA1 b78bc96ca3ab8b62b2b6dd30ba292e89560b8191 SHA256 933f20461d8322ae207b3e2a5f33cf00def3324cf2c8b129e3a43de59c44b163
-EBUILD vdr-epgsearch-0.9.22.ebuild 1327 RMD160 f1291a11381f6cf91fee28ee7efaec2cd54a4613 SHA1 a2d1dfecde5df10073ca831801564a8b021b9ec8 SHA256 7586eef4bc0e5cd1ffa148a20bd7a9d5e5ae81decd35680ff61a8a57275c0396
-EBUILD vdr-epgsearch-0.9.23.ebuild 1327 RMD160 9a7deee2e4099eef97681e17b316e33d419bf213 SHA1 316234e29907b8ddcfa8ff557122f02cdf8403a9 SHA256 a7e0449ed8270ff213fe081bb27eddabd03af7a97ea97b25e59d7cfdfdc593b2
-EBUILD vdr-epgsearch-0.9.24.ebuild 1506 RMD160 71eed3bb89ac5e43a0fff5bc6a84ab226f9abc0d SHA1 1a4723c701169a90d29b7e000d8f864791643ddf SHA256 267cc207fbae663c967c09436e532b3fafac0ba625858cad761ccf2b470e9cf3
-EBUILD vdr-epgsearch-0.9.24_beta19.ebuild 1509 RMD160 f37e228274fdb40c31aaed123368070f9fe171e2 SHA1 a995eabe3bda346936c6b01746015effe468e339 SHA256 38ade4190050d5e7d90c26fb8a3d0c322ac29a354a59959540ba5d9de86b07d8
-EBUILD vdr-epgsearch-0.9.24_beta22.ebuild 1504 RMD160 3a37e66099a10b3ea2e0515b728669c0c14a29b0 SHA1 4de5aec6ebf7ed873a6548a250db0bd2a52849a2 SHA256 b13359c29a67d4cf865312fdbe343f7b971e1fe600d0fdafb664c9c1e4026c60
-EBUILD vdr-epgsearch-0.9.24_beta23.ebuild 1509 RMD160 5a824546b782da811bd9dc2558e1e5b002bacb52 SHA1 75a377e43b59bf4c33c97d34577849289088be12 SHA256 8f5e2b6f5891346817f85fefc7be0f0345fc54ce9b787865844a3f373f017044
-EBUILD vdr-epgsearch-0.9.24_beta26.ebuild 1504 RMD160 2956a05602875b774995926c2b6c7e0962b9704a SHA1 5b29d2d83f4dd10ab1c88aa3cf08de8e4c5f92cd SHA256 9887ed3d01f7d56661a2fe3c8597ecfeb5812bf133c8f2e9c51a34684e344671
-EBUILD vdr-epgsearch-0.9.24_rc2.ebuild 1510 RMD160 ecb04ce09a1eccdc065704083e34f64a54ff84b5 SHA1 243e43302c8e0152b6211e9c810fb497d88472c1 SHA256 bc7b40b7e419cc217dbc06a9f3895c0293c3d2dba3e4a9bcdc0743aaf56cc859
-MISC ChangeLog 5761 RMD160 74edea3cf257db4878b9a35a26b5c8f73c7dc6b8 SHA1 e4cf4e6634fd428590da2c98813924759266151b SHA256 08cd62a61500268f3937179a8326b9657c17c12655fc5817fab26450dd233bae
+EBUILD vdr-epgsearch-0.9.19.ebuild 1314 RMD160 6db0c458b9d6daad8309a40fc2697a11cb13f320 SHA1 47d65c77515045299862cd11ef114579ccb9cc6f SHA256 6a682559091a9ebdc7193c0281f14f4da619acf0c8a1f7c6b5648d2688f887f4
+EBUILD vdr-epgsearch-0.9.20.ebuild 1313 RMD160 f1133dd4f9c0e19beeb5149a24f03e6b76185a91 SHA1 952fd4264d8372ec2e00ab0bad22305a7104c7c0 SHA256 cd4179bcc75e0d7d4deef918c53c0653b1e396e0afab5a1f539df97fb78fbc0c
+EBUILD vdr-epgsearch-0.9.21.ebuild 1314 RMD160 703f07160d730a8395e989a4f7dc80b9ecd32944 SHA1 58133e299707dc18f15fab0432ff3d2c6b2c0e0d SHA256 ab9c5f3cb60a3e6645d86b99b94b50785ee89e3c735541c7fd307b7d3b368760
+EBUILD vdr-epgsearch-0.9.22.ebuild 1408 RMD160 fed0be600e4272117a12316361416e6c6e2f37f7 SHA1 6a84f2f6b39eeaefcb043d8e4899aad457aba4b4 SHA256 40d67f85c382050e41c0c87bc4ea557b9ddb10f96585ab15f99731e30960c64e
+EBUILD vdr-epgsearch-0.9.23.ebuild 1408 RMD160 aa16db48b88530a08b040a04fb05574976973252 SHA1 11f9c2f1fd55911fe057a8b9c71000cad7a1f7c3 SHA256 5ee30323cec0a7070e75341f9f5d0fde45182bcb42da863b11b9f34c020bd409
+EBUILD vdr-epgsearch-0.9.24.ebuild 1587 RMD160 0096a8ddfb02e9da0c4c01bd68a0a3a3cc6c06c1 SHA1 01dc85c8dd8d6b535483760cf5715449d19c7b26 SHA256 fdbfff2120f0eb0a62195d11e3710a527f94fcd7bfc6d47dbe4164aed1dfe898
+EBUILD vdr-epgsearch-0.9.24_beta19.ebuild 1585 RMD160 97d2153944d713f7db9e41d24ab053828bad0e5f SHA1 1bc3aa2070162c9236816407925a42f33f0aacda SHA256 6fd5a51bf4d8408c06a4e2e6875f30f6fdf786a55b4122b6f477bc0af8fd703e
+EBUILD vdr-epgsearch-0.9.24_beta22.ebuild 1585 RMD160 6c702e1e7a54b545533af25351fd5d813198ae55 SHA1 d934d3d8850af8acd50c2cf0b11645726c7012e3 SHA256 560534ec40f310c931345f5ecce6d30fb5f4cfee862b0954c885c308ad3750d9
+EBUILD vdr-epgsearch-0.9.24_beta23.ebuild 1585 RMD160 d7eeb95ce3be9f91cfeb30d59f06c87b1bf779a6 SHA1 b9f5a5e94150fe230e6227e20efe7906a91a9f69 SHA256 a96c5be4d5af00a46861255ce8e7096c09036b8dc9c23f0d3d24a4e9d20e33b1
+EBUILD vdr-epgsearch-0.9.24_beta26.ebuild 1585 RMD160 404b3f9a3984083e687d8af4232d5fbca2ebbbfd SHA1 5776c0066210c53b719906d69eda03b28c09010c SHA256 dabe6a9472a001b48c501b507ceeb83ce70678c53d4c76a749c18b872154c5bf
+EBUILD vdr-epgsearch-0.9.24_rc2.ebuild 1591 RMD160 5f78de1d565e1de633d822f29c07f7f9b8f55128 SHA1 caf3dded2146a7603a76e2489cb73827eb8e7f44 SHA256 674bb00c39e91dc1e68eb05d58fefa1f794d316196c938f4ef99d68b7a4fe3d7
+MISC ChangeLog 6319 RMD160 042994b400903b7feb6b0a2d5619193238f77f30 SHA1 c12255a15ef96ada37286f3ea11da238f2597176 SHA256 4cdaf630ecddbfd1b28862e910de363a56c4af0d0ff25ddcfa13821acebece4a
 MISC metadata.xml 298 RMD160 7e0a2f2a14c259d83aeca27b96f53bde893cc3cf SHA1 909d564739e5ee061ef40e6b09c6a48c6578269f SHA256 50a4a1a273a8415774ef522ac281cd664bd217c04bcbfa16e13b53649b9a9581
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkgbHx0ACgkQt2vP6XvVdOcDdwCePUEcfnroeYbThkberLhEPHO0
-lOQAoNnqodSmiXGKBV7AL00j3mhN8ZtC
-=u9iZ
+iEYEARECAAYFAkhUxOoACgkQ/ejvha5XGaPkdQCg2jr5zFjij3joiRKf2HtmR3LT
++boAoIWwz+CMoPvNHX5dlL8ckAppBg+B
+=PzN4
 -----END PGP SIGNATURE-----
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild
index ebd878886282..bbf8a9e8951b 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild,v 1.5 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.19.ebuild,v 1.6 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -32,9 +32,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild
index 7ce72074e29b..c6030c989252 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild,v 1.4 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.20.ebuild,v 1.5 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -32,9 +32,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild
index 7cdf8dde90f0..8103f1d00cdc 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild,v 1.3 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.21.ebuild,v 1.4 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -32,9 +32,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild
index 709a59bb04ee..ec72e75a92d8 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild,v 1.4 2008/01/12 11:57:34 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.22.ebuild,v 1.5 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -35,9 +35,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild
index 14253ca1616b..a09c0439c950 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild,v 1.3 2008/01/12 12:01:36 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.23.ebuild,v 1.4 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -35,9 +35,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild
index 02d6a72abd14..fcea841d5f32 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild,v 1.1 2008/04/29 17:20:16 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -45,9 +45,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild
index 31a8edcfc7e9..6c4563fc1ea9 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild,v 1.2 2008/02/20 16:40:33 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta19.ebuild,v 1.3 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild
index f4c99db155a0..ea28ac708410 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild,v 1.1 2008/03/18 22:11:59 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta22.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild
index 2f7247c4fc48..bad020b9d304 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild,v 1.1 2008/03/24 15:19:11 hd_brummy Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta23.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild
index 493477f6f1bd..235caa6ed71a 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild,v 1.1 2008/04/07 15:24:15 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_beta26.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -42,9 +42,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f
diff --git a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild
index 7434b44be69b..a7e1b389a0ee 100644
--- a/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild
+++ b/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild,v 1.1 2008/04/28 16:45:09 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-epgsearch/vdr-epgsearch-0.9.24_rc2.ebuild,v 1.2 2008/06/15 07:29:36 zmedico Exp $
 
 inherit vdr-plugin
 
@@ -45,9 +45,14 @@ src_install() {
 	dodoc MANUAL
 }
 
+pkg_preinst() {
+	has_version "<${CATEGORY}/${PN}-0.9.18"
+	previous_less_than_0_9_18=$?
+}
+
 pkg_postinst() {
 	vdr-plugin_pkg_postinst
-	if has_version "<media-plugins/vdr-epgsearch-0.9.18"; then
+	if [[ $previous_less_than_0_9_18 = 0 ]] ; then
 		elog "Moving config-files to new location /etc/vdr/plugins/epgsearch"
 		cd "${ROOT}"/etc/vdr/plugins
 		local f