dev-cpp/commoncpp2: Fix for C++17

Closes: https://bugs.gentoo.org/787761
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: David Seifert <[email protected]>

dev-cpp/commoncpp2/Manifest

@@ -1 +1,2 @@
+DIST commoncpp2-1.8.1-patches.txz 7028 BLAKE2B be1d3ba7a87d82b3eb29c766df7f2a67cba60640ec6c2162d48bdd7b5cbf2bdd7b88ce1bae8f34c1418fc239d1a90ef6fbaa1600cb39c514176de74afb36cb36 SHA512 bc511776b4330ea1700a4288f30e22e7be3b5d7d0a6dc66baa787bcdbf4321a9ebb8ab3ca5dd6531425988136bb26f6094af89997bb6a44cf9455b6bb85ef7f9
 DIST commoncpp2-1.8.1.tar.gz 908678 BLAKE2B 93868286230b4b0507127627f0a1c24b4f340e4af50d7592774b57bfc7a8f1e31bacc0cee5d17b4237aac85be0265cf3aabd65708e988159daaac85b4145c398 SHA512 949823461d20429c2b0acfa22554a5a9dacc977e3ee097f34416f65d322df84fbdb27c644435c6c6caaed800347dfbe789cee7f19b39b306165c97b4f4012bfe

dev-cpp/commoncpp2/commoncpp2-1.8.1-r4.ebuild

@@ -7,7 +7,9 @@ inherit autotools
 
 DESCRIPTION="C++ library offering portable support for system-related services"
 HOMEPAGE="https://www.gnu.org/software/commoncpp/"
-SRC_URI="mirror://gnu/commoncpp/${P}.tar.gz"
+SRC_URI="
+ mirror://gnu/commoncpp/${P}.tar.gz
+ https://dev.gentoo.org/~soap/distfiles/${P}-patches.txz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -25,19 +27,20 @@ RDEPEND="
  dev-libs/openssl:0=
  )
  )"
-DEPEND="${RDEPEND}
- doc? ( >=app-doc/doxygen-1.3.6 )"
+DEPEND="${RDEPEND}"
+BDEPEND="doc? ( >=app-doc/doxygen-1.3.6 )"
 
 PATCHES=(
- "${FILESDIR}/1.8.1-configure_detect_netfilter.patch"
- "${FILESDIR}/1.8.0-glibc212.patch"
- "${FILESDIR}/1.8.1-autoconf-update.patch"
- "${FILESDIR}/1.8.1-fix-buffer-overflow.patch"
- "${FILESDIR}/1.8.1-parallel-build.patch"
- "${FILESDIR}/1.8.1-libgcrypt.patch"
- "${FILESDIR}/1.8.1-fix-c++14.patch"
- "${FILESDIR}/1.8.1-gnutls-3.4.patch"
- "${FILESDIR}/1.8.1-fix-gcc9.patch" # bug 686012
+ "${WORKDIR}"/patches/1.8.1-configure_detect_netfilter.patch
+ "${WORKDIR}"/patches/1.8.1-glibc212.patch
+ "${WORKDIR}"/patches/1.8.1-autoconf-update.patch
+ "${WORKDIR}"/patches/1.8.1-fix-buffer-overflow.patch
+ "${WORKDIR}"/patches/1.8.1-parallel-build.patch
+ "${WORKDIR}"/patches/1.8.1-libgcrypt.patch
+ "${WORKDIR}"/patches/1.8.1-fix-c++14.patch
+ "${WORKDIR}"/patches/1.8.1-gnutls-3.4.patch
+ "${WORKDIR}"/patches/1.8.1-fix-gcc9.patch
+ "${WORKDIR}"/patches/1.8.1-c++17.patch
 )
 
 src_prepare() {
@@ -47,19 +50,19 @@ src_prepare() {
 
 src_configure() {
  econf \
+ --disable-static \
  $(use_enable debug) \
  $(use_with ipv6) \
  $(use_with ssl $(usex gnutls gnutls openssl)) \
- $(use_enable static-libs static) \
  $(use_with doc doxygen)
 }
 
 src_install() {
- use doc && local HTML_DOCS=( doc/html/. )
+ use doc && HTML_DOCS=( doc/html/. )
  default
 
  # package provides .pc files
- find "${D}" -name '*.la' -delete || die
+ find "${ED}" -name '*.la' -delete || die
 
  dodoc COPYING.addendum