git: 946e50159ff1 - main - finance/py-ebaysdk: Fix install conflict

The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=946e50159ff14dbf1b82738f4c7467013829949c

commit 946e50159ff14dbf1b82738f4c7467013829949c
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2022-09-29 04:36:48 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2022-09-29 04:36:48 +0000

    finance/py-ebaysdk: Fix install conflict
    
    - py-ebaysdk was installed test and sample files to general directories
    - Bump PORTREVISION
    - Bump PORTREVISION of finance/odoo and finance/odoo14
    - finance/odoo fix a problem with werkzeug dependency
    PR:             262759
---
 finance/odoo/Makefile       | 4 +++-
 finance/odoo14/Makefile     | 3 ++-
 finance/py-ebaysdk/Makefile | 7 +++++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/finance/odoo/Makefile b/finance/odoo/Makefile
index fda9dada09ef..1d34eb0e6e1e 100644
--- a/finance/odoo/Makefile
+++ b/finance/odoo/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	odoo
 PORTVERSION=	15.0
+PORTREVISION=	1
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -64,7 +65,7 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}
 
-USES=		cpe python:3.5+ pgsql shebangfix
+USES=		cpe python:3.7+ pgsql shebangfix
 USE_PYTHON=	distutils
 USE_OPENLDAP=	yes
 
@@ -86,6 +87,7 @@ post-patch:
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_quote_plus|werkzeug.urls.url_quote_plus|g' \
 		${WRKSRC}/odoo/addons/base/models/ir_ui_view.py
 	@${REINPLACE_CMD} -i "" -e 's|werkzeug.url_unquote_plus|werkzeug.urls.url_quote_plus|g' \
+		-e 's|.NumberConverter|.converters.NumberConverter|g' \
 		${WRKSRC}/odoo/addons/base/models/ir_http.py \
 		${WRKSRC}/odoo/addons/http_routing/models/ir_http.py
 	@${REINPLACE_CMD} -i "" -e 's|from werkzeug import url_encode|from werkzeug.urls import url_encode|g' \
diff --git a/finance/odoo14/Makefile b/finance/odoo14/Makefile
index d4d319e8cd47..170e1f6a3130 100644
--- a/finance/odoo14/Makefile
+++ b/finance/odoo14/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	odoo
 PORTVERSION=	14.0
+PORTREVISION=	1
 CATEGORIES=	finance www
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	14
@@ -65,7 +66,7 @@ RUN_DEPENDS=	wkhtmltopdf>0:converters/wkhtmltopdf \
 		${PYTHON_PKGNAMEPREFIX}idna>0:dns/py-idna@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stdnum>0:devel/py-stdnum@${PY_FLAVOR}
 
-USES=		cpe python:3.5+ pgsql shebangfix
+USES=		cpe python:3.7+ pgsql shebangfix
 USE_PYTHON=	distutils
 USE_OPENLDAP=	yes
 
diff --git a/finance/py-ebaysdk/Makefile b/finance/py-ebaysdk/Makefile
index b0336582c369..61c9d9282384 100644
--- a/finance/py-ebaysdk/Makefile
+++ b/finance/py-ebaysdk/Makefile
@@ -1,7 +1,6 @@
-#
-
 PORTNAME=	ebaysdk
 PORTVERSION=	2.2.0
+PORTREVISION=	1
 CATEGORIES=	finance python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -19,4 +18,8 @@ USE_PYTHON=	autoplist distutils
 
 NO_ARCH=	yes
 
+post-extract:
+	@${MV} ${WRKSRC}/samples ${WRKSRC}/ebaysdk/
+	@${MV} ${WRKSRC}/tests ${WRKSRC}/ebaysdk/
+
 .include <bsd.port.mk>