diff options
Diffstat (limited to 'x11-misc/fspanel')
-rw-r--r-- | x11-misc/fspanel/ChangeLog | 8 | ||||
-rw-r--r-- | x11-misc/fspanel/files/digest-fspanel-0.8_beta1-r1 | 1 | ||||
-rw-r--r-- | x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild | 32 | ||||
-rw-r--r-- | x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild | 14 |
4 files changed, 16 insertions, 39 deletions
diff --git a/x11-misc/fspanel/ChangeLog b/x11-misc/fspanel/ChangeLog index f86fd527cb35..e6af8ff1a11f 100644 --- a/x11-misc/fspanel/ChangeLog +++ b/x11-misc/fspanel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for x11-misc/fspanel -# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.11 2005/06/19 19:26:07 smithj Exp $ +# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/ChangeLog,v 1.12 2006/01/21 12:03:15 nelchael Exp $ + + 21 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org> + -fspanel-0.8_beta1-r1.ebuild, fspanel-0.8_beta1-r2.ebuild: + Fixed DEPEND for modular X. 19 Jun 2005; Jonathan Smith <smithj@gentoo.org> +metadata.xml, -fspanel-0.8_beta1.ebuild: diff --git a/x11-misc/fspanel/files/digest-fspanel-0.8_beta1-r1 b/x11-misc/fspanel/files/digest-fspanel-0.8_beta1-r1 deleted file mode 100644 index 536e61ef47f2..000000000000 --- a/x11-misc/fspanel/files/digest-fspanel-0.8_beta1-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 213ea167a50c4971c3c110db9b4be4e9 fspanel-0.8beta1.tar.gz 9703 diff --git a/x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild b/x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild deleted file mode 100644 index 027587b8e34e..000000000000 --- a/x11-misc/fspanel/fspanel-0.8_beta1-r1.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2004 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-r1.ebuild,v 1.5 2004/07/15 00:52:45 agriffis Exp $ - -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" - -SLOT="0" -KEYWORDS="x86 sparc" -IUSE="" -LICENSE="GPL-2" - -DEPEND="virtual/x11" - -src_compile() { - - if pkg-config xft - then - CFLAGS="${CFLAGS} -I/usr/include/freetype2" - fi - ./configure - emake || die -} - -src_install () { - exeinto /usr/bin - doexe ${S}/fspanel - - dodoc README -} diff --git a/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild b/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild index 8254d6856a5d..3351fe7785af 100644 --- a/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild +++ b/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2004 Gentoo Foundation +# 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.5 2004/08/04 20:54:44 slarti Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-misc/fspanel/fspanel-0.8_beta1-r2.ebuild,v 1.6 2006/01/21 12:03:15 nelchael Exp $ S=${WORKDIR}/fspanel-0.8beta1 DESCRIPTION="F***ing Small Panel. Good (and small) replacement for gnome-panel" @@ -12,8 +12,14 @@ KEYWORDS="x86 sparc ppc ~amd64" IUSE="" LICENSE="GPL-2" -DEPEND="virtual/x11 - dev-util/pkgconfig" +RDEPEND="|| ( ( + x11-libs/libX11 + x11-libs/libXpm + x11-libs/libXft ) + virtual/x11 )" +DEPEND="${RDEPEND} + || ( x11-proto/xproto virtual/x11 ) + dev-util/pkgconfig" src_compile() { |