games-puzzle/picpuz: EAPI 6->8, simplify patches, remove homepage

Much of zfuncs.cc is actually not used and doesn't
need to be cared for.

HOMEPAGE seems to be long gone with no replacement.

Should also fix prefix.

Signed-off-by: Ionen Wolkens <ionen@gentoo.org>

4 files changed, 28 insertions, 165 deletions

diff --git a/games-puzzle/picpuz/files/picpuz-2.5-build.patch b/games-puzzle/picpuz/files/picpuz-2.5-build.patch
deleted file mode 100644
index 6ca26e178bbf..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-build.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Jul 21 17:03:11 UTC 2012
-
---- a/Makefile
-+++ b/Makefile
-@@ -11,24 +11,26 @@
- 
- # target install directories
- BINDIR = $(PREFIX)/bin
--SHAREDIR = $(PREFIX)/share/$(PROGRAM)
--ICONDIR = $(SHAREDIR)/icons
--LOCALESDIR = $(SHAREDIR)/locales
-+DATADIR = $(PREFIX)/share/$(PROGRAM)
-+ICONDIR = $(DATADIR)/icons
-+LOCALESDIR = $(DATADIR)/locales
- DOCDIR = $(PREFIX)/share/doc/$(PROGRAM)
- MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
--CFLAGS = $(CXXFLAGS) -c `pkg-config --cflags gtk+-3.0`
-+CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
- LIBS = `pkg-config --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
--	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
-+	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
- 
- $(PROGRAM).o: $(SOURCE)
--	$(CXX) $(CFLAGS) -o $(PROGRAM).o $(SOURCE)
-+	$(CXX) $(CXXFLAGS) -o $(PROGRAM).o $(SOURCE) \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\""
- 
- zfuncs.o: zfuncs.cc
--	$(CXX) $(CFLAGS) zfuncs.cc -D PREFIX=\"$(PREFIX)\"
-+	$(CXX) $(CXXFLAGS) zfuncs.cc \
-+		-D "DATADIR=\"$(DATADIR)\"" -D "DOCDIR=\"$(DOCDIR)\"" -D "BINDIR=\"$(BINDIR)\""
- 
- install: $(PROGRAM)
- 	mkdir -p  $(DESTDIR)$(BINDIR)
-@@ -52,7 +54,7 @@
- 
- uninstall:
- 	rm -f  $(DESTDIR)$(BINDIR)/$(PROGRAM)
--	rm -R -f  $(DESTDIR)$(SHAREDIR)
-+	rm -R -f  $(DESTDIR)$(DATADIR)
- 	rm -R -f  $(DESTDIR)$(DOCDIR)
- 	rm -f  $(DESTDIR)$(MANDIR)/$(PROGRAM).1.gz
- 	xdg-desktop-menu uninstall $(DESTDIR)$(MENUFILE)
---- a/zfuncs.cc
-+++ b/zfuncs.cc
-@@ -3111,7 +3111,6 @@
-          /prefix/share/appname/locales/         translations: appname-de.po  etc.
-          /home/user/.appname/                   parameters etc. are copied here
- 
--   zprefix        install location              has /bin and /share subtrees
-    zdatadir       installed data files          .desktop, parameters, etc.
-    zdocdir        user documentation            README, changelog, user guide
-    zicondir       icons                         icon files .png
-@@ -3123,7 +3122,7 @@
- namespace zfuncs
- {
-    char        zappname[20];
--   char        zprefix[200], zdatadir[200], zdocdir[200];                  //  app directories
-+   char        zdatadir[200], zdocdir[200];                                //  app directories
-    char        zicondir[200], zlocalesdir[200], zuserdir[200];
-    char        zlang[8] = "en";                                            //  "lc" or "lc_RC"
-    char        JPGquality[4] = "85";                                       //  JPG file save quality
-@@ -3132,7 +3131,6 @@
-    pthread_t   tid_main = 0;                                               //  main thread ID               v.4.8
- }
- 
--cchar * get_zprefix() { return zfuncs::zprefix; }                          //  /usr or /home/<userid>
- cchar * get_zuserdir() { return zfuncs::zuserdir; }                        //  /home/user/.appname
- cchar * get_zdatadir() { return zfuncs::zdatadir; }                        //  parameters, icons
- cchar * get_zdocdir()  { return zfuncs::zdocdir;  }                        //  documentation files
-@@ -3156,19 +3154,15 @@
-    
-    catch_signals();                                                        //  catch segfault, do backtrace
-    
--   strcpy(zappname,appname);                                               //  save app name
--   
--   #ifndef PREFIX                                                          //  install location                v.4.7
--      #define PREFIX "/usr"
--   #endif
--   
--   strncpy0(work,PREFIX,199);                                              //  /usr or /home/<userid>          v.4.6
--   strcpy(zprefix,work);                                                   //  /prefix
--   strncatv(zdatadir,199,work,"/share/",zappname,"/data",null);            //  /prefix/share/appname/data
--   strncatv(zicondir,199,work,"/share/",zappname,"/icons",null);           //  /prefix/share/appname/icons
--   strncatv(zlocalesdir,199,work,"/share/",zappname,"/locales",null);      //  /prefix/share/appname/locales
--   strncatv(zdocdir,199,work,"/share/doc/",zappname,null);                 //  /prefix/share/doc/appname
--   
-+   strcpy(zappname,appname);
-+
-+   strcpy(zdatadir,DATADIR);                                               //  macros from build script
-+   strcpy(zdocdir,DOCDIR);
-+   strcpy(zicondir,zdatadir);
-+   strcat(zicondir,"/icons");
-+   strcpy(zlocalesdir,zdatadir);
-+   strcat(zlocalesdir,"/locales");
-+
-    snprintf(zuserdir,199,"%s/.%s",getenv("HOME"),zappname);                //  /home/user/.appname/            v.4.3
-    err = stat(zuserdir,&statdat);                                          //  does it exist already?
-    if (err) {
-@@ -3366,9 +3360,9 @@
-    fputs(work,fid);
-    fputs("Type=Application\n",fid);                                        //  Type=Application
-    fputs("Terminal=false\n",fid);                                          //  Terminal=false
--   snprintf(work,199,"Exec=%s/bin/%s\n",zprefix,command);                  //  Exec=/usr/bin/appname -options
-+   snprintf(work,199,"Exec=%s/%s\n",BINDIR,zappname);                  //  Exec=/usr/bin/appname -options
-    fputs(work,fid);
--   snprintf(work,199,"Icon=%s/%s.png\n",zicondir,appname);                 //  Icon=/usr/share/appname/icons/appname.png
-+   snprintf(work,199,"Icon=%s/icons/%s.png\n",DATADIR,zappname);                 //  Icon=/usr/share/appname/icons/appname.png
-    fputs(work,fid);
-    fclose(fid);
- 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
new file mode 100644
index 000000000000..d627d826e56e
--- /dev/null
+++ b/games-puzzle/picpuz/files/picpuz-2.5-docdir.patch
@@ -0,0 +1,7 @@
+Simplify opening the html guide with right path.
+--- a/zfuncs.cc
++++ b/zfuncs.cc
+@@ -3222,2 +3222,3 @@
+    using namespace zfuncs;
++   showz_html("file://" PREFIX "/share/doc/" DOCDIR "/html/userguide-en.html"); return;
+ 
diff --git a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch b/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
deleted file mode 100644
index f11f95cbf72b..000000000000
--- a/games-puzzle/picpuz/files/picpuz-2.5-pthread-underlinking.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix underlinking on recent binutils:
-
-> x86_64-pc-linux-gnu-g++ -Wl,-O1 -Wl,--as-needed -Wl,--hash-style=gnu picpuz.o zfuncs.o `pkg-config --libs gtk+-3.0` -o picpuz
-> /usr/lib/gcc/x86_64-pc-linux-gnu/4.8.2/../../../../x86_64-pc-linux-gnu/bin/ld: zfuncs.o: undefined reference to symbol 'pthread_create@@GLIBC_2.2.5'
-> /lib64/libpthread.so.0: error adding symbols: DSO missing from command line
---- a/Makefile
-+++ b/Makefile
-@@ -19,7 +19,7 @@ MANDIR = $(PREFIX)/share/man/man1
- MENUFILE = $(PREFIX)/share/applications/kornelix-$(PROGRAM).desktop
- 
- CXXFLAGS += -c `${PKG_CONFIG} --cflags gtk+-3.0`
--LIBS = `pkg-config --libs gtk+-3.0`
-+LIBS = -pthread `${PKG_CONFIG} --libs gtk+-3.0`
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
- 	$(CXX) $(LDFLAGS) $(PROGRAM).o zfuncs.o $(LIBS) -o $(PROGRAM)
diff --git a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
index 2b1863eb8bbe..92a9c069b79a 100644
--- a/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
+++ b/games-puzzle/picpuz/picpuz-2.5-r1.ebuild
@@ -1,60 +1,48 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit desktop gnome2-utils toolchain-funcs
+inherit desktop flag-o-matic toolchain-funcs
 
-DESCRIPTION="A jigsaw puzzle program"
-HOMEPAGE="http://kornelix.squarespace.com/picpuz/"
-SRC_URI="http://kornelix.squarespace.com/storage/downloads/${P}.tar.gz"
+DESCRIPTION="Jigsaw puzzle program"
+HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
+SRC_URI="mirror://gentoo/${P}.tar.gz"
 
-LICENSE="GPL-2"
+LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 RDEPEND="x11-libs/gtk+:3"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
-	"${FILESDIR}"/${P}-build.patch
-	"${FILESDIR}"/${P}-pthread-underlinking.patch
+	"${FILESDIR}"/${P}-docdir.patch
 )
 
 src_compile() {
-	tc-export CXX PKG_CONFIG
+	tc-export CXX
 
-	emake \
-		BINDIR="/usr/bin" \
-		DATADIR=/usr/share/${PN} \
-		DOCDIR=/usr/share/doc/${PF}/html
+	append-cppflags $($(tc-getPKG_CONFIG) --cflags gtk+-3.0) -DDOCDIR="'\"${PF}\"'"
+	append-ldflags -pthread
+	append-libs $($(tc-getPKG_CONFIG) --libs gtk+-3.0)
+
+	emake PREFIX="${EPREFIX}/usr" CFLAGS="${CXXFLAGS} ${CPPFLAGS} -c" LIBS="${LIBS}"
 }
 
 src_install() {
 	dobin ${PN}
+	newman doc/${PN}.man ${PN}.1
 
 	insinto /usr/share/${PN}
 	doins -r icons locales
 
-	doicon -s 48 icons/${PN}.png
-	make_desktop_entry ${PN} Picpuz
-
-	HTML_DOCS="doc/userguide-en.html doc/images" einstalldocs
+	dodoc doc/{README,changelog,translations}
 
-	dodoc doc/{changelog,README,translations}
-	newman doc/${PN}.man ${PN}.1
-}
+	docinto html
+	dodoc -r doc/{images,userguide-en.html}
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
+	doicon icons/${PN}.png
+	make_desktop_entry ${PN} Picpuz
 }