Fixed gcc-4.3 issue, bug #228225. Removed old versions.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-gentoo x86_64

6 files changed, 68 insertions, 113 deletions

diff --git a/x11-misc/qterm/ChangeLog b/x11-misc/qterm/ChangeLog
index 1fb3abfc5e47..ab9f1bf7b56c 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.28 2008/07/28 21:42:48 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/ChangeLog,v 1.29 2008/11/03 15:17:44 matsuu Exp $
+
+*qterm-0.5.2-r1 (03 Nov 2008)
+
+  03 Nov 2008; MATSUU Takuto <matsuu@gentoo.org>
+  +files/qterm-0.5.2-abs.patch, -qterm-0.4.0.ebuild, -qterm-0.4.0-r1.ebuild,
+  +qterm-0.5.2-r1.ebuild:
+  Fixed gcc-4.3 issue, bug #228225. Removed old versions.
 
   28 Jul 2008; Carsten Lohrke <carlo@gentoo.org> qterm-0.4.0-r1.ebuild,
   qterm-0.5.2.ebuild:
diff --git a/x11-misc/qterm/Manifest b/x11-misc/qterm/Manifest
index 284db9736d15..49478a10f8a2 100644
--- a/x11-misc/qterm/Manifest
+++ b/x11-misc/qterm/Manifest
@@ -1,7 +1,6 @@
-DIST qterm-0.4.0.tar.bz2 805526 RMD160 a9e5e43b70883d8dbdd719d5073770c33299e9f6 SHA1 9d18fc6d2b851969880b40d95fd521a6b29c9c2f SHA256 b79cd26eb57d9abc1e2eb530d5fb42f9fdcff86d544466596674273e3571156a
+AUX qterm-0.5.2-abs.patch 339 RMD160 325be19dfcdab2205b8711e676394b6caffbd84c SHA1 4511498267856fad4707159c1fdeea883cdc3a16 SHA256 44c4c27c6d43047bcccd7d480cab0d4974562ba9f2f670c2919a8c11a436051a
 DIST qterm-0.5.2.tar.bz2 249423 RMD160 4264a9ffccdc75fb0bc2d13d3da28d923c1819ce SHA1 b04d67352a913d06ed162643b1c81646870bec24 SHA256 2f88a26672dc52be5ed6f3b6eabc79dc7f6b9bc9ce30417a73d9120232022eda
-EBUILD qterm-0.4.0-r1.ebuild 1843 RMD160 4b9ef55a82b9f0f452d78ffde36fec577b6fe010 SHA1 06c4c562facb4530f64867c08de48eecb84aa37f SHA256 db3ac60f7c325824ca0ba9e60b68523abefdd64c7c232a49f105392cc8ce8101
-EBUILD qterm-0.4.0.ebuild 1476 RMD160 58cef2a94bf9b184eee675140528fa0a9bc0796c SHA1 500011be9cb7d818b0871f5eda0e412704e7774b SHA256 b3e632c993ff878b85ba1e85d059e3ee73f6d44aba45057b418866e0500fcb8a
+EBUILD qterm-0.5.2-r1.ebuild 1053 RMD160 b4d1ee3a705d113df2d04dde6279443cf41c3cfb SHA1 22d04f263657d34bde8b0bd9769ade22c8d77182 SHA256 196ff48e9a45f20f42542d7b039063b736122d6d522b0c0d64c9f90c4df3b824
 EBUILD qterm-0.5.2.ebuild 991 RMD160 5d5b80e5a069114af58fbf6e2e7e523b5f0965d9 SHA1 153c1c75862a84c277071ea489cc36bbb0cd7f53 SHA256 8ee47a7d9f672796da08b85adbbb19f7a12cad11dbf4a1646f917b3117c21cdd
-MISC ChangeLog 4077 RMD160 0dcb4faf6defa30cc37b9fc3bd7dd6b582d81f72 SHA1 cc40344889310117280913a5c3ee13def08f764c SHA256 a80a7726c1c38939b686f7a32374351ba00f48503dff1377926fd9d26cc9cd69
+MISC ChangeLog 4320 RMD160 3da301bc31a361445e93c3f0f974a41f4b9db5bb SHA1 aa00eba51325706666bc19ff2f1cf19dc376687d SHA256 237af98ac381a943a30350e22652bcb4759207ff86182fe5e5a5e900bda28a0b
 MISC metadata.xml 156 RMD160 8adcf0a760a605cd42501f53097ca3a1c4e8daad SHA1 8ccc2b0f20743002b783b1f7b5162c71f7f54c2e SHA256 815820f2e5866d973fafb29a8b8027d022ccea43023309b6dc294cf077598215
diff --git a/x11-misc/qterm/files/qterm-0.5.2-abs.patch b/x11-misc/qterm/files/qterm-0.5.2-abs.patch
new file mode 100644
index 000000000000..cf8311aa8105
--- /dev/null
+++ b/x11-misc/qterm/files/qterm-0.5.2-abs.patch
@@ -0,0 +1,12 @@
+--- 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/qterm-0.4.0-r1.ebuild b/x11-misc/qterm/qterm-0.4.0-r1.ebuild
deleted file mode 100644
index 0670b84a0f9e..000000000000
--- a/x11-misc/qterm/qterm-0.4.0-r1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.4.0-r1.ebuild,v 1.5 2008/07/28 21:42:48 carlo Exp $
-
-EAPI=1
-
-inherit eutils qt3
-
-DESCRIPTION="QTerm is a BBS client in Linux."
-HOMEPAGE="http://qterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="arts esd ssl"
-
-DEPEND="dev-lang/python
-	x11-libs/qt:3
-	arts? ( kde-base/arts )
-	esd? ( >=media-sound/esound-0.2.22 )
-	ssl? ( dev-libs/openssl )"
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	sed -i -e '/^Exec/s/qterm/QTerm/' qterm/qterm.desktop.in || die
-}
-
-src_compile() {
-	# fix the broken language files
-	lrelease qterm/po/qterm_ch*.ts
-
-	# yeah, it's --disable-ssh to disable ssl
-	local myconf="`use_enable esd` `use_enable ssl ssh` --program-transform-name=QTerm"
-
-	# Although "configure --help" claims use "--with-arts-dir" to set aRts dir, it actually
-	# check the value of "--with-artsdir" option. To gracefully fix this bug, I have to run
-	# s/(artsdir/(arts-dir/ to ${S}/admin/acinclude.m4.in, then make -f Makefile.dist to
-	# regenerate the configure script. For simplicity I choose to just use the buggy script
-	# and give it the "wrong" option.
-	use arts && myconf="${myconf} --enable-arts --with-artsdir=`kde-config --prefix`" \
-			|| myconf="${myconf} --disable-arts"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "install faled"
-	dodoc AUTHORS BUGS ChangeLog README* RELEASE_NOTES
-	# #176533
-	mv "${D}"/usr/bin/qterm "${D}"/usr/bin/QTerm || die
-}
-
-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.4.0.ebuild b/x11-misc/qterm/qterm-0.4.0.ebuild
deleted file mode 100644
index 32eaa99e3f51..000000000000
--- a/x11-misc/qterm/qterm-0.4.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/qterm/qterm-0.4.0.ebuild,v 1.5 2006/10/30 18:30:11 nixnut Exp $
-
-inherit kde-functions eutils
-
-DESCRIPTION="QTerm is a BBS client in Linux."
-HOMEPAGE="http://qterm.sourceforge.net/"
-SRC_URI="mirror://sourceforge/qterm/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ppc x86"
-IUSE="arts esd ssl"
-
-DEPEND=">=media-sound/esound-0.2.22
-	dev-lang/python
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-need-qt 3
-
-src_compile() {
-
-	cd ${S}
-
-	# fix the broken language files
-	lrelease qterm/po/qterm_ch*.ts
-
-	# yeah, it's --disable-ssh to disable ssl
-	local myconf="`use_enable esd` `use_enable ssl ssh`"
-
-	# Although "configure --help" claims use "--with-arts-dir" to set aRts dir, it actually
-	# check the value of "--with-artsdir" option. To gracefully fix this bug, I have to run
-	# s/(artsdir/(arts-dir/ to ${S}/admin/acinclude.m4.in, then make -f Makefile.dist to
-	# regenerate the configure script. For simplicity I choose to just use the buggy script
-	# and give it the "wrong" option.
-	use arts && myconf="${myconf} --enable-arts --with-artsdir=`kde-config --prefix`" \
-			|| myconf="${myconf} --disable-arts"
-
-	econf ${myconf} || die "configure failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	make install DESTDIR=${D} || die "install faled"
-	dodoc AUTHORS BUGS COPYING ChangeLog README* RELEASE_NOTES
-}
diff --git a/x11-misc/qterm/qterm-0.5.2-r1.ebuild b/x11-misc/qterm/qterm-0.5.2-r1.ebuild
new file mode 100644
index 000000000000..229e150c3556
--- /dev/null
+++ b/x11-misc/qterm/qterm-0.5.2-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2008 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-r1.ebuild,v 1.1 2008/11/03 15:17:44 matsuu Exp $
+
+EAPI="1"
+inherit cmake-utils eutils
+
+DESCRIPTION="QTerm is a BBS client in 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-4.3:4
+	dev-libs/openssl"
+
+DEPEND="${RDEPEND}
+	>=dev-util/cmake-2.4.2"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# bug #228225
+	epatch "${FILESDIR}/${P}-abs.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
+}