diff --git a/app-pda/jpilot/Manifest b/app-pda/jpilot/Manifest
new file mode 100644
index 0000000..f39c063
--- /dev/null
+++ b/app-pda/jpilot/Manifest
@@ -0,0 +1 @@
+DIST jpilot-1.8.2.tar.gz 1740735 BLAKE2B efc9fb8e88843d6e0f4f2245753d67856c9d0cd455c9a22c829bb103631fd8a8111ead3cb4bc434a6be00ad0cb35fe554a9ebbe1f2d38bfaf560e1b414c62260 SHA512 733dd51a2acc60760bb1ffaa0d7b4433584a571793d5e4f857492349bae8d032625baf9f0060e619d760628ddda3559bf4be057f45f4dc17ddf1af1ca795c024
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-fno-common.patch b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
new file mode 100644
index 0000000..c6cf366
--- /dev/null
+++ b/app-pda/jpilot/files/jpilot-1.8.2-fno-common.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/709790
+--- a/jpilot-dump.c
++++ b/jpilot-dump.c
+@@ -76,7 +76,7 @@ const char *formatT;
+  * this code but must be instantiated for the code to compile.  
+  * The same is true of the functions which are only used in GUI mode. */
+ pid_t jpilot_master_pid = -1;
+-int pipe_to_parent;
++extern int pipe_to_parent;
+ GtkWidget *glob_dialog;
+ GtkWidget *glob_date_label;
+ gint glob_date_timer_tag;
+--- a/jpilot-sync.c
++++ b/jpilot-sync.c
+@@ -37,7 +37,8 @@
+ #include "otherconv.h"
+ 
+ /******************************* Global vars **********************************/
+-int pipe_to_parent, pipe_from_parent;
++extern int pipe_to_parent;
++int pipe_from_parent;
+ pid_t glob_child_pid;
+ unsigned char skip_plugins;
+ 
+--- a/jpilot.c
++++ b/jpilot.c
+@@ -84,7 +84,8 @@
+ /* #define PIPE_DEBUG */
+ /******************************* Global vars **********************************/
+ /* Application-wide globals */
+-int pipe_from_child, pipe_to_parent;
++extern int pipe_to_parent;
++int pipe_from_child;
+ int pipe_from_parent, pipe_to_child;
+ /* Main GTK window for application */
+ GtkWidget *window;
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-r1.ebuild b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
new file mode 100644
index 0000000..0dd467c
--- /dev/null
+++ b/app-pda/jpilot/jpilot-1.8.2-r1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools
+
+DESCRIPTION="Desktop Organizer Software for the Palm Pilot"
+HOMEPAGE="http://www.jpilot.org/"
+SRC_URI="http://jpilot.org/tarballs/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	app-pda/pilot-link
+	dev-libs/libgcrypt:0=
+	x11-libs/gtk+:2"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	nls? (
+		dev-util/intltool
+		sys-devel/gettext
+	)
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-qa-desktop-file.patch
+	"${FILESDIR}"/${P}-fix-paths.patch
+	"${FILESDIR}"/${P}-fno-common.patch
+)
+
+src_prepare() {
+	default
+	sed -i -e 's|_UNQUOTED(ABILIB, "lib"|_UNQUOTED(ABILIB, "'$(get_libdir)'"|' configure.in || die
+	mv configure.{in,ac} || die
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_enable nls)
+}
+
+src_install() {
+	default
+	docompress -x /usr/share/doc/${PF}/icons
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}