diff --git a/dev-java/caffeine/Manifest b/dev-java/caffeine/Manifest
new file mode 100644
index 0000000..5fe009e
--- /dev/null
+++ b/dev-java/caffeine/Manifest
@@ -0,0 +1 @@
+DIST caffeine-2.6.2-sources.jar 715580 BLAKE2B 882cac33d205c8186232c64010b4e25e805d3d188d6a9e6ca151187b55d5ee3a3d5641566f5e8d32de596fab3dae8967c74f3d60e2321b34374ce996382322fe SHA512 52a8c67648e2a6bb1c600d99712473a64911f2b6c8fe6c924ba98e72b4b040a1094fa5c93ae2bae8734d352634bc72960711afd152566ef02f6bad4c84e510c8
diff --git a/dev-java/caffeine/caffeine-2.6.2.ebuild b/dev-java/caffeine/caffeine-2.6.2.ebuild
new file mode 100644
index 0000000..019d6c3
--- /dev/null
+++ b/dev-java/caffeine/caffeine-2.6.2.ebuild
@@ -0,0 +1,33 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.ben-manes.caffeine:caffeine:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="A high performance caching library"
+HOMEPAGE="https://github.com/ben-manes/caffeine"
+SRC_URI="https://repo1.maven.org/maven2/com/github/ben-manes/caffeine/caffeine/${PV}/caffeine-${PV}-sources.jar"
+# Compiling from Github would require to be packaged at least
+# package com.squareup.javapoet
+# package MethodSpec
+# package TypeSpec
+# SRC_URI="https://github.com/ben-manes/caffeine/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+# S="${WORKDIR}/${P}/caffeine"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="app-arch/unzip"
+CP_DEPEND="dev-java/jsr305:0"
+DEPEND="${CP_DEPEND}
+ >=virtual/jdk-1.8:*"
+RDEPEND="${CP_DEPEND}
+ >=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="com.github.benmanes.caffeine"
diff --git a/dev-java/caffeine/metadata.xml b/dev-java/caffeine/metadata.xml
new file mode 100644
index 0000000..8168da8
--- /dev/null
+++ b/dev-java/caffeine/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ java@gentoo.org
+
+
+ ben-manes/caffeine
+
+
diff --git a/dev-java/jdbc-postgresql/Manifest b/dev-java/jdbc-postgresql/Manifest
new file mode 100644
index 0000000..32b99ea
--- /dev/null
+++ b/dev-java/jdbc-postgresql/Manifest
@@ -0,0 +1 @@
+DIST postgresql-jdbc-42.7.0.src.tar.gz 994637 BLAKE2B 1700acf42ee2d36a9b9953a670cb5ba3874885c992f3f1ef438b409ea86f7ee52cc8db20b1cbcdb00bf79b199b38e06a932445532d7f4dba0d91649850a4bb58 SHA512 8b266e9af2ffcd680d4b7d0a92fe2083c4f4630109d887ee53a21fc7f616dcf352909ce83a984bc5c3433966eb148eace4635be2d5bc283f0e72059451c5dd96
diff --git a/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.0.ebuild b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.0.ebuild
new file mode 100644
index 0000000..0dd9391
--- /dev/null
+++ b/dev-java/jdbc-postgresql/jdbc-postgresql-42.7.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.postgresql:postgresql:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Java JDBC 4.2 (JRE 8+) driver for PostgreSQL database"
+HOMEPAGE="https://jdbc.postgresql.org/"
+SRC_URI="https://jdbc.postgresql.org/download/postgresql-jdbc-${PV}.src.tar.gz"
+S="${WORKDIR}/postgresql-${PV}-jdbc-src"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64"
+# package se.jiderhamn.classloader
+# package se.jiderhamn.classloader.leak
+# package uk.org.webcompere.systemstubs.environment
+# package uk.org.webcompere.systemstubs.jupiter
+# package uk.org.webcompere.systemstubs.properties
+# package uk.org.webcompere.systemstubs.resource
+RESTRICT="test" #839681
+
+DEPEND="
+ dev-java/checker-framework-qual:0
+ dev-java/jna:4
+ dev-java/osgi-cmpn:8
+ dev-java/osgi-core:0
+ dev-java/scram:0
+ dev-java/waffle-jna:0
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:5 )
+"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_CLASSPATH_EXTRA="
+ checker-framework-qual
+ jna-4
+ osgi-cmpn-8
+ osgi-core
+ scram
+ waffle-jna
+"
+JAVA_AUTOMATIC_MODULE_NAME="org.postgresql.jdbc"
+JAVA_MAIN_CLASS="org.postgresql.util.PGJDBCMain"
+JAVA_RESOURCE_DIRS="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+ junit-4
+ junit-5
+"
+JAVA_TEST_RESOURCE_DIRS="src/test/resources"
+JAVA_TEST_SRC_DIR="src/test/java"
diff --git a/dev-java/jdbc-postgresql/metadata.xml b/dev-java/jdbc-postgresql/metadata.xml
new file mode 100644
index 0000000..941a1af
--- /dev/null
+++ b/dev-java/jdbc-postgresql/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ java@gentoo.org
+
+
+ pgjdbc/pgjdbc
+
+
diff --git a/dev-java/waffle-jna/Manifest b/dev-java/waffle-jna/Manifest
new file mode 100644
index 0000000..de2a4d7
--- /dev/null
+++ b/dev-java/waffle-jna/Manifest
@@ -0,0 +1 @@
+DIST waffle-parent-3.3.0.tar.gz 2147273 BLAKE2B a4f9c06898c50616013870bb383632d0b97e4f527da9b7b1acad9945f275181844d94b6533891a371f588115f60efdf791d5f64e03f938950a8dd48415f1f56f SHA512 e09154761dc5902e97b9dc57c9523bffe401fce33797346bbd5595390db3adaf5eed27d2ac7f98b7504aeb471c5f1a0c0a5104bd819a937e15c67123ecdd5891
diff --git a/dev-java/waffle-jna/metadata.xml b/dev-java/waffle-jna/metadata.xml
new file mode 100644
index 0000000..a9d1f13
--- /dev/null
+++ b/dev-java/waffle-jna/metadata.xml
@@ -0,0 +1,10 @@
+
+
+
+
+ java@gentoo.org
+
+
+ Waffle/waffle
+
+
diff --git a/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
new file mode 100644
index 0000000..43bce59
--- /dev/null
+++ b/dev-java/waffle-jna/waffle-jna-3.3.0.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="com.github.waffle:waffle-jna:${PV}"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Enable drop-in Windows Single Sign On for popular Java web servers"
+HOMEPAGE="https://waffle.github.io/waffle/"
+SRC_URI="https://github.com/Waffle/waffle/archive/waffle-parent-${PV}.tar.gz"
+S="${WORKDIR}/waffle-waffle-parent-${PV}/Source/JNA/waffle-jna"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+RESTRICT="test" #839681
+
+DEPEND="
+ dev-java/caffeine:0
+ dev-java/checker-framework-qual:0
+ dev-java/jakarta-servlet-api:4
+ dev-java/jna:4
+ dev-java/slf4j-api:0
+ >=virtual/jdk-1.8:*
+ test? ( dev-java/junit:5 )
+"
+RDEPEND=">=virtual/jre-1.8:*"
+
+JAVA_AUTOMATIC_MODULE_NAME="waffle.jna"
+JAVA_CLASSPATH_EXTRA="
+ caffeine
+ checker-framework-qual
+ jakarta-servlet-api-4
+ jna-4
+ slf4j-api
+"
+JAVA_RESOURCE_DIR="src/main/resources"
+JAVA_SRC_DIR="src/main/java"
+JAVA_TEST_GENTOO_CLASSPATH="
+ assertj-core-3
+ junit-5
+"
+JAVA_TEST_SRC_DIR="src/test/java"