fix preserve_old_lib usage (bug #167991)

Package-Manager: portage-2.1.3_rc7

4 files changed, 33 insertions, 37 deletions

diff --git a/net-misc/howl/ChangeLog b/net-misc/howl/ChangeLog
index 1f2faf48b975..8b6ea1ad6a77 100644
--- a/net-misc/howl/ChangeLog
+++ b/net-misc/howl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/howl
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/howl/ChangeLog,v 1.48 2007/05/20 17:16:15 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/howl/ChangeLog,v 1.49 2007/07/11 03:59:52 compnerd Exp $
+
+  11 Jul 2007; Saleem Abdulrasool <compnerd@gentoo.org> howl-0.9.8.ebuild,
+  howl-1.0.0.ebuild:
+  Fix preserve_old_lib usage (bug #167991)
 
   20 May 2007; Timothy Redaelli <drizzt@gentoo.org> howl-1.0.0.ebuild:
   Add ~x86-fbsd keyword.
diff --git a/net-misc/howl/Manifest b/net-misc/howl/Manifest
index 57b0363e63c6..d2ef6f953eca 100644
--- a/net-misc/howl/Manifest
+++ b/net-misc/howl/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 0.9.2-ppc.patch 329 RMD160 eb0759c2121d3a325c0f89491af0cd364f117c4c SHA1 5c9a8f74ebaca03a39a530e7b783030bbf307971 SHA256 9a7f9425486466162f763fcce494cd4566b818cfd744302429905036832b9011
 MD5 907cfa8e12495034fd9279c63f14ddf2 files/0.9.2-ppc.patch 329
 RMD160 eb0759c2121d3a325c0f89491af0cd364f117c4c files/0.9.2-ppc.patch 329
@@ -32,18 +29,18 @@ EBUILD howl-0.9.6-r2.ebuild 1603 RMD160 9b5e01b97796a6fb6491341e1d9bc0a0b9be77bb
 MD5 36bee659fa6e51c2722c5622bf814bac howl-0.9.6-r2.ebuild 1603
 RMD160 9b5e01b97796a6fb6491341e1d9bc0a0b9be77bb howl-0.9.6-r2.ebuild 1603
 SHA256 c1759c0c40fe55553baa5d7c0f87106d021a07be1879c2e9c2edd46a8397ace3 howl-0.9.6-r2.ebuild 1603
-EBUILD howl-0.9.8.ebuild 2129 RMD160 6fa05d97b0cd9d43213cb0e180622333d70fa6fe SHA1 5d2e3721edbc2b2263e444bcc2b897aa153d1e85 SHA256 53f0d78da2293800263834a12fd23a9ade0c78c155889d6cf4c202bb3d823413
-MD5 854e6fa30870c222fda27126199e1170 howl-0.9.8.ebuild 2129
-RMD160 6fa05d97b0cd9d43213cb0e180622333d70fa6fe howl-0.9.8.ebuild 2129
-SHA256 53f0d78da2293800263834a12fd23a9ade0c78c155889d6cf4c202bb3d823413 howl-0.9.8.ebuild 2129
-EBUILD howl-1.0.0.ebuild 2306 RMD160 9638443b3a4bdcc2b71a87251cb25278903533e9 SHA1 cb897e2a964c785128e81bcfe9f50b77501a9ef1 SHA256 58407d4f429a97fffa827166cfe6f9d2f9ba2f7f4017e3537009cb6c759971c0
-MD5 b480369d9b717c874b8eb7fd3c39453f howl-1.0.0.ebuild 2306
-RMD160 9638443b3a4bdcc2b71a87251cb25278903533e9 howl-1.0.0.ebuild 2306
-SHA256 58407d4f429a97fffa827166cfe6f9d2f9ba2f7f4017e3537009cb6c759971c0 howl-1.0.0.ebuild 2306
-MISC ChangeLog 7247 RMD160 a3fb94956a2a90d837ad5c3ba1c6e2c8d276568b SHA1 4c2e736e32c80f1cb837474f46edecf87c3f8d96 SHA256 4f13f97626c9aafc0fc722903dba3902925f7d19fb51dea879a5dc64d03493a8
-MD5 a6b01e6b2623fb734b41d316f260db9a ChangeLog 7247
-RMD160 a3fb94956a2a90d837ad5c3ba1c6e2c8d276568b ChangeLog 7247
-SHA256 4f13f97626c9aafc0fc722903dba3902925f7d19fb51dea879a5dc64d03493a8 ChangeLog 7247
+EBUILD howl-0.9.8.ebuild 2147 RMD160 9dd6ef64ec00649a0dad0c6e172ff79ee4f223fe SHA1 4e3fc5920f58c6a0e39899131d95e31f12f13cf3 SHA256 fc824254f964d3ce3e777e9c73dd9d4e226faafd5736aac89b46150ab3108390
+MD5 850c73eb6c00f7788c7db77b7d130f49 howl-0.9.8.ebuild 2147
+RMD160 9dd6ef64ec00649a0dad0c6e172ff79ee4f223fe howl-0.9.8.ebuild 2147
+SHA256 fc824254f964d3ce3e777e9c73dd9d4e226faafd5736aac89b46150ab3108390 howl-0.9.8.ebuild 2147
+EBUILD howl-1.0.0.ebuild 2308 RMD160 434906f6355d291677bc4722c3036cfe49c726d6 SHA1 8e77c5899ae452dddaaa45b3936a1678e8aa6bd6 SHA256 c529676383a60377b03e5fdb829e7ab8dd628aa76c7015bb96905400e7fb945c
+MD5 030d282d4b673467a534e13b99081792 howl-1.0.0.ebuild 2308
+RMD160 434906f6355d291677bc4722c3036cfe49c726d6 howl-1.0.0.ebuild 2308
+SHA256 c529676383a60377b03e5fdb829e7ab8dd628aa76c7015bb96905400e7fb945c howl-1.0.0.ebuild 2308
+MISC ChangeLog 7389 RMD160 89d9fcecbf1e54c9fb73f2128ce7b7e7424ff47a SHA1 9b33fc2f880ab93fe4bfc6edffac45bd6c9f7faf SHA256 86f4792b0a789a5c7009b19d60152556a8f39741bf96b994818881e1d6fd4516
+MD5 7b9e90feded41d9bb4cb339c3e1fcbb7 ChangeLog 7389
+RMD160 89d9fcecbf1e54c9fb73f2128ce7b7e7424ff47a ChangeLog 7389
+SHA256 86f4792b0a789a5c7009b19d60152556a8f39741bf96b994818881e1d6fd4516 ChangeLog 7389
 MISC metadata.xml 899 RMD160 726a6859bf6751bd28bb7c00f0e97e697f586efb SHA1 8d15d993b97268912c55255dfbbc49a6be63822e SHA256 98e4287c2b6861f9a426093b89b15e229b53eba6dfdba8ac4aec5b7d00584849
 MD5 81ffbfd340da6db23dbdee37b2b4d788 metadata.xml 899
 RMD160 726a6859bf6751bd28bb7c00f0e97e697f586efb metadata.xml 899
@@ -57,10 +54,3 @@ SHA256 49d14ba3109e2913c7dea85141ca3d0b8ad724277e24f40fe2c9763b092f6802 files/di
 MD5 10ae159eaf2300013b21f289d5c938b2 files/digest-howl-1.0.0 232
 RMD160 e357429b06f27f54411d958b2adcb7affeafc8f2 files/digest-howl-1.0.0 232
 SHA256 55884f817ecb1f896a1c41cf0ac358bbbee69dad677e0eb2756545b29d12c0e4 files/digest-howl-1.0.0 232
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGUIJljJyKLBkBVroRAmLXAKDCqlWGV2KgfrvKZbALpXx1KKFfRgCfct2I
-3xzXOQPbGfyE8QW4e6nMo60=
-=WJuk
------END PGP SIGNATURE-----
diff --git a/net-misc/howl/howl-0.9.8.ebuild b/net-misc/howl/howl-0.9.8.ebuild
index 430a52cc032e..edc5d177f459 100644
--- a/net-misc/howl/howl-0.9.8.ebuild
+++ b/net-misc/howl/howl-0.9.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/net-misc/howl/howl-0.9.8.ebuild,v 1.19 2007/04/28 23:05:19 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/howl/howl-0.9.8.ebuild,v 1.20 2007/07/11 03:59:52 compnerd Exp $
 
 inherit eutils flag-o-matic
 
@@ -39,6 +39,13 @@ src_compile() {
 	emake || die "emake failed"
 }
 
+pkg_preinst() {
+	# howl-0.9.8 introduces a change in library naming,
+	# preserve old libraries to not break things
+	preserve_old_lib /usr/$(get_libdir)/libhowl-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
+	preserve_old_lib /usr/$(get_libdir)/libmDNSResponder-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
+}
+
 src_install() {
 	emake DESTDIR=${D} install || die "emake install failed"
 	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
@@ -51,11 +58,6 @@ src_install() {
 	# Install init scripts
 	newinitd ${FILESDIR}/nifd.init.d nifd
 	newinitd ${FILESDIR}/mDNSResponder.init.d mDNSResponder
-
-	# howl-0.9.8 introduces a change in library naming,
-	# preserve old libraries to not break things
-	preserve_old_lib /usr/$(get_libdir)/libhowl-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
-	preserve_old_lib /usr/$(get_libdir)/libmDNSResponder-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
 }
 
 pkg_postinst() {
diff --git a/net-misc/howl/howl-1.0.0.ebuild b/net-misc/howl/howl-1.0.0.ebuild
index d6da744a12b5..a7dafc95fd1d 100644
--- a/net-misc/howl/howl-1.0.0.ebuild
+++ b/net-misc/howl/howl-1.0.0.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/net-misc/howl/howl-1.0.0.ebuild,v 1.17 2007/05/20 17:16:15 drizzt Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/howl/howl-1.0.0.ebuild,v 1.18 2007/07/11 03:59:52 compnerd Exp $
 
 inherit eutils flag-o-matic
 
@@ -38,6 +38,13 @@ src_compile() {
 	emake || die "emake failed"
 }
 
+pkg_preinst() {
+	# howl-0.9.8 introduces a change in library naming,
+	# preserve old libraries to not break things
+	preserve_old_lib /usr/$(get_libdir)/libhowl-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
+	preserve_old_lib /usr/$(get_libdir)/libmDNSResponder-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS COPYING ChangeLog INSTALL README TODO
@@ -52,13 +59,6 @@ src_install() {
 	newinitd "${FILESDIR}"/mDNSResponder.init.d mDNSResponder
 }
 
-pkg_preinst() {
-	# howl-0.9.8 introduces a change in library naming,
-	# preserve old libraries to not break things
-	preserve_old_lib /usr/$(get_libdir)/libhowl-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
-	preserve_old_lib /usr/$(get_libdir)/libmDNSResponder-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]
-}
-
 pkg_postinst() {
 	# inform user about library changes
 	preserve_old_lib_notify /usr/$(get_libdir)/libhowl-[0-9].[0-9].[0-9].so.[0-9].[0-9].[0-9]