From d8d4128d61d2b5fd563dc02906c1e1df6f47360a Mon Sep 17 00:00:00 2001 From: gryf Date: Mon, 25 Nov 2019 21:53:50 +0100 Subject: [PATCH] Bump jpilot ebuild version, and hack the path --- app-pda/jpilot/Manifest | 4 +- .../jpilot/files/jpilot-1.8.2-fix-paths.patch | 119 ++++++++++++++++++ .../files/jpilot-1.8.2-qa-desktop-file.patch | 13 ++ app-pda/jpilot/jpilot-1.8.2-r10.ebuild | 55 ++++---- 4 files changed, 163 insertions(+), 28 deletions(-) create mode 100644 app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch create mode 100644 app-pda/jpilot/files/jpilot-1.8.2-qa-desktop-file.patch diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest index 1e541e3..74287c4 100644 --- a/app-pda/jpilot/Manifest +++ b/app-pda/jpilot/Manifest @@ -1,2 +1,2 @@ -DIST jpilot-1.8.2.tar.gz 1740735 SHA256 2c28ed7acea27ae3d541036f2e2ca5ed7e0121badf477e3cfa5ec8d282337e23 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024 WHIRLPOOL 51c834e48b137160d0f313f41a83837428d1a23b0a8955ce8f87fef6dd02051c1705a4f702a543e338cad825303ae4ef89a9f20a3db88875b409404487af622c -EBUILD jpilot-1.8.2-r10.ebuild 1105 SHA256 8624ce4d76e0939cd76c9b8db21cd303671b950b69ff303a22d61870287f02bd SHA512 2d8d9e863c19b39cb0ba4dae66b7aa7658f93f43bff798e726d4ebe33932dc75799f98958cd155ab5059991f13f40d13152d9645bdc1ab54f861e45ec7d9148c WHIRLPOOL 1bcf76878ccc25a340ea89129ac46b85f05bb8189668671581458206e9cb88a8bb9285ed487bffe559d154243432ddca98934ce73b34f086a5501fdeb7e99561 +DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024 +EBUILD jpilot-1.8.2-r10.ebuild 948 BLAKE2B c4f891c0c5a94a20ad9c690e44f44938dc0c88fec26c89746afc8cca036dc1cf28f593e3ec89fb2b30852a373176b8b877778b0c01415a50f1651c3735b03ba9 SHA512 145220c9d5aa80716bed22f1cfd1e0adbbed22068697dede7d4e5493cd2722e25549892b1e74bb5882785301209b63f957d6e0e0d4658f13e1d1e256212bfe77 diff --git a/app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch b/app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch new file mode 100644 index 0000000..e378d56 --- /dev/null +++ b/app-pda/jpilot/files/jpilot-1.8.2-fix-paths.patch @@ -0,0 +1,119 @@ +* Modify Makefile.am's to be compliant with GNU and Gentoo filesystem conventions +* Use redefinable variables instead of hard-replacing @VAR@-style variables +* Replace abuse of 'libdir' install path variables + +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -3,19 +3,17 @@ + man_MANS = jpilot.1 jpilot-dial.1 jpilot-sync.1 jpilot-dump.1 jpilot-merge.1 + + # Install the standard GNU doc files +-miscdir = $(datadir)/doc/$(PACKAGE) ++miscdir = $(docdir) + misc_DATA = \ + ../BUGS \ + ../ChangeLog \ +- ../COPYING \ + ../AUTHORS \ +- ../INSTALL \ + ../README \ + ../TODO + + # Install the manual docs +-docdir = $(miscdir)/manual +-doc_DATA = \ ++manualdir = $(htmldir) ++manual_DATA = \ + manual.html \ + plugin.html \ + jpilot-address.png \ +--- a/Expense/Makefile.am ++++ b/Expense/Makefile.am +@@ -1,11 +1,11 @@ +-libdir = @libdir@/@PACKAGE@/plugins ++pluginsdir = $(libdir)/$(PACKAGE)/plugins + + if MAKE_EXPENSE + +-lib_LTLIBRARIES = libexpense.la ++plugins_LTLIBRARIES = libexpense.la + libexpense_la_SOURCES = expense.c +-libexpense_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir) ++libexpense_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir) + libexpense_la_LDFLAGS = -module -avoid-version +-libexpense_la_LIBADD = @GTK_LIBS@ ++libexpense_la_LIBADD = $(GTK_LIBS) + + endif +--- a/icons/Makefile.am ++++ b/icons/Makefile.am +@@ -1,4 +1,4 @@ +-icondir = $(datadir)/doc/$(PACKAGE)/icons ++icondir = $(docdir)/icons + icon_DATA = \ + jpilot-icon1.xpm \ + jpilot-icon2.xpm \ +--- a/KeyRing/Makefile.am ++++ b/KeyRing/Makefile.am +@@ -1,13 +1,13 @@ +-libdir = @libdir@/@PACKAGE@/plugins ++pluginsdir = $(libdir)/$(PACKAGE)/plugins + + EXTRA_DIST = README + + if MAKE_KEYRING + +-lib_LTLIBRARIES = libkeyring.la ++plugins_LTLIBRARIES = libkeyring.la + libkeyring_la_SOURCES = keyring.c +-libkeyring_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ @LIBGCRYPT_CFLAGS@ -I$(top_srcdir) ++libkeyring_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) $(LIBGCRYPT_CFLAGS) -I$(top_srcdir) + libkeyring_la_LDFLAGS = -module -avoid-version +-libkeyring_la_LIBADD = @OPENSSL_LIBS@ @GTK_LIBS@ @LIBGCRYPT_LIBS@ ++libkeyring_la_LIBADD = $(OPENSSL_LIBS) $(GTK_LIBS) $(LIBGCRYPT_LIBS) + + endif +--- a/Makefile.am ++++ b/Makefile.am +@@ -161,18 +161,17 @@ + ACLOCAL_AMFLAGS = -I m4 + + # Add i18n support +-localedir = $(datadir)/locale + I18NDEFS = -DLOCALEDIR=\"$(localedir)\" + +-AM_CFLAGS= @PILOT_FLAGS@ @GTK_CFLAGS@ ${I18NDEFS} ++AM_CFLAGS= $(PILOT_FLAGS) $(GTK_CFLAGS) $(I18NDEFS) + + # Add linkflags + jpilot_LDFLAGS = -export-dynamic +-jpilot_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@ +-jpilot_dump_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@ ++jpilot_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS) ++jpilot_dump_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS) + jpilot_sync_LDFLAGS = -export-dynamic +-jpilot_sync_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@ +-jpilot_merge_LDADD=@LIBS@ @PILOT_LIBS@ @GTK_LIBS@ ++jpilot_sync_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS) ++jpilot_merge_LDADD=$(LIBS) $(PILOT_LIBS) $(GTK_LIBS) + + ################################################################################ + ## The rest of the file is copied over to the Makefile with only variable +--- a/SyncTime/Makefile.am ++++ b/SyncTime/Makefile.am +@@ -1,11 +1,11 @@ +-libdir = @libdir@/@PACKAGE@/plugins ++pluginsdir = $(libdir)/$(PACKAGE)/plugins + + if MAKE_SYNCTIME + +-lib_LTLIBRARIES = libsynctime.la ++plugins_LTLIBRARIES = libsynctime.la + libsynctime_la_SOURCES = synctime.c +-libsynctime_la_CFLAGS = @PILOT_FLAGS@ @GTK_CFLAGS@ -I$(top_srcdir) ++libsynctime_la_CFLAGS = $(PILOT_FLAGS) $(GTK_CFLAGS) -I$(top_srcdir) + libsynctime_la_LDFLAGS = -module -avoid-version +-libsynctime_la_LIBADD = @GTK_LIBS@ ++libsynctime_la_LIBADD = $(GTK_LIBS) + + endif diff --git a/app-pda/jpilot/files/jpilot-1.8.2-qa-desktop-file.patch b/app-pda/jpilot/files/jpilot-1.8.2-qa-desktop-file.patch new file mode 100644 index 0000000..c4624e1 --- /dev/null +++ b/app-pda/jpilot/files/jpilot-1.8.2-qa-desktop-file.patch @@ -0,0 +1,13 @@ +* The 'Icon=' property should not have a suffix + +--- a/jpilot.desktop ++++ b/jpilot.desktop +@@ -2,7 +2,7 @@ + Name=J-Pilot + Comment=Desktop organizer application for the Palm Pilot + Exec=jpilot +-Icon=jpilot.xpm ++Icon=jpilot + Terminal=false + Type=Application + Categories=Office;PDA; diff --git a/app-pda/jpilot/jpilot-1.8.2-r10.ebuild b/app-pda/jpilot/jpilot-1.8.2-r10.ebuild index 798e79b..a804b0d 100644 --- a/app-pda/jpilot/jpilot-1.8.2-r10.ebuild +++ b/app-pda/jpilot/jpilot-1.8.2-r10.ebuild @@ -1,49 +1,52 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-pda/jpilot/jpilot-1.8.1.ebuild,v 1.4 2014/03/01 22:17:19 mgorny Exp $ -EAPI=4 -inherit autotools eutils +EAPI=6 + +inherit autotools DESCRIPTION="Desktop Organizer Software for the Palm Pilot" HOMEPAGE="http://www.jpilot.org/" -SRC_URI="http://www.jpilot.org/${P}.tar.gz" +SRC_URI="http://jpilot.org/tarballs/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" IUSE="nls" -RDEPEND=">=app-pda/pilot-link-0.12.5 - dev-libs/libgcrypt:0 - >=x11-libs/gtk+-2.18.9:2" +RDEPEND=" + app-pda/pilot-link + dev-libs/libgcrypt:0= + x11-libs/gtk+:2" DEPEND="${RDEPEND} - nls? ( dev-util/intltool - sys-devel/gettext ) + nls? ( + dev-util/intltool + sys-devel/gettext + ) virtual/pkgconfig" -src_prepare() { - sed -i \ - -e '/^Icon/s:jpilot.xpm:/usr/share/pixmaps/jpilot/jpilot-icon1.xpm:' \ - jpilot.desktop || die +PATCHES=( + "${FILESDIR}"/${PN}-1.8.2-qa-desktop-file.patch + "${FILESDIR}"/${PN}-1.8.2-fix-paths.patch +) +src_prepare() { + default + mv configure.{in,ac} || die eautoreconf } src_configure() { - econf \ - $(use_enable nls) + if use amd64; then + export ABILIB="lib64" + fi + econf $(use_enable nls) } src_install() { - emake \ - DESTDIR="${D}" \ - icondir="/usr/share/pixmaps/${PN}" \ - miscdir="/usr/share/doc/${PF}" \ - install + default + docompress -x /usr/share/doc/${PF}/icons - rm -f "${D}"/usr/share/doc/${PF}/{COPYING,INSTALL} \ - "${D}"/usr/share/pixmaps/${PN}/README - - find "${D}" -name '*.la' -exec rm -f {} + + # .la files for plugins are useless + find "${D}" -name '*.la' -delete || die }