Remove virtual/x11 references.

Package-Manager: portage-2.1.3_rc8

4 files changed, 38 insertions, 39 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
diff --git a/media-libs/vgui/ChangeLog b/media-libs/vgui/ChangeLog
index 9e90df6a8bcc..de91724ea043 100644
--- a/media-libs/vgui/ChangeLog
+++ b/media-libs/vgui/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/vgui
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vgui/ChangeLog,v 1.8 2007/02/22 02:07:55 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vgui/ChangeLog,v 1.9 2007/07/22 08:57:19 drac Exp $
+
+  22 Jul 2007; Samuli Suominen <drac@gentoo.org> vgui-1.90a-r1.ebuild:
+  Remove virtual/x11 references.
 
   22 Feb 2007; Piotr Jaroszyński <peper@gentoo.org> ChangeLog:
   Transition to Manifest2.
diff --git a/media-libs/vgui/vgui-1.90a-r1.ebuild b/media-libs/vgui/vgui-1.90a-r1.ebuild
index f7baa1ea91f1..58b2c89a34b7 100644
--- a/media-libs/vgui/vgui-1.90a-r1.ebuild
+++ b/media-libs/vgui/vgui-1.90a-r1.ebuild
@@ -1,39 +1,39 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/vgui/vgui-1.90a-r1.ebuild,v 1.2 2007/07/12 03:10:24 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/vgui/vgui-1.90a-r1.ebuild,v 1.3 2007/07/22 08:57:19 drac Exp $
 
 MY_PN="v"
 MY_PV="${PV/a}"
 MY_P="${MY_PN}-${MY_PV}"
+
 DESCRIPTION="V is a free portable C++ GUI Framework"
 HOMEPAGE="http://vgui.sf.net/"
 SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz
 		 mirror://sourceforge/${PN}/${MY_PN}-${PV}-patch.tar.gz"
+
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~x86 ~ppc"
 IUSE=""
-RDEPEND="|| ( ( media-libs/glut
-				x11-libs/libXaw
-				virtual/opengl
-				virtual/glut )
-			virtual/x11 )
-		virtual/libc"
+
+RDEPEND="media-libs/glut
+	x11-libs/libXaw
+	virtual/opengl
+	virtual/glut
+	virtual/libc"
 DEPEND="${RDEPEND}
-	|| ( ( 	x11-proto/xextproto
-			x11-proto/xproto )
-		virtual/x11 )"
+	x11-proto/xextproto
+	x11-proto/xproto"
 
 src_unpack() {
 	unpack ${MY_P}.tar.gz
 	unpack ${MY_PN}-${PV}-patch.tar.gz
 	# renames ./home/vgui to ${S}
-	mv ${WORKDIR}/home/vgui ${S}
+	mv "${WORKDIR}"/home/vgui "${S}"
 	# put ./home/help inside ${S}
-	mv ${WORKDIR}/home/help ${S}
-
-	cd ${S}
+	mv "${WORKDIR}"/home/help "${S}"
 
+	cd "${S}"
 	for i in srcx/vtimer.cxx includex/v/vtimer.h; do
 		sed -e 's|notUsed|notUsedVariable|g' -i ${i}
 	done
@@ -67,9 +67,9 @@ src_compile() {
 	export CFLAGS=""
 	echo "CFLAGS += ${oldcflags}" >> Config.mk
 
-	emake vlib || die
-	emake vtest utils examples || die
-	emake || die
+	emake vlib || die "emake vlib failed."
+	emake vtest utils examples || die "emake vtest utils examples failed."
+	emake || die "emake failed."
 }
 
 src_install() {
@@ -81,5 +81,5 @@ src_install() {
 
 	local docs=/usr/share/doc/${PF}/html
 	dodir ${docs}
-	mv help/vrefman/ ${D}${docs}
+	mv help/vrefman/ "${D}"${docs}
 }