fixes...

4 files changed, 4 insertions, 70 deletions

diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 0daffc4..26ed90d 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -21,7 +21,7 @@ IUSE="+builtin-blkid crypt loop-aes nls old-linux selinux slang unicode"
 RDEPEND="!sys-process/schedutils
 	!sys-apps/setarch
 	>=sys-libs/ncurses-5.2-r2
-	sys-libs/e2fsprogs-libs[without-blkid]
+	builtin-blkid? ( sys-libs/e2fsprogs-libs[without-blkid] )
 	selinux? ( sys-libs/libselinux )
 	slang? ( sys-libs/slang )"
 DEPEND="${RDEPEND}
diff --git a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.4.ebuild b/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.4.ebuild
deleted file mode 100644
index a303689..0000000
--- a/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.4.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/e2fsprogs-libs/e2fsprogs-libs-1.41.4.ebuild,v 1.2 2009/03/15 05:01:39 vapier Exp $
-
-EAPI="2"
-
-inherit flag-o-matic toolchain-funcs
-
-DESCRIPTION="e2fsprogs libraries (common error, subsystem, uuid, block id)"
-HOMEPAGE="http://e2fsprogs.sourceforge.net/"
-SRC_URI="mirror://sourceforge/e2fsprogs/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS=""
-IUSE="nls +without-blkid"
-
-RDEPEND="elibc_glibc? ( >=sys-libs/glibc-2.6 )
-	!sys-libs/com_err
-	!sys-libs/ss
-	!<sys-fs/e2fsprogs-1.41"
-DEPEND="nls? ( sys-devel/gettext )
-	sys-devel/bc"
-
-set_env() {
-	export LDCONFIG=/bin/true
-	export CC=$(tc-getCC)
-}
-
-src_configure() {
-	set_env
-
-	# We want to use the "bsd" libraries while building on Darwin, but while
-	# building on other Gentoo/*BSD we prefer elf-naming scheme.
-	local libtype
-	case ${CHOST} in
-		*-darwin*) libtype=bsd;;
-		*)         libtype=elf;;
-	esac
-
-	econf \
-		--enable-${libtype}-shlibs \
-		$(use_enable !elibc_uclibc tls) \
-		$(use_enable nls) \
-		|| die
-}
-
-src_compile() {
-	set_env
-	emake STRIP=/bin/true || die
-}
-
-src_install() {
-	set_env
-	emake STRIP=/bin/true DESTDIR="${D}" install || die
-
-	dodir /$(get_libdir)
-	local lib slib
-	for lib in "${D}"/usr/$(get_libdir)/*.a ; do
-		slib=${lib##*/}
-		mv "${lib%.a}"$(get_libname)* "${D}"/$(get_libdir)/ || die "moving lib ${slib}"
-		gen_usr_ldscript ${slib%.a}$(get_libname)
-	done
-	useq without-blkid && ( rm ${D}/$(get_libdir)/libblkid.* && rm ${D}/usr/$(get_libdir)/libblkid.* )
-}
-
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index a568dd1..798130b 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -29,8 +29,7 @@ RDEPEND="media-libs/fontconfig
 	svg? ( dev-libs/libxml2 )
 	X? ( 	>=x11-libs/libXrender-0.6
 		x11-libs/libXext
-		x11-libs/libX11
-		virtual/xft )
+		x11-libs/libX11 )
 	xcb? (	>=x11-libs/libxcb-0.92
 		x11-libs/xcb-util )"
 #	test? (
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index 6b09676..eeaf2f5 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-9999.ebuild
@@ -34,7 +34,8 @@ DEPEND="${RDEPEND}
 				>=dev-util/gtk-doc-1
 				~app-text/docbook-xml-dtd-4.1.2
 			 )
-		X? ( x11-proto/xproto )"
+		X? ( x11-proto/xproto )
+		gnome-base/gnome-common"
 
 DOCS="AUTHORS ChangeLog* NEWS README TODO*"