gentoo resync : 25.01.2020

4 files changed, 84 insertions, 3 deletions

diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index e798e994db93..4cde74a6ec0a 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,11 +1,14 @@
 AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
+AUX ipmiutil-3.1.4-fix_lanplus_build.patch 485 BLAKE2B b4a5c7092b6ff6ab54c05b848d6f89b161cf79e271f8dd77eecae0a1fa523db83539a258c227d7b90f7e11b9103acf1f7ab4fd354654bd2e7aff8d8bf89a02e9 SHA512 270d94131e434a0be89929815f9ce2e52e2dfe77e69758f5201a837215fe364c622c22fbc9db03042427aaf7629ce09a896b1ad532443c57bc8d0327cae3d30b
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
 DIST ipmiutil-3.1.3.tar.gz 1698835 BLAKE2B a540a4522a22f98ad47c89e59f371e5304583cfaab348154dee366a058d78ca6d6ecd6003d8b49c08e8247d38254f7abf48ee05672ddd678566d40a66f63c912 SHA512 bd1f95b59583a07a5b6001b40e59269f25eb63b69e33f7fad6dd40136e1ea7611e647eb5ed2e2a9746944bde2dc2a3aa2def44238947693d75d9ca48697e1b99
 DIST ipmiutil-3.1.4.tar.gz 1693730 BLAKE2B a45de6e33110ae95b19a76be4c70a40025a9b6cbb5faa4555ff8d0b1c0445afcdd839d361052aadf31674b4be8db2c6c7087507727f74123809106b442bb1b8b SHA512 e76f3efbd5a15882607f9f141fe1298bfc80a3bc04f616bb0525c4546f19846616ce5aecc4aba658bcd01678724c05f770f893ba3dac91f5fe9c6cabd2acd579
+DIST ipmiutil-3.1.5.tar.gz 1703583 BLAKE2B 5e96659387b3e11e5f7867156d0079e06f19676099e8ff2a212f7e28550f9dde2079a4d527439489e1a710d878e7eb79a68b0e11b531f92d986aa7687273d462 SHA512 a9bd4d99d5bcad8a9f64c3636d6774d09e1d4c20927a6803891777ba035ee3c114b06295185cf00fb0c5d4b4b9afd335fd19c06f64298130e42945dc5f6e8010
 EBUILD ipmiutil-3.0.6.ebuild 1304 BLAKE2B a1ce20853a9c2e29fe289bba096bbfb74beac4009630e9e7a36af13c69b98a0a48a0c86db4516fb179e5b8887576e832d1a81a921fde56c559906dbdfbfccea7 SHA512 a13dc0bd8546e321c84e942c9137d6e8f64e5df99c7a3aa41b090c116ad352aa631d51c7078e2c063004e20e10e86b3b26473ab209a81b9fca99776226812cbb
 EBUILD ipmiutil-3.0.9.ebuild 1401 BLAKE2B dd45a5580ccc8aad7f329985bf3fe6e3d68a95a54bf345cadfec84cf77fc6b65c073b8a31ececa88d7caa0dba94cf0bbeb882aee6cb13e56c496818a291d5074 SHA512 a8dec8237051be08002fa96517a8a322e213e08bd04f18249d2ee174d892cb4bd49d290d3f4f9b8e3ff5b73a1f3b05d4b1129699de8443b3834278e301a855f9
 EBUILD ipmiutil-3.1.3.ebuild 1431 BLAKE2B fda36080e5844588b7a89623b6f92486361580ed5eda666c821e6ef10cd00da24a3beecdc419f362c2abbbcc754d061ddcd37f66fa574d2bd3ec69c2f86d3037 SHA512 6dcc5aba9441276c1ddf851abc95dd6108d255a02355dd3eb7189c28aba30ee3076e1a388400305f723f8e80be5d5bdbe1047132262369aafbd0ea14f2b029d5
-EBUILD ipmiutil-3.1.4.ebuild 1510 BLAKE2B c4a90296c9b33c038b1f5f17a3a9cbb7fe2a6e3f251c23e331b6cc02d11b4034cea12de2855fea38b05698c4b229b589436d055c04bc0f675ff730781b19b99d SHA512 dc3bdcb34a6158bbf67f46ac740b109f899b2a6458d31ac732c07783ba73c7dc0086c239d306edec785ad3223e4096fc08ad944cce2bd63f8c521da1ccfa5180
+EBUILD ipmiutil-3.1.4.ebuild 1578 BLAKE2B 662fda0d6c6a0353e72d6c55a437c15d77360d8baacd8bccb8c2c2ec015302c1b68164666a073fd710f0cd1e66f094c4c70fb67c3e931f08e1d03334f1218dd8 SHA512 d1d6294f4e521b5f01e07163d255569d1e6e2112189a451dcb727d3f7d8d6be00fd0380e6147a61b8e395f42fd6bbbd56fa700ef492cb0d7ebdb0f3650912307
+EBUILD ipmiutil-3.1.5.ebuild 1578 BLAKE2B 662fda0d6c6a0353e72d6c55a437c15d77360d8baacd8bccb8c2c2ec015302c1b68164666a073fd710f0cd1e66f094c4c70fb67c3e931f08e1d03334f1218dd8 SHA512 d1d6294f4e521b5f01e07163d255569d1e6e2112189a451dcb727d3f7d8d6be00fd0380e6147a61b8e395f42fd6bbbd56fa700ef492cb0d7ebdb0f3650912307
 MISC metadata.xml 337 BLAKE2B 5f04801092c5d0cf4166c36b508c4cb27e3a08f53f8f86d968d01d1d6911c6dd9cff78d70ec5c9bb60e6f3a028b7e5db1b629a9ba7961b3d729accbc6b62f9c2 SHA512 85f9992b8c7fddbffe99cba761637a897e7ba68f70762f882c039c6492feefefa6bd1ca38fbc73d0a214d04ddb07f5f0ea2106552e4133736d4594e43fae4845
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
new file mode 100644
index 000000000000..3f1331412d85
--- /dev/null
+++ b/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
@@ -0,0 +1,11 @@
+--- a/configure.ac	2020-01-24 23:32:53.768314546 +0700
++++ b/configure.ac	2020-01-24 23:32:13.971662393 +0700
+@@ -94,7 +94,7 @@ AC_ARG_ENABLE([landesk],
+ 
+ dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
+ AC_ARG_ENABLE([lanplus],
+-    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
++    [  --enable-lanplus      enable lanplus support (default=yes)],
+ [if test "x$enableval" = "xno"; then
+ 	drv_lanplus=""
+ 	LANPLUS_CFLAGS=""
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
index a8fbfd6eff87..9f6c5ecdfef1 100644
--- a/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -20,6 +20,7 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.9.8-flags.patch
 	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+	"${FILESDIR}"/${PN}-3.1.4-fix_lanplus_build.patch
 )
 
 src_prepare() {
@@ -35,7 +36,7 @@ src_prepare() {
 }
 
 src_configure() {
-	econf --disable-systemd --enable-sha256
+	econf --disable-systemd --enable-sha256 --enable-lanplus
 }
 
 src_compile() {
diff --git a/sys-apps/ipmiutil/ipmiutil-3.1.5.ebuild b/sys-apps/ipmiutil/ipmiutil-3.1.5.ebuild
new file mode 100644
index 000000000000..9f6c5ecdfef1
--- /dev/null
+++ b/sys-apps/ipmiutil/ipmiutil-3.1.5.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools systemd
+
+DESCRIPTION="IPMI Management Utilities"
+HOMEPAGE="http://ipmiutil.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE="static-libs"
+
+RDEPEND=">=dev-libs/openssl-1:0="
+DEPEND="${RDEPEND}
+	virtual/os-headers"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.9.8-flags.patch
+	"${FILESDIR}"/${PN}-2.9.9-lib_symlink.patch
+	"${FILESDIR}"/${PN}-3.1.4-fix_lanplus_build.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's|-O2 -g|$(CFLAGS)|g;s|-g -O2|$(CFLAGS)|g' util/Makefile.am* || die
+	sed -i -e 's|which rpm |which we_are_gentoo_rpm_is_a_guest |' configure.ac || die
+
+	# Don't compress man pages
+	sed '/gzip -f/d' -i doc/Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf --disable-systemd --enable-sha256 --enable-lanplus
+}
+
+src_compile() {
+	# Ulgy workaround. Upstream is misusing the make system here
+	# and it doesn't even work.
+	# Please check on each bump if this workaround is still required.
+	pushd lib/lanplus &>/dev/null || die
+	emake
+	cp libipmi_lanplus.a .. || die
+	popd &>/dev/null || die
+
+	emake
+}
+
+src_install() {
+	emake DESTDIR="${D}" sysdto="${D}/$(systemd_get_systemunitdir)" install
+	dodoc -r AUTHORS ChangeLog NEWS README TODO doc/UserGuide
+
+	# Init scripts are only for Fedora
+	rm -r "${ED}"/etc/init.d || die 'remove initscripts failed'
+
+	if ! use static-libs ; then
+		find "${ED}" -type f -name '*.a' -delete || die
+	fi
+
+	keepdir /var/lib/ipmiutil
+}