Bump x11-plugins/libdockapp-0.5.0 revision to r1, with fixes to close #64047...

5 files changed, 138 insertions, 6 deletions

diff --git a/x11-libs/libdockapp/ChangeLog b/x11-libs/libdockapp/ChangeLog
index ef40f6101792..ea36e9fa5bf8 100644
--- a/x11-libs/libdockapp/ChangeLog
+++ b/x11-libs/libdockapp/ChangeLog
@@ -1,6 +1,12 @@
 # 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.13 2004/09/03 02:47:39 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdockapp/ChangeLog,v 1.14 2004/09/15 21:20:35 s4t4n Exp $
+
+*libdockapp-0.5.0 (15 Sep 2004)
+
+  15 Sep 2004; Michele Noberasco <s4t4n@gentoo.org> libdocapp-0.5.0-r1.ebuild:
+  Revision bump, adding patch to fix installation paths, closing #64047.
+  I won't change the KEYWORDS variable as these changes are trivial...
 
   02 Sep 2004; Tom Gall <tgall@gentoo.org> libdocapp-0.5.0.ebuild:
   stable on ppc64, bug #62251
diff --git a/x11-libs/libdockapp/Manifest b/x11-libs/libdockapp/Manifest
index 343a064a5baf..b39b357f8919 100644
--- a/x11-libs/libdockapp/Manifest
+++ b/x11-libs/libdockapp/Manifest
@@ -1,9 +1,12 @@
-MD5 dc2b55dc23ee23f7988610313416e8bc ChangeLog 1969
-MD5 29fcbf021c7f75a5c09170b9083e3e3d libdockapp-0.4.0-r1.ebuild 750
+MD5 e4d90e71a08b2300b84131fec0109179 libdockapp-0.5.0-r1.ebuild 1877
 MD5 63dbe756fe9dbcbd58595f9fd05b486f libdockapp-0.4.0.ebuild 747
-MD5 733bfa0b7abf240bb8c431f6df2e3ef4 libdockapp-0.5.0.ebuild 906
+MD5 31fc3596f17fc5936ed75c21419dd599 ChangeLog 2226
 MD5 6d7c8273694466206e24aefb3fc0b5b4 metadata.xml 226
-MD5 6d4007efde61dae8b2bd3fedbbf8f96b files/digest-libdockapp-0.4.0 68
+MD5 29fcbf021c7f75a5c09170b9083e3e3d libdockapp-0.4.0-r1.ebuild 750
+MD5 733bfa0b7abf240bb8c431f6df2e3ef4 libdockapp-0.5.0.ebuild 906
+MD5 a402d44f954b7fc63212fed2c8e9499f files/makefile-0.5.0.patch 830
 MD5 7bad37505d2b23b096bfbacca819b2d5 files/digest-libdockapp-0.4.0-r1 68
+MD5 343593eb3d4db7ce043a12878ae1949e files/digest-libdockapp-0.5.0-r1 69
+MD5 a70c186c6965fe64569ea3cb109adad9 files/install-paths.patch-0.5.0-r1 1837
+MD5 6d4007efde61dae8b2bd3fedbbf8f96b files/digest-libdockapp-0.4.0 68
 MD5 343593eb3d4db7ce043a12878ae1949e files/digest-libdockapp-0.5.0 69
-MD5 a402d44f954b7fc63212fed2c8e9499f files/makefile-0.5.0.patch 830
diff --git a/x11-libs/libdockapp/files/digest-libdockapp-0.5.0-r1 b/x11-libs/libdockapp/files/digest-libdockapp-0.5.0-r1
new file mode 100644
index 000000000000..2f7b00972bdd
--- /dev/null
+++ b/x11-libs/libdockapp/files/digest-libdockapp-0.5.0-r1
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..4e990650b3fe
--- /dev/null
+++ b/x11-libs/libdockapp/files/install-paths.patch-0.5.0-r1
@@ -0,0 +1,45 @@
+--- 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
new file mode 100644
index 000000000000..c5b9f2b86b55
--- /dev/null
+++ b/x11-libs/libdockapp/libdockapp-0.5.0-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2004 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.1 2004/09/15 21:20:35 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 "XF86Config 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 "XF86Config, 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
+}