From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-973357-garchives=archives.gentoo.org@lists.gentoo.org>
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 D5F06139083
for <garchives@archives.gentoo.org>; Sun, 17 Sep 2017 19:59:27 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 3185F1FC093;
Sun, 17 Sep 2017 19:59:27 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 0CAE81FC093
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Sep 2017 19:59:26 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D12EE33BEBE
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Sep 2017 19:59:24 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 68CBD6AA2
for <gentoo-commits@lists.gentoo.org>; Sun, 17 Sep 2017 19:59:22 +0000 (UTC)
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" <asturm@gentoo.org>
Message-ID: <1505678333.0902eba3032f998a6ae627554e4d35ef1f2d29b3.asturm@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libpqxx/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/libpqxx/libpqxx-5.1.0.ebuild
X-VCS-Directories: dev-libs/libpqxx/
X-VCS-Committer: asturm
X-VCS-Committer-Name: Andreas Sturmlechner
X-VCS-Revision: 0902eba3032f998a6ae627554e4d35ef1f2d29b3
X-VCS-Branch: master
Date: Sun, 17 Sep 2017 19:59:22 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 22ee42b8-2b1c-4fb0-be2f-1b657e46833a
X-Archives-Hash: 693e3d8e4aee375675df1b9b1d3f7a90
commit: 0902eba3032f998a6ae627554e4d35ef1f2d29b3
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 23:31:32 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 19:58:53 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0902eba3
dev-libs/libpqxx: Cleanup, indendation, add missing die
Fix src_* order.
Closes: https://github.com/gentoo/gentoo/pull/5218
Package-Manager: Portage-2.3.8, Repoman-2.3.3
dev-libs/libpqxx/libpqxx-5.1.0.ebuild | 42 ++++++++++++++---------------------
1 file changed, 17 insertions(+), 25 deletions(-)
diff --git a/dev-libs/libpqxx/libpqxx-5.1.0.ebuild b/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
index 6c01ca8a607..83c831e8738 100644
--- a/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
+++ b/dev-libs/libpqxx/libpqxx-5.1.0.ebuild
@@ -16,12 +16,12 @@ SLOT="0"
IUSE="doc static-libs"
RDEPEND="dev-db/postgresql:="
-DEPEND="${PYTHON_DEPS}
- ${RDEPEND}
- doc? (
- app-doc/doxygen
- app-text/xmlto
- )
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ doc? (
+ app-doc/doxygen
+ app-text/xmlto
+ )
"
DOCS=( AUTHORS NEWS README{.md,-UPGRADE} )
@@ -41,16 +41,6 @@ src_configure() {
$(use_enable static-libs static)
}
-src_install () {
- use doc && HTML_DOCS=( doc/html/. )
-
- default
-
- if ! use static-libs; then
- find "${D}" -name '*.la' -delete || die
- fi
-}
-
src_test() {
einfo "The tests need a running PostgreSQL server and an existing database."
einfo "Test requires PGDATABASE and PGUSER to be set at a minimum. Optionally,"
@@ -71,15 +61,8 @@ src_test() {
local server_version
server_version=$(psql -Aqtc 'SELECT version();' 2> /dev/null)
if [[ $? = 0 ]] ; then
- # Currently works with highest server version in tree
- #server_version=$(echo ${server_version} | cut -d " " -f 2 | cut -d "." -f -2 | tr -d .)
- #if [[ $server_version < 92 ]] ; then
- cd "${S}/test"
- emake check
- #else
- # eerror "Server version must be 8.4.x or below."
- # die "Server version isn't 8.4.x or below"
- #fi
+ cd "${S}/test" || die
+ emake check
else
eerror "Is the server running?"
eerror "Verify role and database exist, and are permitted in pg_hba.conf for:"
@@ -92,3 +75,12 @@ src_test() {
eerror "Skipping tests."
fi
}
+
+src_install () {
+ use doc && HTML_DOCS=( doc/html/. )
+ default
+
+ if ! use static-libs; then
+ find "${D}" -name '*.la' -delete || die
+ fi
+}