Fix Qt dep for bug 248038 and in the process fix bug 225117 by applying

suggested as-needed patch.
(Portage version: 2.2_rc22/cvs/Linux 2.6.28-hh1 i686)

3 files changed, 100 insertions, 2 deletions

diff --git a/x11-misc/qterm/ChangeLog b/x11-misc/qterm/ChangeLog
index ab9f1bf7b56c..173a2b065360 100644
--- a/x11-misc/qterm/ChangeLog
+++ b/x11-misc/qterm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/qterm
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.29 2008/11/03 15:17:44 matsuu Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.30 2009/01/20 06:43:55 yngwin Exp $
+
+*qterm-0.5.2-r2 (19 Jan 2009)
+
+  19 Jan 2009; Ben de Groot <yngwin@gentoo.org>
+  +files/qterm-0.5.2-as-needed.patch, +qterm-0.5.2-r2.ebuild:
+  Fix Qt dep for bug 248038 and in the process fix bug 225117 by applying
+  suggested as-needed patch.
 
 *qterm-0.5.2-r1 (03 Nov 2008)
 
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
new file mode 100644
index 000000000000..8bc5bbe5d298
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.2-as-needed.patch
@@ -0,0 +1,44 @@
+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/qterm-0.5.2-r2.ebuild b/x11-misc/qterm/qterm-0.5.2-r2.ebuild
new file mode 100644
index 000000000000..f4b82fb9eca9
--- /dev/null
+++ b/x11-misc/qterm/qterm-0.5.2-r2.ebuild
@@ -0,0 +1,47 @@
+# 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.1 2009/01/20 06:43:55 yngwin 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
+
+	# 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
+}