Skip to content

Commit

Permalink
dev-libs/libpqxx: Cleanup, indendation, add missing die
Browse files Browse the repository at this point in the history
Fix src_* order.

Closes: gentoo#5218
Package-Manager: Portage-2.3.8, Repoman-2.3.3
  • Loading branch information
a17r committed Sep 17, 2017
1 parent 513281c commit 0902eba
Showing 1 changed file with 17 additions and 25 deletions.
42 changes: 17 additions & 25 deletions dev-libs/libpqxx/libpqxx-5.1.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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} )
Expand All @@ -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,"
Expand All @@ -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:"
Expand All @@ -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
}

0 comments on commit 0902eba

Please sign in to comment.