From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 05A14138E95 for ; Sun, 16 Oct 2016 16:15:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 55EA7E0BE2; Sun, 16 Oct 2016 16:15:45 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 29F21E0BE2 for ; Sun, 16 Oct 2016 16:15:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1859C34123F for ; Sun, 16 Oct 2016 16:15:42 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7A982FC for ; Sun, 16 Oct 2016 16:15:40 +0000 (UTC) From: "Jory Pratt" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jory Pratt" Message-ID: <1476634349.9ce42ad5bc98b846f0f4d445e9b066e9667cecd6.anarchy@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-text/openlp/, app-text/openlp/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-text/openlp/Manifest app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch app-text/openlp/openlp-2.0.4.ebuild app-text/openlp/openlp-2.0.5.ebuild app-text/openlp/openlp-2.4.2.ebuild X-VCS-Directories: app-text/openlp/ app-text/openlp/files/ X-VCS-Committer: anarchy X-VCS-Committer-Name: Jory Pratt X-VCS-Revision: 9ce42ad5bc98b846f0f4d445e9b066e9667cecd6 X-VCS-Branch: master Date: Sun, 16 Oct 2016 16:15:40 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8d040e15-6b7a-47a0-b0c2-0ecd9cb3e429 X-Archives-Hash: 755fc66eed3ed27f85c64252cb87bbc8 commit: 9ce42ad5bc98b846f0f4d445e9b066e9667cecd6 Author: Jory A. Pratt gentoo org> AuthorDate: Fri Sep 9 23:42:08 2016 +0000 Commit: Jory Pratt gentoo org> CommitDate: Sun Oct 16 16:12:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ce42ad5 app-text/openlp - remove stale builds, version bump bug #564758 Package-Manager: portage-2.3.0 app-text/openlp/Manifest | 3 +- .../openlp/files/OpenLP-2.4.2-disable-tests.patch | 22 ++++++++++++ app-text/openlp/openlp-2.0.5.ebuild | 41 ---------------------- .../{openlp-2.0.4.ebuild => openlp-2.4.2.ebuild} | 19 +++++----- 4 files changed, 34 insertions(+), 51 deletions(-) diff --git a/app-text/openlp/Manifest b/app-text/openlp/Manifest index bdcd653..5f55e2f 100644 --- a/app-text/openlp/Manifest +++ b/app-text/openlp/Manifest @@ -1,2 +1 @@ -DIST OpenLP-2.0.4.tar.gz 5805304 SHA256 ffb66cf67b04bf0070444fd4c61fbddb5ba9e411c4fb7b4225b84418e9c25d96 SHA512 314d1ed3ff5c8ff8cf11709941fa95515a899632c210ee67bc9f08c853a8d2bd5f61743a5b2b438fdddebc3cced53fbddd1d1f93e3a4c7b1324a1af3a4e4b2c1 WHIRLPOOL 8125fd331e092daa71093e46bdf99680b5acadfae9b7dde65f0dabe7d25e55c926b98bb69807d419274218c9161b2985c06357129bf928d0fa1ed1058eaf7660 -DIST OpenLP-2.0.5.tar.gz 5806428 SHA256 d1d39282b9a55d031d98d396373416ff0216d44ed5c9f6f747501592fe94699b SHA512 643fb632a430831e8ac697fd895573d56db2c4954aefd5d06bbca39af55cbdc9788aec7366c6663a4fdbf92f0fcb4aeeeef4579b8ca41e3e65a862b322835620 WHIRLPOOL e966b00ecc8c6c067fe78c028e4ebf18256fac417f4e5685e7bc43a7e26f7392a89a44ed6784e6c648a3937dba22c89dc7d2ef94f5dddf363f8b416c255227be +DIST OpenLP-2.4.2.tar.gz 7430438 SHA256 ae56a9661a1847eb3c859fec3ac73e7b2e8b102b821232a26fd273f61a039c9c SHA512 650662231a5ef23460162f794237f8ecf54c20f8514793aef1b1bada2912e82c3e1a8aaec36e56a88ed38b5c282393635f6345926362080f8101ef6285a5d317 WHIRLPOOL 2771a17c76001b2981ceb4b5fad44319fa4218477fcdc00589a7e437ae6d721624ef5955ee041db20bf9bb6b802e90f386c7e87a95c53dcae9b52d7ebd072e7b diff --git a/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch b/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch new file mode 100644 index 00000000..0b1de65 --- /dev/null +++ b/app-text/openlp/files/OpenLP-2.4.2-disable-tests.patch @@ -0,0 +1,22 @@ +diff -urN a/setup.cfg b/setup.cfg +--- a/setup.cfg 2016-06-25 13:20:56.000000000 -0500 ++++ b/setup.cfg 2016-09-08 22:30:54.606413547 -0500 +@@ -2,3 +2,5 @@ + exclude=resources.py,vlc.py + max-line-length = 120 + ignore = E402 ++[install] ++install_scripts=/usr/bin +\ No newline at end of file +diff -urN a/setup.py b/setup.py +--- a/setup.py 2016-06-25 13:20:56.000000000 -0500 ++++ b/setup.py 2016-09-08 22:30:50.523413394 -0500 +@@ -157,7 +157,7 @@ + author_email='raoulsnyman@openlp.org', + url='http://openlp.org/', + license='GNU General Public License', +- packages=find_packages(exclude=['ez_setup', 'examples', 'tests']), ++ packages=find_packages(exclude=['ez_setup', 'examples', 'tests', 'tests.*']), + scripts=['openlp.py'], + include_package_data=True, + zip_safe=False, diff --git a/app-text/openlp/openlp-2.0.5.ebuild b/app-text/openlp/openlp-2.0.5.ebuild deleted file mode 100644 index 4948990..00000000 --- a/app-text/openlp/openlp-2.0.5.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE='sqlite' - -inherit distutils-r1 - -DESCRIPTION="Free church presentation software" -HOMEPAGE="http://openlp.org/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/OpenLP-${PV}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -RDEPEND=" - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] - dev-python/chardet[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/mako[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] - dev-python/pyodbc - dev-python/PyQt4[X,multimedia,phonon,webkit,${PYTHON_USEDEP}] - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/sip[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] - dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]" -DEPEND="${RDEPEND}" - -S=${WORKDIR}/OpenLP-${PV} - -python_install_all() { - distutils-r1_python_install_all - domenu resources/openlp.desktop - dosym openlp.pyw /usr/bin/openlp - doicon -s scalable resources/images/openlp.svg -} diff --git a/app-text/openlp/openlp-2.0.4.ebuild b/app-text/openlp/openlp-2.4.2.ebuild similarity index 59% rename from app-text/openlp/openlp-2.0.4.ebuild rename to app-text/openlp/openlp-2.4.2.ebuild index 4948990..6b96638 100644 --- a/app-text/openlp/openlp-2.0.4.ebuild +++ b/app-text/openlp/openlp-2.4.2.ebuild @@ -1,41 +1,44 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ EAPI=5 -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_4) PYTHON_REQ_USE='sqlite' inherit distutils-r1 DESCRIPTION="Free church presentation software" HOMEPAGE="http://openlp.org/" -SRC_URI="mirror://sourceforge/${PN}/${PV}/OpenLP-${PV}.tar.gz" +SRC_URI="https://get.openlp.org/${PV}/OpenLP-${PV}.tar.gz" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64" RDEPEND=" - dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}] + dev-python/alembic[${PYTHON_USEDEP}] + dev-python/beautifulsoup:4[${PYTHON_USEDEP}] dev-python/chardet[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/mako[${PYTHON_USEDEP}] - dev-python/pyenchant[${PYTHON_USEDEP}] + >=dev-python/pyenchant-1.3[${PYTHON_USEDEP}] dev-python/pyodbc - dev-python/PyQt4[X,multimedia,phonon,webkit,${PYTHON_USEDEP}] + dev-python/PyQt5[multimedia,gui,network,svg,webkit,${PYTHON_USEDEP}] dev-python/setuptools[${PYTHON_USEDEP}] dev-python/sip[${PYTHON_USEDEP}] - dev-python/sqlalchemy[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-0.5[${PYTHON_USEDEP}] dev-python/sqlalchemy-migrate[${PYTHON_USEDEP}]" DEPEND="${RDEPEND}" S=${WORKDIR}/OpenLP-${PV} +PATCHES=( "${FILESDIR}"/OpenLP-${PV}-disable-tests.patch ) + python_install_all() { distutils-r1_python_install_all domenu resources/openlp.desktop - dosym openlp.pyw /usr/bin/openlp + mv "${D}"/usr/bin/openlp.py "${D}"/usr/bin/openlp doicon -s scalable resources/images/openlp.svg }