x11-misc/xrmap: Remove last-rited pkg, #520890

diff --git a/profiles/package.mask b/profiles/package.mask
index ba761460157e054d71c86b4763256870d14e28db..b84e943bdc307e7dfc0b89d193fb21999514b507 100644 (file)
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -264,11 +264,6 @@ dev-vcs/veracity
 >=dev-python/qscintilla-python-2.10
 >=x11-libs/qscintilla-2.10
 
-# Michael Palimaka <kensington@gentoo.org> (22 Feb 2017)
-# Fails to build. Dead upstream.
-# Masked for removal in 30 days. Bug #520890.
-x11-misc/xrmap
-
 # Andreas K. Hüttel <dilfridge@gentoo.org> (19 Feb 2017)
 # Dead upstream for >3 years. Closed source. Bundles outdated
 # libraries that certainly have known security issues (e.g.,

diff --git a/x11-misc/xrmap/Manifest b/x11-misc/xrmap/Manifest
deleted file mode 100644 (file)
index 4294244..0000000
--- a/x11-misc/xrmap/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-DIST CIA_WDB2.jpd.gz 7391060 SHA256 6bd5c4dc9b31814fdd724563ad27a5a08484d2e8b4f410f8a3a6941491dc13e1 SHA512 bd17b556369e4b5b4882448888f7d6e4b2557eaf3ed649706f7e06b333cc16c15c556c122234eae6a37535df553aefbbafe326be0a352a3dea42c955d94ca63c WHIRLPOOL 78ff5eb17d294b2a9a2bc76315a00d4ee10e4e921eb76bbb481feab6193abd6f8569b61be22270e5b5edc89036006a8e5b16c37ffb89b935dc8606b56fe4c596
-DIST anthems-1.3.tar.bz2 204506 SHA256 69457f8834e004192884abdccfe4b46d75a08c8c7c5f8e8dae3efe46ef022662 SHA512 08be5ec1b7134214129753626210a6f1b7f644a5615cae33377bbd4bfe3f8ad6fd06874c9cf07d60012c27e30a8b30f713c427b10026e72d559f2008a37b9278 WHIRLPOOL 6c0dd0f804b0fb94ac829fa5ee55c691266cee98d1a4a1d38dbe0031b0e1151cffa707c087efdc334883e5d252e2fe26f1ae53930bd2df63b80624bacf63f9cd
-DIST earthdata_low_res.tar.bz2 8399634 SHA256 659b03d2e461de2d78315dc27a3ddbeb58b9aa434687dfa0920eefd645315de3 SHA512 c4b5d13e4b890ecb16e2f8f9622c0d9c2a4bb148c1dc6f1e3e0fa1987ccef1872727a31d94f5bc45b605c60ba4a21e341c438ce5fa3e6a7f57d69f47d483b6eb WHIRLPOOL 65d1ea801bf25fb98b3d354aa0fbb012ecc0cf546acdd7f0fdce8fe3ebc98c0149f2eb614f2019b56dac89738dec99ad93265f21a02d3fb59adbab08f849d037
-DIST factbook_html_2008.tar.bz2 42761187 SHA256 bd260ecbf2c2fac92486d2136d9a7fc4cee84e16ca658cee756977262aa45b0f SHA512 a501eb7f23310a48bacc40e8e37b451ec7fb87d129fb8839024898d16562130269eea930dac0626979e313ebe76f70dc077cda44c6f60374268439f0f8a93150 WHIRLPOOL 347a8ec4ccf1c5db8d5f98ecf346e3f854ca7930aba80492c2b25d3cff34af796d3613132f2644424efc12724419cfd47be1a80cf503c8d9f6d9fbd55da4bfc3
-DIST flags-2.9-xpm_150.tar.bz2 1248162 SHA256 e26cd5d66fe48949e00ffe492b89a06916a3cb1b07fd1d3f62eca8a042128b12 SHA512 fde4959bd702867d11745dc85af6a0fa19ab87f66938626292f657d9baa17a2ac444686a0c3db9090935ebe822ff0779c0de6457dbdb5fa08f1cb701e328875d WHIRLPOOL 414edfd7efc5113138ed00e58d40cbaef2c8ed31b9e92454262aa1dc19c5db7e5d1e326be34c6ff7f6efaff37122db9ee8fac1bff26d1d044c406eda5eff314d
-DIST hymns-1.4.tar.bz2 841330 SHA256 a2197d99bfe88be6bc728dda1160f58a8b8e5be0ce4ee94b886da35dd8754b0d SHA512 331147e18ee258ed4179986c96b919ce0e884c952291beacf76787380a8e0737ca2f8f2add5363e08f9687540ed3092d7172db28ca3bb5bf1456d19060ed49f6 WHIRLPOOL 6faef4996a4c447148b62abbe221d2ada3fa61b529bb9e3dac5e3464f6f0ef5a7671e03908e20c790228e572bf1e5f99e984880b77ac9bb969c67c4e326389d9
-DIST xrmap-2.33.tar.bz2 1224699 SHA256 120bb1544a7f375e2ed2ec036e7b170081a963b559c3b3b0b5eefe52f56c8440 SHA512 039f13f34b6c72f09858f381847c5f1eaa45d841688244491d0249f9cf74f3883edaa5498a908f12716892d703956272b3bea1b64bc7881306caa2fbaa601158 WHIRLPOOL bfc54ae6a1d8437671d75ab7a0a75107afcc9bb2bad1691b1dbcc982101aed3c36e1bc53299024572ac3b11a3fb8460e73f5e0224330795a335b5b15ccd626ab

diff --git a/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch b/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch
deleted file mode 100644 (file)
index 9cf26c7..0000000
--- a/x11-misc/xrmap/files/xrmap-2.33-Makefile.kit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: xrmap-2.33/editkit/Makefile.kit
-===================================================================
---- xrmap-2.33.orig/editkit/Makefile.kit
-+++ xrmap-2.33/editkit/Makefile.kit
-@@ -15,13 +15,14 @@
- 
- SHAREDIR=/usr/share/editkit
- 
--CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\""
-+CFLAGS = -O2 -fomit-frame-pointer -pipe -Wall -DTHREED -DGREEK -DJUSTIFY -DSHAREDIR="\"$(SHAREDIR)\"" -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/files/xrmap-2.33-as-needed.patch b/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch
deleted file mode 100644 (file)
index 82f29f5..0000000
--- a/x11-misc/xrmap/files/xrmap-2.33-as-needed.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: xrmap-2.33/Makefile.noimake
-===================================================================
---- xrmap-2.33.orig/Makefile.noimake
-+++ xrmap-2.33/Makefile.noimake
-@@ -20,7 +20,7 @@ LDOPTIONS=-O6 -g -Wall  -lXpm -lX11 -ljp
- ## LDOPTIONS=-O6 -g -Wall libxpm/libXpm.a -lX11 -lz -lm -L/usr/X11R6/lib
- 
- all: explorer.o image.o xrmap.o
--      gcc $(LDOPTIONS) -o xrmap explorer.o image.o xrmap.o
-+      gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS)
-       cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR)
-       cd earthview ; make DESTDIR=$(DESTDIR)  
-       @cat EXTRADATA

diff --git a/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch b/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch
deleted file mode 100644 (file)
index 48cd29a..0000000
--- a/x11-misc/xrmap/files/xrmap-2.33-libpng15.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- image.c
-+++ image.c
-@@ -18,6 +18,7 @@
- 
- #include <stdio.h>
- #include <stdlib.h>
-+#include <zlib.h> /* gzFile */
- #include <png.h>
- #include <jpeglib.h>
- 

diff --git a/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch b/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch
deleted file mode 100644 (file)
index 64681c6..0000000
--- a/x11-misc/xrmap/files/xrmap-2.33-parallel-make.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-Parallel make fixes
-
-Patch by Kevin McCarthy <signals@gentoo.org>
-
---- Makefile.noimake
-+++ Makefile.noimake
-@@ -21,12 +21,12 @@
- 
- all: explorer.o image.o xrmap.o
-       gcc -o xrmap explorer.o image.o xrmap.o $(LDOPTIONS)
--      cd editkit ; make -f Makefile.kit DESTDIR=$(DESTDIR)
--      cd earthview ; make DESTDIR=$(DESTDIR)  
-+      $(MAKE) -C editkit -f Makefile.kit DESTDIR=$(DESTDIR)
-+      $(MAKE) -C earthview DESTDIR=$(DESTDIR) 
-       @cat EXTRADATA
-       
- numdefs.h:
--      cd tools ; make
-+      $(MAKE) -C tools
- 
- explorer.o: xrmap.h version.h bitmaps.h numdefs.h menudefs.h xrmap.c
-       gcc $(CCOPTIONS) -c explorer.c
---- tools/Makefile
-+++ tools/Makefile
-@@ -3,16 +3,16 @@
-       ./preproc > ../numdefs.h
- 
- locutils:
--      cd locutils; make
-+      $(MAKE) -C locutils
- 
- cbd2else:
--      cd cbd2else; make
-+      $(MAKE) -C cbd2else
- 
- jpd2else:
--      cd jpd2else; make
-+      $(MAKE) -C jpd2else
- 
- rez2else:
--      cd rez2else; make
-+      $(MAKE) -C rez2else
- 
- world: locutils cbd2else jpd2else rez2else
- 

diff --git a/x11-misc/xrmap/files/xrmap-2.33-zlib.patch b/x11-misc/xrmap/files/xrmap-2.33-zlib.patch
deleted file mode 100644 (file)
index 8b7301b..0000000
--- a/x11-misc/xrmap/files/xrmap-2.33-zlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- xrmap-2.33.orig/earthview/earthview.c      2005-07-12 06:56:41.000000000 -0700
-+++ xrmap-2.33/earthview/earthview.c   2013-12-27 15:59:14.068667773 -0800
-@@ -96,7 +96,7 @@
- char *data_file = NULL;
- char *cps_file, *cps_dir;
- FILE *fd = NULL;
--gzFile *gzd = NULL;
-+gzFile gzd = NULL;
- 
- /* Predefined color schemes */
- /* You can of course add as many as you like... */
-@@ -212,7 +212,7 @@
-     return n;
- }
- 
--int ngzread(gzFile *gzd)
-+int ngzread(gzFile gzd)
- {
- unsigned char c;
- int n;

diff --git a/x11-misc/xrmap/metadata.xml b/x11-misc/xrmap/metadata.xml
deleted file mode 100644 (file)
index 2ba8e9e..0000000
--- a/x11-misc/xrmap/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-       <maintainer type="project">
-               <email>desktop-misc@gentoo.org</email>
-               <name>Gentoo Desktop Miscellaneous Project</name>
-       </maintainer>
-</pkgmetadata>

diff --git a/x11-misc/xrmap/xrmap-2.33-r2.ebuild b/x11-misc/xrmap/xrmap-2.33-r2.ebuild
deleted file mode 100644 (file)
index 16347cc..0000000
--- a/x11-misc/xrmap/xrmap-2.33-r2.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=2
-inherit eutils toolchain-funcs
-
-FLAGS_VER=2.9
-ANTHEMS_VER=1.3
-HYMNS_VER=1.4
-FACTBOOK_VER=2008
-DESCRIPTION="Xrmap displays portions of the Earth using the huge CIA world map"
-HOMEPAGE="http://frmas.free.fr/li_1.htm#_Xrmap_"
-SRC_URI="ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/${P}.tar.bz2
-                ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/factbook_html_${FACTBOOK_VER}.tar.bz2
-                ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/anthems-${ANTHEMS_VER}.tar.bz2
-                ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/flags-${FLAGS_VER}-xpm_150.tar.bz2
-                ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/hymns-${HYMNS_VER}.tar.bz2
-                ftp://ftp.ac-grenoble.fr/ge/geosciences/${PN}/data/earthdata_low_res.tar.bz2
-                ftp://ftp.ac-grenoble.fr/ge/geosciences/CIA_WDB2.jpd.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-CDEPEND="x11-libs/libX11
-       x11-libs/libXpm
-       virtual/jpeg
-       >=media-libs/libpng-1.4
-       sys-libs/zlib"
-RDEPEND="${CDEPEND}
-       x11-misc/xdg-utils
-       app-text/gv
-       virtual/imagemagick-tools
-       sys-apps/less
-       media-sound/timidity++"
-DEPEND="${CDEPEND}
-       x11-proto/xproto
-       >=sys-apps/sed-4"
-
-pkg_setup() {
-       tc-export CC
-}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${P}-Makefile.kit.patch \
-               "${FILESDIR}"/${P}-as-needed.patch \
-               "${FILESDIR}"/${P}-parallel-make.patch \
-               "${FILESDIR}"/${P}-libpng15.patch \
-               "${FILESDIR}"/${P}-zlib.patch
-
-       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' \
-                -e 's,^\(LDOPTIONS=\)-O6 -g,\1${LDFLAGS},g' \
-                -e 's,gcc,$(CC),' \
-                       Makefile.noimake > Makefile || die
-       sed -i 's,^\(#define DEFAULT_JPD_FILE \"/usr/share/\),\1x,g' \
-               tools/jpd2else/jpd2else.c || die
-       sed -i -e 's,^\(#define RCFILE \)SHAREDIR\",\1\"/etc/xrmap,g'  \
-                  -e 's,^\(#define SHAREDIR \"/usr/share/\),\1x,g' xrmap.h || die
-       # bug #323065
-       sed -i "/^image.o/s/image.o:/& numdefs.h/" Makefile || die
-       # Respect CFLAGS, LDFLAGS, CC
-       sed -i -e 's,cc,$(CC) $(CFLAGS) $(LDFLAGS),' tools/Makefile || die
-       sed -i -e 's,gcc,$(CC) $(CFLAGS) $(LDFLAGS),' \
-               tools/jpd2else/Makefile tools/cbd2else/Makefile \
-               earthview/Makefile editkit/Makefile.kit || die
-       # Fix implicit decl of strlen
-       sed -i -e '3 i #include <string.h>' tools/preproc.c || die
-       # Fix array subscript below bounds (Eliminates unnecessary cast to char)
-       sed -i -e '2495 s/(char)//' xrmap.c || die
-       # Fix datadir for earthview
-       sed -i -e 's,^DATADIR=.*$,DATADIR=/usr/share/xrmap/earthdata,' earthview/Makefile || die
-}
-
-src_compile() {
-       emake HTML_VIEWER="xdg-open" || die
-       emake -C tools || die
-       emake -C tools/jpd2else || die
-       emake -C tools/cbd2else || die
-}
-
-src_install() {
-       dobin xrmap tools/preproc tools/jpd2else/jpd2else tools/cbd2else/cbd2else \
-               earthview/earthview || die
-       dodir /etc/xrmap  || die
-       insinto /etc/xrmap
-       doins Xrmaprc  || die
-       dodoc CHANGES README TODO tools/cbd2else/README.cbd tools/jpd2else/README.jpd tools/rez2else/README.rez || die
-       newman xrmap.man xrmap.1 || die "newman failed"
-       mv "${WORKDIR}"/hymns-${HYMNS_VER} hymns || die
-       mv "${WORKDIR}"/anthems-${ANTHEMS_VER} anthems || die
-       dodir /usr/share/${PN}/ || die
-       insinto /usr/share/${PN}
-       doins -r i18n hymns anthems Locations pixmaps \
-               "${WORKDIR}"/{factbook,flags,earthdata,CIA_WDB2.jpd}  || die
-}