Remove old.

Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64

4 files changed, 13 insertions, 158 deletions

diff --git a/app-misc/tmux/ChangeLog b/app-misc/tmux/ChangeLog
index 54b0ba82c3e6..fdf768583957 100644
--- a/app-misc/tmux/ChangeLog
+++ b/app-misc/tmux/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/tmux
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.83 2012/10/13 17:23:16 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/ChangeLog,v 1.84 2012/10/13 17:24:18 radhermit Exp $
+
+  13 Oct 2012; Tim Harder <radhermit@gentoo.org> -tmux-1.5.ebuild,
+  -files/tmux-1.5-darwin.patch:
+  Remove old.
 
   13 Oct 2012; Tim Harder <radhermit@gentoo.org> tmux-1.6.ebuild:
   Stabilize for x86 (bug #435320) and remove unused eutils inherit.
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest
index 37642b3b5f70..a4172c45aaea 100644
--- a/app-misc/tmux/Manifest
+++ b/app-misc/tmux/Manifest
@@ -1,25 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX tmux-1.5-darwin.patch 2180 SHA256 df949038aa2c12030d97991e4e330e9cc957bb135336fae69bd921879404f8bd SHA512 4adac8dd83ebddfe68468937095aa0943537af21bd76ea0807ea83236e1a1e54e8fbfebd01cce6581c4d67d7f4fb744450ce8b66208e11bc190bfc29f19decc7 WHIRLPOOL 6d60db2090794cec36fd142e7c74c672f4d3c857bf3074fdbd11997661f926ab9556bfed607e69260f7679f356bef80db02305f1608e79647814aaf4133bc89b
 AUX tmux.vim 55 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e WHIRLPOOL fa0019bcfcbe46aa9d383f8778ea4b7d8ec94f7b58f9c38b07c9b6649ea17363f2436e684d83c0c262711e30b62f90fe7f65d87e3a2c9dc5b391633f75a5d7ca
-DIST tmux-1.5.tar.gz 374093 SHA256 eb8215b57c05b765d2446d9acb2bc5edcdb3eb4ea31af89ee127a27e90056306 SHA512 a2004923d645f32e30d3e6ecee92a5cea71f831718bc09dec14c11a420848d175eff919f00b344ac65be1e2af00362c4b0ffc4e03851d5e3df2fa4c005069bd6 WHIRLPOOL f0513738646be2e10fa7bd9ebc275ba6db2da47e3025575debab02528cc98f236c32704db6617e06b3e63d3a706d7cc55a4d967c2e8671cdc4fa23753a216484
 DIST tmux-1.6.tar.gz 388633 SHA256 faee08ba1bd8c22537cd5b7458881d1bdb4985df88ed6bc5967c56881a7efbd6 SHA512 5c7b311d011f2f2027926a615d4300e97fd22f3ae32b0c364fdf935ff02124c59d1d0c48e7e9d572229c7600b6583fd679f4b960a5af872305f005d27350ad9c WHIRLPOOL 5acbd3ed4b6e60a8a08f1ab4117ac9002108d37a13cb3f64925fc2a986fd86b83037cfa1a7016bb65099a0bb00cb37329ad338b8913d48590f2ab8b3ee1755cd
 DIST tmux-1.7.tar.gz 407164 SHA256 68346bda11cf7d86591e663b94b98576332ac88c2890df26acb080f4440f9e7b SHA512 d2002858ab6c974e6a6c7dc31db20cd6271170cba9e7314216dfcea6670ae09c5112a4313b77bd21d14a906c89723fc9f6c20cea528e7320e2857ec4d71c725b WHIRLPOOL 8a40e42f3e3a3da4b32be32d65c4eb1e1e68e74482d039af6faef1669a349b0667d388d711bed0a1b3e6daf71b97ae1210718fd12a8f3dfdae8cf7f190805fc8
-EBUILD tmux-1.5.ebuild 2059 SHA256 e1e5ccae6b8ffdbe4282e9d16a544c953b43b74ce628667816c7deb1473af35e SHA512 9a9cc47f38e661ce2347d54b6b63c423033f7745da294bdf9f19c503da439b4bb7886baf750266448c05b229234f4b8a66b6a117026bba7d9cf67b64fa151c29 WHIRLPOOL 17f1ec82757bfaaca84242bbb8d633a32be90df1da86d4399b6d54038597fdf401a9c6b2ee335a99b2545f94c9375779fa4092bff9086c8eec6e4b657c96dc0a
 EBUILD tmux-1.6.ebuild 2257 SHA256 af615384974ca2cc1fd5f78b0063a31adb19bc686d4e8702f10a1f24fa739ea6 SHA512 7f0274d16981635170a4cf35864e448029fcb9ec98647d9d3b5c07926672dd12ef814c0fe1f2d0e2b8b1e26cc7ea49588d46033d9ddd22dc68b5bd34ce64a274 WHIRLPOOL 134c2e9db34bfb29cd75786145a99cb18061e309bdca0edf479e131d4ea6bde26d7351ecc859f9a5c104225062e74fdf3946b653f91ccacd4fc2013ee850ffeb
 EBUILD tmux-1.7.ebuild 1747 SHA256 cd1136f50cf28d042edd9cc6287fcfe10e574080db66d3a56f2cc9782d74202d SHA512 87118733a70d8b72b6d51b71d8c3dea36a33dfd44aa912f83df3c1c418ca6eadab633b879690bae8730c747f2b4cc188268d6725468d24211f242c38af3f3c5a WHIRLPOOL 884a31874a04da0df66965898b90b260d0e6e903075d2da7e965d4d8271e8c73ef26dff54847d321e49e182904c9f03bc7161e414d3a65bb9e057edb7221fdbf
 EBUILD tmux-9999.ebuild 1362 SHA256 833431b7d9abff42dbba622cb4b94f99900f0bf2c0442e12e2e6f1fa4dfa10f3 SHA512 0f4dc4cf36fe8848887f6946019059c1b7b4fb003bd25e97d14c4e9ac9b49a393e7faff527f2530f5e2d560c45ad5e27b607f00712f98ec98c0913697f21f37f WHIRLPOOL 94da4845e68097139c5481039628453ae2383eb9262c8dc5cd26af470ad05d55d2bf759e33675a0209ea49f2460dab8d04e67bac817313ef2eea7f8c5fefa45e
-MISC ChangeLog 9397 SHA256 9490e7090e3c46c42110a3996434e3e73599107c8cc504d20277669d8f01ea29 SHA512 ba4729f7aca9b11c19bd2d8eb727b0641a36fa8271957c14069a7bc417fa8ba9186d69fe16a7a9cce5a5d9ff7c89b428faca93d4955a3b5439fd7da5ce75c9da WHIRLPOOL 4e6ef07e7d0baaf1c6c1771f53ee5001e5b0969b43248de9a183e902aa0ace8cfc2a03dda60f9fc39349ca6822ff5120606a6ffdde64519768f8da0cf2575081
+MISC ChangeLog 9511 SHA256 0b79c386af7fb6d2a76b91ca48504034cae410b65a22933eeddc30d607e6158b SHA512 26f2c2ff5132d4ac81f95581c835be5665257bb56ec63a9486cf863070ccb1f7ed612ecbca5b17d085544f0bc2ecf71dfd15b7c8850352b30aa4550596671f61 WHIRLPOOL 7d7524198dae21590504639bca9664d2eb485357fdd51a3d0714dd90026e63dd9512552d561d61336aecbadb3ba901166854df09d158931752a266e242e20b29
 MISC metadata.xml 553 SHA256 767126148103c206d8a942e171f2f0c572bc42fac680cb188cf304e1ec8fc3c4 SHA512 1346cfa2350670bc0f00f04cc3b663d5295f023d0c418761cfdcb24fa9211f11f0759c0c4d78e97d9697a001eae4bf401d38eae7b77c52b7c3eb524ddb09153c WHIRLPOOL 49b96d39cf405794f9deffb7a266675896fc18d49f5f8da5fea947d705f10e36c270c0c962cad0010691a91fbb7bdc172c3c881640638ace8319baab55443c91
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQeaOFAAoJEEqz6FtPBkyj4dwH/jOjWbRNG2huHemVHQwGE9xi
-HtLYlbeT/4uDSgmw8+zFQokBrym2vE2oxCytVDP0uxUzMN2+N/m1X3cAyEuVcVwW
-IFM5uF95maMjguFwheicVlGADylifmI3NGil8FFs8l/xU5a++aHCKe7/SsBwW7oq
-Iw/1tHlBIJ+L5+gWGeG8WMdEfD6Km47G5+LoLgPbD+p5DZcIGfTL7UrJkr/tCWVo
-3jISDY81jK/VoOTA4260WFfdw6QIMntHP31Kze1nNNTFFLgK+SQeEDpSL9i65+iU
-lDTMnqAiWAyvtagVD5vxWDkaMSvBn7gVRJDpFF5Wt6skcQ06hyzmMwJh0hG/ZD4=
-=irqK
+iQEcBAEBCAAGBQJQeaPDAAoJEEqz6FtPBkyjV6IH/A6UxKwHjnfyed4WnUs1bxaX
+q8f2ZiwG6RC4kDrMDiqcONUjaJMKgKg0B2w2lVE+sWDCVIuqlIS2kgAyl9mrH2Fh
+Mbd2AV3aZ9glIpNcIExyGX1XR0UMLMvE+QJjG7rr5GjbinVfP4i0t5sKhZeyGiCW
+fK+/ShN5m+A0gs8A1Q+AWa8u6J3mcEXBOHnefi48a+bAsvV2Aafg29FNaOvhyA44
+drlX6nMYAGyyOieiNl3L16oPsJninX7kPpuFeamtzHJHdlSavBf03y58fDnHgFgW
+wwih/2D9Dz6SG5D4y7Gpsg7oDi7AAuaUUw+QvoLBJzZXbuy6925BdcsRIY6qK6s=
+=82je
 -----END PGP SIGNATURE-----
diff --git a/app-misc/tmux/files/tmux-1.5-darwin.patch b/app-misc/tmux/files/tmux-1.5-darwin.patch
deleted file mode 100644
index 515c4e8acc51..000000000000
--- a/app-misc/tmux/files/tmux-1.5-darwin.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-http://sourceforge.net/tracker/?func=detail&aid=3376684&group_id=200378&atid=973262
-
-
---- configure.ac
-+++ configure.ac
-@@ -124,6 +124,7 @@
- # Look for networking libraries.
- AC_SEARCH_LIBS(b64_ntop, resolv)
- AC_SEARCH_LIBS(__b64_ntop, resolv)
-+AC_SEARCH_LIBS(res_9_b64_ntop, resolv)
- AC_SEARCH_LIBS(inet_ntoa, nsl)
- AC_SEARCH_LIBS(socket, socket)
- AC_CHECK_LIB(xnet, socket)
---- configure
-+++ configure
-@@ -4718,6 +4718,62 @@
- 
- fi
- 
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing res_9_b64_ntop" >&5
-+$as_echo_n "checking for library containing res_9_b64_ntop... " >&6; }
-+if test "${ac_cv_search_res_9_b64_ntop+set}" = set; then :
-+  $as_echo_n "(cached) " >&6
-+else
-+  ac_func_search_save_LIBS=$LIBS
-+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h.  */
-+
-+/* Override any GCC internal prototype to avoid an error.
-+   Use char because int might match the return type of a GCC
-+   builtin and then its argument prototype would still apply.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+char res_9_b64_ntop ();
-+int
-+main ()
-+{
-+return res_9_b64_ntop ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+for ac_lib in '' resolv; do
-+  if test -z "$ac_lib"; then
-+    ac_res="none required"
-+  else
-+    ac_res=-l$ac_lib
-+    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
-+  fi
-+  if ac_fn_c_try_link "$LINENO"; then :
-+  ac_cv_search_res_9_b64_ntop=$ac_res
-+fi
-+rm -f core conftest.err conftest.$ac_objext \
-+    conftest$ac_exeext
-+  if test "${ac_cv_search_res_9_b64_ntop+set}" = set; then :
-+  break
-+fi
-+done
-+if test "${ac_cv_search_res_9_b64_ntop+set}" = set; then :
-+
-+else
-+  ac_cv_search_res_9_b64_ntop=no
-+fi
-+rm conftest.$ac_ext
-+LIBS=$ac_func_search_save_LIBS
-+fi
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_res_9_b64_ntop" >&5
-+$as_echo "$ac_cv_search_res_9_b64_ntop" >&6; }
-+ac_res=$ac_cv_search_res_9_b64_ntop
-+if test "$ac_res" != no; then :
-+  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
-+
-+fi
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
- $as_echo_n "checking for library containing inet_ntoa... " >&6; }
- if test "${ac_cv_search_inet_ntoa+set}" = set; then :
diff --git a/app-misc/tmux/tmux-1.5.ebuild b/app-misc/tmux/tmux-1.5.ebuild
deleted file mode 100644
index 4d7aedf69c47..000000000000
--- a/app-misc/tmux/tmux-1.5.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/tmux/tmux-1.5.ebuild,v 1.7 2012/07/12 14:30:36 ryao Exp $
-
-EAPI=4
-
-inherit eutils autotools
-
-DESCRIPTION="Terminal multiplexer"
-HOMEPAGE="http://tmux.sourceforge.net"
-SRC_URI="mirror://sourceforge/tmux/${P}.tar.gz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc64-solaris"
-IUSE="vim-syntax"
-
-DEPEND="
-	|| ( >=dev-libs/libevent-2.0.10 <dev-libs/libevent-2 )
-	sys-libs/ncurses"
-RDEPEND="${DEPEND}
-	vim-syntax? ( || (
-			app-editors/vim
-			app-editors/gvim ) )"
-
-DOCS=( CHANGES FAQ NOTES TODO )
-
-pkg_setup() {
-	if has_version "<app-misc/tmux-1.3"; then
-		echo
-		ewarn "Commands 'up-pane', 'down-pane' and 'select-prompt' were removed in version 1.3."
-		ewarn "You may want to update your configuration file accordingly to avoid errors on"
-		ewarn "tmux startup."
-		ewarn
-		ewarn "For the full Changelog, together with details on what replaced the above"
-		ewarn "commands, visit http://tmux.cvs.sourceforge.net/viewvc/tmux/tmux/CHANGES."
-		ewarn
-		ewarn "WARNING: after updating to ${P} you will _not_ be able to connect to any"
-		ewarn "running 1.2 tmux server instances. You'll have to use an existing client to"
-		ewarn "end your old sessions or kill the old server instances. Otherwise you'll have"
-		ewarn "to temporarily downgrade to tmux 1.2 to access them."
-		echo
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-darwin.patch  # drop on next release
-	eautoreconf  # for darwin patch
-	# look for config file in the prefix
-	sed -i -e '/SYSTEM_CFG/s:"/etc:"'"${EPREFIX}"'/etc:' tmux.h || die
-	# and don't just add some includes
-	sed -i -e 's:-I/usr/local/include::' Makefile.in || die
-}
-
-src_install() {
-	default
-
-	docinto examples
-	dodoc examples/*.conf
-
-	if use vim-syntax; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins examples/tmux.vim
-
-		insinto /usr/share/vim/vimfiles/ftdetect
-		doins "${FILESDIR}"/tmux.vim
-	fi
-}