dev-db/gqlplus-1.16-r1: revbump to pull in some fixes

Bug: https://bugs.gentoo.org/777504 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Fabian Groffen <[email protected]>
hanetzer · Mar 21, 2021 · cea282f · cea282f
1 parent 854098e
commit cea282f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/dev-db/gqlplus/Manifest b/dev-db/gqlplus/Manifest
@@ -1 +1,2 @@
+DIST gqlplus-1.16-sqlplus-handling-fixes.patch 24618 BLAKE2B b0d4d784756bafc5a030e850a22749e4a981f3bd3da9f0951319c62d895de0c6795bcbc7cf47b4afd2f965dc139478d8fe8d4de904c8b378584de40ef862f556 SHA512 7d30941d6def9ab82c430e3c7089c510b3e96425c9b833f71d51940c3ed23529f27af11eeffece17eb9da82c5435c151f79bf4171a62ec0fb6cb82538da79e30
 DIST gqlplus-1.16.tar.gz 2128428 BLAKE2B 5d2ad6cd58d7a5e0e6ce0d54301d70ad452d34a9636ce1f831d1b6d1de3bbc0ebce3d92ed15c2b8da60107d49c56c306543c768c0ef3534f34d2d545b80c43d7 SHA512 e9d7685e4db741db8232f7ba7a05df59042d0cafe198060adcd37aea2d3878e785eacb1f7b72fcb154558d1be8c619818dbeceffaefb75e372a18ed23e234512
diff --git a/dev-db/gqlplus/gqlplus-1.16.ebuild → dev-db/gqlplus/gqlplus-1.16-r1.ebuild b/dev-db/gqlplus/gqlplus-1.16.ebuild → dev-db/gqlplus/gqlplus-1.16-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,8 @@ inherit autotools
 
 DESCRIPTION="a front-end for Oracle program sqlplus with command-line editing"
 HOMEPAGE="https://gitlab.com/jessp011/gqlplus"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
+ https://dev.gentoo.org/~grobian/distfiles/gqlplus-1.16-sqlplus-handling-fixes.patch"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -17,17 +18,23 @@ IUSE=""
 DEPEND="sys-libs/readline:*"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}"/${P}-ncurses-tinfo.patch )
+PATCHES=(
+ "${FILESDIR}"/${P}-ncurses-tinfo.patch
+ "${DISTDIR}"/${P}-sqlplus-handling-fixes.patch
+)
 
 src_prepare() {
  default
 
  # don't use packaged readline and old version containing it
- rm -Rf readline gqlplus-1.15
+ rm -Rf readline gqlplus-1.15 aclocal.m4 configure
 
  # maintainer can't seem to get versioning right
  sed -i '/^#define VERSION/s/"[^"]\+"/"'"${PV}"'"/' gqlplus.c || die
  sed -i '/^AC_INIT/s/\[[1-9.]\+\]/['"${PV}"']/' configure.ac || die
 
+ # fix some ancientness, bug #777504
+ sed -i 's/^INCLUDES=/gqlplus_CPPFLAGS=/' Makefile.am || die
+
  eautoreconf
 }