Remove virtual/x11 references.

(Portage version: 2.1.3_rc8)

2 files changed, 15 insertions, 19 deletions

diff --git a/media-libs/t1lib/ChangeLog b/media-libs/t1lib/ChangeLog
index 49a942201122..a190c44ce0cb 100644
--- a/media-libs/t1lib/ChangeLog
+++ b/media-libs/t1lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/t1lib
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.53 2007/01/05 08:35:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/ChangeLog,v 1.54 2007/07/22 09:01:05 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org> t1lib-5.0.2.ebuild:
+  Remove virtual/x11 references.
 
   05 Jan 2007; Diego Pettenò <flameeyes@gentoo.org> t1lib-1.3.1.ebuild,
   t1lib-5.0.2.ebuild:
diff --git a/media-libs/t1lib/t1lib-5.0.2.ebuild b/media-libs/t1lib/t1lib-5.0.2.ebuild
index 05cbb2dd2ef0..9e5580dbd40a 100644
--- a/media-libs/t1lib/t1lib-5.0.2.ebuild
+++ b/media-libs/t1lib/t1lib-5.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2.ebuild,v 1.28 2007/01/05 08:35:17 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/t1lib/t1lib-5.0.2.ebuild,v 1.29 2007/07/22 09:01:05 drac Exp $
 
 inherit eutils flag-o-matic libtool toolchain-funcs
 
@@ -14,30 +14,24 @@ KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc-macos ppc64 s390 sh sparc x86 ~
 IUSE="X doc"
 
 RDEPEND="X? ( x11-libs/libXaw )"
-
 DEPEND="${RDEPEND}
 	doc? ( virtual/tetex )
-	X? ( || ( (
-		x11-libs/libXfont
+	X? ( x11-libs/libXfont
 		x11-proto/xproto
-		x11-proto/fontsproto )
-	virtual/x11 ) )"
+		x11-proto/fontsproto )"
 
 src_unpack() {
 	unpack ${A}
 	use ppc-macos && darwintoolize
-	cd ${S}
-	epatch "${FILESDIR}/${P}-gentoo.diff"
-	epatch "${FILESDIR}/${P}-asneeded.patch"
-
-	sed -i -e "s:dvips:#dvips:" ${S}/doc/Makefile.in
-
-	sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" ${S}/xglyph/xglyph.c
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-gentoo.diff
+	epatch "${FILESDIR}"/${P}-asneeded.patch
+	sed -i -e "s:dvips:#dvips:" "${S}"/doc/Makefile.in
+	sed -i -e "s:\./\(t1lib\.config\):/etc/t1lib/\1:" "${S}"/xglyph/xglyph.c
 }
 
 src_compile() {
 	local myopt=""
-
 	tc-export CC
 
 	use alpha && append-flags -mieee
@@ -51,13 +45,12 @@ src_compile() {
 	econf \
 		--datadir=/etc \
 		`use_with X x` \
-		 || die
-	emake ${myopt} || die
+		 || die "econf failed."
+	emake ${myopt} || die "emake failed."
 }
 
 src_install() {
-	make DESTDIR=${D} install || die
-
+	make DESTDIR="${D}" install || die "make install failed."
 	dodoc Changes LGPL LICENSE README*
 	if use doc ; then
 		cd doc