From 90528a1ba6afb1760bde510a411ce037be659dbb Mon Sep 17 00:00:00 2001
From: Joerg Deckert <jdeckert@unitas-network.de>
Date: Mon, 15 Apr 2024 10:26:04 +0200
Subject: [PATCH] version bump, fix perl circular dependencies

---
 Makefile    | 10 ++++++----
 package.use |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index f3d563b..11d27a0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,16 @@
 install_assp = /opt/assp
 assp.service = $(CHROOT)/lib/systemd/system/assp.service
 
-ASSP_SNAPSHOT ?= r362
-ASSP_MOD_INST_VER ?= 2.10
+ASSP_SNAPSHOT ?= r397
+ASSP_MOD_INST_VER ?= 2.12
 ASSP_FC_VER ?= 1.05
 ASSP_ZIP = assp-svn-$(ASSP_SNAPSHOT).zip
 ASSP_URL = https://sourceforge.net/code-snapshots/svn/a/as/assp/svn/$(ASSP_ZIP)
 
 $(CHROOT)$(install_assp):
-##	RUN test -f /var/cache/distfiles/$(ASSP_ZIP) || \
-##		RUN wget $(ASSP_URL) -O /var/cache/distfiles/$(ASSP_ZIP)
+	if [ ! -f $(DISTDIR)/$(ASSP_ZIP) ] ; \
+		then curl -L $(ASSP_URL) -o ${DISTDIR}/$(ASSP_ZIP); \
+	fi
 	RUN sh -c '(echo y;echo manual;echo o conf prerequisites_policy follow;echo o conf commit)|cpan'
 	RUN sh -c 'cd /opt && unzip /var/cache/distfiles/$(ASSP_ZIP) && mv /opt/assp-svn-$(ASSP_SNAPSHOT)/assp2/trunk $(install_assp) && rm -rf /opt/assp-svn-$(ASSP_SNAPSHOT)'
 	echo "AsADaemon:=1" > $(CHROOT)$(install_assp)/assp.cfg
@@ -24,3 +25,4 @@ $(assp.service): assp/assp.service
 preinstall:
 
 postinstall: $(CHROOT)$(install_assp) $(assp.service)
+	RUN sh -c 'USE=berkdb $(EMERGE) $(USEPKG) --oneshot dev-lang/perl'
diff --git a/package.use b/package.use
index 6340737..c700eee 100644
--- a/package.use
+++ b/package.use
@@ -1,4 +1,4 @@
-dev-lang/perl berkdb ithreads
+dev-lang/perl ithreads
 mail-mta/postfix cdb ldap mysql
 app-text/tesseract jpeg png tiff webp
 media-libs/leptonica tiff webp jpeg png