Remove monolithic X from dependencies, use MY_P and fix quotes.

Package-Manager: portage-2.1.2_pre3-r6

3 files changed, 32 insertions, 31 deletions

diff --git a/x11-misc/fspanel/ChangeLog b/x11-misc/fspanel/ChangeLog
index b64eab228c00..12d2fb328612 100644
--- a/x11-misc/fspanel/ChangeLog
+++ b/x11-misc/fspanel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-misc/fspanel
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.13 2006/10/11 11:17:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.14 2006/10/22 00:05:32 omp Exp $
+
+  22 Oct 2006; David Shakaryan <omp@gentoo.org> fspanel-0.8_beta1-r2.ebuild:
+  Remove monolithic X from dependencies, use MY_P and fix quotes.
 
   11 Oct 2006; Krzysiek Pawlik <nelchael@gentoo.org>
   fspanel-0.8_beta1-r2.ebuild:
diff --git a/x11-misc/fspanel/Manifest b/x11-misc/fspanel/Manifest
index 0606080ade82..0b1944f6397f 100644
--- a/x11-misc/fspanel/Manifest
+++ b/x11-misc/fspanel/Manifest
@@ -2,14 +2,14 @@
 Hash: SHA1
 
 DIST fspanel-0.8beta1.tar.gz 9703 RMD160 e892f182375e8a8541a01e6f3015f7fa4900c009 SHA1 80225c1cd6984b458e487db3cbc04d8e3a4173d8 SHA256 02ec44100395ebf6d59e03f1f4febb754650a1dd12b9dc13bf6e5afbaf277621
-EBUILD fspanel-0.8_beta1-r2.ebuild 956 RMD160 3d69c133d74ff2d12c102a196f1b0bf5ea15cf3e SHA1 a313340c2cf1b5e1e86713e5d3cb579a2af4fe17 SHA256 98743ae727ff1d00d500f7d9d06872300cb23a5baf79df49bb4f9b46ae0c0ed3
-MD5 609470556e54c01fec32e00f2bc578f2 fspanel-0.8_beta1-r2.ebuild 956
-RMD160 3d69c133d74ff2d12c102a196f1b0bf5ea15cf3e fspanel-0.8_beta1-r2.ebuild 956
-SHA256 98743ae727ff1d00d500f7d9d06872300cb23a5baf79df49bb4f9b46ae0c0ed3 fspanel-0.8_beta1-r2.ebuild 956
-MISC ChangeLog 1411 RMD160 fbeca326fc8a7601f3d5d51f91a09ddf285ab3d2 SHA1 2406df9579e6320b043cd2cbe0efadd6647298a3 SHA256 a40132041c57aa8afe4fc66fb04ba1413edc3918354e7ff06255dd6f2c337951
-MD5 55d4e2a976c4e56303824563de934884 ChangeLog 1411
-RMD160 fbeca326fc8a7601f3d5d51f91a09ddf285ab3d2 ChangeLog 1411
-SHA256 a40132041c57aa8afe4fc66fb04ba1413edc3918354e7ff06255dd6f2c337951 ChangeLog 1411
+EBUILD fspanel-0.8_beta1-r2.ebuild 950 RMD160 ed0aa5b17686f129edbb3aafe31c191d2ec91ee1 SHA1 0167d694801311ec42d1554c4d3b8aea4fa4c2d4 SHA256 a33904e746c86f424e189463322d7e7da9a096269878d866dd7dab51df646c6b
+MD5 a1889de5152d65235756b8c115a17d87 fspanel-0.8_beta1-r2.ebuild 950
+RMD160 ed0aa5b17686f129edbb3aafe31c191d2ec91ee1 fspanel-0.8_beta1-r2.ebuild 950
+SHA256 a33904e746c86f424e189463322d7e7da9a096269878d866dd7dab51df646c6b fspanel-0.8_beta1-r2.ebuild 950
+MISC ChangeLog 1550 RMD160 f96d092a2dad5c68e4b7fd49eea30cc6615b43ca SHA1 07c5eafb5cfd76318be5c10f10cdb70d8a5fddd1 SHA256 87cb16d3eed18365b7880fb45bb74258f6bb0a6ff38aaa0d35d6093b37b474d4
+MD5 387192eebaa3801054097534d5737c7b ChangeLog 1550
+RMD160 f96d092a2dad5c68e4b7fd49eea30cc6615b43ca ChangeLog 1550
+SHA256 87cb16d3eed18365b7880fb45bb74258f6bb0a6ff38aaa0d35d6093b37b474d4 ChangeLog 1550
 MISC metadata.xml 231 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 SHA1 f78294e25f7fd11c0954f753892ece303fc491b3 SHA256 f9af69429b315694d8f6094781bf242d6235450fc58aba6e9e35e28099cc334a
 MD5 8dad4c602e8fc48cf21cf32d762b9af0 metadata.xml 231
 RMD160 edee523a81eb20b171a5dd298e8507ecd49230f6 metadata.xml 231
@@ -20,7 +20,7 @@ SHA256 19f3a1e4cf0a5b9ee6eb2892b4702fc964ba4a6a352fed27f092793fd2617c60 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFLNMDgo/w9rxVVVERAgWnAKCnB5oYUCTITsLlj1cSRQaVwBunFgCfU5gp
-ywZOU8ZugoX8UGdOANna0fA=
-=bTJJ
+iD8DBQFFOrXVvSApE0uP4UsRAh3KAJ4u1J0GPpoQHRpa28ghlkC3/J5+TACcCy1j
+Vfdzf0BM2ezVc3WUcFZRI7o=
+=lgwb
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild b/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild
index be0768dae1ed..e372510ee826 100644
--- a/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild
+++ b/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild
@@ -1,46 +1,44 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild,v 1.7 2006/10/11 11:17:53 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild,v 1.8 2006/10/22 00:05:32 omp Exp $
+
+MY_P=${P/_beta/beta}
 
-S=${WORKDIR}/fspanel-0.8beta1
 DESCRIPTION="F***ing Small Panel. Good (and small) replacement for gnome-panel"
-SRC_URI="http://www.chatjunkies.org/fspanel/fspanel-0.8beta1.tar.gz"
 HOMEPAGE="http://www.chatjunkies.org/fspanel"
+SRC_URI="http://www.chatjunkies.org/fspanel/${MY_P}.tar.gz"
 
+LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 sparc ppc ~amd64"
 IUSE=""
-LICENSE="GPL-2"
 
-RDEPEND="|| ( (
-		x11-libs/libX11
-		x11-libs/libXpm
-		x11-libs/libXft )
-	virtual/x11 )"
+RDEPEND="x11-libs/libX11
+	x11-libs/libXpm
+	x11-libs/libXft"
 DEPEND="${RDEPEND}
-	|| ( x11-proto/xproto virtual/x11 )
-	dev-util/pkgconfig"
+	dev-util/pkgconfig
+	x11-proto/xproto"
 
-src_unpack() {
+S=${WORKDIR}/${MY_P}
 
+src_unpack() {
 	unpack ${A}
 	sed -i -e 's,/X11R6,,g' "${S}/configure"
-
 }
 
 src_compile() {
-
-	if pkg-config xft
-	then
+	if pkg-config xft; then
 		CFLAGS="${CFLAGS} -I/usr/include/freetype2"
 	fi
-	./configure
-	emake || die
+
+	./configure || die "configure failed"
+	emake || die "emake failed"
 }
 
 src_install () {
 	exeinto /usr/bin
-	doexe ${S}/fspanel
+	doexe "${S}/fspanel"
 
 	dodoc README
 }