Fix dodoc, version bump.

(Portage version: 2.0.53_rc7)

7 files changed, 105 insertions, 18 deletions

diff --git a/x11-misc/xrmap/ChangeLog b/x11-misc/xrmap/ChangeLog
index c8237024b053..669129a87848 100644
--- a/x11-misc/xrmap/ChangeLog
+++ b/x11-misc/xrmap/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for x11-misc/xrmap
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.9 2005/06/15 16:25:19 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/ChangeLog,v 1.10 2005/11/01 11:42:14 nelchael Exp $
+
+*xrmap-2.32 (01 Nov 2005)
+
+  01 Nov 2005; Krzysiek Pawlik <nelchael@gentoo.org>
+  +files/xrmap-2.32-Makefile.kit.patch, xrmap-2.29.ebuild,
+  xrmap-2.30.ebuild, +xrmap-2.32.ebuild:
+  Fix dodoc, version bump.
 
 *xrmap-2.30 (15 Jun 2005)
 
diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
index 90442102bc4b..3c2660d7abcc 100644
--- a/x11-misc/xrmap/Manifest
+++ b/x11-misc/xrmap/Manifest
@@ -1,16 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 ac07cc5322160aff56c331a570f67429 ChangeLog 1097
-MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
-MD5 3601ea3aafdcf814938e2ba2b8e74585 xrmap-2.29.ebuild 2044
-MD5 c12a853ce73675639395f34a2d5f9d1c xrmap-2.30.ebuild 2046
 MD5 a6a793c0c22c5a0b6255f93bed17b0a4 files/digest-xrmap-2.29 185
 MD5 ec6e902eadf9754724dbaa860e288acb files/digest-xrmap-2.30 185
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCsFaWl5AvwDPiUowRAhRfAJ0cSlSIqVYnWjphCxTtuv2oF2B3RgCgj9WK
-UKN+fSuaMuLluH5CkNayhhc=
-=KwzR
------END PGP SIGNATURE-----
+MD5 8ecf9f6b2852ef3841ee919c2c1b31be files/digest-xrmap-2.32 185
+MD5 68f544c43102455686aedc82bd5a2727 files/xrmap-2.32-Makefile.kit.patch 750
+MD5 cdb11033a3fa6525334cecf938961c07 metadata.xml 166
+MD5 086a5c91fdbccbdeefc052fb1b26fd65 xrmap-2.29.ebuild 2036
+MD5 9988d49d0cc4a1048c261d3afbc0ec84 xrmap-2.30.ebuild 2038
+MD5 11da4fcdcf6900d8dabbc89bf9103673 xrmap-2.32.ebuild 2100
diff --git a/x11-misc/xrmap/files/digest-xrmap-2.32 b/x11-misc/xrmap/files/digest-xrmap-2.32
new file mode 100644
index 000000000000..7f575b107992
--- /dev/null
+++ b/x11-misc/xrmap/files/digest-xrmap-2.32
@@ -0,0 +1,3 @@
+MD5 534818ffb498322b64373f66ae042596 CIA_WDB2.jpd.gz 7391060
+MD5 e18247abf044e8e00616ef67f6126678 xrmap-2.10.tgz 3944521
+MD5 3ad9f956867540c9e97044b51f76b13f xrmap-2.32.tar.bz2 1133345
diff --git a/x11-misc/xrmap/files/xrmap-2.32-Makefile.kit.patch b/x11-misc/xrmap/files/xrmap-2.32-Makefile.kit.patch
new file mode 100644
index 000000000000..b774d175c1ab
--- /dev/null
+++ b/x11-misc/xrmap/files/xrmap-2.32-Makefile.kit.patch
@@ -0,0 +1,19 @@
+diff -Nru xrmap-2.32.orig/editkit/Makefile.kit xrmap-2.32/editkit/Makefile.kit
+--- xrmap-2.32.orig/editkit/Makefile.kit	2005-11-01 12:59:09.000000000 +0100
++++ xrmap-2.32/editkit/Makefile.kit	2005-11-01 13:02:57.000000000 +0100
+@@ -15,13 +15,13 @@
+ 
+ SHARE_DIR=/usr/share/editkit
+ 
+-CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\""
++CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHARE_DIR="\"$(SHARE_DIR)\"" -DSHAREDIR="\"$(SHARE_DIR)\""
+ 
+ #CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DMINIMAL -DTWOBUTN -DVERTCURS -DTLL
+ 
+ #CFLAGS = -g -pipe
+ 
+-TLIBS = -L/usr/lib -ltermcap
++TLIBS = -L/usr/lib -lcurses
+ XLIBS = -L/usr/X11R6/lib -lX11
+ 
+ # Use this for solaris
diff --git a/x11-misc/xrmap/xrmap-2.29.ebuild b/x11-misc/xrmap/xrmap-2.29.ebuild
index 90cf0e5ba8a6..bf380bb6c2d2 100644
--- a/x11-misc/xrmap/xrmap-2.29.ebuild
+++ b/x11-misc/xrmap/xrmap-2.29.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/x11-misc/xrmap/xrmap-2.29.ebuild,v 1.5 2005/04/28 18:32:36 wormo Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.29.ebuild,v 1.6 2005/11/01 11:42:14 nelchael Exp $
 
 DESCRIPTION="The Xrmap program is a X client for generating images of the Earth and manipulating the CIA World data bank"
 HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
@@ -55,7 +55,7 @@ src_install() {
 	cp -r {i18n,Locations,factbook,anthems,flags,hymns,pixmaps} ${D}/usr/share/${PN}/ || die
 	cp Xrmaprc ${D}/etc/xrmap || die
 	cp ${WORKDIR}/CIA_WDB2.jpd ${D}/usr/share/${PN}/ || die
-	dodoc CHANGES COPYING README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
+	dodoc CHANGES README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
 
 	cd ${S}
 	newman xrmap.man xrmap.1 || die "newman failed"
diff --git a/x11-misc/xrmap/xrmap-2.30.ebuild b/x11-misc/xrmap/xrmap-2.30.ebuild
index 5ee84bcbad4f..b3d938a6934a 100644
--- a/x11-misc/xrmap/xrmap-2.30.ebuild
+++ b/x11-misc/xrmap/xrmap-2.30.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/x11-misc/xrmap/xrmap-2.30.ebuild,v 1.1 2005/06/15 16:25:19 smithj Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.30.ebuild,v 1.2 2005/11/01 11:42:14 nelchael Exp $
 
 DESCRIPTION="The Xrmap program is a X client for generating images of the Earth and manipulating the CIA World data bank"
 HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
@@ -55,7 +55,7 @@ src_install() {
 	cp -r {i18n,Locations,factbook,anthems,flags,hymns,pixmaps} ${D}/usr/share/${PN}/ || die
 	cp Xrmaprc ${D}/etc/xrmap || die
 	cp ${WORKDIR}/CIA_WDB2.jpd ${D}/usr/share/${PN}/ || die
-	dodoc CHANGES COPYING README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
+	dodoc CHANGES README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
 
 	cd ${S}
 	newman xrmap.man xrmap.1 || die "newman failed"
diff --git a/x11-misc/xrmap/xrmap-2.32.ebuild b/x11-misc/xrmap/xrmap-2.32.ebuild
new file mode 100644
index 000000000000..fe7a864aead4
--- /dev/null
+++ b/x11-misc/xrmap/xrmap-2.32.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/xrmap/xrmap-2.32.ebuild,v 1.1 2005/11/01 11:42:14 nelchael Exp $
+
+inherit eutils
+
+DESCRIPTION="The Xrmap program is a X client for generating images of the Earth and manipulating the CIA World data bank"
+HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
+FULL_DIST="2.10"
+SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${PN}-${FULL_DIST}.tgz
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2
+		 ftp://ftp.ac-grenoble.fr/ge/geosciences/CIA_WDB2.jpd.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64 ~ppc"
+IUSE="zlib"
+DEPEND="media-gfx/imagemagick
+	app-text/gv
+	sys-apps/less
+	media-libs/xpm
+	>=sys-apps/sed-4
+	zlib? ( sys-libs/zlib )"
+
+src_unpack() {
+	unpack ${A}
+	rm -rf ${S}
+	mv ${WORKDIR}/${PN}-${FULL_DIST} ${S}
+	unpack ${A}
+	epatch "${FILESDIR}/${P}-Makefile.kit.patch"
+	cd ${S}/editkit && xmkmf || die
+}
+
+src_compile() {
+	use zlib || sed -i 's/-DZLIB\|-lz//g' Makefile.noimake || die
+
+	sed  -e 's,^\(X11DIR=\).*,\1/usr/,g' \
+		 -e 's,^\(EDITOR=\).*,\1less,g'   \
+		 -e 's,^\(SHAREDIR=\).*,\1/usr/share/xrmap,g' \
+		 -e 's,^\(CCOPTIONS=\)-O6 -g,\1${CFLAGS},g' Makefile.noimake > Makefile || die
+
+	sed -i -e 's,^\(#define RCFILE \)SHAREDIR\",\1\"/etc/xrmap,g'  \
+		   -e 's,^\(#define SHAREDIR \"/usr/share/\),\1x,g' xrmap.h || die
+	emake || die
+	cd tools
+	emake || die
+	cd jpd2else
+	sed -i 's,^\(#define DEFAULT_JPD_FILE \"/usr/share/\),\1x,g' jpd2else.c || die
+	emake || die
+	cd ../cbd2else
+	emake || die
+}
+
+src_install() {
+	dobin xrmap tools/preproc tools/jpd2else/jpd2else tools/cbd2else/cbd2else || die
+	dodir /usr/share/${PN}/ || die
+	dodir /etc/xrmap  || die
+	cp -r {i18n,Locations,factbook,anthems,flags,hymns,pixmaps} ${D}/usr/share/${PN}/ || die
+	cp Xrmaprc ${D}/etc/xrmap || die
+	cp ${WORKDIR}/CIA_WDB2.jpd ${D}/usr/share/${PN}/ || die
+	dodoc CHANGES README TODO WARNING tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
+
+	cd ${S}
+	newman xrmap.man xrmap.1 || die "newman failed"
+}