Build use qt3's qmake, bug #96201. Removed 1.1.

Package-Manager: portage-2.0.51.22-r1

5 files changed, 32 insertions, 49 deletions

diff --git a/app-text/tuxcards/ChangeLog b/app-text/tuxcards/ChangeLog
index ee901220e814..937dd2ccc70e 100644
--- a/app-text/tuxcards/ChangeLog
+++ b/app-text/tuxcards/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-text/tuxcards
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/ChangeLog,v 1.10 2005/06/05 12:09:52 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/ChangeLog,v 1.11 2005/06/16 15:11:34 ticho Exp $
+
+  16 Jun 2005; Andrej Kacian <ticho@gentoo.org> -tuxcards-1.1.ebuild,
+  tuxcards-1.2.ebuild:
+  Build with qt3. Closes bug #96201, by Christian Hesse <mail at
+  earthworm.de>. Removed ebuild for 1.1.
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> tuxcards-1.2.ebuild:
   Stable on ppc.
diff --git a/app-text/tuxcards/Manifest b/app-text/tuxcards/Manifest
index be52c1a1b0e4..e24e8fcbb0e5 100644
--- a/app-text/tuxcards/Manifest
+++ b/app-text/tuxcards/Manifest
@@ -1,6 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 00c4ea8d5a23ab3572c4e3e421c009b0 tuxcards-1.2.ebuild 1042
+MD5 546b76ddd600c29c3232d356bf0be972 ChangeLog 1645
 MD5 7dbb92cd2f9678d8a28634c532431cf4 metadata.xml 254
-MD5 75c52c34f735f562bb963dd246015032 ChangeLog 1446
-MD5 7833b5a279dc97ed5d79bc9512d92390 tuxcards-1.1.ebuild 838
-MD5 276b418e4f98cc44e1da673d1ccde249 tuxcards-1.2.ebuild 1035
-MD5 7496f3cc8989aa48c37967ab36dcd0af files/digest-tuxcards-1.1 64
 MD5 210b415d2d1cd19da5aecd13de112a99 files/digest-tuxcards-1.2 64
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCsZbqQlM6RnzZP+IRAuH/AJ40d4vDREfuSkuox72zAfWqKCn4KwCgs2pA
+ChmSqJMG+IdPYzsb97vIm4Q=
+=j4lW
+-----END PGP SIGNATURE-----
diff --git a/app-text/tuxcards/files/digest-tuxcards-1.1 b/app-text/tuxcards/files/digest-tuxcards-1.1
deleted file mode 100644
index dc02828d7fff..000000000000
--- a/app-text/tuxcards/files/digest-tuxcards-1.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 711da6fdabacd4c5f3a2491ca29fef36 tuxcards-1.1.tar.gz 233649
diff --git a/app-text/tuxcards/tuxcards-1.1.ebuild b/app-text/tuxcards/tuxcards-1.1.ebuild
deleted file mode 100644
index de8892465c87..000000000000
--- a/app-text/tuxcards/tuxcards-1.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/tuxcards-1.1.ebuild,v 1.6 2005/01/01 16:39:44 eradicator Exp $
-
-DESCRIPTION="A heirarchical text editor"
-HOMEPAGE="http://www.tuxcards.de"
-
-SRC_URI="http://www.tifskom.de/tux/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="x86"
-IUSE=""
-DEPEND=">=x11-libs/qt-3.1.1"
-
-src_compile() {
-	sed -e 's:/usr/local:/usr:g' \
-		-e 's:/usr/doc/tuxcards:/usr/share/tuxcards:g' tuxcards.pro > tuxpro && \
-		mv tuxpro tuxcards.pro
-	sed -e 's:/usr/local/doc:/usr/share:g' src/tuxcardsconfiguration.cpp > temp && \
-		mv temp src/tuxcardsconfiguration.cpp
-	qmake tuxcards.pro
-
-	emake || die
-}
-
-src_install() {
-	make INSTALL_ROOT=${D} install || die
-	dodoc AUTHORS COPYING INSTALL README
-}
diff --git a/app-text/tuxcards/tuxcards-1.2.ebuild b/app-text/tuxcards/tuxcards-1.2.ebuild
index e42fe3e7ee2d..bc6da6ad63f3 100644
--- a/app-text/tuxcards/tuxcards-1.2.ebuild
+++ b/app-text/tuxcards/tuxcards-1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/tuxcards-1.2.ebuild,v 1.9 2005/06/05 12:09:52 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-text/tuxcards/tuxcards-1.2.ebuild,v 1.10 2005/06/16 15:11:34 ticho Exp $
 
 inherit kde-functions
 
@@ -14,20 +14,22 @@ SLOT="0"
 
 KEYWORDS="~amd64 ppc x86"
 IUSE=""
-DEPEND="sys-apps/sed"
+DEPEND="${DEPEND}
+		=x11-libs/qt-3*
+		sys-apps/sed"
 
-need-qt 3.1
+# This implies >=qt-3, thus qt4 as well - we don't build with qt4 (bug #96201)
+#need-qt 3.1
 
 src_compile() {
-	sed -e 's:/usr/local:/usr:g' \
-		-e 's:/usr/doc/tuxcards:/usr/share/tuxcards:g' tuxcards.pro > tuxpro && \
-		mv tuxpro tuxcards.pro
-	sed -e 's:/usr/local/doc:/usr/share:g' src/CTuxCardsConfiguration.cpp > temp && \
-		mv temp src/CTuxCardsConfiguration.cpp
-	sed -e 's:/usr/local/bin/:/usr/bin/:g' src/gui/dialogs/optionsDialog/IOptionsDialog.ui > temp && \
-		mv temp src/gui/dialogs/optionsDialog/IOptionsDialog.ui
-
-	qmake tuxcards.pro
+	sed -i -e 's:/usr/local:/usr:g' \
+		-e 's:/usr/doc/tuxcards:/usr/share/tuxcards:g' tuxcards.pro
+	sed -i -e 's:/usr/local/doc:/usr/share:g' src/CTuxCardsConfiguration.cpp
+	sed -i -e 's:/usr/local/bin/:/usr/bin/:g' \
+		src/gui/dialogs/optionsDialog/IOptionsDialog.ui
+
+	# Use qt3's qmake (bug #96201)
+	/usr/qt/3/bin/qmake tuxcards.pro
 
 	emake || die
 }