Added fixlocalpod to not collision with local pod file

(Portage version: 2.0.54)

5 files changed, 18 insertions, 44 deletions

diff --git a/net-im/gaim/ChangeLog b/net-im/gaim/ChangeLog
index 4bcea95764a1..c7ad5dfcd579 100644
--- a/net-im/gaim/ChangeLog
+++ b/net-im/gaim/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/gaim
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.389 2006/05/06 19:54:35 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/ChangeLog,v 1.390 2006/05/13 18:02:10 tester Exp $
+
+  13 May 2006; Olivier Crête <tester@gentoo.org> gaim-1.5.0.ebuild,
+  gaim-2.0.0_beta3.ebuild:
+  Added fixlocalpod to not collision with local pod file
 
   06 May 2006; Jory A. Pratt <anarchy@gentoo.org>
   -files/gaim-2.0.0-as-needed.patch,
diff --git a/net-im/gaim/Manifest b/net-im/gaim/Manifest
index 0f5fb888e72e..8c4b8273c1e8 100644
--- a/net-im/gaim/Manifest
+++ b/net-im/gaim/Manifest
@@ -1,40 +1,10 @@
-AUX gaim-0.76-xinput.patch 644 RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f SHA1 f74085f170b8d6171cf47094bde9601f2e6085d7 SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0 size 644
+MD5 c746c361836fa5811fd528d6294fc36c ChangeLog 56491
+MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
+MD5 5447214c866d2701435a0b84e7280d71 files/digest-gaim-2.0.0_beta2-r2 253
+MD5 11719585ae7559ea4b14d1480b0cd817 files/digest-gaim-2.0.0_beta3 69
 MD5 afc682711efed5d09a9229bd06a7a13b files/gaim-0.76-xinput.patch 644
-RMD160 8003dcbad47c300845898cb42b7a96f12b149c5f files/gaim-0.76-xinput.patch 644
-SHA256 3532e792388cc6023522871bc99fd9e84204a42dfa6801b507df7fe480c37cd0 files/gaim-0.76-xinput.patch 644
-AUX gaim-2.0.0_beta3-as-needed.patch 401 RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 SHA1 21416ead465dd22ae0c9b3005656ff4e00e3405e SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 size 401
 MD5 5b872a7214f3650a286c300a7511cc94 files/gaim-2.0.0_beta3-as-needed.patch 401
-RMD160 5546fb8a00b774ee17e9e5d605f5b0ed620d75c1 files/gaim-2.0.0_beta3-as-needed.patch 401
-SHA256 5db944b244b6324b2e09b0d68ce672fd633043b33028030205465efddd24f855 files/gaim-2.0.0_beta3-as-needed.patch 401
-DIST gaim-1.5.0.tar.bz2 6123237 size 6123237
-DIST gaim-2.0.0beta2.tar.bz2 7353162 RMD160 0d3b4018148b882269822944da26a07c9ab25cff SHA256 72c1af01c46c305c4d37ea1fa18e27a33bede6efc19eab7c0b2c80122c73b758 size 7353162
-DIST gaim-2.0.0beta3.tar.bz2 8056708 RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710 size 8056708
-EBUILD gaim-1.5.0.ebuild 4181 RMD160 564bc734da173923441dc86d6caba79f50f8ccda SHA1 0daab64a60511b2d589a3df359bda35431c1af91 SHA256 6f0426214a4670f03b4e3b305f31a4a9c0c354c42722b307fe5deb85c5345cf7 size 4181
-MD5 375e4842d0812bfba079e1b2539c7b17 gaim-1.5.0.ebuild 4181
-RMD160 564bc734da173923441dc86d6caba79f50f8ccda gaim-1.5.0.ebuild 4181
-SHA256 6f0426214a4670f03b4e3b305f31a4a9c0c354c42722b307fe5deb85c5345cf7 gaim-1.5.0.ebuild 4181
-EBUILD gaim-2.0.0_beta2-r2.ebuild 5462 RMD160 5457966a7103a833ad6443f41c45897b3e7ee3d3 SHA1 d91b04415ff88cc2080f84f7a5daa49612f277e4 SHA256 57ca508badc3d691058b0777328f5ef2294e60145310e976882511bcf435f459 size 5462
+MD5 0f36a0e8a7c4e8045a5578d2e60e7a7a gaim-1.5.0.ebuild 4218
 MD5 2e08064c481c88940c023b304ad27ef8 gaim-2.0.0_beta2-r2.ebuild 5462
-RMD160 5457966a7103a833ad6443f41c45897b3e7ee3d3 gaim-2.0.0_beta2-r2.ebuild 5462
-SHA256 57ca508badc3d691058b0777328f5ef2294e60145310e976882511bcf435f459 gaim-2.0.0_beta2-r2.ebuild 5462
-EBUILD gaim-2.0.0_beta3.ebuild 5438 RMD160 85b893a576a450a3443bd3d9651e36f594a4a09a SHA1 e180e0e0cebf23bae7f4f975cb6c9d6ba6b3d84c SHA256 17d3abaa798e9fc836f0d48bf6cb50851c234b48701c8295a83f49e424f9a566 size 5438
-MD5 ae4e5f1937035d4eccad0b67f88cbd54 gaim-2.0.0_beta3.ebuild 5438
-RMD160 85b893a576a450a3443bd3d9651e36f594a4a09a gaim-2.0.0_beta3.ebuild 5438
-SHA256 17d3abaa798e9fc836f0d48bf6cb50851c234b48701c8295a83f49e424f9a566 gaim-2.0.0_beta3.ebuild 5438
-MISC ChangeLog 56491 RMD160 2d3d4111330a5a38c9a17769271e60773a62b69e SHA1 ea6510e315febec9ec8195f299bd09e1231b0dc8 SHA256 5416fa4f5fe1ea57ddd6de68b9f7836d6c6ad4edd4af9ee5eb74639c5237f162 size 56491
-MD5 c746c361836fa5811fd528d6294fc36c ChangeLog 56491
-RMD160 2d3d4111330a5a38c9a17769271e60773a62b69e ChangeLog 56491
-SHA256 5416fa4f5fe1ea57ddd6de68b9f7836d6c6ad4edd4af9ee5eb74639c5237f162 ChangeLog 56491
-MISC metadata.xml 414 RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 SHA1 9cd1e1d6345fc95f73379f5ee554a8e70860e067 SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f size 414
+MD5 333a314752e047f3f2932d137d35386e gaim-2.0.0_beta3.ebuild 5475
 MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414
-RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414
-SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata.xml 414
-MD5 55807d838af0375bc41eabe3534fdda8 files/digest-gaim-1.5.0 64
-RMD160 35345ec4b0fe16f5f1862974ba20bef7b54bfdbb files/digest-gaim-1.5.0 64
-SHA256 6d0d6a97397284c18dd881305d135a634f77b01c762cd8232f8b626d97841036 files/digest-gaim-1.5.0 64
-MD5 5447214c866d2701435a0b84e7280d71 files/digest-gaim-2.0.0_beta2-r2 253
-RMD160 3c53d5682c6d05cfd6c0f48b162c5eb673c4b6cf files/digest-gaim-2.0.0_beta2-r2 253
-SHA256 ccf624a4c27f49a823a5e988cfe639813ddcddb99efcea971b6cf79f8d3f484c files/digest-gaim-2.0.0_beta2-r2 253
-MD5 18ac09d4d582248a50d0f68546832419 files/digest-gaim-2.0.0_beta3 253
-RMD160 f5f547a5d04a6d1e1a3dc043abeabbe930ab8d55 files/digest-gaim-2.0.0_beta3 253
-SHA256 4e8269e2659d7e240380f43cef0fa13244ce16c29457d81ba55a20ac071f62e4 files/digest-gaim-2.0.0_beta3 253
diff --git a/net-im/gaim/files/digest-gaim-2.0.0_beta3 b/net-im/gaim/files/digest-gaim-2.0.0_beta3
index 8079211445be..849b703d8548 100644
--- a/net-im/gaim/files/digest-gaim-2.0.0_beta3
+++ b/net-im/gaim/files/digest-gaim-2.0.0_beta3
@@ -1,3 +1 @@
 MD5 c077655e4dd251cf22c406777c985a74 gaim-2.0.0beta3.tar.bz2 8056708
-RMD160 f7c7273ebb5149b5eb3b3759f4a1d756f68392c5 gaim-2.0.0beta3.tar.bz2 8056708
-SHA256 5ce3a0054b26e96cacb5471d0d3456fde00223cadc267a3e010155b6a2ffe710 gaim-2.0.0beta3.tar.bz2 8056708
diff --git a/net-im/gaim/gaim-1.5.0.ebuild b/net-im/gaim/gaim-1.5.0.ebuild
index a2e4433e07cc..406b295fad43 100644
--- a/net-im/gaim/gaim-1.5.0.ebuild
+++ b/net-im/gaim/gaim-1.5.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.5.0.ebuild,v 1.10 2005/08/16 04:56:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-1.5.0.ebuild,v 1.11 2006/05/13 18:02:10 tester Exp $
 
-inherit flag-o-matic eutils toolchain-funcs debug multilib
+inherit flag-o-matic eutils toolchain-funcs debug multilib perl-module
 
 DESCRIPTION="GTK Instant Messenger client"
 HOMEPAGE="http://gaim.sourceforge.net/"
@@ -132,6 +132,7 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D} || die "Install failed"
+	use perl && fixlocalpod
 	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
 }
 
diff --git a/net-im/gaim/gaim-2.0.0_beta3.ebuild b/net-im/gaim/gaim-2.0.0_beta3.ebuild
index 0fdcc0596077..0a4910c408ab 100644
--- a/net-im/gaim/gaim-2.0.0_beta3.ebuild
+++ b/net-im/gaim/gaim-2.0.0_beta3.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3.ebuild,v 1.5 2006/05/06 19:54:35 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta3.ebuild,v 1.6 2006/05/13 18:02:10 tester Exp $
 
-inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools
+inherit flag-o-matic eutils toolchain-funcs debug multilib mono autotools perl-module
 
 MY_PV=${PV/_beta/beta}
 MY_P="${PN}-${MY_PV}"
@@ -165,6 +165,7 @@ src_compile() {
 
 src_install() {
 	make install DESTDIR=${D} || die "Install failed"
+	use perl && fixlocalpod
 	dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION
 }