Stabilise latest. Drop old. Cleanup ebuild a bit.

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

10 files changed, 15 insertions, 258 deletions

diff --git a/x11-misc/qterm/ChangeLog b/x11-misc/qterm/ChangeLog
index 7a6b66538af8..ec2cf03301b4 100644
--- a/x11-misc/qterm/ChangeLog
+++ b/x11-misc/qterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/qterm
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.37 2010/10/08 08:34:49 wired Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.38 2011/01/29 18:21:58 scarabeus Exp $
+
+  29 Jan 2011; Tomáš Chvátal <scarabeus@gentoo.org> -qterm-0.5.2-r2.ebuild,
+  -files/qterm-0.5.2-abs.patch, -files/qterm-0.5.2-as-needed.patch,
+  -files/qterm-0.5.2-include.patch, -qterm-0.5.7.ebuild,
+  -qterm-0.5.7-r1.ebuild, -files/qterm-0.5.7-gentoo.patch, -qterm-0.5.8.ebuild,
+  qterm-0.5.11.ebuild:
+  Stabilise latest. Drop old. Cleanup ebuild a bit.
 
 *qterm-0.5.11 (08 Oct 2010)
 
diff --git a/x11-misc/qterm/files/qterm-0.5.2-abs.patch b/x11-misc/qterm/files/qterm-0.5.2-abs.patch
deleted file mode 100644
index cf8311aa8105..000000000000
--- a/x11-misc/qterm/files/qterm-0.5.2-abs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- qterm-0.5.2-org/src/qtermbuffer.cpp	2008-05-12 00:07:32.000000000 +0800
-+++ qterm-0.5.2/src/qtermbuffer.cpp	2008-08-05 08:00:29.908006506 +0800
-@@ -18,6 +18,9 @@
- #include <QString>
- #include <QRect>
- #include <QRegExp>
-+#include <algorithm>
-+using namespace std;
-+
- // #include <stdlib.h>
- // #include <stdio.h>
- // #include <math.h>
diff --git a/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch b/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch
deleted file mode 100644
index 8bc5bbe5d298..000000000000
--- a/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -urN qterm-0.5.2.orig/cmake/FindOpenSSL.cmake qterm-0.5.2/cmake/FindOpenSSL.cmake
---- qterm-0.5.2.orig/cmake/FindOpenSSL.cmake	2008-05-12 00:07:32.000000000 +0800
-+++ qterm-0.5.2/cmake/FindOpenSSL.cmake	2008-06-06 21:56:41.000000000 +0800
-@@ -5,38 +5,6 @@
- #  OPENSSL_INCLUDE_DIR - the OpenSSL include directory
- #  OPENSSL_LIBRARIES - The libraries needed to use OpenSSL
- 
--if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
-+INCLUDE( FindPkgConfig )
-+pkg_search_module(OPENSSL "openssl")
- 
--  # in cache already
--  SET(OPENSSL_FOUND TRUE)
--
--else (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
--
--  FIND_PATH(OPENSSL_INCLUDE_DIR openssl/ssl.h
--     /usr/include/
--     /usr/local/include/
--  )
--  
--  FIND_LIBRARY(OPENSSL_LIBRARIES NAMES ssl ssleay32
--     PATHS
--     /usr/lib
--     /usr/local/lib
--  )
--  
--  if (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
--     set(OPENSSL_FOUND TRUE)
--  endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
--  
--  if (OPENSSL_FOUND)
--     if (NOT OpenSSL_FIND_QUIETLY)
--        message(STATUS "Found OpenSSL: ${OPENSSL_LIBRARIES}")
--     endif (NOT OpenSSL_FIND_QUIETLY)
--  else (OPENSSL_FOUND)
--     if (OpenSSL_FIND_REQUIRED)
--        message(FATAL_ERROR "Could NOT find OpenSSL")
--     endif (OpenSSL_FIND_REQUIRED)
--  endif (OPENSSL_FOUND)
--  
--  MARK_AS_ADVANCED(OPENSSL_INCLUDE_DIR OPENSSL_LIBRARIES)
--  
--endif (OPENSSL_INCLUDE_DIR AND OPENSSL_LIBRARIES)
diff --git a/x11-misc/qterm/files/qterm-0.5.2-include.patch b/x11-misc/qterm/files/qterm-0.5.2-include.patch
deleted file mode 100644
index d6ca94e42f30..000000000000
--- a/x11-misc/qterm/files/qterm-0.5.2-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urB qterm-0.5.2-org/src/ssh/transport.cpp qterm-0.5.2/src/ssh/transport.cpp
---- qterm-0.5.2-org/src/ssh/transport.cpp	2008-05-11 17:07:32.000000000 +0100
-+++ qterm-0.5.2/src/ssh/transport.cpp	2009-09-22 18:22:21.441471876 +0100
-@@ -9,6 +9,8 @@
- // Copyright: See COPYING file that comes with this distribution
- //
- //
-+#include <cstdio>
-+#include <stdint.h>
- #include "transport.h"
- #include <QtCore/QString>
-
diff --git a/x11-misc/qterm/files/qterm-0.5.7-gentoo.patch b/x11-misc/qterm/files/qterm-0.5.7-gentoo.patch
deleted file mode 100644
index fa241af612e1..000000000000
--- a/x11-misc/qterm/files/qterm-0.5.7-gentoo.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur qterm-0.5.7.orig/src/qterm.desktop.in qterm-0.5.7/src/qterm.desktop.in
---- qterm-0.5.7.orig/src/qterm.desktop.in	2009-01-07 03:11:15.000000000 +0900
-+++ qterm-0.5.7/src/qterm.desktop.in	2009-10-03 01:30:27.000000000 +0900
-@@ -3,7 +3,7 @@
- Encoding=UTF-8
- Type=Application
- Name=QTerm
--Exec=qterm -caption "%c" %i %m %u
-+Exec=QTerm -caption "%c" %i %m %u
- GenericName=BBS Client
- GenericName[zh_CN]=BBS 客户端程序
- GenericName[zh_TW]=BBS 客戶端程式
diff --git a/x11-misc/qterm/qterm-0.5.11.ebuild b/x11-misc/qterm/qterm-0.5.11.ebuild
index f3b2fcdb4378..7849442d1f30 100644
--- a/x11-misc/qterm/qterm-0.5.11.ebuild
+++ b/x11-misc/qterm/qterm-0.5.11.ebuild
@@ -1,24 +1,22 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.5.11.ebuild,v 1.1 2010/10/08 08:34:49 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.5.11.ebuild,v 1.2 2011/01/29 18:21:58 scarabeus Exp $
 
-EAPI="2"
+EAPI=3
 inherit cmake-utils eutils
 
 DESCRIPTION="A BBS client for Linux"
-HOMEPAGE="http://qterm.sourceforge.net/"
+HOMEPAGE="http://www.qterm.org/"
 SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE=""
 
 RDEPEND=">=x11-libs/qt-gui-4.5:4[qt3support]
 	dev-libs/openssl"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
+DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}"/"${PN}"-0.5.11-gentoo.patch
@@ -29,10 +27,3 @@ src_install() {
 	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
 	dodoc README TODO
 }
-
-pkg_postinst() {
-	einfo
-	elog "Since 0.4.0-r1, /usr/bin/qterm has been renamed to /usr/bin/QTerm."
-	elog "Please see bug #176533 for more information."
-	einfo
-}
diff --git a/x11-misc/qterm/qterm-0.5.2-r2.ebuild b/x11-misc/qterm/qterm-0.5.2-r2.ebuild
deleted file mode 100644
index 27a1bdae84c2..000000000000
--- a/x11-misc/qterm/qterm-0.5.2-r2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.5.2-r2.ebuild,v 1.4 2009/09/22 20:06:04 mr_bones_ Exp $
-
-EAPI="1"
-inherit cmake-utils eutils
-
-DESCRIPTION="A BBS client for Linux"
-HOMEPAGE="http://qterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-RDEPEND="x11-libs/qt-gui:4
-	dev-libs/openssl"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	# bug #228225
-	epatch "${FILESDIR}/${P}-abs.patch"
-	# bug #225117
-	epatch "${FILESDIR}/${P}-as-needed.patch"
-	sed -i -e '/^Exec/s/qterm/QTerm/' src/qterm.desktop.in || die
-	# bug 276185
-	epatch "${FILESDIR}/${P}-include.patch"
-
-	# fix the broken language files
-	lrelease src/po/qterm_ch*.ts || die
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
-	dodoc README TODO
-}
-
-pkg_postinst() {
-	elog
-	elog "Since 0.4.0-r1, /usr/bin/qterm has been renamed to /usr/bin/QTerm."
-	elog "Please see bug #176533 for more information."
-	elog
-}
diff --git a/x11-misc/qterm/qterm-0.5.7-r1.ebuild b/x11-misc/qterm/qterm-0.5.7-r1.ebuild
deleted file mode 100644
index 6654ccf499a1..000000000000
--- a/x11-misc/qterm/qterm-0.5.7-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.5.7-r1.ebuild,v 1.1 2009/10/02 22:19:24 matsuu Exp $
-
-EAPI="1"
-inherit cmake-utils eutils
-
-DESCRIPTION="A BBS client for Linux"
-HOMEPAGE="http://qterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/qt-gui:4
-	dev-libs/openssl"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
-	dodoc README TODO
-}
-
-pkg_postinst() {
-	elog
-	elog "Since 0.4.0-r1, /usr/bin/qterm has been renamed to /usr/bin/QTerm."
-	elog "Please see bug #176533 for more information."
-	elog
-}
diff --git a/x11-misc/qterm/qterm-0.5.7.ebuild b/x11-misc/qterm/qterm-0.5.7.ebuild
deleted file mode 100644
index 4d2ee53c3465..000000000000
--- a/x11-misc/qterm/qterm-0.5.7.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.5.7.ebuild,v 1.1 2009/09/22 19:06:39 patrick Exp $
-
-EAPI="1"
-inherit cmake-utils eutils
-
-DESCRIPTION="A BBS client for Linux"
-HOMEPAGE="http://qterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/qt-gui:4
-	dev-libs/openssl"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
-	dodoc README TODO
-}
-
-pkg_postinst() {
-	elog
-	elog "Since 0.4.0-r1, /usr/bin/qterm has been renamed to /usr/bin/QTerm."
-	elog "Please see bug #176533 for more information."
-	elog
-}
diff --git a/x11-misc/qterm/qterm-0.5.8.ebuild b/x11-misc/qterm/qterm-0.5.8.ebuild
deleted file mode 100644
index d79d2100344a..000000000000
--- a/x11-misc/qterm/qterm-0.5.8.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.5.8.ebuild,v 1.1 2009/12/15 14:03:15 matsuu Exp $
-
-EAPI="2"
-inherit cmake-utils eutils
-
-DESCRIPTION="A BBS client for Linux"
-HOMEPAGE="http://qterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-RDEPEND=">=x11-libs/qt-gui-4.5:4[qt3support]
-	dev-libs/openssl"
-
-DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.4.7"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-0.5.7-gentoo.patch
-}
-
-src_install() {
-	cmake-utils_src_install
-	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
-	dodoc README TODO
-}
-
-pkg_postinst() {
-	einfo
-	elog "Since 0.4.0-r1, /usr/bin/qterm has been renamed to /usr/bin/QTerm."
-	elog "Please see bug #176533 for more information."
-	einfo
-}