Updated perl-cleaner to remove the emptied dirs after a .ph purge

(Portage version: 2.0.51.22-r1)

6 files changed, 50 insertions, 7 deletions

diff --git a/dev-lang/perl/ChangeLog b/dev-lang/perl/ChangeLog
index 59e20f9abe10..3f4b16fea6b7 100644
--- a/dev-lang/perl/ChangeLog
+++ b/dev-lang/perl/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-lang/perl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.130 2005/05/30 02:52:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/ChangeLog,v 1.131 2005/05/30 13:41:04 mcummings Exp $
+
+  30 May 2005; Michael Cummings <mcummings@gentoo.org> files/perl-cleaner,
+  perl-5.8.2-r4.ebuild, perl-5.8.4-r4.ebuild, perl-5.8.5-r5.ebuild,
+  perl-5.8.6-r4.ebuild:
+  Updated perl-cleaner to remove the emptied dirs after a .ph purge
 
   29 May 2005; <solar@gentoo.org> perl-5.8.2-r4.ebuild, perl-5.8.4-r4.ebuild,
   perl-5.8.5-r5.ebuild, perl-5.8.6-r4.ebuild:
diff --git a/dev-lang/perl/files/perl-cleaner b/dev-lang/perl/files/perl-cleaner
index a2a9becff7e9..5831c5e02424 100755
--- a/dev-lang/perl/files/perl-cleaner
+++ b/dev-lang/perl/files/perl-cleaner
@@ -68,13 +68,19 @@ function ph_clean() {
          done
       fi
    done
+   for DIR in $INC; do
+	 for empty in $(find $DIR -type d); do
+		# Silently remove those dirs that we just emptied
+	 	rmdir $empty  >/dev/null 2>&1
+   	 done
+   done
 }
 
 # Generate ph files; this is useful if we've upgraded packages with headers so that perl knows the new info
 function ph_update() {
    echo "$(date) : Updating ph files" | tee -a $LOG
-   cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*>>$LOG
-   cd /usr/include/linux; h2ph * >>$LOG
+   cd /usr/include; h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/* | tee -a $LOG
+   cd /usr/include/linux; h2ph * | tee -a $LOG
 }
 
 # Build a list of modules installed under older perls - only valid if the module was an ebuild :)
diff --git a/dev-lang/perl/perl-5.8.2-r4.ebuild b/dev-lang/perl/perl-5.8.2-r4.ebuild
index 92ab364f753d..b6379568cc60 100644
--- a/dev-lang/perl/perl-5.8.2-r4.ebuild
+++ b/dev-lang/perl/perl-5.8.2-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r4.ebuild,v 1.9 2005/05/30 02:52:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.2-r4.ebuild,v 1.10 2005/05/30 13:41:04 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -324,6 +324,14 @@ pkg_postinst() {
 				done
 			fi
 		done
+		# Silently remove the now empty dirs
+		for DIR in $INC; do
+		   if [ -d ${ROOT}/$DIR ]; then
+		       for $empty in $(find ${ROOT}/$DIR -type d); do
+			   		rmdir $empty >/dev/null 2>&1
+			   done
+		   fi
+		done
 		ebegin "Converting C header files to the corresponding Perl format"
 		cd /usr/include;
 		h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*
diff --git a/dev-lang/perl/perl-5.8.4-r4.ebuild b/dev-lang/perl/perl-5.8.4-r4.ebuild
index 8cf9cf18844b..28917d046db6 100644
--- a/dev-lang/perl/perl-5.8.4-r4.ebuild
+++ b/dev-lang/perl/perl-5.8.4-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r4.ebuild,v 1.9 2005/05/30 02:52:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.4-r4.ebuild,v 1.10 2005/05/30 13:41:04 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -389,6 +389,14 @@ pkg_postinst() {
 				done
 			fi
 		done
+		# Silently remove the now empty dirs
+		for DIR in $INC; do
+		   if [ -d ${ROOT}/$DIR ]; then
+		       for $empty in $(find ${ROOT}/$DIR -type d); do
+			   		rmdir $empty >/dev/null 2>&1
+			   done
+		   fi
+		done
 		ebegin "Converting C header files to the corresponding Perl format"
 		cd /usr/include;
 		h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*
diff --git a/dev-lang/perl/perl-5.8.5-r5.ebuild b/dev-lang/perl/perl-5.8.5-r5.ebuild
index 6bd3eca83595..ac5956e5b2b4 100644
--- a/dev-lang/perl/perl-5.8.5-r5.ebuild
+++ b/dev-lang/perl/perl-5.8.5-r5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r5.ebuild,v 1.10 2005/05/30 02:52:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.5-r5.ebuild,v 1.11 2005/05/30 13:41:04 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -377,6 +377,14 @@ pkg_postinst() {
 				done
 			fi
 		done
+		# Silently remove the now empty dirs
+		for DIR in $INC; do
+		   if [ -d ${ROOT}/$DIR ]; then
+		       for $empty in $(find ${ROOT}/$DIR -type d); do
+			   		rmdir $empty >/dev/null 2>&1
+			   done
+		   fi
+		done
 		ebegin "Converting C header files to the corresponding Perl format"
 		cd /usr/include;
 		h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*
diff --git a/dev-lang/perl/perl-5.8.6-r4.ebuild b/dev-lang/perl/perl-5.8.6-r4.ebuild
index 3b2e1683d96a..2523e38c436e 100644
--- a/dev-lang/perl/perl-5.8.6-r4.ebuild
+++ b/dev-lang/perl/perl-5.8.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r4.ebuild,v 1.12 2005/05/30 02:52:00 solar Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/perl/perl-5.8.6-r4.ebuild,v 1.13 2005/05/30 13:41:04 mcummings Exp $
 
 inherit eutils flag-o-matic toolchain-funcs multilib
 
@@ -380,6 +380,14 @@ pkg_postinst() {
 				done
 			fi
 		done
+		# Silently remove the now empty dirs
+		for DIR in $INC; do
+		   if [ -d ${ROOT}/$DIR ]; then
+		       for $empty in $(find ${ROOT}/$DIR -type d); do
+			   		rmdir $empty >/dev/null 2>&1
+			   done
+		   fi
+		done
 		ebegin "Converting C header files to the corresponding Perl format"
 		cd /usr/include;
 		h2ph * sys/* arpa/* netinet/* bits/* security/* asm/* gnu/* linux/*