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

suggested as-needed patch.
Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.28-hh1 i686

4 files changed, 103 insertions, 3 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/Manifest b/x11-misc/qterm/Manifest
index 49478a10f8a2..84dde5b2a576 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,6 +1,8 @@
 AUX qterm-0.5.2-abs.patch 339 RMD160 325be19dfcdab2205b8711e676394b6caffbd84c SHA1 4511498267856fad4707159c1fdeea883cdc3a16 SHA256 44c4c27c6d43047bcccd7d480cab0d4974562ba9f2f670c2919a8c11a436051a
+AUX qterm-0.5.2-as-needed.patch 1396 RMD160 5d1ca89b8c38fdad622fc9751fe7b88010d515c7 SHA1 bc6fcddc2568ed063743e96a6c30650a2f852e7b SHA256 3ef206f23c6e701a6be1bd5ba80b34644654d9b0a331226c331dcb064f2761d1
 DIST qterm-0.5.2.tar.bz2 249423 RMD160 4264a9ffccdc75fb0bc2d13d3da28d923c1819ce SHA1 b04d67352a913d06ed162643b1c81646870bec24 SHA256 2f88a26672dc52be5ed6f3b6eabc79dc7f6b9bc9ce30417a73d9120232022eda
 EBUILD qterm-0.5.2-r1.ebuild 1053 RMD160 b4d1ee3a705d113df2d04dde6279443cf41c3cfb SHA1 22d04f263657d34bde8b0bd9769ade22c8d77182 SHA256 196ff48e9a45f20f42542d7b039063b736122d6d522b0c0d64c9f90c4df3b824
+EBUILD qterm-0.5.2-r2.ebuild 1100 RMD160 eedbad7d50ded4332c845308a23df92b6eb6e778 SHA1 851070771443e94ceab56a3c654ea66f54d513cd SHA256 1487b024747587b792ec48b51be427dda24ef695654f455a2a4c0d5511aed82d
 EBUILD qterm-0.5.2.ebuild 991 RMD160 5d5b80e5a069114af58fbf6e2e7e523b5f0965d9 SHA1 153c1c75862a84c277071ea489cc36bbb0cd7f53 SHA256 8ee47a7d9f672796da08b85adbbb19f7a12cad11dbf4a1646f917b3117c21cdd
-MISC ChangeLog 4320 RMD160 3da301bc31a361445e93c3f0f974a41f4b9db5bb SHA1 aa00eba51325706666bc19ff2f1cf19dc376687d SHA256 237af98ac381a943a30350e22652bcb4759207ff86182fe5e5a5e900bda28a0b
+MISC ChangeLog 4565 RMD160 37a1c8bf4151887bc00c7c88b570896833495adb SHA1 9eb74c6755a786ab94ee42a04d3fc2db53b6b7d0 SHA256 390cf272b25637e1cb1cd00a36ae0c07ae9d276fccd1176471cbeb7cda4785e6
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
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
+}