Revision bump to add Xft support. bug #78239

Package-Manager: portage-2.0.51-r15

5 files changed, 32 insertions, 14 deletions

diff --git a/app-admin/torsmo/ChangeLog b/app-admin/torsmo/ChangeLog
index 8defca758592..ab87efa91e38 100644
--- a/app-admin/torsmo/ChangeLog
+++ b/app-admin/torsmo/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-admin/torsmo
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.20 2004/12/31 22:38:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/ChangeLog,v 1.21 2005/01/30 08:40:52 dragonheart Exp $
+
+*torsmo-0.18-r2 (30 Jan 2005)
+
+  30 Jan 2005; Daniel Black <dragonheart@gentoo.org> torsmo-0.18-r1.ebuild,
+  +torsmo-0.18-r2.ebuild, -torsmo-0.18.ebuild:
+  Revision bump to add Xft support. Thanks to Peter Beutner <imago@devinity.de>
+  in bug #78239. Old version removed.
 
 *torsmo-0.18-r1 (01 Jan 2005)
 
diff --git a/app-admin/torsmo/Manifest b/app-admin/torsmo/Manifest
index ef4a12ef4a2c..82df7e1e9bc4 100644
--- a/app-admin/torsmo/Manifest
+++ b/app-admin/torsmo/Manifest
@@ -2,12 +2,11 @@
 Hash: SHA1
 
 MD5 7a2556b95496bf7e5e0d50be6cd48535 torsmo-0.17.ebuild 1340
-MD5 c9e747430115f0a5df516b72d4d0d1bc ChangeLog 3952
+MD5 abac551bf8bbe458f5ba568c022cd1d4 ChangeLog 4225
 MD5 e62755aeb2fcd53a4426e99d3af550ed metadata.xml 549
 MD5 54314b9d79bb7baa1a44fac3b66b6317 torsmo-0.17-r1.ebuild 1481
-MD5 09130da23bc92b86c3ef533c981578a7 torsmo-0.18.ebuild 1343
-MD5 e0409bfec69e82251365f9913d12677e torsmo-0.18-r1.ebuild 1460
-MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18 62
+MD5 77257a00168062f4eb96225cf2c2ec89 torsmo-0.18-r1.ebuild 1459
+MD5 61f8b65e8fc7c8a06200a971cb5b24ab torsmo-0.18-r2.ebuild 1545
 MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r1 62
 MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17-r1 62
 MD5 38f2bbcb59c900a0fc2a2f0ec2f75463 files/digest-torsmo-0.17 62
@@ -15,10 +14,11 @@ MD5 552e015366516a5ff2034d10b083c303 files/torsmo-0.17-mozilla.patch 601
 MD5 d27874dbf963063e13d6387d8ef3912f files/torsmo-0.17-kernel2.4.patch 2388
 MD5 39312a5c71ba9590531a7c0ccd9aaee9 files/torsmo-0.17-mldonkey.patch 15411
 MD5 3345892556d2bc8fddf510c86d3c70f0 files/torsmo-0.18.xwin.patch 575
+MD5 19932267a722d71554454bb3779a9ae0 files/digest-torsmo-0.18-r2 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFB1dT8mdTrptrqvGERArMsAKCFEj7yk/9HJ3MExhrFg3DH1GudnwCdFzOn
-idKfhYD6anzZOzZul+t/fAE=
-=NfnI
+iD8DBQFB/J2amdTrptrqvGERAsCbAJ9sUsKcgtz9c4MwGfzriqXB5yi7XACcD93G
+MEFhhMrtnnU0vQr2RYKnzCg=
+=I3BD
 -----END PGP SIGNATURE-----
diff --git a/app-admin/torsmo/files/digest-torsmo-0.18 b/app-admin/torsmo/files/digest-torsmo-0.18-r2
index f2c1092e434d..f2c1092e434d 100644
--- a/app-admin/torsmo/files/digest-torsmo-0.18
+++ b/app-admin/torsmo/files/digest-torsmo-0.18-r2
diff --git a/app-admin/torsmo/torsmo-0.18-r1.ebuild b/app-admin/torsmo/torsmo-0.18-r1.ebuild
index bb9d389b3373..13e7d7d9e55b 100644
--- a/app-admin/torsmo/torsmo-0.18-r1.ebuild
+++ b/app-admin/torsmo/torsmo-0.18-r1.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-admin/torsmo/torsmo-0.18-r1.ebuild,v 1.1 2004/12/31 22:38:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18-r1.ebuild,v 1.2 2005/01/30 08:40:52 dragonheart Exp $
 
 inherit eutils
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
+KEYWORDS="x86 ~ppc ~amd64 ~sparc"
 IUSE=""
 
 RDEPEND="virtual/libc
diff --git a/app-admin/torsmo/torsmo-0.18.ebuild b/app-admin/torsmo/torsmo-0.18-r2.ebuild
index 1ba89cb7f5c5..47aacbff13f6 100644
--- a/app-admin/torsmo/torsmo-0.18.ebuild
+++ b/app-admin/torsmo/torsmo-0.18-r2.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18.ebuild,v 1.3 2004/12/31 22:38:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/torsmo/torsmo-0.18-r2.ebuild,v 1.1 2005/01/30 08:40:52 dragonheart Exp $
+
+inherit eutils
 
 DESCRIPTION="minimalist system monitor for X"
 HOMEPAGE="http://torsmo.sourceforge.net/"
@@ -9,10 +11,11 @@ SRC_URI="mirror://sourceforge/torsmo/${P}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~x86 ~ppc ~amd64 ~sparc"
-IUSE=""
+IUSE="truetype"
 
 RDEPEND="virtual/libc
-	virtual/x11"
+	virtual/x11
+	truetype? ( >=media-libs/freetype-2*)"
 DEPEND="${RDEPEND}
 	>=sys-devel/automake-1.4
 	sys-devel/autoconf
@@ -20,8 +23,16 @@ DEPEND="${RDEPEND}
 	sys-apps/sed
 	sys-devel/gcc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}.xwin.patch || die "patch failed"
+}
+
 src_compile() {
-	econf --x-libraries=/usr/X11R6/lib/ || die "econf failed"
+	econf \
+	   `use_enable truetype xft` \
+	   --x-libraries=/usr/X11R6/lib/ || die "econf failed"
 	emake || die "compile failed"
 }