Handle files with long lines with DB 4.3 (#174547); remove older versions

Package-Manager: portage-2.1.2.3

diff --git a/app-editors/nvi/ChangeLog b/app-editors/nvi/ChangeLog
index 2c641710463aacb287ed66ac313044012564838c..49c9e7af91714d057b714161b10681e3d061db45 100644 (file)
--- a/app-editors/nvi/ChangeLog
+++ b/app-editors/nvi/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-editors/nvi
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.49 2007/03/21 16:11:58 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/ChangeLog,v 1.50 2007/04/14 09:03:56 truedfx Exp $
+
+*nvi-1.81.5-r7 (14 Apr 2007)
+
+  14 Apr 2007; Harald van Dijk <truedfx@gentoo.org>
+  files/nvi-1.81.5-db4.patch, -nvi-1.79.ebuild, -nvi-1.81.4.ebuild,
+  -nvi-1.81.5.ebuild, -nvi-1.81.5-r1.ebuild, -nvi-1.81.5-r2.ebuild,
+  -nvi-1.81.5-r6.ebuild, +nvi-1.81.5-r7.ebuild:
+  Handle files with long lines with DB 4.3 (#174547); remove older versions
 
   21 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> nvi-1.81.5-r5.ebuild:
   Stable on alpha wrt bug #170745.

diff --git a/app-editors/nvi/Manifest b/app-editors/nvi/Manifest
index 90cde788a525f4cb9cee13f3096fac4f9788df77..0e5b0a96137f79a76cd9f19255d6161284fb8044 100644 (file)
--- a/app-editors/nvi/Manifest
+++ b/app-editors/nvi/Manifest
@@ -9,10 +9,10 @@ AUX nvi-1.81.5-build.patch 5616 RMD160 94456cee460a371ba65565103e0e220d85cf6bec
 MD5 9df984935aa5f11cba1af0fa0505c2be files/nvi-1.81.5-build.patch 5616
 RMD160 94456cee460a371ba65565103e0e220d85cf6bec files/nvi-1.81.5-build.patch 5616
 SHA256 b8bffc7446047f366c831041620bbd382b0118e17c8dd4b2e8dc0b2050c99461 files/nvi-1.81.5-build.patch 5616
-AUX nvi-1.81.5-db4.patch 5746 RMD160 1454b7e0c3ef52310ef5e52a4c97dedffc01803a SHA1 c4b0e1d0c780a85c28ece38905e709d066f74e69 SHA256 f7924c19601992d55a41a503d52aef92ecfed61725c917461c7ff6890381e3fa
-MD5 61b1cde04a63468be2b3b8053859bb31 files/nvi-1.81.5-db4.patch 5746
-RMD160 1454b7e0c3ef52310ef5e52a4c97dedffc01803a files/nvi-1.81.5-db4.patch 5746
-SHA256 f7924c19601992d55a41a503d52aef92ecfed61725c917461c7ff6890381e3fa files/nvi-1.81.5-db4.patch 5746
+AUX nvi-1.81.5-db4.patch 6288 RMD160 cf2ed5ea2a3bee407c6552d939d3fa5fcc3c5c9f SHA1 29b047ff3bb88dec4f3d6e7ffaa50bcd562582fa SHA256 aa569f39677027870722856fd07c8087b563c843423484e35fba65a0545cbc2f
+MD5 96107d30c63109b16dedf1054de34c96 files/nvi-1.81.5-db4.patch 6288
+RMD160 cf2ed5ea2a3bee407c6552d939d3fa5fcc3c5c9f files/nvi-1.81.5-db4.patch 6288
+SHA256 aa569f39677027870722856fd07c8087b563c843423484e35fba65a0545cbc2f files/nvi-1.81.5-db4.patch 6288
 AUX nvi-1.81.5-gcc4.patch 4894 RMD160 2f5e790815627a522f4831f55b028e1b1bc86796 SHA1 628e8d5010d6b47f40f3b18aa62dddb5ffefb182 SHA256 04fecc2b41310059708700b52b415ec971076cf98243c78200efa03940c9bb0c
 MD5 b02176fad055feb722d0e56e9f78616c files/nvi-1.81.5-gcc4.patch 4894
 RMD160 2f5e790815627a522f4831f55b028e1b1bc86796 files/nvi-1.81.5-gcc4.patch 4894
@@ -33,26 +33,7 @@ AUX nvi-1.81.5-wide.patch 2464 RMD160 b6515008120041bd1888dc55253cb5b224c58dff S
 MD5 8cbb25c05b847c738b548ee0c60db86e files/nvi-1.81.5-wide.patch 2464
 RMD160 b6515008120041bd1888dc55253cb5b224c58dff files/nvi-1.81.5-wide.patch 2464
 SHA256 99139bb3762a800af88e38fcb826fde8a95cfd8feb803a30f42616a15bb71691 files/nvi-1.81.5-wide.patch 2464
-DIST nvi-1.79.tar.gz 1295401 RMD160 1c39d480e0d30a87fc061c3219354b50011a8621 SHA1 65b49768783372609278ecedd63caa8c1547aa2a SHA256 755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33
-DIST nvi-1.81.4.tar.gz 1514011 RMD160 7c5f9aca3b1fbce3fa71873b4827dc5685e8afeb SHA1 5be066d0989d1389da8c5ec7276edd7a5b3dc4de SHA256 3d5a1fcccd246dad4650081336767b43ca47f25dcbb4c7cc8496a4fd5d3f33f1
 DIST nvi-1.81.5.tar.gz 1628555 RMD160 d1cfd4a87250baea4832ed6cac69ed18e6880915 SHA1 a4a8ee861526f661b3461c79df9c61ce0d508f79 SHA256 4c6b5c13999d8883da85e49e6dc2d02dddc084ac24fc72102cc372c5a0b7e745
-DIST nvi_1.79-24.diff.gz 13563 RMD160 b25aa937fa685eba92dfaa53bfddb4163b2ce82e SHA1 f431eab652532c80d4cf76e0a6914fb4c0f91fd1 SHA256 2917a9a58f3595cf26e4388a8f967498948a93d6e9955841b472ffc1cfa7b508
-EBUILD nvi-1.79.ebuild 1515 RMD160 969a093bb79db2d0058e94304e0c3ec93c188ea5 SHA1 7452d8b9608a6df4d4edd34244bd024cbda41af5 SHA256 375a83db42a1bc3cd466523d5513b74e654ce5f93de05ad4e15cb08aa4083659
-MD5 9f76017246ef00c9b3172166f1d6453b nvi-1.79.ebuild 1515
-RMD160 969a093bb79db2d0058e94304e0c3ec93c188ea5 nvi-1.79.ebuild 1515
-SHA256 375a83db42a1bc3cd466523d5513b74e654ce5f93de05ad4e15cb08aa4083659 nvi-1.79.ebuild 1515
-EBUILD nvi-1.81.4.ebuild 712 RMD160 fdf48987f4ac77c2c686c771fbb4d6604d73b7e8 SHA1 dae90675706893b2e498927afb703221e8ac9228 SHA256 87054cbb0aad7a40ff9491bc783cc11742abd374b8fa741e00e6ce1293f010c7
-MD5 190aaddfae40928d909d2a261f5fa9df nvi-1.81.4.ebuild 712
-RMD160 fdf48987f4ac77c2c686c771fbb4d6604d73b7e8 nvi-1.81.4.ebuild 712
-SHA256 87054cbb0aad7a40ff9491bc783cc11742abd374b8fa741e00e6ce1293f010c7 nvi-1.81.4.ebuild 712
-EBUILD nvi-1.81.5-r1.ebuild 1024 RMD160 b3c616a0799328237bfcedde45af6f48bed0873b SHA1 c1b11ae94818580f7a7310be63b2403b8cc5766e SHA256 7a2bf511ce534b393dde42cd94778111deeeecd5e3e6414a40658d6c8257c072
-MD5 01f064c8fcf86ffd327320acf0646a7e nvi-1.81.5-r1.ebuild 1024
-RMD160 b3c616a0799328237bfcedde45af6f48bed0873b nvi-1.81.5-r1.ebuild 1024
-SHA256 7a2bf511ce534b393dde42cd94778111deeeecd5e3e6414a40658d6c8257c072 nvi-1.81.5-r1.ebuild 1024
-EBUILD nvi-1.81.5-r2.ebuild 1153 RMD160 7b867af7f2e871fb7c008c8b3c344fbfb5b93a6b SHA1 6f220ee13baef4e87628e93ff85a5296b4a291b0 SHA256 e557749c7eaf3649956d4ef708d65d2ceba33bbbea875bb12029f17d40548bb8
-MD5 f11aad7670562e59219d0c56241a3a5d nvi-1.81.5-r2.ebuild 1153
-RMD160 7b867af7f2e871fb7c008c8b3c344fbfb5b93a6b nvi-1.81.5-r2.ebuild 1153
-SHA256 e557749c7eaf3649956d4ef708d65d2ceba33bbbea875bb12029f17d40548bb8 nvi-1.81.5-r2.ebuild 1153
 EBUILD nvi-1.81.5-r3.ebuild 1752 RMD160 062d939badcbcd50c7e247701e5bf0e45f853052 SHA1 a74ef8e85a528499c4e691aefc186228a57a32c9 SHA256 97b3a7c14c5f7c179dec7c17d6afd4a102b81879aaec43d87075db573175c878
 MD5 b37d4ad3451b77cbcbc1b0552b7054bb nvi-1.81.5-r3.ebuild 1752
 RMD160 062d939badcbcd50c7e247701e5bf0e45f853052 nvi-1.81.5-r3.ebuild 1752
@@ -61,50 +42,31 @@ EBUILD nvi-1.81.5-r5.ebuild 1421 RMD160 453932bfe82a38ab8db90cc2e75829dcac4eff0f
 MD5 708c1a9961aacd3ee940354d292abfde nvi-1.81.5-r5.ebuild 1421
 RMD160 453932bfe82a38ab8db90cc2e75829dcac4eff0f nvi-1.81.5-r5.ebuild 1421
 SHA256 b3b15f462b45857a36e0967b649b6f9e56572542e681dffd065f8ba2101d817c nvi-1.81.5-r5.ebuild 1421
-EBUILD nvi-1.81.5-r6.ebuild 1504 RMD160 161420bc09599a8b87f1da4ba0c268e81e70edb5 SHA1 874a862091934fbd8229ae96748c48c157f9812a SHA256 f502db2dbe991339991455a510f077a037ca10a0c72cd311f21ea5c5fd3f464a
-MD5 c6654d98503f81d76b343e6f351d3dd6 nvi-1.81.5-r6.ebuild 1504
-RMD160 161420bc09599a8b87f1da4ba0c268e81e70edb5 nvi-1.81.5-r6.ebuild 1504
-SHA256 f502db2dbe991339991455a510f077a037ca10a0c72cd311f21ea5c5fd3f464a nvi-1.81.5-r6.ebuild 1504
-EBUILD nvi-1.81.5.ebuild 740 RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 SHA1 61b1f847cccadf7b79e09926e078a5701c93079b SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd
-MD5 097be8de63d6000e28275ce4ca15e3b5 nvi-1.81.5.ebuild 740
-RMD160 603b62f186c042dbaf123db499f02a1df4fb7f50 nvi-1.81.5.ebuild 740
-SHA256 ec13fa09cbea157fec2ed0abf9aba9d4c908410d165d15da62631c7302a5a9fd nvi-1.81.5.ebuild 740
-MISC ChangeLog 6740 RMD160 94bc34ed270d3468345eb1d721761b6c831d6702 SHA1 f2a81399fdcd14d606580c67c655a82f5b1bbbcb SHA256 5f167447b5ca2ba6264807d57f495db0031d37922018de33798fba44bcb91b77
-MD5 da2261ff3243cdbd2903207116d07321 ChangeLog 6740
-RMD160 94bc34ed270d3468345eb1d721761b6c831d6702 ChangeLog 6740
-SHA256 5f167447b5ca2ba6264807d57f495db0031d37922018de33798fba44bcb91b77 ChangeLog 6740
+EBUILD nvi-1.81.5-r7.ebuild 1504 RMD160 3474ec2bb0bb8f1fd79ac7116600e0c73f405eb7 SHA1 5128cba1410a1eeb6910b811581898cc26496a89 SHA256 b74c392adbd919930b6ca72d8ba43a4ed6d5055a07f8220455748ee1d7d04c6a
+MD5 9c1d77f351038af57683716b88edd349 nvi-1.81.5-r7.ebuild 1504
+RMD160 3474ec2bb0bb8f1fd79ac7116600e0c73f405eb7 nvi-1.81.5-r7.ebuild 1504
+SHA256 b74c392adbd919930b6ca72d8ba43a4ed6d5055a07f8220455748ee1d7d04c6a nvi-1.81.5-r7.ebuild 1504
+MISC ChangeLog 7082 RMD160 6d17490d5446ecd977556be6c0cfc9806f799f69 SHA1 5eaf322726cf6a2297c3367cb0470b02ae9cdb50 SHA256 a86f948d70022e14ae282703d3bfcc5bd40ce9f529ff28353155b228984e95e6
+MD5 25103338e311b08427b4b83c0e8030b4 ChangeLog 7082
+RMD160 6d17490d5446ecd977556be6c0cfc9806f799f69 ChangeLog 7082
+SHA256 a86f948d70022e14ae282703d3bfcc5bd40ce9f529ff28353155b228984e95e6 ChangeLog 7082
 MISC metadata.xml 229 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 SHA1 e73c39033b0ba91260f9204c2e1671d241ade7f2 SHA256 8a284b9b59c3f0170e57a942a872e0251f6c691e8b8f6076187b0c3228664d79
 MD5 d2f99257546fd32545332a3cce582cd9 metadata.xml 229
 RMD160 062ecd5166b6dc7b58f6628fbe66726d6e6e9d86 metadata.xml 229
 SHA256 8a284b9b59c3f0170e57a942a872e0251f6c691e8b8f6076187b0c3228664d79 metadata.xml 229
-MD5 2542e54c3a2e933d04b0b0ea17ac1573 files/digest-nvi-1.79 464
-RMD160 a7a5c4b67c7d4fc16f045d5eaa2b393dd1b4ab99 files/digest-nvi-1.79 464
-SHA256 6c44fc5b10eac61c5a156665b7becbb3fe0fb88e929c0d1315ab5e625c069c7c files/digest-nvi-1.79 464
-MD5 cba8e0f3f732a19636dfcac97ca8a4c8 files/digest-nvi-1.81.4 235
-RMD160 11b69d924c6a57bc72f7ce92fa8411ee4ec6ea16 files/digest-nvi-1.81.4 235
-SHA256 3604cbb61d80c7df813a46a2f30167db377258f25fce6d68673a6c971ecc594c files/digest-nvi-1.81.4 235
-MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5 235
-RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5 235
-SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5 235
-MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r1 235
-RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r1 235
-SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r1 235
-MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r2 235
-RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r2 235
-SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r2 235
 MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r3 235
 RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r3 235
 SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r3 235
 MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r5 235
 RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r5 235
 SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r5 235
-MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r6 235
-RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r6 235
-SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r6 235
+MD5 57f64625d249c4a4f9c8a946506fc896 files/digest-nvi-1.81.5-r7 235
+RMD160 ecceb3fd5a1c33ad0677f0b925835ae218353bcb files/digest-nvi-1.81.5-r7 235
+SHA256 d16de2b31513278d860c1123d3927cc84f5db81a613e570e32f931ff34303bc1 files/digest-nvi-1.81.5-r7 235
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.3 (GNU/Linux)
 
-iD8DBQFGAVlTkT4lNIS36YERAmDbAJ4hJsZOq0wnkgHhURlMBhmL0Kj5agCgwXxz
-lNjCj5sxXZWyQhYU29QGT6s=
-=KrDH
+iD8DBQFGIJk+wnQyISwouHwRArgjAJ4m2A1FQyQXVrcIhh5jYy8a81AM+gCeJp0J
+hQAV6sm60WCnzOxiXRHsfcE=
+=/uWB
 -----END PGP SIGNATURE-----

diff --git a/app-editors/nvi/files/digest-nvi-1.79 b/app-editors/nvi/files/digest-nvi-1.79
deleted file mode 100644 (file)
index 25c54f5..0000000
--- a/app-editors/nvi/files/digest-nvi-1.79
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 765e2153f5fc4f21793f2edc2647305a nvi-1.79.tar.gz 1295401
-RMD160 1c39d480e0d30a87fc061c3219354b50011a8621 nvi-1.79.tar.gz 1295401
-SHA256 755b87aa1e25c24c4c1668de5573d7d9a327b529423ce3ad9ee753bfb2296e33 nvi-1.79.tar.gz 1295401
-MD5 1c47843539d225bc4ee72cbf55e2d2eb nvi_1.79-24.diff.gz 13563
-RMD160 b25aa937fa685eba92dfaa53bfddb4163b2ce82e nvi_1.79-24.diff.gz 13563
-SHA256 2917a9a58f3595cf26e4388a8f967498948a93d6e9955841b472ffc1cfa7b508 nvi_1.79-24.diff.gz 13563

diff --git a/app-editors/nvi/files/digest-nvi-1.81.4 b/app-editors/nvi/files/digest-nvi-1.81.4
deleted file mode 100644 (file)
index 4599378..0000000
--- a/app-editors/nvi/files/digest-nvi-1.81.4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5826bdceb43cb3787ee89ef57de033f6 nvi-1.81.4.tar.gz 1514011
-RMD160 7c5f9aca3b1fbce3fa71873b4827dc5685e8afeb nvi-1.81.4.tar.gz 1514011
-SHA256 3d5a1fcccd246dad4650081336767b43ca47f25dcbb4c7cc8496a4fd5d3f33f1 nvi-1.81.4.tar.gz 1514011

diff --git a/app-editors/nvi/files/digest-nvi-1.81.5-r1 b/app-editors/nvi/files/digest-nvi-1.81.5-r1
deleted file mode 100644 (file)
index ebc8a21..0000000
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5cc674f049054f3e8f7600df8d8d5cf4 nvi-1.81.5.tar.gz 1628555
-RMD160 d1cfd4a87250baea4832ed6cac69ed18e6880915 nvi-1.81.5.tar.gz 1628555
-SHA256 4c6b5c13999d8883da85e49e6dc2d02dddc084ac24fc72102cc372c5a0b7e745 nvi-1.81.5.tar.gz 1628555

diff --git a/app-editors/nvi/files/digest-nvi-1.81.5-r2 b/app-editors/nvi/files/digest-nvi-1.81.5-r2
deleted file mode 100644 (file)
index ebc8a21..0000000
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5cc674f049054f3e8f7600df8d8d5cf4 nvi-1.81.5.tar.gz 1628555
-RMD160 d1cfd4a87250baea4832ed6cac69ed18e6880915 nvi-1.81.5.tar.gz 1628555
-SHA256 4c6b5c13999d8883da85e49e6dc2d02dddc084ac24fc72102cc372c5a0b7e745 nvi-1.81.5.tar.gz 1628555

diff --git a/app-editors/nvi/files/digest-nvi-1.81.5-r6 b/app-editors/nvi/files/digest-nvi-1.81.5-r6
deleted file mode 100644 (file)
index ebc8a21..0000000
--- a/app-editors/nvi/files/digest-nvi-1.81.5-r6
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 5cc674f049054f3e8f7600df8d8d5cf4 nvi-1.81.5.tar.gz 1628555
-RMD160 d1cfd4a87250baea4832ed6cac69ed18e6880915 nvi-1.81.5.tar.gz 1628555
-SHA256 4c6b5c13999d8883da85e49e6dc2d02dddc084ac24fc72102cc372c5a0b7e745 nvi-1.81.5.tar.gz 1628555

diff --git a/app-editors/nvi/files/digest-nvi-1.81.5 b/app-editors/nvi/files/digest-nvi-1.81.5-r7
similarity index 100%
rename from app-editors/nvi/files/digest-nvi-1.81.5
rename to app-editors/nvi/files/digest-nvi-1.81.5-r7

diff --git a/app-editors/nvi/files/nvi-1.81.5-db4.patch b/app-editors/nvi/files/nvi-1.81.5-db4.patch
index d6191cb501f22ea797e240e4d01fcac76c9de1ff..18e25d59abd2678b03bbe904e20f1d359a79d138 100644 (file)
--- a/app-editors/nvi/files/nvi-1.81.5-db4.patch
+++ b/app-editors/nvi/files/nvi-1.81.5-db4.patch
@@ -132,6 +132,29 @@
  # Check whether --enable-re or --disable-re was given.
  if test "${enable_re+set}" = set; then
    enableval="$enable_re"
+--- nvi-1.81.5/common/db.c
++++ nvi-1.81.5/common/db.c
+@@ -175,7 +175,7 @@
+       data.ulen = ep->c_blen;
+       data.flags = DB_DBT_USERMEM;
+       switch (ep->db->get(ep->db, NULL, &key, &data, 0)) {
+-      case ENOMEM:
++      case DB_BUFFER_SMALL:
+               nlen = data.size;
+               goto retry;
+         default:
+--- nvi-1.81.5/common/db.h
++++ nvi-1.81.5/common/db.h
+@@ -1,5 +1,9 @@
+ #include <db.h>
+ 
++#ifndef DB_BUFFER_SMALL
++#define DB_BUFFER_SMALL ENOMEM
++#endif
++
+ #ifdef USE_DYNAMIC_LOADING
+ #define db_create     nvi_db_create
+ #define db_env_create   nvi_db_env_create
 --- nvi-1.81.5/common/exf.c
 +++ nvi-1.81.5/common/exf.c
 @@ -282,7 +282,7 @@

diff --git a/app-editors/nvi/nvi-1.79.ebuild b/app-editors/nvi/nvi-1.79.ebuild
deleted file mode 100644 (file)
index bf43a57..0000000
--- a/app-editors/nvi/nvi-1.79.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.79.ebuild,v 1.2 2006/07/23 12:04:12 truedfx Exp $
-
-inherit eutils
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="http://www.bostic.com/vi/"
-SRC_URI="ftp://ftp.sleepycat.com/pub/${P}.tar.gz
-       mirror://debian/pool/main/n/${PN}/${P/-/_}-24.diff.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~mips ~alpha ~hppa ~amd64 ~ppc64"
-IUSE=""
-
-DEPEND=""
-RDEPEND="!app-editors/vim
-       !app-editors/gvim"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       epatch "${DISTDIR}"/${P/-/_}-24.diff.gz
-       epatch "${FILESDIR}"/${P}-build.patch
-       # Fix bug 23888
-       epatch "${FILESDIR}"/${PN}-1.81.5-tcsetattr.patch
-}
-
-src_compile() {
-       cd build
-       econf --program-prefix=n \
-               --disable-curses \
-               --disable-re \
-               || die "configure failed"
-       emake || die "make failed"
-}
-
-src_install() {
-       cd build
-       einstall || die "install failed"
-}
-
-pkg_postinst() {
-       [[ ! -e "${ROOT}"/usr/bin/vi ]] &&
-               ln -sf nvi "${ROOT}"/usr/bin/vi
-       [[ ! -e "${ROOT}"/usr/bin/ex ]] &&
-               ln -sf nvi "${ROOT}"/usr/bin/ex
-       [[ ! -e "${ROOT}"/usr/bin/view ]] &&
-               ln -sf nvi "${ROOT}"/usr/bin/view
-}
-
-pkg_postrm() {
-       [[ -L "${ROOT}"/usr/bin/vi && ! -f "${ROOT}"/usr/bin/vi ]] &&
-               rm -f "${ROOT}"/usr/bin/vi
-       [[ -L "${ROOT}"/usr/bin/ex && ! -f "${ROOT}"/usr/bin/ex ]] &&
-               rm -f "${ROOT}"/usr/bin/ex
-       [[ -L "${ROOT}"/usr/bin/view && ! -f "${ROOT}"/usr/bin/view ]] &&
-               rm -f "${ROOT}"/usr/bin/view
-}

diff --git a/app-editors/nvi/nvi-1.81.4.ebuild b/app-editors/nvi/nvi-1.81.4.ebuild
deleted file mode 100644 (file)
index 3cd46c6..0000000
--- a/app-editors/nvi/nvi-1.81.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.4.ebuild,v 1.18 2005/02/10 15:03:29 ciaranm Exp $
-
-DESCRIPTION="Vi clone"
-SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
-HOMEPAGE="http://www.bostic.com/vi/"
-
-SLOT="0"
-LICENSE="Sleepycat"
-KEYWORDS="x86 ppc sparc"
-IUSE=""
-
-DEPEND=">=sys-libs/db-3.1"
-RDEPEND="${DEPEND} !app-editors/vim"
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-       cd build.unix
-       ../dist/configure \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man \
-               --prefix=/usr \
-               --host=${CHOST} || die
-       emake || die
-}
-
-src_install() {
-       cd ${S}/build.unix
-       einstall
-}

diff --git a/app-editors/nvi/nvi-1.81.5-r1.ebuild b/app-editors/nvi/nvi-1.81.5-r1.ebuild
deleted file mode 100644 (file)
index 83a29e3..0000000
--- a/app-editors/nvi/nvi-1.81.5-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r1.ebuild,v 1.11 2005/02/10 15:03:29 ciaranm Exp $
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="http://www.bostic.com/vi/"
-SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc ~mips alpha hppa"
-IUSE=""
-
-DEPEND="virtual/libc
-       =sys-libs/db-3.2*"
-RDEPEND="${DEPEND} !app-editors/vim"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-       unpack ${P}.tar.gz
-       sed -e 's|-ldb|-ldb-3.2|g' -e 's|libdb-3|libdb-3.2|g' -i ${S}/dist/configure
-}
-
-src_compile() {
-       local myconf=""
-       export LIBS="-lpthread"
-       export ADDCPPFLAGS="-I/usr/include/db3"
-       cd build.unix
-       ../dist/configure \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man \
-               --prefix=/usr \
-               --host=${CHOST} \
-               ${myconf} || die "configure failed"
-       einfo "Doing make now"
-       emake || die "emake failed"
-}
-
-src_install() {
-       cd ${S}/build.unix
-       einstall || die
-}

diff --git a/app-editors/nvi/nvi-1.81.5-r2.ebuild b/app-editors/nvi/nvi-1.81.5-r2.ebuild
deleted file mode 100644 (file)
index b4a85ab..0000000
--- a/app-editors/nvi/nvi-1.81.5-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r2.ebuild,v 1.10 2005/02/10 15:03:29 ciaranm Exp $
-
-inherit eutils
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="http://www.bostic.com/vi/"
-SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
-
-LICENSE="Sleepycat"
-SLOT="0"
-KEYWORDS="x86 ppc sparc ~mips alpha hppa amd64 ppc64"
-IUSE=""
-
-DEPEND="virtual/libc
-       =sys-libs/db-3.2*"
-RDEPEND="${DEPEND} !app-editors/vim"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-       unpack ${A}
-       cd ${S}
-       sed -i -e 's|-ldb|-ldb-3.2|g' -e 's|libdb-3|libdb-3.2|g' dist/configure \
-               || die "sed failed"
-       # Fix bug 23888
-       epatch ${FILESDIR}/${P}-tcsetattr.patch || die "epatch failed"
-}
-
-src_compile() {
-       local myconf=""
-       export LIBS="-lpthread"
-       export ADDCPPFLAGS="-I/usr/include/db3"
-       cd build.unix
-       ../dist/configure \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man \
-               --prefix=/usr \
-               --host=${CHOST} \
-               ${myconf} || die "configure failed"
-       einfo "Doing make now"
-       emake || die "emake failed"
-}
-
-src_install() {
-       cd ${S}/build.unix
-       einstall || die
-}

diff --git a/app-editors/nvi/nvi-1.81.5-r6.ebuild b/app-editors/nvi/nvi-1.81.5-r7.ebuild
similarity index 92%
rename from app-editors/nvi/nvi-1.81.5-r6.ebuild
rename to app-editors/nvi/nvi-1.81.5-r7.ebuild
index 3f29816701d4de42b03ad813874703c7c4aca2da..c7345211d0b96328741a34390b2827528b0fd036 100644 (file)
--- a/app-editors/nvi/nvi-1.81.5-r6.ebuild
+++ b/app-editors/nvi/nvi-1.81.5-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r6.ebuild,v 1.2 2007/03/17 23:10:23 truedfx Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5-r7.ebuild,v 1.1 2007/04/14 09:03:56 truedfx Exp $
 
 inherit eutils
 

diff --git a/app-editors/nvi/nvi-1.81.5.ebuild b/app-editors/nvi/nvi-1.81.5.ebuild
deleted file mode 100644 (file)
index 7d18bb7..0000000
--- a/app-editors/nvi/nvi-1.81.5.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nvi/nvi-1.81.5.ebuild,v 1.15 2005/02/10 15:03:29 ciaranm Exp $
-
-DESCRIPTION="Vi clone"
-HOMEPAGE="http://www.bostic.com/vi/"
-SRC_URI="http://www.kotnet.org/~skimo/nvi/devel/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="Sleepycat"
-KEYWORDS="x86 ppc ~sparc hppa alpha"
-IUSE=""
-
-DEPEND="=sys-libs/db-3*
-       !>=sys-libs/db-4"
-RDEPEND="${DEPEND} !app-editors/vim"
-
-PROVIDE="virtual/editor"
-
-src_compile() {
-       cd build.unix
-       ../dist/configure \
-               --infodir=/usr/share/info \
-               --mandir=/usr/share/man \
-               --prefix=/usr \
-               --host=${CHOST} || die
-       emake || die
-}
-
-src_install() {
-       cd ${S}/build.unix
-       einstall
-}