From 33bd2df897267e6b66956396389d6eed304b7e3c Mon Sep 17 00:00:00 2001
From: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Sat, 27 Aug 2022 18:12:20 +0800
Subject: [PATCH] print/py-pypdf2: Move print/py-pdf2 to print/py-pypdf2

- Bump PORTREVISION of dependent ports for dependency change
---
 MOVED                                  | 1 +
 finance/odoo/Makefile                  | 4 ++--
 print/Makefile                         | 2 +-
 print/{py-pdf2 => py-pypdf2}/Makefile  | 5 ++---
 print/{py-pdf2 => py-pypdf2}/distinfo  | 0
 print/{py-pdf2 => py-pypdf2}/pkg-descr | 0
 6 files changed, 6 insertions(+), 6 deletions(-)
 rename print/{py-pdf2 => py-pypdf2}/Makefile (83%)
 rename print/{py-pdf2 => py-pypdf2}/distinfo (100%)
 rename print/{py-pdf2 => py-pypdf2}/pkg-descr (100%)

diff --git a/MOVED b/MOVED
index b6e5160d95fbe..ef333534910bc 100644
--- a/MOVED
+++ b/MOVED
@@ -17536,3 +17536,4 @@ japanese/font-hackgen-nerd|japanese/font-hackgen-nf|2022-08-20|Renamed upstream
 x11-themes/adwaita-qt|x11-themes/adwaita-qt5|2022-08-23|Renamed to make space for x11-themes/adwaita-qt6
 net/gstreamer1-plugins-libmms||2022-08-26|Microsoft deprecated MMS in 2003
 mail/py-email_reply_parser|mail/py-email-reply-parser|2022-08-27|Rename to match upstream naming
+print/py-pdf2|print/py-pypdf2|2022-08-27|Rename to match upstream naming
diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
index c0d66d840092f..80a3e7b4523bb 100644
--- a/finance/odoo/Makefile
+++ b/finance/odoo/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	odoo
 PORTVERSION=	14.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -48,7 +48,7 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}xlwt>=0:textproc/py-xlwt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}XlsxWriter>=0:textproc/py-xlsxwriter@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}decorator>0:devel/py-decorator@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pdf2>0:print/py-pdf2@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pypdf2>0:print/py-pypdf2@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}reportlab>0:print/py-reportlab@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}passlib>0:security/py-passlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} \
diff --git a/print/Makefile b/print/Makefile
index c218bcb9fb2d9..72b5374b6ac3b 100644
--- a/print/Makefile
+++ b/print/Makefile
@@ -182,11 +182,11 @@
     SUBDIR += py-glyphsets
     SUBDIR += py-glyphtools
     SUBDIR += py-pdf
-    SUBDIR += py-pdf2
     SUBDIR += py-pollyreports
     SUBDIR += py-preppy
     SUBDIR += py-psautohint
     SUBDIR += py-pycups
+    SUBDIR += py-pypdf2
     SUBDIR += py-pypdf3
     SUBDIR += py-python-ly
     SUBDIR += py-relatorio
diff --git a/print/py-pdf2/Makefile b/print/py-pypdf2/Makefile
similarity index 83%
rename from print/py-pdf2/Makefile
rename to print/py-pypdf2/Makefile
index fa7c084b2c667..5c00003c40224 100644
--- a/print/py-pdf2/Makefile
+++ b/print/py-pypdf2/Makefile
@@ -1,9 +1,8 @@
-PORTNAME=	pdf
+PORTNAME=	pypdf2
 PORTVERSION=	1.27.12
 CATEGORIES=	print python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-PKGNAMESUFFIX=	2
 DISTNAME=	PyPDF2-${PORTVERSION}
 
 MAINTAINER=	python@FreeBSD.org
@@ -13,7 +12,7 @@ LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		python:3.6+
-USE_PYTHON=	distutils autoplist
+USE_PYTHON=	autoplist concurrent distutils
 
 NO_ARCH=	yes
 
diff --git a/print/py-pdf2/distinfo b/print/py-pypdf2/distinfo
similarity index 100%
rename from print/py-pdf2/distinfo
rename to print/py-pypdf2/distinfo
diff --git a/print/py-pdf2/pkg-descr b/print/py-pypdf2/pkg-descr
similarity index 100%
rename from print/py-pdf2/pkg-descr
rename to print/py-pypdf2/pkg-descr