Added a call to fixlocalpod to fix the collision-protect bug #68367.

Package-Manager: portage-2.0.51.22-r1

3 files changed, 30 insertions, 22 deletions

diff --git a/net-irc/irssi/ChangeLog b/net-irc/irssi/ChangeLog
index 14e58383a9ab..eb175803aeb7 100644
--- a/net-irc/irssi/ChangeLog
+++ b/net-irc/irssi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-irc/irssi
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.64 2005/05/17 15:57:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/ChangeLog,v 1.65 2005/05/19 20:52:43 swegener Exp $
+
+  19 May 2005; Sven Wegener <swegener@gentoo.org> irssi-0.8.9-r1.ebuild,
+  irssi-0.8.10_rc5-r1.ebuild:
+  Added a call to fixlocalpod to fix the collision-protect bug #68367.
 
   17 May 2005; Sven Wegener <swegener@gentoo.org>
   +files/irssi-0.8.10_rc5-gcc4.patch, irssi-0.8.10_rc5-r1.ebuild:
diff --git a/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild b/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild
index b7d0deb93908..f7bce0651109 100644
--- a/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild
+++ b/net-irc/irssi/irssi-0.8.10_rc5-r1.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/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild,v 1.8 2005/05/17 15:57:52 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.10_rc5-r1.ebuild,v 1.9 2005/05/19 20:52:43 swegener Exp $
 
 inherit perl-module eutils
 
@@ -26,11 +26,11 @@ RDEPEND="!net-irc/irssi-cvs
 DEPEND="${RDEPEND}
 	>=sys-apps/sed-4"
 
-S=${WORKDIR}/${MY_P}
+S="${WORKDIR}"/${MY_P}
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	# Ugly hack to work around compression of the html files.
 	# Remove this if prepalldocs is changed to avoid gzipping html files.
@@ -38,9 +38,9 @@ src_unpack() {
 		-e 's/[^ 	]\+\.html//g' docs/Makefile.in || \
 			die "sed doc/Makefile.in failed"
 
-	epatch ${WORKDIR}/${P}-CVS-20050121.patch
-	epatch ${FILESDIR}/irssi-socks-fix.patch
-	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch "${WORKDIR}"/${P}-CVS-20050121.patch
+	epatch "${FILESDIR}"/irssi-socks-fix.patch
+	epatch "${FILESDIR}"/${P}-gcc4.patch
 }
 
 src_compile() {
@@ -69,21 +69,23 @@ src_compile() {
 src_install() {
 	if use perl
 	then
-		for dir in ${S}/src/perl/{common,irc,textui,ui}
+		for dir in "${S}"/src/perl/{common,irc,textui,ui}
 		do
-			cd ${dir}
+			cd "${dir}"
 			perl-module_src_prep
 		done
-		cd ${S}
+		cd "${S}"
 	fi
 
 	make \
-		DESTDIR=${D} \
+		DESTDIR="${D}" \
 		docdir=/usr/share/doc/${PF} \
-		gnulocaledir=${D}/usr/share/locale \
+		gnulocaledir="${D}"/usr/share/locale \
 		install || die "make install failed"
 
+	use perl && fixlocalpod
+
 	prepalldocs
 	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
-	dohtml -r ${S}/docs/. || die "dohtml failed"
+	dohtml -r "${S}"/docs/. || die "dohtml failed"
 }
diff --git a/net-irc/irssi/irssi-0.8.9-r1.ebuild b/net-irc/irssi/irssi-0.8.9-r1.ebuild
index a4c96684ecee..58830471cde6 100644
--- a/net-irc/irssi/irssi-0.8.9-r1.ebuild
+++ b/net-irc/irssi/irssi-0.8.9-r1.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/net-irc/irssi/irssi-0.8.9-r1.ebuild,v 1.9 2005/05/15 02:13:51 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/irssi/irssi-0.8.9-r1.ebuild,v 1.10 2005/05/19 20:52:43 swegener Exp $
 
 inherit perl-module eutils
 
@@ -28,13 +28,13 @@ src_unpack() {
 
 	# Ugly hack to work around compression of the html files.
 	# Remove this if prepalldocs is changed to avoid gzipping html files.
-	cd ${S} && \
+	cd "${S}" && \
 	sed -i \
 		-e 's/[^ 	]\+\.html//g' docs/Makefile.in || \
 			die "sed doc/Makefile.in failed"
 
-	epatch ${FILESDIR}/${P}-64bit-exec-fix.patch
-	epatch ${FILESDIR}/irssi-socks-fix.patch
+	epatch "${FILESDIR}"/${P}-64bit-exec-fix.patch
+	epatch "${FILESDIR}"/irssi-socks-fix.patch
 }
 
 src_compile() {
@@ -59,20 +59,22 @@ src_compile() {
 src_install() {
 	if use perl
 	then
-		for dir in ${S}/src/perl/{common,irc,textui,ui}
+		for dir in "${S}"/src/perl/{common,irc,textui,ui}
 		do
-			cd ${dir}
+			cd "${dir}"
 			perl-module_src_prep
 		done
-		cd ${S}
+		cd "${S}"
 	fi
 
 	make \
-		DESTDIR=${D} \
+		DESTDIR="${D}" \
 		docdir=/usr/share/doc/${PF} \
-		gnulocaledir=${D}/usr/share/locale \
+		gnulocaledir="${D}"/usr/share/locale \
 		install || die "make install failed"
 
+	use perl && fixlocalpod
+
 	prepalldocs
 	dodoc AUTHORS ChangeLog README TODO NEWS || die "dodoc failed"
 	dohtml -r ${S}/docs/. || die "dohtml failed"