From nobody Thu Sep 29 04:41:55 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MdLLD206Xz4d5TM; Thu, 29 Sep 2022 04:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MdLLD1Vyrz3p3H; Thu, 29 Sep 2022 04:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664426516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8g1RpNqY+4A+7XZxqhfAkRJjvKKb2e3JBXureo23ug=; b=oZriPkp60eyl0Qt2afnrWSpOsIYS66xlvJ3jm/XqqDK6UBVZdl3DYacPpwvUHkbAPRAmR8 +fw1g1EMqs7Ad4wV2KRllPFlNpeFMM68BsKPFT0kYy4Ae+El/xRUYo2SmDoyQO5I/WT/jb wxp/D/Tklg2phuie4tCFKKmuw77Qy9e1If9HKlVFQVH4JV1DiQUnKIWy3KTOruhVwDWk0C 1gtkgDBtyjeo9W6v+eLUC3IOwwgAwphCkuhrdLEu3TTfBWn480St8v/FnbrQUTFr4SIKJy zPyQ9bBlaPhxCbRbFBOR+AdhS6HkX62qLoYbsCNnUeOfYAcKTeecrgMV6hmw4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MdLLD0ZJWzj2c; Thu, 29 Sep 2022 04:41:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28T4ftil005621; Thu, 29 Sep 2022 04:41:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28T4ftUI005620; Thu, 29 Sep 2022 04:41:55 GMT (envelope-from git) Date: Thu, 29 Sep 2022 04:41:55 GMT Message-Id: <202209290441.28T4ftUI005620@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jose Alonso Cardenas Marquez Subject: git: 946e50159ff1 - main - finance/py-ebaysdk: Fix install conflict List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: acm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 946e50159ff14dbf1b82738f4c7467013829949c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664426516; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t8g1RpNqY+4A+7XZxqhfAkRJjvKKb2e3JBXureo23ug=; b=kIAUsjR5MLZe2hZHP2zTLXrQbyQkcuvBC9CMQMTH04XrcD6UdhMHL+N1wmhm9BzmQ+x3iy lFO1pWj9H5Niu9wFcn54gI0byD3ajJpGhSDgVnsUe5Vmi2WYnpJUZhndLJoESaNaVzHx9D e/lKYNUWK4Pau56y6/zGSo+yOvWjca7LvLqrQowM4D1tkv4zVe2OgAM9B2RVne1fCpNQ8h QvpNRwYvBLYqIc5ejfxn7RNTaUD/ybDeGVgajPKh4uUA+E8jU8ykap0xelQ+SETMi6oovp KfUuT19BzGmKto93PEplwGXhWrsirCmM08olvnJ4yEZZIKoU1YClAnxdW/MUMw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664426516; a=rsa-sha256; cv=none; b=WrKGSkfAHK5cMOBDsY9pJ/T1EmT8Eerkbw7Cc0mPCuAwd6YKIpJ9UoLvCOj45dU8wRQynB OJFtCbyHkQqLamep/G7OkQyklLpaaI4XWBXQiXm6TIEIlm9pbtxDRW1XU4pcTAYE/xWjDC vS6UuLqyACpYNbWWWxcVFAy0yosQMe7Zlvci5obM07SVjlI685vdYLTE7UR1JoQkbQr4Gk 2kQsrL9iNmeaDeGjEvwydN+Wtn6jxe/YMFQN2MsBiO2frc8+S4NTCpN3WFnkDFzX4kHWMC CALEM1VmuDZGoCzoJwhiXHXqD359KM0KiOOpeAeF5dm41asrFExOtbgIIfp+Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by acm: URL: https://cgit.FreeBSD.org/ports/commit/?id=946e50159ff14dbf1b82738f4c7467013829949c commit 946e50159ff14dbf1b82738f4c7467013829949c Author: Jose Alonso Cardenas Marquez AuthorDate: 2022-09-29 04:36:48 +0000 Commit: Jose Alonso Cardenas Marquez 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