Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 84018 Details for
Bug 69329
gaim-1.3.1 fails to merge when collision-protect is in FEATURES
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
fixes problem with perllocalpod by means of perl-app.eclass
gaim.patch (text/plain), 6.35 KB, created by
Klaus Zimmermann
on 2006-04-05 13:50:25 UTC
(
hide
)
Description:
fixes problem with perllocalpod by means of perl-app.eclass
Filename:
MIME Type:
Creator:
Klaus Zimmermann
Created:
2006-04-05 13:50:25 UTC
Size:
6.35 KB
patch
obsolete
>diff -Nur /usr/portage/net-im/gaim/files/digest-gaim-1.5.0 /usr/local/portage/net-im/gaim/files/digest-gaim-1.5.0 >--- /usr/portage/net-im/gaim/files/digest-gaim-1.5.0 2005-08-12 06:43:01.000000000 +0200 >+++ /usr/local/portage/net-im/gaim/files/digest-gaim-1.5.0 2006-04-05 22:31:57.000000000 +0200 >@@ -1 +1,3 @@ > MD5 9205321ac11fad271c90f2f0d7c5e7ce gaim-1.5.0.tar.bz2 6123237 >+RMD160 13f74e2d2ed69a775a5884b807c365177455ae0e gaim-1.5.0.tar.bz2 6123237 >+SHA256 58e3b0340cfc9e54e46f8d8835e5a02e31201c9ed8820bbb4cea36c59b9682aa gaim-1.5.0.tar.bz2 6123237 >diff -Nur /usr/portage/net-im/gaim/gaim-1.5.0.ebuild /usr/local/portage/net-im/gaim/gaim-1.5.0.ebuild >--- /usr/portage/net-im/gaim/gaim-1.5.0.ebuild 2005-08-16 07:05:51.000000000 +0200 >+++ /usr/local/portage/net-im/gaim/gaim-1.5.0.ebuild 2006-04-05 22:31:44.000000000 +0200 >@@ -2,7 +2,7 @@ > # 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 $ > >-inherit flag-o-matic eutils toolchain-funcs debug multilib >+inherit flag-o-matic eutils toolchain-funcs debug multilib perl-app > > DESCRIPTION="GTK Instant Messenger client" > HOMEPAGE="http://gaim.sourceforge.net/" >@@ -133,6 +133,7 @@ > src_install() { > make install DESTDIR=${D} || die "Install failed" > dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION >+ use perl && fixlocalpod > } > > pkg_postinst() { >diff -Nur /usr/portage/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild /usr/local/portage/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild >--- /usr/portage/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild 2006-03-28 07:26:20.000000000 +0200 >+++ /usr/local/portage/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild 2006-04-05 22:45:25.000000000 +0200 >@@ -2,7 +2,7 @@ > # Distributed under the terms of the GNU General Public License v2 > # $Header: /var/cvsroot/gentoo-x86/net-im/gaim/gaim-2.0.0_beta2-r2.ebuild,v 1.1 2006/03/28 05:26:20 gothgirl Exp $ > >-inherit flag-o-matic eutils toolchain-funcs debug multilib mono >+inherit flag-o-matic eutils toolchain-funcs debug multilib mono perl-app > > MY_PV=${PV/_beta/beta} > MY_P="${PN}-${MY_PV}" >@@ -158,6 +158,7 @@ > src_install() { > make install DESTDIR=${D} || die "Install failed" > dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION >+ use perl && fixlocalpod > } > > pkg_postinst() { >diff -Nur /usr/portage/net-im/gaim/gaim-2.0.0_beta3.ebuild /usr/local/portage/net-im/gaim/gaim-2.0.0_beta3.ebuild >--- /usr/portage/net-im/gaim/gaim-2.0.0_beta3.ebuild 2006-03-30 22:36:38.000000000 +0200 >+++ /usr/local/portage/net-im/gaim/gaim-2.0.0_beta3.ebuild 2006-04-05 22:45:39.000000000 +0200 >@@ -2,7 +2,7 @@ > # 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.3 2006/03/30 20:12:42 gothgirl Exp $ > >-inherit flag-o-matic eutils toolchain-funcs debug multilib mono >+inherit flag-o-matic eutils toolchain-funcs debug multilib mono perl-app > > MY_PV=${PV/_beta/beta} > MY_P="${PN}-${MY_PV}" >@@ -162,6 +162,7 @@ > src_install() { > make install DESTDIR=${D} || die "Install failed" > dodoc ABOUT-NLS AUTHORS COPYING HACKING INSTALL NEWS PROGRAMMING_NOTES README ChangeLog VERSION >+ use perl && fixlocalpod > } > > pkg_postinst() { >diff -Nur /usr/portage/net-im/gaim/Manifest /usr/local/portage/net-im/gaim/Manifest >--- /usr/portage/net-im/gaim/Manifest 2006-03-30 22:36:38.000000000 +0200 >+++ /usr/local/portage/net-im/gaim/Manifest 2006-04-05 22:45:59.000000000 +0200 >@@ -1,9 +1,9 @@ > MD5 cb2c4f0c131a47f1facba59bb3b953e1 ChangeLog 56102 > RMD160 c601afe8f78ed066c4bad7375133b48501d488bc ChangeLog 56102 > SHA256 1def539f61f5a47e9a21a3fa2f443765878aca0a51f8771d01c67cc53e25e3d3 ChangeLog 56102 >-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 390f6cb2111f1f54bb55da3cb074981e files/digest-gaim-1.5.0 238 >+RMD160 565afdbee5ecd1f78913ee6d3d813ff9db8bb185 files/digest-gaim-1.5.0 238 >+SHA256 0eeeff6fff0204e03a372c96611f8db0135f38286f7abade6be47aef06463f5b files/digest-gaim-1.5.0 238 > 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 >@@ -13,15 +13,15 @@ > 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 >-MD5 375e4842d0812bfba079e1b2539c7b17 gaim-1.5.0.ebuild 4181 >-RMD160 564bc734da173923441dc86d6caba79f50f8ccda gaim-1.5.0.ebuild 4181 >-SHA256 6f0426214a4670f03b4e3b305f31a4a9c0c354c42722b307fe5deb85c5345cf7 gaim-1.5.0.ebuild 4181 >-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 >-MD5 283a5495674b8ead7a0389cd3d59aaf8 gaim-2.0.0_beta3.ebuild 5341 >-RMD160 1ced60ccb33d497ec63331e7cf80341f9c4716f4 gaim-2.0.0_beta3.ebuild 5341 >-SHA256 790b7a880052dab3bc9bd21675ddb35fcec3dc5f1538059c4b5fa4824c04f5dc gaim-2.0.0_beta3.ebuild 5341 >+MD5 32bbb95c089e7edb882e04eb071caed1 gaim-1.5.0.ebuild 4215 >+RMD160 575ecbfe9003ba317058c47f05902bfdb27f187f gaim-1.5.0.ebuild 4215 >+SHA256 a935c11fd0105a320701750fe74c3017e54fd75a1b257b849709bb85d7dc77f2 gaim-1.5.0.ebuild 4215 >+MD5 08d9d691dd0728c427e9b4ae1b0a5088 gaim-2.0.0_beta2-r2.ebuild 5496 >+RMD160 a1956f28517863057250e7856d168aac0f943934 gaim-2.0.0_beta2-r2.ebuild 5496 >+SHA256 4e2d88712e109b4bde5f9b63ee29d135b3da7b43a30e6832c295a8d27d23794e gaim-2.0.0_beta2-r2.ebuild 5496 >+MD5 621b21a00fe7435c0d36c69ab3bc4762 gaim-2.0.0_beta3.ebuild 5375 >+RMD160 f4d15fad299ba1ec0bf1f5fce2611fea08896b3e gaim-2.0.0_beta3.ebuild 5375 >+SHA256 f9fd040b487860fc52fd58fb4aedb343ab84b0c13825907891e7a6fd79033645 gaim-2.0.0_beta3.ebuild 5375 > MD5 6727d140d07549b6be4b0ca9886e2514 metadata.xml 414 > RMD160 fed9c6330ca8dd83726b90f10b2b627c539f8a71 metadata.xml 414 > SHA256 f789243482d75a4fda274cc53b0c821f1cce89f08d856d8b8d641d4ae05c813f metadata.xml 414
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 69329
: 84018