Fixed DEPEND for modular X (bug #118261), removed old version.

(Portage version: 2.1_pre3-r1)

5 files changed, 22 insertions, 130 deletions

diff --git a/x11-libs/libdockapp/ChangeLog b/x11-libs/libdockapp/ChangeLog
index a49875ed7591..d47034ede67e 100644
--- a/x11-libs/libdockapp/ChangeLog
+++ b/x11-libs/libdockapp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-libs/libdockapp
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/ChangeLog,v 1.24 2005/11/03 20:37:02 metalgod Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/ChangeLog,v 1.25 2006/01/15 14:25:55 nelchael Exp $
+
+  15 Jan 2006; Krzysiek Pawlik <nelchael@gentoo.org>
+  -files/install-paths.patch-0.5.0-r1, -libdockapp-0.5.0-r1.ebuild,
+  libdockapp-0.6.0.ebuild:
+  Fixed DEPEND for modular X (bug #118261), removed old version.
 
   03 Nov 2005; Luis Medinas <metalgod@gentoo.org> libdockapp-0.6.0.ebuild:
   Marked Stable on amd64.
diff --git a/x11-libs/libdockapp/files/digest-libdockapp-0.5.0-r1 b/x11-libs/libdockapp/files/digest-libdockapp-0.5.0-r1
deleted file mode 100644
index 2f7b00972bdd..000000000000
--- a/x11-libs/libdockapp/files/digest-libdockapp-0.5.0-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 918693a30bdff72e629ef8b85a3f6779 libdockapp-0.5.0.tar.bz2 131091
diff --git a/x11-libs/libdockapp/files/install-paths.patch-0.5.0-r1 b/x11-libs/libdockapp/files/install-paths.patch-0.5.0-r1
deleted file mode 100644
index 4e990650b3fe..000000000000
--- a/x11-libs/libdockapp/files/install-paths.patch-0.5.0-r1
+++ /dev/null
@@ -1,45 +0,0 @@
---- dockapp/fonts/Makefile.in	2003-04-14 06:30:24.000000000 -0500
-+++ dockapp/fonts/Makefile.in	2004-06-08 02:34:32.755288400 -0500
-@@ -77,7 +77,7 @@
- XFONTDIR = $(DESTDIR)/usr/X11R6/lib/X11/fonts
- 
- MYFONTDIR = /dockapp
--MYDATA = luxel-ascii-06x09.pcf.gz seg7-ascii-05x07.pcf.gz fonts.dir fonts.alias
-+MYDATA = luxel-ascii-06x09.pcf.gz seg7-ascii-05x07.pcf.gz
- subdir = fonts
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES =
-@@ -204,8 +204,8 @@
- 
- 
- install-data-local:
--	$(INSTALL) -d $(XFONTDIR)$(MYFONTDIR)
--	$(INSTALL_DATA) $(MYDATA) $(XFONTDIR)$(MYFONTDIR)
-+	$(INSTALL) -d $(DESTDIR)/usr/share/fonts/libdockapp-fonts
-+	$(INSTALL_DATA) $(MYDATA) $(DESTDIR)/usr/share/fonts/libdockapp-fonts
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
---- dockapp/examples/Makefile.in	2004-09-15 21:53:56.224260440 +0200
-+++ dockapp/examples/Makefile.in	2004-09-15 22:05:52.527365816 +0200
-@@ -212,14 +212,14 @@
- 
- 
- install-data-local:
--	$(INSTALL) -d $(SHAREDIR)$(EXAMPLESDIR)$(BASICDIR)
--	$(INSTALL_DATA) $(BASICSRC) $(SHAREDIR)$(EXAMPLESDIR)$(BASICDIR)
-+	$(INSTALL) -d $(SHAREDIR)$(BASICDIR)
-+	$(INSTALL_DATA) $(BASICSRC) $(SHAREDIR)$(BASICDIR)
- 
--	$(INSTALL) -d $(SHAREDIR)$(EXAMPLESDIR)$(RECTDIR)
--	$(INSTALL_DATA) $(RECTSRC) $(SHAREDIR)$(EXAMPLESDIR)$(RECTDIR)
-+	$(INSTALL) -d $(SHAREDIR)$(RECTDIR)
-+	$(INSTALL_DATA) $(RECTSRC) $(SHAREDIR)$(RECTDIR)
- 
--	$(INSTALL) -d $(SHAREDIR)$(EXAMPLESDIR)$(SHAPEDIR)
--	$(INSTALL_DATA) $(SHAPESRC) $(SHAREDIR)$(EXAMPLESDIR)$(SHAPEDIR)
-+#	$(INSTALL) -d $(SHAREDIR)$(SHAPEDIR)
-+#	$(INSTALL_DATA) $(SHAPESRC) $(SHAREDIR)$(SHAPEDIR)
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff --git a/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild b/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild
deleted file mode 100644
index 8f1d1507a227..000000000000
--- a/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild,v 1.4 2005/06/08 12:56:58 s4t4n Exp $
-
-inherit eutils
-
-IUSE=""
-
-DESCRIPTION="Window Maker Dock Applet Library"
-SRC_URI="http://solfertje.student.utwente.nl/~dalroi/libdockapp/files/${P}.tar.bz2"
-HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/libdockapp/"
-
-LICENSE="as-is"
-SLOT="0"
-KEYWORDS="x86 sparc amd64 ppc ppc64"
-DEPEND="virtual/x11"
-S=${WORKDIR}/${PN/lib/}
-FONTDIR="/usr/share/fonts/${PN}-fonts"
-
-src_unpack()
-{
-	unpack ${A}
-
-	# Remove non existing targets from makefile.in
-	# sanitize fonts installation path
-	# sanitize examples install. path
-	cd ${S}
-	epatch ${FILESDIR}/install-paths.patch-0.5.0-r1
-}
-
-src_compile()
-{
-	libtoolize --force --copy
-	aclocal
-	autoconf
-
-	econf || die "configure failed"
-	emake || die "parallel make failed"
-}
-
-src_install()
-{
-	make                                                    \
-		DESTDIR=${D}                                        \
-		SHAREDIR="${D}/usr/share/doc/${PF}/examples/"       \
-		install || die "make install failed"
-
-	dodoc README ChangeLog NEWS AUTHORS
-}
-
-pkg_postinst()
-{
-	einfo
-	einfo "You need to add following line into 'Section \"Files\"' in"
-	einfo "/etc/X11/xorg.conf (or /etc/X11/XF86Config if you are still using XFree86)"
-	einfo "and reboot X Window System, to use these fonts."
-	einfo
-	einfo "\t FontPath \"${FONTDIR}\""
-	einfo
-	einfo "You also need to add the following line to /etc/fonts/local.conf"
-	einfo
-	einfo "\t <dir>${FONTDIR}</dir>"
-	einfo
-}
-
-pkg_postrm()
-{
-	einfo
-	einfo "You need to remove following line from 'Section \"Files\"' in"
-	einfo "/etc/X11/xorg.conf (or /etc/X11/XF86Config if you are still using XFree86)"
-	einfo "to unmerge this package completely."
-	einfo
-	einfo "\t FontPath \"${FONTDIR}\""
-	einfo
-	einfo "You also need to remove the following line from /etc/fonts/local.conf"
-	einfo
-	einfo "\t <dir>${FONTDIR}</dir>"
-	einfo
-}
diff --git a/x11-libs/libdockapp/libdockapp-0.6.0.ebuild b/x11-libs/libdockapp/libdockapp-0.6.0.ebuild
index 269d71af9819..7253c8b07963 100644
--- a/x11-libs/libdockapp/libdockapp-0.6.0.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.6.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/libdockapp-0.6.0.ebuild,v 1.6 2005/11/03 20:37:02 metalgod Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/libdockapp-0.6.0.ebuild,v 1.7 2006/01/15 14:25:55 nelchael Exp $
 
 inherit eutils
 
@@ -13,7 +13,19 @@ HOMEPAGE="http://solfertje.student.utwente.nl/~dalroi/libdockapp/"
 LICENSE="as-is"
 SLOT="0"
 KEYWORDS="amd64 ppc ppc64 sparc x86"
-DEPEND="virtual/x11"
+
+RDEPEND="|| ( (
+		x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXext
+		x11-libs/libXpm )
+	virtual/x11 )"
+DEPEND="${RDEPEND}
+	|| ( (
+		x11-proto/xextproto
+		x11-proto/xproto )
+	virtual/x11 )"
+
 S=${WORKDIR}/${P/lib/}
 FONTDIR="/usr/share/fonts/${PN}-fonts"