Remove old.

(Portage version: 2.2.0_alpha136/cvs/Linux x86_64)

3 files changed, 5 insertions, 147 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/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
-}