10 files changed, 33 insertions, 65 deletions
diff --git a/kde-misc/kompose/ChangeLog b/kde-misc/kompose/ChangeLog
index 235a126cc961..35e774581318 100644
--- a/kde-misc/kompose/ChangeLog
+++ b/kde-misc/kompose/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/kompose
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/ChangeLog,v 1.8 2005/06/05 11:45:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/ChangeLog,v 1.9 2005/06/30 12:58:44 danarmak Exp $
+
+  30 Jun 2005; Dan Armak <danarmak@gentoo.org> -kompose-0.3.ebuild,
+  -kompose-0.4.1.ebuild, -kompose-0.4.2.ebuild, kompose-0.5.ebuild,
+  kompose-0.5.1.ebuild:
+  Fix bug 94881: require imlib2 build with USE=X. Also, removed some old
+  ebuild versions.
 
   05 Jun 2005; Michael Hanselmann <hansmi@gentoo.org> kompose-0.5.1.ebuild:
   Stable on ppc.
diff --git a/kde-misc/kompose/Manifest b/kde-misc/kompose/Manifest
index ea982f03cd90..8242abf31d41 100644
--- a/kde-misc/kompose/Manifest
+++ b/kde-misc/kompose/Manifest
@@ -1,12 +1,12 @@
-MD5 e3cea27f8754824f2d2b1bc0fb239c69 kompose-0.4.2.ebuild 503
+MD5 6a099f473f54739426034b826ac04d2a kompose-0.5.ebuild 500
 MD5 3c57ab3db4386169d7e63f374e2b10f9 kompose-0.4.1.ebuild 502
-MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
+MD5 155908cd101267f8da7a220f938ced75 kompose-0.5.1.ebuild 802
+MD5 e3cea27f8754824f2d2b1bc0fb239c69 kompose-0.4.2.ebuild 503
 MD5 fe08ce4e6ae9d8db4b824583dbf02098 ChangeLog 1960
-MD5 6a099f473f54739426034b826ac04d2a kompose-0.5.ebuild 500
 MD5 34245662075f9a2f2fd67ec2dc8753ec kompose-0.3.ebuild 475
-MD5 442da8f3f06fd8aff02657c59946a341 kompose-0.5.1.ebuild 508
-MD5 0b66fd01b68c84aa8facffe68dcb40bb files/digest-kompose-0.3 70
+MD5 acc03a4b12bb0433a57e95bd253b9501 metadata.xml 156
 MD5 56cd1ffdc72ce2bf99c8772482ad6ceb files/digest-kompose-0.4.1 66
 MD5 e9dac40c72df3ad65456c25eea055d6b files/digest-kompose-0.4.2 66
 MD5 bb8349056aacdedf127c2fc397eee839 files/digest-kompose-0.5.1 66
+MD5 0b66fd01b68c84aa8facffe68dcb40bb files/digest-kompose-0.3 70
 MD5 940d03f7ca83b7e2d11b40b4013b0d12 files/digest-kompose-0.5 64
diff --git a/kde-misc/kompose/files/digest-kompose-0.3 b/kde-misc/kompose/files/digest-kompose-0.3
deleted file mode 100644
index ec21f8d9a9c7..000000000000
--- a/kde-misc/kompose/files/digest-kompose-0.3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 68631556682df276a9382ecb29f336df 14422-kompose-0.3.tar.bz2 475928
diff --git a/kde-misc/kompose/files/digest-kompose-0.4.1 b/kde-misc/kompose/files/digest-kompose-0.4.1
deleted file mode 100644
index c8ccdd60bb57..000000000000
--- a/kde-misc/kompose/files/digest-kompose-0.4.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 33eef6c79bec0e04f563769d9004064d kompose-0.4.1.tar.bz2 494730
diff --git a/kde-misc/kompose/files/digest-kompose-0.4.2 b/kde-misc/kompose/files/digest-kompose-0.4.2
deleted file mode 100644
index 9aff201c0bf0..000000000000
--- a/kde-misc/kompose/files/digest-kompose-0.4.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 b51839098432590c0903da3e75a853ac kompose-0.4.2.tar.bz2 492247
diff --git a/kde-misc/kompose/kompose-0.3.ebuild b/kde-misc/kompose/kompose-0.3.ebuild
deleted file mode 100644
index c92795d2990e..000000000000
--- a/kde-misc/kompose/kompose-0.3.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.3.ebuild,v 1.2 2005/01/21 17:15:42 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="A KDE fullscreen task manager."
-HOMEPAGE="http://kde-apps.org/content/show.php?content=14422"
-SRC_URI="http://kde-apps.org/content/files/14422-${P}.tar.bz2"
-
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~amd64"
-IUSE=""
-
-need-kde 3.2
-\ No newline at end of file
diff --git a/kde-misc/kompose/kompose-0.4.1.ebuild b/kde-misc/kompose/kompose-0.4.1.ebuild
deleted file mode 100644
index 0766ebf2b9cd..000000000000
--- a/kde-misc/kompose/kompose-0.4.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.4.1.ebuild,v 1.2 2005/01/21 17:15:42 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="A KDE fullscreen task manager."
-HOMEPAGE="http://kompose.berlios.de"
-SRC_URI="http://download.berlios.de/kompose/${P}.tar.bz2"
-
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ppc ~amd64"
-IUSE=""
-
-DEPEND="media-libs/imlib2"
-RDEPEND="media-libs/imlib2"
-need-kde 3.2
-\ No newline at end of file
diff --git a/kde-misc/kompose/kompose-0.4.2.ebuild b/kde-misc/kompose/kompose-0.4.2.ebuild
deleted file mode 100644
index 9deeff796407..000000000000
--- a/kde-misc/kompose/kompose-0.4.2.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.4.2.ebuild,v 1.2 2005/01/21 17:15:42 carlo Exp $
-
-inherit kde
-
-DESCRIPTION="A KDE fullscreen task manager."
-HOMEPAGE="http://kompose.berlios.de"
-SRC_URI="http://download.berlios.de/kompose/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~x86 ~ppc ~amd64"
-IUSE=""
-
-DEPEND="media-libs/imlib2"
-RDEPEND="media-libs/imlib2"
-need-kde 3.2
diff --git a/kde-misc/kompose/kompose-0.5.1.ebuild b/kde-misc/kompose/kompose-0.5.1.ebuild
index c197f2cf49ed..a0f3375e1444 100644
--- a/kde-misc/kompose/kompose-0.5.1.ebuild
+++ b/kde-misc/kompose/kompose-0.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.5.1.ebuild,v 1.5 2005/06/05 11:45:24 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.5.1.ebuild,v 1.6 2005/06/30 12:58:44 danarmak Exp $
 
 inherit kde
 
@@ -16,3 +16,12 @@ IUSE=""
 DEPEND="media-libs/imlib2"
 RDEPEND="media-libs/imlib2"
 need-kde 3.2
+
+function pkg_setup() {
+	# bug 94881
+	if ! built_with_use media-libs/imlib2 X; then
+		eerror "This package requires imlib2 to be built with X11 support."
+		eerror "Please run USE=X emerge media-libs/imlib2, then try emerging kompose again."
+		die "imlib2 must be built with USE=X"
+	fi
+}
diff --git a/kde-misc/kompose/kompose-0.5.ebuild b/kde-misc/kompose/kompose-0.5.ebuild
index 4f8dd600ae45..b814c48d38e3 100644
--- a/kde-misc/kompose/kompose-0.5.ebuild
+++ b/kde-misc/kompose/kompose-0.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.5.ebuild,v 1.3 2005/01/21 17:15:42 carlo Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/kompose/kompose-0.5.ebuild,v 1.4 2005/06/30 12:58:44 danarmak Exp $
 
 inherit kde
 
@@ -16,3 +16,13 @@ IUSE=""
 DEPEND="media-libs/imlib2"
 RDEPEND="media-libs/imlib2"
 need-kde 3.2
+
+
+function pkg_setup() {
+	# bug 94881
+	if ! built_with_use media-libs/imlib2 X; then
+	        eerror "This package requires imlib2 to be built with X11 support."
+	        eerror "Please run USE=X emerge media-libs/imlib2, then try emerging kompose again."
+	        die "imlib2 must be built with USE=X"
+	fi
+}