From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1016607-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 006E31382C5
for <garchives@archives.gentoo.org>; Tue, 10 Apr 2018 19:29:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 26DACE09F7;
Tue, 10 Apr 2018 19:29:30 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
(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 E7E4AE09F7
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Apr 2018 19:29:29 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(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 C882A335C09
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Apr 2018 19:29:28 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 3465623F
for <gentoo-commits@lists.gentoo.org>; Tue, 10 Apr 2018 19:29:27 +0000 (UTC)
From: "Thomas Deutschmann" <whissi@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, "Thomas Deutschmann" <whissi@gentoo.org>
Message-ID: <1523388551.92895a39a8deb689e5e8d663dddcb257d97a7bb7.whissi@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/, sys-apps/util-linux/files/
X-VCS-Repository: repo/gentoo
X-VCS-Files: sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch sys-apps/util-linux/util-linux-2.32-r1.ebuild sys-apps/util-linux/util-linux-2.32-r2.ebuild
X-VCS-Directories: sys-apps/util-linux/ sys-apps/util-linux/files/
X-VCS-Committer: whissi
X-VCS-Committer-Name: Thomas Deutschmann
X-VCS-Revision: 92895a39a8deb689e5e8d663dddcb257d97a7bb7
X-VCS-Branch: master
Date: Tue, 10 Apr 2018 19:29:27 +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: fad24634-e25c-4e6c-8afc-1ff6c8a96cb4
X-Archives-Hash: c554a7859ea4c4152347d55e1b832d5b
commit: 92895a39a8deb689e5e8d663dddcb257d97a7bb7
Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 10 19:13:10 2018 +0000
Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Apr 10 19:29:11 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92895a39
sys-apps/util-linux: Rev bump to add missing -lintl
Bugs: https://bugs.gentoo.org/652674
Package-Manager: Portage-2.3.28, Repoman-2.3.9
.../files/util-linux-2.32-add-missing-lintl.patch | 38 ++++++++++++++++++++++
...ux-2.32-r1.ebuild => util-linux-2.32-r2.ebuild} | 4 +++
2 files changed, 42 insertions(+)
diff --git a/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
new file mode 100644
index 00000000000..8cca093d7cb
--- /dev/null
+++ b/sys-apps/util-linux/files/util-linux-2.32-add-missing-lintl.patch
@@ -0,0 +1,38 @@
+From 3188ea9a9292604e537f06f11adddf474fc9e52d Mon Sep 17 00:00:00 2001
+From: Karel Zak <kzak@redhat.com>
+Date: Mon, 9 Apr 2018 12:11:36 +0200
+Subject: [PATCH] build: Add missing -lintl linkage to lib{smartcols,uuid}
+
+Addresses: https://github.com/karelzak/util-linux/pull/615
+Signed-off-by: Karel Zak <kzak@redhat.com>
+---
+ libsmartcols/src/Makemodule.am | 2 +-
+ libuuid/src/Makemodule.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/libsmartcols/src/Makemodule.am b/libsmartcols/src/Makemodule.am
+index 664aca30b..665b2aa7f 100644
+--- a/libsmartcols/src/Makemodule.am
++++ b/libsmartcols/src/Makemodule.am
+@@ -19,7 +19,7 @@ libsmartcols_la_SOURCES= \
+ libsmartcols/src/version.c \
+ libsmartcols/src/init.c
+
+-libsmartcols_la_LIBADD = libcommon.la
++libsmartcols_la_LIBADD = $(LDADD) libcommon.la
+
+ libsmartcols_la_CFLAGS = \
+ $(AM_CFLAGS) \
+diff --git a/libuuid/src/Makemodule.am b/libuuid/src/Makemodule.am
+index 5122622a5..e58fa261c 100644
+--- a/libuuid/src/Makemodule.am
++++ b/libuuid/src/Makemodule.am
+@@ -31,7 +31,7 @@ libuuid_la_SOURCES = \
+ EXTRA_libuuid_la_DEPENDENCIES = \
+ libuuid/src/libuuid.sym
+
+-libuuid_la_LIBADD = $(SOCKET_LIBS)
++libuuid_la_LIBADD = $(LDADD) $(SOCKET_LIBS)
+
+ libuuid_la_CFLAGS = \
+ $(AM_CFLAGS) \
diff --git a/sys-apps/util-linux/util-linux-2.32-r1.ebuild b/sys-apps/util-linux/util-linux-2.32-r2.ebuild
similarity index 97%
rename from sys-apps/util-linux/util-linux-2.32-r1.ebuild
rename to sys-apps/util-linux/util-linux-2.32-r2.ebuild
index 6d113163470..b616055b934 100644
--- a/sys-apps/util-linux/util-linux-2.32-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.32-r2.ebuild
@@ -68,6 +68,10 @@ pkg_setup() {
src_prepare() {
default
+ eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
+ touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
+ touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
+
# Prevent uuidd test failure due to socket path limit. #593304
sed -i \
-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \