commit: cf9acaa5689862e0d346cef31ea735bd9215f711
Author: Philipp Rösner <rndxelement <AT> protonmail <DOT> com>
AuthorDate: Sat Jan 8 00:04:24 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 16 01:33:24 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf9acaa5
media-gfx/tuxpaint: cleaned up src_prepare
We fixed the QA issue that man pages were stored as .gz.
Also we moved the sed call in src_prepare to a patch file.
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Philipp Roesner <rndxelement <AT> protonmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../tuxpaint/files/tuxpaint-0.9.27-Makefile.patch | 117 +++++++++++++++++++++
media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild | 25 ++---
2 files changed, 124 insertions(+), 18 deletions(-)
diff --git a/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
new file mode 100644
index 000000000000..7fd2e3ded8ec
--- /dev/null
+++ b/media-gfx/tuxpaint/files/tuxpaint-0.9.27-Makefile.patch
@@ -0,0 +1,117 @@
+--- a./Makefile
++++ b./Makefile
+@@ -72,7 +72,7 @@ endif
+ # <HOSTROOT> is the directory containing support files for building for
<HOST>:
+ # <HOSTROOT>/include Header files.
+ # <HOSTROOT>/lib Library files.
+-# <HOSTROOT>/lib/pkgconfig *.pc files.
++# <HOSTROOT>/$(LIBDIR)/pkgconfig *.pc files.
+ #
+ ifdef HOST
+ ifdef HOSTROOT
+@@ -103,7 +103,7 @@ ifdef HOST
+ # We set PKG_CONFIG_LIBDIR instead of PKG_CONFIG_PATH because we want to
+ # *change* where pkg-config looks for .pc files instead of adding to the
+ # default path which may have libraries that aren't for HOST.
+- export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/lib/pkgconfig
++ export PKG_CONFIG_LIBDIR:=$(HOSTROOT)/$(LIBDIR)/pkgconfig
+ endif
+ endif
+
+@@ -169,7 +169,7 @@ windows_ARCH_CFLAGS:=
+ macos_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include
-I$(HOSTROOT)/include -mmacosx-version-min=$(MINVER) -arch $(subst $() $(),
-arch ,$(ARCHS)) -w -headerpad_max_install_names -DHAVE_STRCASESTR
+ ios_ARCH_CFLAGS:=-isysroot $(SDKROOT) -I$(SDKROOT)/usr/include
-I$(HOSTROOT)/include $(MINVEROPT) -arch $(subst $() $(), -arch ,$(ARCHS)) -w
-fPIC -DHAVE_STRCASESTR -DUNLINK_ONLY
+ beos_ARCH_CFLAGS:=
+-linux_ARCH_CFLAGS:=
++linux_ARCH_CFLAGS:= ${CFLAGS}
+ ARCH_CFLAGS:=$($(OS)_ARCH_CFLAGS)
+
+ windows_ARCH_LDFLAGS:=
+@@ -205,7 +205,7 @@ ARCH_HEADERS:=$($(OS)_ARCH_HEADERS)
+ windows_PREFIX:=/usr/local
+ macos_PREFIX:=Resources
+ ios_PREFIX:=.
+-linux_PREFIX:=/usr/local
++linux_PREFIX:=/usr
+ PREFIX:=$($(OS)_PREFIX)
+
+ # Root directory to place files when creating packages.
+@@ -243,7 +243,7 @@
MAGIC_PREFIX:=$(DESTDIR)$(LIBDIR)/lib$(LIBDIRSUFFIX)/tuxpaint/plugins
+
+ # Docs and man page:
+ DOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)
+-DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/tuxpaint-$(VER_VERSION)/tuxpaint-dev
++DEVDOC_PREFIX:=$(DESTDIR)$(PREFIX)/share/doc/${PF}/tuxpaint-dev
+ MAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+ DEVMAN_PREFIX:=$(DESTDIR)$(PREFIX)/share/man
+
+@@ -545,7 +545,7 @@ trans:
+ windows_ARCH_INSTALL:=install-dlls install-tpconf-i18n
+ macos_ARCH_INSTALL:=install-macbundle TuxPaint.dmg install-man
install-importscript install-bash-completion
+ ios_ARCH_INSTALL:=install-iosbundle install-man install-importscript
install-bash-completion
+-linux_ARCH_INSTALL:=install-xdg install-man install-importscript
install-bash-completion
++linux_ARCH_INSTALL:= install-man install-importscript install-bash-completion
+ ARCH_INSTALL:=$($(OS)_ARCH_INSTALL)
+
+ # "make install" installs all of the various parts
+@@ -693,12 +693,12 @@ uninstall: uninstall-i18n
+ -rm $(BIN_PREFIX)/tuxpaint-import
+ -rm -r $(DATA_PREFIX)
+ -rm -r $(DOC_PREFIX)
+- -rm $(MAN_PREFIX)/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint.1.gz
+- -rm $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1.gz
+- -rm $(MAN_PREFIX)/man1/tp-magic-config.1.gz
+- -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1.gz
++ -rm $(MAN_PREFIX)/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint.1
++ -rm $(MAN_PREFIX)/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/*/man1/tuxpaint-import.1
++ -rm $(MAN_PREFIX)/man1/tp-magic-config.1
++ -rm $(MAN_PREFIX)/*/man1/tp-magic-config.1
+ -rm -f -r $(CONFDIR)
+ -rm $(COMPLETIONDIR)/tuxpaint-completion.bash
+ -rm -r $(MAGIC_PREFIX)
+@@ -962,9 +962,9 @@ install-dlls:
+ @cp -R win32/etc/ $(BIN_PREFIX)
+ @echo
+ @echo "...Installing Library Modules..."
+- @mkdir -p $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @cp $(MINGW_DIR)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
$(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders
+- @strip -s $(BIN_PREFIX)/lib/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
++ @mkdir -p $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @cp $(MINGW_DIR)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
$(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders
++ @strip -s $(BIN_PREFIX)/$(LIBDIR)/gdk-pixbuf-2.0/2.10.0/loaders/*.dll
+
+ # Install symlink:
+ .PHONY: install-haiku
+@@ -1039,24 +1039,20 @@ install-man:
+ @install -d $(MAN_PREFIX)/man1
+ @# tuxpaint.1
+ @cp man/en/tuxpaint.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint.1
+ @# tuxpaint-import.1
+ @cp man/en/tuxpaint-import.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tuxpaint-import.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tuxpaint-import.1
+ @# tp-magic-config.1
+ @cp man/en/tp-magic-config.1 $(MAN_PREFIX)/man1/
+- @gzip -f $(MAN_PREFIX)/man1/tp-magic-config.1
+- @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1.gz
++ @chmod a+rx,g-w,o-w $(MAN_PREFIX)/man1/tp-magic-config.1
+ @echo
+ for l in `ls -d man/*.UTF-8 | cut -d '/' -f 2`; do \
+ DEST=$(MAN_PREFIX)/$$l/man1 ; \
+ echo "...Installing $$l man pages into $$DEST..." ; \
+ install -d $$DEST ; \
+ cp man/$$l/tuxpaint.1 $$DEST ; \
+- gzip -f $$DEST/tuxpaint.1 ; \
+- chmod a+rx,g-w,o-w $$DEST/tuxpaint.1.gz ; \
++ chmod a+rx,g-w,o-w $$DEST/tuxpaint.1 ; \
+ done
+ @# FIXME: The other man pages aren't localizable yet -bjk 2021.08.14
+
diff --git a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
index 9fbfe4c29e7b..43abb09a491e 100644
--- a/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
+++ b/media-gfx/tuxpaint/tuxpaint-0.9.27.ebuild
@@ -11,21 +11,21 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
RDEPEND="
app-text/libpaper
dev-libs/fribidi
gnome-base/librsvg:2
- media-gfx/libimagequant
>=media-libs/libpng-1.2:0=
>=media-libs/freetype-2:2
media-libs/libsdl[joystick]
- media-libs/sdl-gfx
media-libs/sdl-image[png]
media-libs/sdl-mixer
media-libs/sdl-pango
media-libs/sdl-ttf
+ media-libs/sdl-gfx
+ media-gfx/libimagequant
x11-libs/cairo
"
DEPEND="${RDEPEND}"
@@ -35,24 +35,13 @@ BDEPEND="
sys-devel/gettext
"
-src_prepare() {
-
- sed -i \
- -e 's|linux_ARCH_INSTALL:=install-xdg|linux_ARCH_INSTALL:=|' \
- -e "s|linux_PREFIX:=/usr/local|linux_PREFIX:=/usr|" \
- -e "s:/lib/:/$(get_libdir)/:g" \
- -e
's:/share/doc/tuxpaint-$(VER_VERSION)/:'"/share/doc/${PF}/:g" \
- -e '/@gzip -f/d' \
- -e '/@chmod a+rx,g-w,o-w $(MAN_PREFIX)/d' \
- -e "s|linux_ARCH_CFLAGS:=|linux_ARCH_CFLAGS:= ${CFLAGS}|" \
- Makefile || die
-
- eapply_user
-}
+PATCHES=(
+ ${FILESDIR}"/${P}-Makefile.patch"
+)
src_compile() {
# parallel build may break things
- emake -j1 CC="$(tc-getCC)"
+ emake -j1 CC="$(tc-getCC)" LIBDIR="$(get_libdir)"
}
src_install() {
