old
authorMike Frysinger <vapier@gentoo.org>
Sat, 10 Mar 2007 22:28:22 +0000 (22:28 +0000)
committerMike Frysinger <vapier@gentoo.org>
Sat, 10 Mar 2007 22:28:22 +0000 (22:28 +0000)
Package-Manager: portage-2.1.2.2

15 files changed:
app-editors/nano/Manifest
app-editors/nano/files/digest-nano-1.3.11-r2 [deleted file]
app-editors/nano/files/digest-nano-2.0.0 [deleted file]
app-editors/nano/files/digest-nano-2.0.1 [deleted file]
app-editors/nano/files/nano-1.3.10-crash.patch [deleted file]
app-editors/nano/files/nano-1.3.10-disp.patch [deleted file]
app-editors/nano/files/nano-1.3.11-backupfix.patch [deleted file]
app-editors/nano/files/nano-1.3.11-columnfix.patch [deleted file]
app-editors/nano/files/nano-1.3.11-parse.patch [deleted file]
app-editors/nano/files/nano-1.3.11-regexfix.patch [deleted file]
app-editors/nano/files/nano-1.3.11-wrapfix.patch [deleted file]
app-editors/nano/nano-1.3.11-r2.ebuild [deleted file]
app-editors/nano/nano-2.0.0.ebuild [deleted file]
app-editors/nano/nano-2.0.1.ebuild [deleted file]
app-editors/nano/nano-2.0.3.ebuild

index 336c3710dd5c81df4f92931015a383dbd94ca9dc..47229c27445996920e509be755ad7ca4022f0249 100644 (file)
@@ -1,35 +1,10 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX gentoo.nanorc 2488 RMD160 a6f63f32b8fb0f6fce016f3eddf0ca66e63cfe1b SHA1 5aec4fb09ca0795b7f7f1f8bec1a270757edd800 SHA256 4adf339744fe2bf4f1bd1217957b5b36d0361293d0cb7a98488eeae05d4237ed
 MD5 7d50a4249c66395a87e86e932ccf6420 files/gentoo.nanorc 2488
 RMD160 a6f63f32b8fb0f6fce016f3eddf0ca66e63cfe1b files/gentoo.nanorc 2488
 SHA256 4adf339744fe2bf4f1bd1217957b5b36d0361293d0cb7a98488eeae05d4237ed files/gentoo.nanorc 2488
-AUX nano-1.3.10-crash.patch 2409 RMD160 5aa12ba776b5f1be0a906c97bcba5afccd734d36 SHA1 50a01feb7d03d174ea0bcbf3b7953276a932547f SHA256 ea4ac8594bbbe0a2e4305ceca9390dfe72fcb86cb9ac94e2a05c11b1895c3a99
-MD5 7151e8b7b8c9267b63a4f9b84148992a files/nano-1.3.10-crash.patch 2409
-RMD160 5aa12ba776b5f1be0a906c97bcba5afccd734d36 files/nano-1.3.10-crash.patch 2409
-SHA256 ea4ac8594bbbe0a2e4305ceca9390dfe72fcb86cb9ac94e2a05c11b1895c3a99 files/nano-1.3.10-crash.patch 2409
-AUX nano-1.3.10-disp.patch 659 RMD160 4d9678202f0b7ccb565c814aeece13bc6953df48 SHA1 52edc315a12befd444e722cd24b2394b237201f3 SHA256 e6ab908907cf9ecfeefda2df7b5d6fdb5f7eb577927574b5cbbdc4a00da616de
-MD5 4fd1c712601540686888c2f8e4927ab3 files/nano-1.3.10-disp.patch 659
-RMD160 4d9678202f0b7ccb565c814aeece13bc6953df48 files/nano-1.3.10-disp.patch 659
-SHA256 e6ab908907cf9ecfeefda2df7b5d6fdb5f7eb577927574b5cbbdc4a00da616de files/nano-1.3.10-disp.patch 659
-AUX nano-1.3.11-backupfix.patch 2208 RMD160 200108b959174467e7c3f3370eac2b6f80b4e457 SHA1 70dadf2e68471bc54d9250d8afed4ec569d6b767 SHA256 c513611fe51f84a7ac323bc6cac21d1ccbf22535264307ecd0b5071848db78db
-MD5 f66627eed31f8d8004da20a6062f2317 files/nano-1.3.11-backupfix.patch 2208
-RMD160 200108b959174467e7c3f3370eac2b6f80b4e457 files/nano-1.3.11-backupfix.patch 2208
-SHA256 c513611fe51f84a7ac323bc6cac21d1ccbf22535264307ecd0b5071848db78db files/nano-1.3.11-backupfix.patch 2208
-AUX nano-1.3.11-columnfix.patch 500 RMD160 6956bcee3d6288e377fae4173dad15decc71a781 SHA1 3ec6322a2afa7f5362b92063764817e86f938af6 SHA256 c9999f9d117df5df2f6dad52119733f3fb982ac13b874bf822cd3acbe448fe84
-MD5 842bf2910041e7c0f340ee79e54ed93c files/nano-1.3.11-columnfix.patch 500
-RMD160 6956bcee3d6288e377fae4173dad15decc71a781 files/nano-1.3.11-columnfix.patch 500
-SHA256 c9999f9d117df5df2f6dad52119733f3fb982ac13b874bf822cd3acbe448fe84 files/nano-1.3.11-columnfix.patch 500
-AUX nano-1.3.11-parse.patch 987 RMD160 a3894b52aed42b30c975ad50e1b543d77d56cb36 SHA1 a8badfc3d40522a9baebcef7c9ff2bcc176ec193 SHA256 a0965f6312dc345cc615a750511d239248c19f28c8fe8762d893a161a74ffded
-MD5 280fc0ba88354e8f7615372a2f78aa62 files/nano-1.3.11-parse.patch 987
-RMD160 a3894b52aed42b30c975ad50e1b543d77d56cb36 files/nano-1.3.11-parse.patch 987
-SHA256 a0965f6312dc345cc615a750511d239248c19f28c8fe8762d893a161a74ffded files/nano-1.3.11-parse.patch 987
-AUX nano-1.3.11-regexfix.patch 8774 RMD160 0a77ee53e19b0f8522e4f59d86bea97d0d9b5d42 SHA1 9233fe18ef98b2fdcf3f56f9ec9a7bc7cb24a3a7 SHA256 133d8d2f0856446b1701088aacb31dbda514eef48d417ebdff72355cebc3b398
-MD5 7f3f15cc793f57e82308ea7f1161ea1f files/nano-1.3.11-regexfix.patch 8774
-RMD160 0a77ee53e19b0f8522e4f59d86bea97d0d9b5d42 files/nano-1.3.11-regexfix.patch 8774
-SHA256 133d8d2f0856446b1701088aacb31dbda514eef48d417ebdff72355cebc3b398 files/nano-1.3.11-regexfix.patch 8774
-AUX nano-1.3.11-wrapfix.patch 921 RMD160 89035f5ec88f95d8f4072b54299a9f8adf9e1699 SHA1 1091586dd04d714a6cae87e4fa7fb27e660fd112 SHA256 b6d880501abe2726e1916e6dc5597f300996319833272234a21742be50ccd8ad
-MD5 b1cbcbc158ab430eebcd99a0875727e5 files/nano-1.3.11-wrapfix.patch 921
-RMD160 89035f5ec88f95d8f4072b54299a9f8adf9e1699 files/nano-1.3.11-wrapfix.patch 921
-SHA256 b6d880501abe2726e1916e6dc5597f300996319833272234a21742be50ccd8ad files/nano-1.3.11-wrapfix.patch 921
 AUX nano-1.3.12-fix2.patch 481 RMD160 8c86b8bed823db226e5c7492c4bcd371e3ec6619 SHA1 96eb32aad43f86d51a67e3cd218b77bf01f64d95 SHA256 4c074af7006e583c0d5a3e8f25a13dc511200cf771934f75a464669dbb73eab1
 MD5 d275b06e7853941b3f306aa080660277 files/nano-1.3.12-fix2.patch 481
 RMD160 8c86b8bed823db226e5c7492c4bcd371e3ec6619 files/nano-1.3.12-fix2.patch 481
@@ -47,40 +22,25 @@ MD5 9e3cff28391bfad1799dfa30d80ed9ca files/nanorc-gentoo 1898
 RMD160 df026420d78b71d4bd04bf15eaabbc862b2d2c89 files/nanorc-gentoo 1898
 SHA256 e4f58765d1cb6a0548a6a7c6c55873fbccdfa27cef63339f82b1ea999f4faff0 files/nanorc-gentoo 1898
 DIST nano-1.2.5.tar.gz 911938 RMD160 92d694b79588fafdedc2731c2e1240bb100950f9 SHA1 ba55942aacf9f296a910d8f73afb7446f118830d SHA256 66b25e3b0df504e2f43bc9711e1c4835ff0826f9d784c323152910b559165346
-DIST nano-1.3.11.tar.gz 1172504 RMD160 44156620181f5b968375c682b3713d869810f193 SHA1 921c88c272eaa768f33a65fa1eed95df90ba2fb9 SHA256 5f8d718bf5274be6a3a7100ae6693b5001ad15f4b505f0ba670cc28f9b9fc798
 DIST nano-1.3.12.tar.gz 1250777 RMD160 f594c4805af873718828b0aedba06c1f89946458 SHA1 70ff08220ebd00399569d64d308a2edc54505264 SHA256 f5537b8a988618fa8524b6a4b0a6950184d37db983b4521ad843b98845da571c
-DIST nano-2.0.0.tar.gz 1298469 RMD160 2de6bbc119ddc814a101b52dade3ab30309b7cf1 SHA1 300fd9633fbd77e342393ecfe0c479f3c0ea7592 SHA256 c55a0f8aa7222d47bbfdf9772b5c94e0177c2de28cb9b3f73e69b9fd74a021ae
-DIST nano-2.0.1.tar.gz 1299203 RMD160 bce343f9f31c1cc63bd4b37a66fefcaa159a11cf SHA1 9c5e26893879355e41e417de30e9473439ceaf5d SHA256 6af1a2081c6303008163719b9012b403b461fb07991b5603ac28a820494741e2
 DIST nano-2.0.2.tar.gz 1302412 RMD160 56355e7ef646cbb924ca84985798ed4746b9758c SHA1 6113236ec5382942e33535f0f0ae448915343607 SHA256 884af214d4b4bf2cb064806070e746eb0f8302e7942324496f5bb93a9a06af90
 DIST nano-2.0.3.tar.gz 1313437 RMD160 8325e70c957ef84cae7a47ac78d893095e5128d2 SHA1 5012a57c3aeabd6f798f5c767970ba1d260854c4 SHA256 8c29569d0e1eb29cbd3580313b9796c4e6fd0830071ec885021f22be635f5297
 EBUILD nano-1.2.5.ebuild 1433 RMD160 c8541e986213795e8b120e06da2e615ad687cfb7 SHA1 5493f48d4f56611e7726ec8c246d14ccaa9e2321 SHA256 c796f6fb8005d668cf342ba101c7774b046dcdc6abc363c45c3cefd966dadf09
 MD5 ce5dd202213b8c487dbbaa5029c97710 nano-1.2.5.ebuild 1433
 RMD160 c8541e986213795e8b120e06da2e615ad687cfb7 nano-1.2.5.ebuild 1433
 SHA256 c796f6fb8005d668cf342ba101c7774b046dcdc6abc363c45c3cefd966dadf09 nano-1.2.5.ebuild 1433
-EBUILD nano-1.3.11-r2.ebuild 2153 RMD160 a11e66251e3258c7c14f879be6e31cb30873b23a SHA1 d3829730747a472663e3a0e8ecf3fa7b999f9532 SHA256 85bc5e60024e80a3cbf7d05dfc9d0d4a2a8493e0c6d35e26293186250679f42a
-MD5 12d4165a712e7f1abe1b94895e64144a nano-1.3.11-r2.ebuild 2153
-RMD160 a11e66251e3258c7c14f879be6e31cb30873b23a nano-1.3.11-r2.ebuild 2153
-SHA256 85bc5e60024e80a3cbf7d05dfc9d0d4a2a8493e0c6d35e26293186250679f42a nano-1.3.11-r2.ebuild 2153
 EBUILD nano-1.3.12-r1.ebuild 2060 RMD160 b1db971bf2bbb8057266b0ab1d35767803626a97 SHA1 ffd61606b5b3f5acc11e296547bafa15078dc43e SHA256 54507ae412b65997cb260776463c72510f877808f08ec93b464cbb62d65a5d33
 MD5 32a55aa38f03d56b2e2d53f2494d1657 nano-1.3.12-r1.ebuild 2060
 RMD160 b1db971bf2bbb8057266b0ab1d35767803626a97 nano-1.3.12-r1.ebuild 2060
 SHA256 54507ae412b65997cb260776463c72510f877808f08ec93b464cbb62d65a5d33 nano-1.3.12-r1.ebuild 2060
-EBUILD nano-2.0.0.ebuild 1938 RMD160 2cb13973143d6e7735917c16783a77168c49debb SHA1 03eece8f3ba263e4e2b3e505b84a631a3008e423 SHA256 e41f8131ec7685ade60e72fa442c5d37c383a163711d00520dd9b4606923e93b
-MD5 085ed3619b0ad0c679235dd510042b74 nano-2.0.0.ebuild 1938
-RMD160 2cb13973143d6e7735917c16783a77168c49debb nano-2.0.0.ebuild 1938
-SHA256 e41f8131ec7685ade60e72fa442c5d37c383a163711d00520dd9b4606923e93b nano-2.0.0.ebuild 1938
-EBUILD nano-2.0.1.ebuild 1926 RMD160 8b65ccb04e6c479410a2dc2e5c016bd44849f763 SHA1 3e8acc384497e543b21f2817e3c9d4916e71397a SHA256 7766212a407b8abe9f4848f128e2b2c75518346d21a3435e5be83a6e01921f06
-MD5 7ed7dc52f79659a726f92ea4e8b1e026 nano-2.0.1.ebuild 1926
-RMD160 8b65ccb04e6c479410a2dc2e5c016bd44849f763 nano-2.0.1.ebuild 1926
-SHA256 7766212a407b8abe9f4848f128e2b2c75518346d21a3435e5be83a6e01921f06 nano-2.0.1.ebuild 1926
 EBUILD nano-2.0.2.ebuild 1926 RMD160 f53072cf876fed0ca08de4b40f25a998e0f4284d SHA1 4cce0438d941a0e8f42ef39ab71d002c1ee98e8f SHA256 a055858353ce27137f4fb72679dd79c326e27cc9e7eacad3ae631175668ace18
 MD5 7457300b14bd177d3f632417d1a3bc04 nano-2.0.2.ebuild 1926
 RMD160 f53072cf876fed0ca08de4b40f25a998e0f4284d nano-2.0.2.ebuild 1926
 SHA256 a055858353ce27137f4fb72679dd79c326e27cc9e7eacad3ae631175668ace18 nano-2.0.2.ebuild 1926
-EBUILD nano-2.0.3.ebuild 1938 RMD160 e436feb241eb3617fc91c9dab355f92c4abb1040 SHA1 0ad73c935409992ff1bc5a75f41d22e5b0ebc36c SHA256 28bb8b93e81239d342ec2f26f383072c04de5ef93896c5422a8ef2b63a160ae1
-MD5 7045602ff5a291d18d4b184023da6f46 nano-2.0.3.ebuild 1938
-RMD160 e436feb241eb3617fc91c9dab355f92c4abb1040 nano-2.0.3.ebuild 1938
-SHA256 28bb8b93e81239d342ec2f26f383072c04de5ef93896c5422a8ef2b63a160ae1 nano-2.0.3.ebuild 1938
+EBUILD nano-2.0.3.ebuild 1974 RMD160 b784cf50a8133a4b0f979a9db9ae2d83a5111ba3 SHA1 d96b87241c16f8b53bd35ab0b9e6b20eea7b2a33 SHA256 c076efcdf3d97da09775b1b55153dec770e93602f02e2a2870694a36bf3f8194
+MD5 c22758a258a7cf33884851fc53eeff6b nano-2.0.3.ebuild 1974
+RMD160 b784cf50a8133a4b0f979a9db9ae2d83a5111ba3 nano-2.0.3.ebuild 1974
+SHA256 c076efcdf3d97da09775b1b55153dec770e93602f02e2a2870694a36bf3f8194 nano-2.0.3.ebuild 1974
 MISC ChangeLog 17276 RMD160 89fd4d5e7838e94937c4092def9ee0397d934d0c SHA1 db495477a0ac882cb6c5f12d7197df0b7b3e517d SHA256 afd39b623b5091e8edf0523f949d945c9201e71563ea6a4b7bd46274c01a37e7
 MD5 e39e7067800f986ed2646934a5300ec8 ChangeLog 17276
 RMD160 89fd4d5e7838e94937c4092def9ee0397d934d0c ChangeLog 17276
@@ -92,21 +52,19 @@ SHA256 6275a0f662182b053119dda8ce016bf860aa75813c179a951b253fb9f5caef6b metadata
 MD5 a5e57002cd33e3fcdaac5f503d8d8039 files/digest-nano-1.2.5 232
 RMD160 26fe8d36f1a7f3c75bdc726cb5f106a03abc9ced files/digest-nano-1.2.5 232
 SHA256 b1d40b6cca5ffcac0553a5a0228995fa36cac294c05cbd88efc8c283c3c9590d files/digest-nano-1.2.5 232
-MD5 3d33eea38d45a28d1124745478dfab1b files/digest-nano-1.3.11-r2 238
-RMD160 7447b52eecd4b4eb74ebfebeaa33af9d045cca33 files/digest-nano-1.3.11-r2 238
-SHA256 52f1a86cfaac6443a84afd7bd023597650db74e61389483bcb57dbbd7e1e8bf3 files/digest-nano-1.3.11-r2 238
 MD5 4baa4a2c2e0b0ad343cf3f648184d5ad files/digest-nano-1.3.12-r1 238
 RMD160 06dc9bd947bc9f3fe88c0b5346ec3e5493aa5dfb files/digest-nano-1.3.12-r1 238
 SHA256 ea6e29364ff13378968ac433b1142ceabbc525a0424760b66fa1d8524bbd17cf files/digest-nano-1.3.12-r1 238
-MD5 9cd7a88817181de7df2a9a4e90a9a0fa files/digest-nano-2.0.0 235
-RMD160 d7a8e92f1eb4bb24da6a0684f7911acf37b9e79d files/digest-nano-2.0.0 235
-SHA256 01fc80911b88ac78e48561b171e72bf7b19fa9671e2b8a14cdeb541960073729 files/digest-nano-2.0.0 235
-MD5 6c276806ce2144b60cc6cc294131cdc8 files/digest-nano-2.0.1 235
-RMD160 b0ed1e76570186eb59b1e968ba2d6385663f1f76 files/digest-nano-2.0.1 235
-SHA256 0e8da9149ca6368913f202fc1bf78df81bb31144680612c27d99954a272eb173 files/digest-nano-2.0.1 235
 MD5 870fa9c8dab3d026cc09b9a7a01d2fbc files/digest-nano-2.0.2 235
 RMD160 7923efb8c2e2114de9ece81b61c3dc5e539a600d files/digest-nano-2.0.2 235
 SHA256 4fc983390415c2c813c1a32fad3184c13cfdce7e2388d83d7e7bdd4858654d6a files/digest-nano-2.0.2 235
 MD5 8b7d7ca7231200fb164f0ff46e660f2d files/digest-nano-2.0.3 235
 RMD160 ee2c975d279b33ffb6abf1ce9bc51350e0a8a813 files/digest-nano-2.0.3 235
 SHA256 b981082a0e4a219ec81b1b8b175edc3e73812eedfd557f58ffcd309365b6731d files/digest-nano-2.0.3 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.2 (GNU/Linux)
+
+iD8DBQFF8zER8bi6rjpTunYRAp92AJ9H9f2LawwE9KlP+4tAotzWwYmB3wCgyrJ9
+z6ssq66Yq+xZqm2VtohSk3o=
+=ZAX7
+-----END PGP SIGNATURE-----
diff --git a/app-editors/nano/files/digest-nano-1.3.11-r2 b/app-editors/nano/files/digest-nano-1.3.11-r2
deleted file mode 100644 (file)
index 4134e43..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 ad6c2270fd674065ef994a58d3a8a7b7 nano-1.3.11.tar.gz 1172504
-RMD160 44156620181f5b968375c682b3713d869810f193 nano-1.3.11.tar.gz 1172504
-SHA256 5f8d718bf5274be6a3a7100ae6693b5001ad15f4b505f0ba670cc28f9b9fc798 nano-1.3.11.tar.gz 1172504
diff --git a/app-editors/nano/files/digest-nano-2.0.0 b/app-editors/nano/files/digest-nano-2.0.0
deleted file mode 100644 (file)
index 460e0f9..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 d1a8ac92b1985217f405a4c54562d8f3 nano-2.0.0.tar.gz 1298469
-RMD160 2de6bbc119ddc814a101b52dade3ab30309b7cf1 nano-2.0.0.tar.gz 1298469
-SHA256 c55a0f8aa7222d47bbfdf9772b5c94e0177c2de28cb9b3f73e69b9fd74a021ae nano-2.0.0.tar.gz 1298469
diff --git a/app-editors/nano/files/digest-nano-2.0.1 b/app-editors/nano/files/digest-nano-2.0.1
deleted file mode 100644 (file)
index d2664d8..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 8abe33be6816ad9acd17391806b42d92 nano-2.0.1.tar.gz 1299203
-RMD160 bce343f9f31c1cc63bd4b37a66fefcaa159a11cf nano-2.0.1.tar.gz 1299203
-SHA256 6af1a2081c6303008163719b9012b403b461fb07991b5603ac28a820494741e2 nano-2.0.1.tar.gz 1299203
diff --git a/app-editors/nano/files/nano-1.3.10-crash.patch b/app-editors/nano/files/nano-1.3.10-crash.patch
deleted file mode 100644 (file)
index f0fdd85..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-http://bugs.gentoo.org/111564
-http://lists.gnu.org/archive/html/nano-devel/2006-02/msg00006.html
-
-diff -ur nano-1.3.7/src/winio.c nano-1.3.7-fixed/src/winio.c
---- nano-1.3.7/src/winio.c     2005-04-10 23:51:22.000000000 -0400
-+++ nano-1.3.7-fixed/src/winio.c       2006-02-02 23:47:01.000000000 -0500
-@@ -2253,10 +2253,22 @@
-     assert(column <= start_col);
--    /* Allocate enough space for the entire line. */
--    alloc_len = (mb_cur_max() * (COLS + 1));
-+    /* Make sure there's enough room for the initial character, whether
-+     * it's a multibyte control character, a non-control multibyte
-+     * character, a tab character, or a null terminator.  Rationale:
-+     *
-+     * multibyte control character followed by a null terminator:
-+     *     1 byte ('^') + mb_cur_max() bytes + 1 byte ('\0')
-+     * multibyte non-control character followed by a null terminator:
-+     *     mb_cur_max() bytes + 1 byte ('\0')
-+     * tab character followed by a null terminator:
-+     *     mb_cur_max() bytes + (tabsize - 1) bytes + 1 byte ('\0')
-+     *
-+     * Since tabsize has a minimum value of 1, it can substitute for 1
-+     * byte above. */
-+    alloc_len = (mb_cur_max() + tabsize + 1) * 128;
-+    converted = charalloc(alloc_len);
--    converted = charalloc(alloc_len + 1);
-     index = 0;
-     if (buf[start_index] != '\t' && (column < start_col || (dollars &&
-@@ -2295,9 +2306,17 @@
- #endif
-     }
--    while (index < alloc_len - 1 && buf[start_index] != '\0') {
-+    while (buf[start_index] != '\0') {
-       buf_mb_len = parse_mbchar(buf + start_index, buf_mb, NULL);
-+      /* Make sure there's enough room for the next character, whether
-+       * it's a multibyte control character, a non-control multibyte
-+       * character, a tab character, or a null terminator. */
-+      if (index + mb_cur_max() + tabsize + 1 >= alloc_len - 1) {
-+          alloc_len += (mb_cur_max() + tabsize + 1) * 128;
-+          converted = charealloc(converted, alloc_len);
-+      }
-+
-       /* If buf contains a tab character, interpret it. */
-       if (*buf_mb == '\t') {
- #if !defined(NANO_SMALL) && defined(ENABLE_NANORC)
-@@ -2379,8 +2398,10 @@
-       start_index += buf_mb_len;
-     }
--    if (index < alloc_len - 1)
--      converted[index] = '\0';
-+    assert(alloc_len >= index + 1);
-+
-+    /* Null terminate converted. */
-+    converted[index] = '\0';
-     /* Make sure converted takes up no more than len columns. */
-     index = actual_x(converted, len);
diff --git a/app-editors/nano/files/nano-1.3.10-disp.patch b/app-editors/nano/files/nano-1.3.10-disp.patch
deleted file mode 100644 (file)
index 01201c3..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-http://lists.gnu.org/archive/html/nano-devel/2006-01/msg00000.html
-http://lists.gnu.org/archive/html/nano-devel/2006-01/msg00001.html
-
-diff -ur nano-1.3.10/src/winio.c nano-1.3.10-fixed/src/winio.c
---- nano-1.3.10/src/winio.c    2005-12-08 02:24:54.000000000 -0500
-+++ nano-1.3.10-fixed/src/winio.c      2006-01-10 03:10:14.000000000 -0500
-@@ -2772,6 +2772,11 @@
-       openfile->edittop = old_edittop;
-+      /* Update old_current if we're not on the first page and/or
-+       * we're not on the same page as before. */
-+      if (do_redraw)
-+          update_line(old_current, 0);
-+
-       /* Scroll the edit window up or down until edittop is in range
-        * of current. */
-       if (nlines < 0)
diff --git a/app-editors/nano/files/nano-1.3.11-backupfix.patch b/app-editors/nano/files/nano-1.3.11-backupfix.patch
deleted file mode 100644 (file)
index 32dd74f..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-diff -ur nano-1.3.11/src/files.c nano-1.3.11-fixed/src/files.c
---- nano-1.3.11/src/files.c    2006-02-24 14:38:20.000000000 -0500
-+++ nano-1.3.11-fixed/src/files.c      2006-05-18 08:59:47.000000000 -0400
-@@ -1336,7 +1336,10 @@
-               statusbar(_("Error reading %s: %s"), realname,
-                       strerror(errno));
-               beep();
--              goto cleanup_and_exit;
-+              /* If we can't read from the original file, go on, since
-+               * only saving the original file is better than saving
-+               * nothing. */
-+              goto skip_backup;
-           }
-       }
-@@ -1375,8 +1378,10 @@
-                   _("Too many backup files?"));
-               free(backuptemp);
-               free(backupname);
--              fclose(f);
--              goto cleanup_and_exit;
-+              /* If we can't write to the backup, go on, since only
-+               * saving the original file is better than saving
-+               * nothing. */
-+              goto skip_backup;
-           } else {
-               free(backupname);
-               backupname = backuptemp;
-@@ -1398,8 +1403,9 @@
-           free(backupname);
-           if (backup_file != NULL)
-               fclose(backup_file);
--          fclose(f);
--          goto cleanup_and_exit;
-+          /* If we can't write to the backup, go on, since only saving
-+           * the original file is better than saving nothing. */
-+          goto skip_backup;
-       }
- #ifdef DEBUG
-@@ -1414,7 +1420,6 @@
-               openfile->current_stat->st_uid,
-               openfile->current_stat->st_gid) == -1 ||
-               utime(backupname, &filetime) == -1) {
--          free(backupname);
-           if (copy_status == -1) {
-               statusbar(_("Error reading %s: %s"), realname,
-                       strerror(errno));
-@@ -1422,11 +1427,15 @@
-           } else
-               statusbar(_("Error writing %s: %s"), backupname,
-                       strerror(errno));
--          goto cleanup_and_exit;
-+          /* If we can't read from or write to the backup, go on,
-+           * since only saving the original file is better than saving
-+           * nothing. */
-       }
-       free(backupname);
-     }
-+
-+  skip_backup:
- #endif /* !NANO_TINY */
-     /* If NOFOLLOW_SYMLINKS is set and the file is a link, we aren't
-@@ -1454,6 +1463,17 @@
-       int fd_source;
-       FILE *f_source = NULL;
-+      if (f == NULL) {
-+          f = fopen(realname, "rb");
-+
-+          if (f == NULL) {
-+              statusbar(_("Error reading %s: %s"), realname,
-+                      strerror(errno));
-+              beep();
-+              goto cleanup_and_exit;
-+          }
-+      }
-+
-       tempname = safe_tempfile(&f);
-       if (tempname == NULL) {
diff --git a/app-editors/nano/files/nano-1.3.11-columnfix.patch b/app-editors/nano/files/nano-1.3.11-columnfix.patch
deleted file mode 100644 (file)
index ef49780..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -ur nano-1.3.11/src/winio.c nano-1.3.11-fixed/src/winio.c
---- nano-1.3.11/src/winio.c    2006-03-29 20:18:29.000000000 -0500
-+++ nano-1.3.11-fixed/src/winio.c      2006-05-19 14:08:24.000000000 -0400
-@@ -1857,7 +1857,12 @@
-           }
-       }
- #ifdef ENABLE_UTF8
--      else if (ISSET(USE_UTF8) && mbwidth(buf_mb) > 1) {
-+      else if (ISSET(USE_UTF8) && mbwidth(buf_mb) == 2) {
-+          if (column >= start_col) {
-+              converted[index++] = ' ';
-+              start_col++;
-+          }
-+
-           converted[index++] = ' ';
-           start_col++;
diff --git a/app-editors/nano/files/nano-1.3.11-parse.patch b/app-editors/nano/files/nano-1.3.11-parse.patch
deleted file mode 100644 (file)
index 0a70335..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -ur nano-1.3.11/src/rcfile.c nano-1.3.11-fixed/src/rcfile.c
---- nano-1.3.11/src/rcfile.c   2006-01-06 17:04:38.000000000 -0500
-+++ nano-1.3.11-fixed/src/rcfile.c     2006-04-15 12:43:25.000000000 -0400
-@@ -275,7 +275,7 @@
- void parse_syntax(char *ptr)
- {
-     const char *fileregptr = NULL, *nameptr = NULL;
--    const syntaxtype *tmpsyntax;
-+    syntaxtype *tmpsyntax;
-     exttype *endext = NULL;
-       /* The end of the extensions list for this syntax. */
-@@ -300,11 +300,16 @@
-     if (ptr == NULL)
-       return;
-+    /* Search for a duplicate syntax name.  If we find one, free it, so
-+     * that we always use the last syntax with a given name. */
-     for (tmpsyntax = syntaxes; tmpsyntax != NULL;
-       tmpsyntax = tmpsyntax->next) {
-       if (strcmp(nameptr, tmpsyntax->desc) == 0) {
--          rcfile_error(N_("Duplicate syntax name %s"), nameptr);
--          return;
-+          syntaxtype *prev_syntax = tmpsyntax;
-+
-+          tmpsyntax = tmpsyntax->next;
-+          free(prev_syntax);
-+          break;
-       }
-     }
diff --git a/app-editors/nano/files/nano-1.3.11-regexfix.patch b/app-editors/nano/files/nano-1.3.11-regexfix.patch
deleted file mode 100644 (file)
index 4a4f6d4..0000000
+++ /dev/null
@@ -1,253 +0,0 @@
-diff -ur nano-1.3.11/src/winio.c nano-1.3.11-fixed/src/winio.c
---- nano-1.3.11/src/winio.c    2006-03-29 20:18:29.000000000 -0500
-+++ nano-1.3.11-fixed/src/winio.c      2006-05-08 12:38:16.000000000 -0400
-@@ -2383,10 +2383,8 @@
-                               _("Refusing zero-length regex match"));
-                   } else if (startmatch.rm_so < endpos &&
-                       startmatch.rm_eo > startpos) {
--                      if (startmatch.rm_so <= startpos)
--                          x_start = 0;
--                      else
--                          x_start = strnlenpt(fileptr->data,
-+                      x_start = (startmatch.rm_so <= startpos) ? 0 :
-+                              strnlenpt(fileptr->data,
-                               startmatch.rm_so) - start;
-                       index = actual_x(converted, x_start);
-@@ -2430,129 +2428,135 @@
-                       goto step_two;
-                   start_line = start_line->prev;
-               }
--              /* No start found, so skip to the next step. */
--              if (start_line == NULL)
--                  goto step_two;
--              /* Now start_line is the first line before fileptr
--               * containing a start match.  Is there a start on this
--               * line not followed by an end on this line? */
--              start_col = 0;
--              while (TRUE) {
--                  start_col += startmatch.rm_so;
--                  startmatch.rm_eo -= startmatch.rm_so;
--                  if (regexec(tmpcolor->end, start_line->data +
--                      start_col + startmatch.rm_eo, 0, NULL,
--                      (start_col + startmatch.rm_eo == 0) ? 0 :
--                      REG_NOTBOL) == REG_NOMATCH)
--                      /* No end found after this start. */
--                      break;
--                  start_col++;
--                  if (regexec(tmpcolor->start, start_line->data +
--                      start_col, 1, &startmatch,
--                      REG_NOTBOL) == REG_NOMATCH)
--                      /* No later start on this line. */
-+              if (startmatch.rm_so == startmatch.rm_eo) {
-+                  startmatch.rm_eo++;
-+                  statusbar(_("Refusing zero-length regex match"));
-+              } else {
-+                  /* No start found, so skip to the next step. */
-+                  if (start_line == NULL)
-                       goto step_two;
--              }
--              /* Indeed, there is a start not followed on this line by
--               * an end. */
-+                  /* Now start_line is the first line before fileptr
-+                   * containing a start match.  Is there a start on
-+                   * this line not followed by an end on this line? */
-+                  start_col = 0;
-+                  while (TRUE) {
-+                      start_col += startmatch.rm_so;
-+                      startmatch.rm_eo -= startmatch.rm_so;
-+                      if (regexec(tmpcolor->end, start_line->data +
-+                              start_col + startmatch.rm_eo, 0, NULL,
-+                              (start_col + startmatch.rm_eo == 0) ?
-+                              0 : REG_NOTBOL) == REG_NOMATCH)
-+                          /* No end found after this start. */
-+                          break;
-+                      start_col++;
-+                      if (regexec(tmpcolor->start, start_line->data +
-+                              start_col, 1, &startmatch,
-+                              REG_NOTBOL) == REG_NOMATCH)
-+                          /* No later start on this line. */
-+                          goto step_two;
-+                  }
-+                  /* Indeed, there is a start not followed on this
-+                   * line by an end. */
--              /* We have already checked that there is no end before
--               * fileptr and after the start.  Is there an end after
--               * the start at all?  We don't paint unterminated
--               * starts. */
--              end_line = fileptr;
--              while (end_line != NULL && regexec(tmpcolor->end,
-+                  /* We have already checked that there is no end
-+                   * before fileptr and after the start.  Is there an
-+                   * end after the start at all?  We don't paint
-+                   * unterminated starts. */
-+                  end_line = fileptr;
-+                  while (end_line != NULL && regexec(tmpcolor->end,
-                       end_line->data, 1, &endmatch, 0) == REG_NOMATCH)
--                  end_line = end_line->next;
-+                      end_line = end_line->next;
--              /* No end found, or it is too early. */
--              if (end_line == NULL || (end_line == fileptr &&
-+                  /* No end found, or it is too early. */
-+                  if (end_line == NULL || (end_line == fileptr &&
-                       endmatch.rm_eo <= startpos))
--                  goto step_two;
-+                      goto step_two;
--              /* Now paint the start of fileptr. */
--              if (end_line != fileptr)
--                  /* If the start of fileptr is on a different line
--                   * from the end, paintlen is -1, meaning that
--                   * everything on the line gets painted. */
--                  paintlen = -1;
--              else
--                  /* Otherwise, paintlen is the expanded location of
--                   * the end of the match minus the expanded location
--                   * of the beginning of the page. */
--                  paintlen = actual_x(converted,
--                      strnlenpt(fileptr->data, endmatch.rm_eo) -
--                      start);
-+                  /* Now paint the start of fileptr. */
-+                  if (end_line != fileptr)
-+                      /* If the start of fileptr is on a different
-+                       * line from the end, paintlen is -1, meaning
-+                       * that everything on the line gets painted. */
-+                      paintlen = -1;
-+                  else
-+                      /* Otherwise, paintlen is the expanded location
-+                       * of the end of the match minus the expanded
-+                       * location of the beginning of the page. */
-+                      paintlen = actual_x(converted,
-+                              strnlenpt(fileptr->data,
-+                              endmatch.rm_eo) - start);
--              mvwaddnstr(edit, line, 0, converted, paintlen);
-+                  mvwaddnstr(edit, line, 0, converted, paintlen);
-   step_two:
--              /* Second step, we look for starts on this line. */
--              start_col = 0;
-+                  /* Second step, we look for starts on this line. */
-+                  start_col = 0;
--              while (start_col < endpos) {
--                  if (regexec(tmpcolor->start, fileptr->data +
--                      start_col, 1, &startmatch, (start_col == 0) ?
--                      0 : REG_NOTBOL) == REG_NOMATCH || start_col +
--                      startmatch.rm_so >= endpos)
--                      /* No more starts on this line. */
--                      break;
--                  /* Translate the match to be relative to the
--                   * beginning of the line. */
--                  startmatch.rm_so += start_col;
--                  startmatch.rm_eo += start_col;
-+                  while (start_col < endpos) {
-+                      if (regexec(tmpcolor->start, fileptr->data +
-+                              start_col, 1, &startmatch, (start_col ==
-+                              0) ? 0 : REG_NOTBOL) == REG_NOMATCH ||
-+                              start_col + startmatch.rm_so >= endpos)
-+                          /* No more starts on this line. */
-+                          break;
-+                      /* Translate the match to be relative to the
-+                       * beginning of the line. */
-+                      startmatch.rm_so += start_col;
-+                      startmatch.rm_eo += start_col;
--                  if (startmatch.rm_so <= startpos)
--                      x_start = 0;
--                  else
--                      x_start = strnlenpt(fileptr->data,
-+                      x_start = (startmatch.rm_so <= startpos) ? 0 :
-+                              strnlenpt(fileptr->data,
-                               startmatch.rm_so) - start;
--                  index = actual_x(converted, x_start);
-+                      index = actual_x(converted, x_start);
--                  if (regexec(tmpcolor->end, fileptr->data +
--                      startmatch.rm_eo, 1, &endmatch,
--                      (startmatch.rm_eo == 0) ? 0 : REG_NOTBOL) ==
--                      0) {
--                      /* Translate the end match to be relative to the
--                       * beginning of the line. */
--                      endmatch.rm_so += startmatch.rm_eo;
--                      endmatch.rm_eo += startmatch.rm_eo;
--                      /* There is an end on this line.  But does it
--                       * appear on this page, and is the match more
--                       * than zero characters long? */
--                      if (endmatch.rm_eo > startpos &&
-+                      if (regexec(tmpcolor->end, fileptr->data +
-+                              startmatch.rm_eo, 1, &endmatch,
-+                              (startmatch.rm_eo == 0) ? 0 :
-+                              REG_NOTBOL) == 0) {
-+                          /* Translate the end match to be relative to
-+                           * the beginning of the line. */
-+                          endmatch.rm_so += startmatch.rm_eo;
-+                          endmatch.rm_eo += startmatch.rm_eo;
-+                          /* There is an end on this line.  But does
-+                           * it appear on this page, and is the match
-+                           * more than zero characters long? */
-+                          if (endmatch.rm_eo > startpos &&
-                               endmatch.rm_eo > startmatch.rm_so) {
--                          paintlen = actual_x(converted + index,
--                              strnlenpt(fileptr->data,
--                              endmatch.rm_eo) - start - x_start);
--
--                          assert(0 <= x_start && x_start < COLS);
-+                              paintlen = actual_x(converted + index,
-+                                      strnlenpt(fileptr->data,
-+                                      endmatch.rm_eo) - start -
-+                                      x_start);
-+
-+                              assert(0 <= x_start && x_start < COLS);
-+
-+                              mvwaddnstr(edit, line, x_start,
-+                                      converted + index, paintlen);
-+                          }
-+                      } else {
-+                          /* There is no end on this line.  But we
-+                           * haven't yet looked for one on later
-+                           * lines. */
-+                          end_line = fileptr->next;
--                          mvwaddnstr(edit, line, x_start, converted +
--                              index, paintlen);
--                      }
--                  } else {
--                      /* There is no end on this line.  But we haven't
--                       * yet looked for one on later lines. */
--                      end_line = fileptr->next;
--
--                      while (end_line != NULL &&
-+                          while (end_line != NULL &&
-                               regexec(tmpcolor->end, end_line->data,
-                               0, NULL, 0) == REG_NOMATCH)
--                          end_line = end_line->next;
-+                              end_line = end_line->next;
--                      if (end_line != NULL) {
--                          assert(0 <= x_start && x_start < COLS);
-+                          if (end_line != NULL) {
-+                              assert(0 <= x_start && x_start < COLS);
--                          mvwaddnstr(edit, line, x_start, converted +
--                              index, -1);
--                          /* We painted to the end of the line, so
--                           * don't bother checking any more starts. */
--                          break;
-+                              mvwaddnstr(edit, line, x_start,
-+                                      converted + index, -1);
-+                              /* We painted to the end of the line, so
-+                               * don't bother checking any more
-+                               * starts. */
-+                              break;
-+                          }
-                       }
-+                      start_col = startmatch.rm_so + 1;
-                   }
--                  start_col = startmatch.rm_so + 1;
-               }
-           }
diff --git a/app-editors/nano/files/nano-1.3.11-wrapfix.patch b/app-editors/nano/files/nano-1.3.11-wrapfix.patch
deleted file mode 100644 (file)
index 509d1af..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur nano-1.3.11/src/text.c nano-1.3.11-fixed/src/text.c
---- nano-1.3.11/src/text.c     2006-02-18 16:32:29.000000000 -0500
-+++ nano-1.3.11-fixed/src/text.c       2006-05-18 13:51:50.000000000 -0400
-@@ -607,14 +607,14 @@
-        * found with short enough display width.  */
-     ssize_t cur_loc = 0;
-       /* Current index in line. */
-+    size_t cur_pos = 0;
-+      /* Current column position in line. */
-     int line_len;
-     assert(line != NULL);
--    while (*line != '\0' && goal >= 0) {
--      size_t pos = 0;
--
--      line_len = parse_mbchar(line, NULL, &pos);
-+    while (*line != '\0' && goal >= cur_pos) {
-+      line_len = parse_mbchar(line, NULL, &cur_pos);
-       if (is_blank_mbchar(line)
- #ifndef DISABLE_HELP
-@@ -629,12 +629,11 @@
- #endif
-       }
--      goal -= pos;
-       line += line_len;
-       cur_loc += line_len;
-     }
--    if (goal >= 0)
-+    if (goal >= cur_pos)
-       /* In fact, the whole line displays shorter than goal. */
-       return cur_loc;
diff --git a/app-editors/nano/nano-1.3.11-r2.ebuild b/app-editors/nano/nano-1.3.11-r2.ebuild
deleted file mode 100644 (file)
index aa8c1aa..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-1.3.11-r2.ebuild,v 1.12 2007/01/24 02:43:53 genone Exp $
-
-#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
-#ECVS_MODULE="nano"
-#ECVS_AUTH="pserver"
-#ECVS_USER="anonymous"
-#inherit cvs
-inherit eutils
-
-MY_P=${PN}-${PV/_}
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-SRC_URI="http://www.nano-editor.org/dist/v1.3/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="build debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2
-       nls? ( sys-devel/gettext )
-       !ncurses? ( slang? ( sys-libs/slang ) )"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-       # fixes from upstream, see mailing list
-       epatch "${FILESDIR}"/${P}-backupfix.patch
-       epatch "${FILESDIR}"/${P}-regexfix.patch
-       epatch "${FILESDIR}"/${P}-columnfix.patch
-       epatch "${FILESDIR}"/${P}-wrapfix.patch
-       epatch "${FILESDIR}"/${P}-parse.patch
-}
-
-src_compile() {
-       if [[ ! -e configure ]] ; then
-               ./autogen.sh || die "autogen failed"
-       fi
-
-       local myconf=""
-       use ncurses \
-               && myconf="--without-slang" \
-               || myconf="${myconf} $(use_with slang)"
-
-       econf \
-               --bindir=/bin \
-               --enable-color \
-               --enable-multibuffer \
-               --enable-nanorc \
-               --disable-wrapping-as-root \
-               $(use_enable spell) \
-               $(use_enable justify) \
-               $(use_enable debug) \
-               $(use_enable nls) \
-               $(use_enable unicode utf8) \
-               $(use_enable minimal tiny) \
-               ${myconf} \
-               || die "configure failed"
-       emake || die
-}
-
-src_install() {
-       make DESTDIR="${D}" install || die
-
-       if use build ; then
-               rm -rf "${D}"/usr/share
-       else
-               cat "${FILESDIR}"/nanorc-* >> doc/nanorc.sample
-               dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
-               dohtml *.html
-               insinto /etc
-               newins doc/nanorc.sample nanorc
-       fi
-
-       dodir /usr/bin
-       dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
-       elog "More helpful info about nano, visit the GDP page:"
-       elog "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.0.0.ebuild b/app-editors/nano/nano-2.0.0.ebuild
deleted file mode 100644 (file)
index fd68c3d..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.0.0.ebuild,v 1.4 2007/01/24 02:43:53 genone Exp $
-
-#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
-#ECVS_MODULE="nano"
-#ECVS_AUTH="pserver"
-#ECVS_USER="anonymous"
-#inherit cvs
-
-MY_P=${PN}-${PV/_}
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2
-       nls? ( sys-devel/gettext )
-       !ncurses? ( slang? ( sys-libs/slang ) )"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       if [[ ! -e configure ]] ; then
-               ./autogen.sh || die "autogen failed"
-       fi
-}
-
-src_compile() {
-       local myconf=""
-       use ncurses \
-               && myconf="--without-slang" \
-               || myconf="${myconf} $(use_with slang)"
-
-       econf \
-               --bindir=/bin \
-               --enable-color \
-               --enable-multibuffer \
-               --enable-nanorc \
-               --disable-wrapping-as-root \
-               $(use_enable spell) \
-               $(use_enable justify) \
-               $(use_enable debug) \
-               $(use_enable nls) \
-               $(use_enable unicode utf8) \
-               $(use_enable minimal tiny) \
-               ${myconf} \
-               || die "configure failed"
-       emake || die
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-
-       dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
-       dohtml *.html
-       insinto /etc
-       newins doc/nanorc.sample nanorc
-
-       insinto /usr/share/nano
-       doins "${FILESDIR}"/*.nanorc || die
-       echo $'\n''# include "/usr/share/nano/gentoo.nanorc"' >> "${D}"/etc/nanorc
-
-       dodir /usr/bin
-       dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
-       elog "More helpful info about nano, visit the GDP page:"
-       elog "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
diff --git a/app-editors/nano/nano-2.0.1.ebuild b/app-editors/nano/nano-2.0.1.ebuild
deleted file mode 100644 (file)
index 9b60ef1..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.0.1.ebuild,v 1.12 2007/01/24 02:43:53 genone Exp $
-
-#ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
-#ECVS_MODULE="nano"
-#ECVS_AUTH="pserver"
-#ECVS_USER="anonymous"
-#inherit cvs
-
-MY_P=${PN}-${PV/_}
-DESCRIPTION="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="http://www.nano-editor.org/"
-SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug justify minimal ncurses nls slang spell unicode"
-
-DEPEND=">=sys-libs/ncurses-5.2
-       nls? ( sys-devel/gettext )
-       !ncurses? ( slang? ( sys-libs/slang ) )"
-PROVIDE="virtual/editor"
-
-src_unpack() {
-       unpack ${A}
-       cd "${S}"
-
-       if [[ ! -e configure ]] ; then
-               ./autogen.sh || die "autogen failed"
-       fi
-}
-
-src_compile() {
-       local myconf=""
-       use ncurses \
-               && myconf="--without-slang" \
-               || myconf="${myconf} $(use_with slang)"
-
-       econf \
-               --bindir=/bin \
-               --enable-color \
-               --enable-multibuffer \
-               --enable-nanorc \
-               --disable-wrapping-as-root \
-               $(use_enable spell) \
-               $(use_enable justify) \
-               $(use_enable debug) \
-               $(use_enable nls) \
-               $(use_enable unicode utf8) \
-               $(use_enable minimal tiny) \
-               ${myconf} \
-               || die "configure failed"
-       emake || die
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die
-
-       dodoc ChangeLog README doc/nanorc.sample AUTHORS BUGS NEWS TODO
-       dohtml *.html
-       insinto /etc
-       newins doc/nanorc.sample nanorc
-
-       insinto /usr/share/nano
-       doins "${FILESDIR}"/*.nanorc || die
-       echo $'\n''# include "/usr/share/nano/gentoo.nanorc"' >> "${D}"/etc/nanorc
-
-       dodir /usr/bin
-       dosym /bin/nano /usr/bin/nano
-}
-
-pkg_postinst() {
-       elog "More helpful info about nano, visit the GDP page:"
-       elog "http://www.gentoo.org/doc/en/nano-basics-guide.xml"
-}
index 4d24d2d3a9319c469210f1eeb26ce1f8e9b03ced..3f670a3fdcbff9327b84b27dfc9d01057bc0ccc4 100644 (file)
@@ -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/nano/nano-2.0.3.ebuild,v 1.3 2007/03/10 22:26:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/nano/nano-2.0.3.ebuild,v 1.4 2007/03/10 22:28:22 vapier Exp $
 
 if [[ ${PV} == "9999" ]] ; then
        ECVS_SERVER="savannah.gnu.org:/cvsroot/nano"
@@ -9,10 +9,10 @@ if [[ ${PV} == "9999" ]] ; then
        ECVS_USER="anonymous"
        inherit cvs
 else
+       MY_P=${PN}-${PV/_}
        SRC_URI="http://www.nano-editor.org/dist/v${PV:0:3}/${MY_P}.tar.gz"
 fi
 
-MY_P=${PN}-${PV/_}
 DESCRIPTION="GNU GPL'd Pico clone with more functionality"
 HOMEPAGE="http://www.nano-editor.org/"