Remove old versioned .la symlinks in pkg_setup instead pkg_postinst (bug 129228 comment 4)

Package-Manager: portage-2.0.54

3 files changed, 28 insertions, 36 deletions

diff --git a/net-dialup/freeradius/ChangeLog b/net-dialup/freeradius/ChangeLog
index a861b7b19dea..67c55bb9a69a 100644
--- a/net-dialup/freeradius/ChangeLog
+++ b/net-dialup/freeradius/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dialup/freeradius
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.51 2006/04/09 17:52:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/ChangeLog,v 1.52 2006/04/17 07:21:48 mrness Exp $
+
+  17 Apr 2006; Alin Nastac <mrness@gentoo.org> freeradius-1.1.1-r1.ebuild:
+  Remove old versioned .la symlinks in pkg_setup instead pkg_postinst (bug
+  129228 comment 4).
 
 *freeradius-1.1.1-r1 (09 Apr 2006)
 
diff --git a/net-dialup/freeradius/Manifest b/net-dialup/freeradius/Manifest
index f660475414b2..1a7ecaa30aa7 100644
--- a/net-dialup/freeradius/Manifest
+++ b/net-dialup/freeradius/Manifest
@@ -1,7 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 0366645ef84cf48baecec660b8239021 ChangeLog 8922
+MD5 5db9ac3a4dfc6a9763f0f8cca7553529 ChangeLog 9094
 MD5 7dc694a1ee1c374e37a40f81bcaf28a3 files/digest-freeradius-1.1.0-r1 69
 MD5 0936eb82363dd9098d21fc7787f8e4cc files/digest-freeradius-1.1.1-r1 69
 MD5 7dc1f8c829f2d44978b414662997041a files/freeradius-1.1.0-dict-attr-sizeof.patch 478
@@ -13,12 +10,5 @@ MD5 73e25b78f2cdb07ed8bbddbcdb9ac08b files/freeradius-1.1.1-whole-archive-gentoo
 MD5 fc6693f3df5a0694610110287a28568a files/radius.conf 129
 MD5 adc7e9af3a2ab37f1ab021de3e279d41 files/radius.init 1675
 MD5 e7a9476cc2e95753463494b2950c8786 freeradius-1.1.0-r1.ebuild 3999
-MD5 794285b7959675bcca4f9f02759e7111 freeradius-1.1.1-r1.ebuild 4906
+MD5 e0d65000fc1c18334722bde2812b47b9 freeradius-1.1.1-r1.ebuild 4887
 MD5 1542bf76e28581e9d6bcfdc75e46f33d metadata.xml 252
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEOUoLjG8pv1lIUX4RAgFJAJ9vjUt2TjD/sy0cXvWPOuHIev9c7QCfeWv6
-TPATKQaTyVDpU1vBDNdiI/0=
-=iP0+
------END PGP SIGNATURE-----
diff --git a/net-dialup/freeradius/freeradius-1.1.1-r1.ebuild b/net-dialup/freeradius/freeradius-1.1.1-r1.ebuild
index 821c9b2d0e58..60737ccf399c 100644
--- a/net-dialup/freeradius/freeradius-1.1.1-r1.ebuild
+++ b/net-dialup/freeradius/freeradius-1.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.1-r1.ebuild,v 1.1 2006/04/09 17:52:53 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/freeradius/freeradius-1.1.1-r1.ebuild,v 1.2 2006/04/17 07:21:48 mrness Exp $
 
 inherit eutils flag-o-matic libtool
 
@@ -35,6 +35,26 @@ pkg_setup() {
 	fi
 	enewgroup radiusd
 	enewuser radiusd -1 -1 /var/log/radius radiusd
+
+	#TODO: Remove this function 6 months after all <1.1.1-r1 versions 
+	#      has been removed from the tree.
+	if cd "${ROOT}/usr/lib" ; then
+		einfo "Cleaning up lefovers from previous versions..."
+
+		local la_prefix file
+		for la_prefix in libradius libeap rlm_acct_unique rlm_always rlm_attr_filter rlm_attr_rewrite \
+			rlm_chap rlm_checkval rlm_counter rlm_cram rlm_dbm rlm_detail rlm_digest rlm_eap rlm_eap_gtc \
+			rlm_eap_leap rlm_eap_md5 rlm_eap_mschapv2 rlm_eap_peap rlm_eap_sim rlm_eap_tls rlm_eap_ttls \
+			rlm_example rlm_exec rlm_expr rlm_fastusers rlm_files rlm_ippool rlm_krb5 rlm_ldap rlm_mschap \
+			rlm_ns_mta_md5 rlm_otp rlm_pam rlm_pap rlm_passwd rlm_perl rlm_preprocess rlm_python rlm_radutmp \
+			rlm_realm rlm_sim_files rlm_smb rlm_sql rlm_sqlcounter rlm_sql_log rlm_unix ; do
+				for file in ${la_prefix}-{0.8.1,0.9.0,0.9.3,1.0.1,1.0.2,1.0.4,1.0.5,1.1.0,1.1.1}.la ; do
+					if [ -f "${file}" ] ; then
+						rm "${file}"
+					fi
+				done
+		done
+	fi
 }
 
 src_unpack() {
@@ -128,28 +148,6 @@ pkg_preinst() {
 	enewuser radiusd -1 -1 /var/log/radius radiusd
 }
 
-pkg_postinst() {
-	#TODO: Remove this function 6 months after all <1.1.1-r1 versions 
-	#      has been removed from the tree.
-	if cd "${ROOT}/usr/lib" ; then
-		einfo "Cleaning up lefovers from previous versions..."
-
-		local la_prefix file
-		for la_prefix in libradius libeap rlm_acct_unique rlm_always rlm_attr_filter rlm_attr_rewrite \
-			rlm_chap rlm_checkval rlm_counter rlm_cram rlm_dbm rlm_detail rlm_digest rlm_eap rlm_eap_gtc \
-			rlm_eap_leap rlm_eap_md5 rlm_eap_mschapv2 rlm_eap_peap rlm_eap_sim rlm_eap_tls rlm_eap_ttls \
-			rlm_example rlm_exec rlm_expr rlm_fastusers rlm_files rlm_ippool rlm_krb5 rlm_ldap rlm_mschap \
-			rlm_ns_mta_md5 rlm_otp rlm_pam rlm_pap rlm_passwd rlm_perl rlm_preprocess rlm_python rlm_radutmp \
-			rlm_realm rlm_sim_files rlm_smb rlm_sql rlm_sqlcounter rlm_sql_log rlm_unix ; do
-				for file in ${la_prefix}-{0.8.1,0.9.0,0.9.3,1.0.1,1.0.2,1.0.4,1.0.5,1.1.0,1.1.1}.la ; do
-					if [ -f "${file}" ] ; then
-						rm "${file}"
-					fi
-				done
-		done
-	fi
-}
-
 pkg_prerm() {
 	if [ "${ROOT}" = "/" ] && /etc/init.d/radiusd --quiet status ; then
 		/etc/init.d/radiusd stop