diff options
| author |   Harald van Dijk <truedfx@gentoo.org> | 2009-10-10 22:48:35 +0000 |
|---|---|---|
| committer | Harald van Dijk <truedfx@gentoo.org> | 2009-10-10 22:48:35 +0000 |
| commit | cfbe9831c871653ef9465e9e5b338905093ddd91 (patch) | |
| tree | eb5b0a879d74db0cba9c66a2beb77ac3e8afca3b /app-editors/nvi | |
| parent | Remove --nobind from init script for bug #282721 (diff) | |
| download | historical-cfbe9831c871653ef9465e9e5b338905093ddd91.tar.gz historical-cfbe9831c871653ef9465e9e5b338905093ddd91.tar.bz2 historical-cfbe9831c871653ef9465e9e5b338905093ddd91.zip | |
Fix build with perl-5.10 with USE=-ithreads (#287654)
Package-Manager: portage-2.2_rc44/cvs/Linux i686
Diffstat (limited to 'app-editors/nvi')
| -rw-r--r-- | app-editors/nvi/ChangeLog | 6 | ||||
| -rw-r--r-- | app-editors/nvi/Manifest | 5 | ||||
| -rw-r--r-- | app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch | 20 | ||||
| -rw-r--r-- | app-editors/nvi/nvi-1.81.6-r3.ebuild | 3 |
4 files changed, 30 insertions, 4 deletions
diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog index 3f5c9920bfad..4617f1d7e571 100644 --- a/app-editors/nvi/ChangeLog +++ b/app-editors/nvi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-editors/nvi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.73 2009/10/08 19:54:16 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.74 2009/10/10 22:48:34 truedfx Exp $ + + 10 Oct 2009; Harald van Dijk <truedfx@gentoo.org> nvi-1.81.6-r3.ebuild, + +files/nvi-1.81.6-perl-shortnames.patch: + Fix build with perl-5.10 with USE=-ithreads (#287654) 06 Oct 2009; Harald van Dijk <truedfx@gentoo.org> nvi-1.81.6-r3.ebuild, +files/nvi-1.81.6-perl-as-needed.patch: diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest index cfd2e72ee97b..6fc0754dfc3f 100644 --- a/app-editors/nvi/Manifest +++ b/app-editors/nvi/Manifest @@ -1,8 +1,9 @@ AUX nvi-1.81.6-db.patch 692 RMD160 d97df499f98db3b7c1fd5a36b889fa1bb4e68ced SHA1 792444962a85f707f43b05083e725edbac687c58 SHA256 6d780ddce5963b6a6f0e8db40f903668849ac1daa6cacf2011a43177e4f06d52 AUX nvi-1.81.6-db44.patch 998 RMD160 a5a91404a22a06b3160d63dd8ad9ddb71a3a384b SHA1 116a870972480867ff916164fc26f5a6afd43342 SHA256 89b6ca0631c4f1df351c8000da17b5c5ca094bbcf704372b0333d37580b50998 AUX nvi-1.81.6-perl-as-needed.patch 2811 RMD160 f55e43fb03beac7a0021ed7ff1d04ba30c1a33e1 SHA1 2e22341ada5300527961f56409513e9afe25d986 SHA256 fdd1fbd6e78f6def03d8be9781c72d1ffe853f86510bf80f7ab616790c19d645 +AUX nvi-1.81.6-perl-shortnames.patch 388 RMD160 d803b6490ec6e539d6057913eac55ef6a5ae76d3 SHA1 2e11f167c7b3c4022593067c23b1d3f4d907ade2 SHA256 95655b83c8d5b0feaa13bffa51951e95765884d3f85d231b979b1782cff9cf65 DIST nvi-1.81.6.tar.bz2 1758309 RMD160 0db8568bea96392d9a027044177c60317c8ade36 SHA1 d3445ed69166102735335a2ff60d092d9a9143c6 SHA256 3441b8e3247b2b6dd19b5fd38355fe6593b2a92e960ecb3dd00d676f63d06b59 EBUILD nvi-1.81.6-r2.ebuild 1611 RMD160 7d49b6893cb7630ed042607ace49eed0504509ce SHA1 b7413666fea17fdf80cc76124eaeb1dd2f2a16fc SHA256 ab401903a623eab148ad7b21a960ee32563208ab50d14ffba015fb625e636ac0 -EBUILD nvi-1.81.6-r3.ebuild 1968 RMD160 3bfdac5ddac7a6e9b0c9a32f980c6f26219c7fef SHA1 1daaa3de2736ed780ce23aab9f108481a8879776 SHA256 e3f1ec6ce19c8a0e9db1d225ef493c42317c091066eb708331e13e218384bd26 -MISC ChangeLog 10372 RMD160 4c15f0ed64df0d660f15b80d662a4b03022f7e5a SHA1 4ab8455437042927e532499589002819a433dda1 SHA256 70a1b00039dace4f6fe0c1b9fc1b8ea3193d775b2db60e82b86ddf95b0266fb5 +EBUILD nvi-1.81.6-r3.ebuild 2017 RMD160 94ec4fbc832f8ae3204dd0fb594f42e01458b419 SHA1 86fa5a24f2eb52756a0e2602ce434b92cb1bd0af SHA256 e23125d7f7f5fcb1e633195356d69e5bd40db22c11d834d8eaec526a17137764 +MISC ChangeLog 10546 RMD160 ec5ac68481dd8d8b15ad020ee190b0716e7a707f SHA1 15da358b83ff055afcfb2d88207b402861f28e46 SHA256 31ba854d99f070e6e5998f73ea0130c5f917c7d10cd7a2ac42386dda5c7c6273 MISC metadata.xml 250 RMD160 61af8ec7e1bf9941d107eff4cc6a639874a6f198 SHA1 7ea68a3bd071637e4a49b61b2f7e35f3277545ef SHA256 aec181c304bce77cce8f1dc110e0203bc06b7c524ab40b1aac19a6f72aefdfde diff --git a/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch new file mode 100644 index 000000000000..3b2de789b5b4 --- /dev/null +++ b/app-editors/nvi/files/nvi-1.81.6-perl-shortnames.patch @@ -0,0 +1,20 @@ +--- ../perl_api/perlsfio.c ++++ ../perl_api/perlsfio.c +@@ -32,6 +32,7 @@ + /* perl redefines them + * avoid warnings + */ ++#undef re_compile + #undef USE_DYNAMIC_LOADING + #undef DEBUG + #undef PACKAGE +--- ../perl_api/perl.xs ++++ ../perl_api/perl.xs +@@ -38,6 +38,7 @@ + /* perl redefines them + * avoid warnings + */ ++#undef re_compile + #undef USE_DYNAMIC_LOADING + #undef DEBUG + #undef PACKAGE diff --git a/app-editors/nvi/nvi-1.81.6-r3.ebuild b/app-editors/nvi/nvi-1.81.6-r3.ebuild index e99f4860980a..1959ade5173f 100644 --- a/app-editors/nvi/nvi-1.81.6-r3.ebuild +++ b/app-editors/nvi/nvi-1.81.6-r3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.2 2009/10/08 19:54:16 truedfx Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.6-r3.ebuild,v 1.3 2009/10/10 22:48:34 truedfx Exp $ inherit autotools db-use eutils flag-o-matic @@ -37,6 +37,7 @@ src_unpack() { epatch "${FILESDIR}"/${P}-db44.patch epatch "${FILESDIR}"/${P}-db.patch epatch "${FILESDIR}"/${P}-perl-as-needed.patch + epatch "${FILESDIR}"/${P}-perl-shortnames.patch cd ../dist || die chmod +x findconfig || die append-flags -I"$(db_includedir ${DBVERS})" |