Version bump, closing bug #95040...

Package-Manager: portage-2.0.51.19

7 files changed, 129 insertions, 8 deletions

diff --git a/x11-libs/libdockapp/ChangeLog b/x11-libs/libdockapp/ChangeLog
index 9c9623f73de7..511245115084 100644
--- a/x11-libs/libdockapp/ChangeLog
+++ b/x11-libs/libdockapp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-libs/libdockapp
-# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/ChangeLog,v 1.18 2004/12/22 11:03:29 s4t4n Exp $
+# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/ChangeLog,v 1.19 2005/06/08 12:56:58 s4t4n Exp $
+
+*libdockapp-0.6.0 (08 Jun 2005)
+
+  08 Jun 2005; Michele Noberasco <s4t4n@gentoo.org> libdocapp-0.6.0.ebuild:
+  Version bump, with updated installation paths patch, and a new one to
+  add legacy support for existing dockapps. Closes #95040.
+  libdocapp-0.6.0.ebuild, libdocapp-0.5.0-r1.ebuild:
+  Edited pkg_postinst() and pkg_postrm(), pointing user to the right config
+  file if he/she/it be using XFree86 or xorg-x11...
 
   22 Dec 2004; Michele Noberasco <s4t4n@gentoo.org> libdockapp-0.4.0.ebuild,
   libdockapp-0.4.0-r1.ebuild, libdockapp-0.5.0.ebuild:
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 3bde83072774..4b658d3c1824 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,5 +1,9 @@
-MD5 70f44adaf24295abff842c9166c52fe0 libdockapp-0.5.0-r1.ebuild 1875
-MD5 06f16d6de60612cf0a082e7a6623a5c6 ChangeLog 2608
+MD5 bdfff5e10e5ac87947825496dc70ce2a libdockapp-0.5.0-r1.ebuild 2020
+MD5 f9bd20104f3fd6597e8da1cfb36fe5d3 libdockapp-0.6.0.ebuild 2016
+MD5 0137aef294e24d77a1232c8bdff0a348 ChangeLog 3030
 MD5 6d7c8273694466206e24aefb3fc0b5b4 metadata.xml 226
+MD5 40670187d13933635b287522420fa9f2 files/install-paths.patch-0.6.0 514
+MD5 0ef2deedbab54627102e1e97fcf4cb9a files/legacy.patch-0.6.0 395
 MD5 343593eb3d4db7ce043a12878ae1949e files/digest-libdockapp-0.5.0-r1 69
 MD5 a70c186c6965fe64569ea3cb109adad9 files/install-paths.patch-0.5.0-r1 1837
+MD5 6cc13b5b510882fd40013a8a35b6725f files/digest-libdockapp-0.6.0 69
diff --git a/x11-libs/libdockapp/files/digest-libdockapp-0.6.0 b/x11-libs/libdockapp/files/digest-libdockapp-0.6.0
new file mode 100644
index 000000000000..3429e387b97d
--- /dev/null
+++ b/x11-libs/libdockapp/files/digest-libdockapp-0.6.0
@@ -0,0 +1 @@
+MD5 fcad826f544c67f8fdde2802f46fd330 libdockapp-0.6.0.tar.bz2 308705
diff --git a/x11-libs/libdockapp/files/install-paths.patch-0.6.0 b/x11-libs/libdockapp/files/install-paths.patch-0.6.0
new file mode 100644
index 000000000000..7206655bb7a3
--- /dev/null
+++ b/x11-libs/libdockapp/files/install-paths.patch-0.6.0
@@ -0,0 +1,15 @@
+--- fonts/Makefile.am	2005-06-08 14:36:38.389096256 +0200
++++ fonts/Makefile.am	2005-06-08 14:37:18.276032520 +0200
+@@ -5,10 +5,10 @@
+ #	but I don't know how and they don't tell.
+ #
+ 
+-XFONTDIR = $(DESTDIR)/usr/X11R6/lib/X11/fonts
++XFONTDIR = $(DESTDIR)/usr/share/fonts/libdockapp-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
+ 
+ install-data-local:
+ 	$(INSTALL) -d $(XFONTDIR)$(MYFONTDIR)
diff --git a/x11-libs/libdockapp/files/legacy.patch-0.6.0 b/x11-libs/libdockapp/files/legacy.patch-0.6.0
new file mode 100644
index 000000000000..b608db02195e
--- /dev/null
+++ b/x11-libs/libdockapp/files/legacy.patch-0.6.0
@@ -0,0 +1,10 @@
+--- dockapp-0.6.0/src/damain-orig.c	2005-04-20 20:05:04.000000000 +0200
++++ dockapp-0.6.0/src/damain.c	2005-06-04 19:21:34.000000000 +0200
+@@ -237,6 +237,7 @@
+ DAInitialize(char *display, char *name, unsigned width, unsigned height,
+ 	int argc, char **argv)
+ {
++    _daContext= DAContextInit();    
+     DAOpenDisplay(display, argc, argv);
+     DACreateIcon(name, width, height, argc, argv);
+ }
diff --git a/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild b/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild
index 257ce93bd4fc..8f1d1507a227 100644
--- a/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild
+++ b/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# 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.3 2004/10/23 16:20:38 weeve Exp $
+# $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
 
@@ -52,7 +52,8 @@ pkg_postinst()
 {
 	einfo
 	einfo "You need to add following line into 'Section \"Files\"' in"
-	einfo "XF86Config and reboot X Window System, to use these fonts."
+	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
@@ -66,7 +67,8 @@ pkg_postrm()
 {
 	einfo
 	einfo "You need to remove following line from 'Section \"Files\"' in"
-	einfo "XF86Config, to unmerge this package completely."
+	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
diff --git a/x11-libs/libdockapp/libdockapp-0.6.0.ebuild b/x11-libs/libdockapp/libdockapp-0.6.0.ebuild
new file mode 100644
index 000000000000..735d2fec366d
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.6.0.ebuild
@@ -0,0 +1,80 @@
+# 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.6.0.ebuild,v 1.1 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="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+DEPEND="virtual/x11"
+S=${WORKDIR}/${P/lib/}
+FONTDIR="/usr/share/fonts/${PN}-fonts"
+
+src_unpack()
+{
+	unpack ${A}
+	cd ${S}
+
+	# sanitize fonts installation path
+	epatch ${FILESDIR}/install-paths.patch-${PV}
+
+	# add legacy support for older dockapps
+	epatch ${FILESDIR}/legacy.patch-${PV}
+}
+
+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
+}