New revision; install man pages in the correct directory (bug #32126). Thanks to Doug Weimer for the patch.

5 files changed, 118 insertions, 5 deletions

diff --git a/app-misc/gcal/ChangeLog b/app-misc/gcal/ChangeLog
index db674f6afd9e..e0ab79bc70bf 100644
--- a/app-misc/gcal/ChangeLog
+++ b/app-misc/gcal/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/gcal
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/ChangeLog,v 1.9 2004/10/21 13:47:08 ka0ttic Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/ChangeLog,v 1.10 2004/10/22 23:52:45 ka0ttic Exp $
+
+*gcal-3.01-r2 (22 Oct 2004)
+
+  22 Oct 2004; Aaron Walker <ka0ttic@gentoo.org>
+  +files/gcal-3.01-mandir.diff, +gcal-3.01-r2.ebuild:
+  New revision; install man pages in the correct directory (bug #32126) Thanks
+  to Doug Weimer for the patch.
 
   21 Oct 2004; Aaron Walker <ka0ttic@gentoo.org> +metadata.xml:
   Add metadata (shell-tools)
diff --git a/app-misc/gcal/Manifest b/app-misc/gcal/Manifest
index 7c04a0aa4e73..1c7406768cbf 100644
--- a/app-misc/gcal/Manifest
+++ b/app-misc/gcal/Manifest
@@ -2,15 +2,18 @@
 Hash: SHA1
 
 MD5 7a20407d34a9fb84f9585e3cd5861b48 gcal-3.01.ebuild 1580
+MD5 5d1c382a45787032ba03880883b53834 gcal-3.01-r2.ebuild 1747
 MD5 6b1766ebbb4c300b30c1bc4fb9b68bcb gcal-3.01-r1.ebuild 1649
-MD5 295cae3608e2794210215fa214e7fd36 ChangeLog 1142
+MD5 1aff488b2b57061f75212fcc96c1364a ChangeLog 1387
 MD5 0c131a7201c4670302767f93643876fa metadata.xml 165
 MD5 e1f8151e053aefc6508cc1bbd8a4b127 files/digest-gcal-3.01 62
+MD5 555a7b92fa6c53dbe05c24e66d0a2c73 files/gcal-3.01-mandir.diff 1515
 MD5 e1f8151e053aefc6508cc1bbd8a4b127 files/digest-gcal-3.01-r1 62
+MD5 e1f8151e053aefc6508cc1bbd8a4b127 files/digest-gcal-3.01-r2 62
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.6 (GNU/Linux)
 
-iD8DBQFBd73kEZCkKN40op4RAkKHAJ4qkriZsl7+Ymk5B/NN+t9rxo/EKACeJ10j
-ZTgbeGCEKsP7Jdf8bw26sZE=
-=ivNx
+iD8DBQFBeZ1WEZCkKN40op4RAg8RAJ4id2fHtqeOrzECLMtMmk2J5MW0eQCfQuTz
+yCrjqqA/FhoEARzS+XynLMs=
+=DMOg
 -----END PGP SIGNATURE-----
diff --git a/app-misc/gcal/files/digest-gcal-3.01-r2 b/app-misc/gcal/files/digest-gcal-3.01-r2
new file mode 100644
index 000000000000..34229d4451c0
--- /dev/null
+++ b/app-misc/gcal/files/digest-gcal-3.01-r2
@@ -0,0 +1 @@
+MD5 65f3394653829fd77f6862045112ad4f gcal-3.01.tar.gz 2371244
diff --git a/app-misc/gcal/files/gcal-3.01-mandir.diff b/app-misc/gcal/files/gcal-3.01-mandir.diff
new file mode 100644
index 000000000000..2e85ad084673
--- /dev/null
+++ b/app-misc/gcal/files/gcal-3.01-mandir.diff
@@ -0,0 +1,49 @@
+--- gcal-3.01/doc/Makefile.in.old	2003-10-27 17:09:11.623164752 -0800
++++ gcal-3.01/doc/Makefile.in	2003-10-27 17:10:35.634393104 -0800
+@@ -46,7 +46,7 @@
+ # Extension (not including `.') for the installed manual page file names.
+ manext = 1
+ # Where to install the manual pages.
+-mandir = @mandir@/man$(manext)
++mandir = @mandir@
+ 
+ #### End of system configuration section. ####
+ 
+@@ -555,7 +555,7 @@
+ 
+ ALLDIRS = \
+   $(infodir) \
+-  $(mandir)
++  $(mandir)/man$(manext)/
+ 
+ ALLDOCS = \
+   $(de) \
+@@ -802,7 +802,7 @@
+ 	$(PRE_INSTALL)
+ 	@for file in $(manFILES); \
+ 	do \
+-	  rm -f $(mandir)/$$file.$(manext); \
++	  rm -f $(mandir)/man$(manext)/$$file.$(manext); \
+ 	done
+ 	$(NORMAL_INSTALL)
+ 	@case "$(doclang)" in \
+@@ -835,8 +835,8 @@
+ 	      fi; \
+ 	    fi; \
+ 	  fi; \
+-	  echo "Installing \`$$file.$(manext)' for LANGUAGE=$(doclang) users as \`$(mandir)/$$file.$(manext)'"; \
+-	  $(INSTALL_DATA) $$file.$(manext) $(mandir)/$$file.$(manext); \
++	  echo "Installing \`$$file.$(manext)' for LANGUAGE=$(doclang) users as \`$(mandir)/man$(manext)/$$file.$(manext)'"; \
++	  $(INSTALL_DATA) $$file.$(manext) $(mandir)/man$(manext)/$$file.$(manext); \
+ 	  rm -f $$file.$(manext); \
+ 	done
+ 	@echo "LANGUAGE=$(doclang) manual pages installed"
+@@ -893,7 +893,7 @@
+ 	$(NORMAL_UNINSTALL)
+ 	-for file in $(manFILES); \
+ 	do \
+-	  rm -f $(mandir)/$$file.$(manext); \
++	  rm -f $(mandir)/man$(manext)/$$file.$(manext); \
+ 	done
+ 	-rm -f $(infodir)/$(PACKAGE).info*
+ 	@echo "Documentation files of distribution uninstalled"
diff --git a/app-misc/gcal/gcal-3.01-r2.ebuild b/app-misc/gcal/gcal-3.01-r2.ebuild
new file mode 100644
index 000000000000..11e0ff85ccfc
--- /dev/null
+++ b/app-misc/gcal/gcal-3.01-r2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gcal/gcal-3.01-r2.ebuild,v 1.1 2004/10/22 23:52:45 ka0ttic Exp $
+
+inherit eutils
+
+DESCRIPTION="The GNU Calendar - a replacement for cal"
+HOMEPAGE="http://www.gnu.org/software/gcal/gcal.html"
+SRC_URI="ftp://ftp.gnu.org/pub/gnu/gcal/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~amd64"
+IUSE="ncurses nls"
+
+DEPEND="nls? ( sys-devel/gettext )"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-mandir.diff
+}
+
+src_compile() {
+	econf `use_enable nls` `use_enable ncurses` || die
+	emake || die
+}
+
+src_install() {
+	einstall || die
+	dodoc ABOUT-NLS ATTENTION BUGS DISCLAIM HISTORY \
+		INSTALL LIMITATIONS MANIFEST NEWS README SYMBOLS THANKS TODO
+
+	# Need to fix up paths for scripts in misc directory
+	# that are automatically created by the makefile
+	for miscfile in ${D}/usr/share/gcal/misc/*/*
+	do
+		dosed "s:${D%/}::g" ${miscfile/${D}}
+	done
+
+	# Rebuild the symlinks that makefile created into the image /usr/bin
+	# directory during make install
+	dosym /usr/share/gcal/misc/daily/daily /usr/bin/gcal-daily
+	dosym /usr/share/gcal/misc/ddiff/ddiff /usr/bin/gcal-ddiff
+	dosym /usr/share/gcal/misc/ddiff/ddiffdrv /usr/bin/gcal-ddiffdrv
+	dosym /usr/share/gcal/misc/dst/dst /usr/bin/gcal-dst
+	dosym /usr/share/gcal/misc/gcalltx/gcalltx /usr/bin/gcal-gcalltx
+	dosym /usr/share/gcal/misc/gcalltx/gcalltx.pl /usr/bin/gcal-gcalltx.pl
+	dosym /usr/share/gcal/misc/moon/moon /usr/bin/gcal-moon
+	dosym /usr/share/gcal/misc/mrms/mrms /usr/bin/gcal-mrms
+	dosym /usr/share/gcal/misc/srss/srss /usr/bin/gcal-srss
+	dosym /usr/share/gcal/misc/wloc/wlocdrv /usr/bin/gcal-wlocdrv
+}