From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 190F61384B4 for ; Mon, 4 Jan 2016 10:05:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F262BE0856; Mon, 4 Jan 2016 10:04:56 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 8B27CE0856 for ; Mon, 4 Jan 2016 10:04:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 508B733D3C7 for ; Mon, 4 Jan 2016 10:04:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id F11C0CB0 for ; Mon, 4 Jan 2016 10:04:52 +0000 (UTC) From: "Jason Zaman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Jason Zaman" Message-ID: <1451901875.255bbef4ec73371480d70ddcf331e1a1c9db1574.perfinion@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/collectd/files/, app-admin/collectd/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/collectd/collectd-5.5.0.ebuild app-admin/collectd/files/collectd-5.5.0-lt.patch X-VCS-Directories: app-admin/collectd/ app-admin/collectd/files/ X-VCS-Committer: perfinion X-VCS-Committer-Name: Jason Zaman X-VCS-Revision: 255bbef4ec73371480d70ddcf331e1a1c9db1574 X-VCS-Branch: master Date: Mon, 4 Jan 2016 10:04:52 +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: 154a6d14-fbab-4301-87ea-895d38249ca5 X-Archives-Hash: 6f359cebbcc14e5dc8556fd32cc95a5e commit: 255bbef4ec73371480d70ddcf331e1a1c9db1574 Author: Jason Zaman gentoo org> AuthorDate: Mon Jan 4 10:03:02 2016 +0000 Commit: Jason Zaman gentoo org> CommitDate: Mon Jan 4 10:04:35 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=255bbef4 app-admin/collectd: update patch to unbundle libltdl Package-Manager: portage-2.2.26 app-admin/collectd/collectd-5.5.0.ebuild | 7 +++-- app-admin/collectd/files/collectd-5.5.0-lt.patch | 35 ++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/app-admin/collectd/collectd-5.5.0.ebuild b/app-admin/collectd/collectd-5.5.0.ebuild index 012278f..64af3dd 100644 --- a/app-admin/collectd/collectd-5.5.0.ebuild +++ b/app-admin/collectd/collectd-5.5.0.ebuild @@ -126,8 +126,9 @@ REQUIRED_USE=" collectd_plugins_python? ( ${PYTHON_REQUIRED_USE} )" PATCHES=( - "${FILESDIR}/${PN}-5.4.1"-{libocci,lt}.patch - "${FILESDIR}/${PN}-4.10.3"-werror.patch + "${FILESDIR}/${PN}-5.4.1-libocci.patch" + "${FILESDIR}/${PN}-5.5.0-lt.patch" + "${FILESDIR}/${PN}-4.10.3-werror.patch" ) # @FUNCTION: collectd_plugin_kernel_linux @@ -220,7 +221,7 @@ pkg_setup() { } src_prepare() { - default + epatch ${PATCHES[@]} epatch_user # There's some strange prefix handling in the default config file, resulting in diff --git a/app-admin/collectd/files/collectd-5.5.0-lt.patch b/app-admin/collectd/files/collectd-5.5.0-lt.patch new file mode 100644 index 0000000..b14736b --- /dev/null +++ b/app-admin/collectd/files/collectd-5.5.0-lt.patch @@ -0,0 +1,35 @@ +diff --git Makefile.am Makefile.am +index 5267123..a7e0d0c 100644 +--- Makefile.am ++++ Makefile.am +@@ -1,6 +1,4 @@ +-ACLOCAL_AMFLAGS = -I libltdl/m4 +- +-SUBDIRS = libltdl src bindings . ++SUBDIRS = src bindings . + + INCLUDES = $(LTDLINCL) + +--- configure.ac.old 2016-01-04 13:55:39.286846436 +0400 ++++ configure.ac 2016-01-04 13:56:07.905362298 +0400 +@@ -2,12 +2,10 @@ + AC_INIT([collectd],[m4_esyscmd(./version-gen.sh)]) + AC_CONFIG_SRCDIR(src/) + AC_CONFIG_HEADERS(src/config.h) +-AC_CONFIG_AUX_DIR([libltdl/config]) + + m4_ifdef([LT_PACKAGE_VERSION], + # libtool >= 2.2 + [ +- LT_CONFIG_LTDL_DIR([libltdl]) + LT_INIT([dlopen]) + LTDL_INIT([convenience]) + AC_DEFINE(LIBTOOL_VERSION, 2, [Define to used libtool version.]) +@@ -19,7 +17,6 @@ + AC_SUBST(LTDLINCL) + AC_SUBST(LIBLTDL) + AC_LIBTOOL_DLOPEN +- AC_CONFIG_SUBDIRS(libltdl) + AC_DEFINE(LIBTOOL_VERSION, 1, [Define to used libtool version.]) + ] + )