QA: Version bump, drop old, wrt bug #470860

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x1F357D42)

3 files changed, 55 insertions, 37 deletions

diff --git a/x11-libs/libyui-ncurses/ChangeLog b/x11-libs/libyui-ncurses/ChangeLog
index 7d8a615d5b7c..153a04c5e63f 100644
--- a/x11-libs/libyui-ncurses/ChangeLog
+++ b/x11-libs/libyui-ncurses/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-libs/libyui-ncurses
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui-ncurses/ChangeLog,v 1.2 2012/06/16 08:35:54 pacho Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui-ncurses/ChangeLog,v 1.3 2014/09/23 17:13:37 pinkbyte Exp $
+
+*libyui-ncurses-2.46.4 (23 Sep 2014)
+
+  23 Sep 2014; Sergey Popov <pinkbyte@gentoo.org>
+  -libyui-ncurses-2.21.1.ebuild, +libyui-ncurses-2.46.4.ebuild:
+  QA: Version bump, drop old, wrt bug #470860
 
   16 Jun 2012; Pacho Ramos <pacho@gentoo.org> libyui-ncurses-2.21.1.ebuild:
   Fix DESCRIPTION, bug #411757 by Jack Hill.
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.21.1.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.21.1.ebuild
deleted file mode 100644
index b37af5dadb54..000000000000
--- a/x11-libs/libyui-ncurses/libyui-ncurses-2.21.1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui-ncurses/libyui-ncurses-2.21.1.ebuild,v 1.2 2012/06/16 08:35:54 pacho Exp $
-
-EAPI=4
-
-inherit autotools
-
-DESCRIPTION="UI abstraction library - ncurses plugin"
-HOMEPAGE="http://sourceforge.net/projects/libyui/"
-SRC_URI="mirror://sourceforge/libyui/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND="sys-libs/ncurses
-	x11-libs/libyui
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf --disable-static
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -exec rm -f {} +
-	rm -rf "${ED}/usr/include"
-}
diff --git a/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild b/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild
new file mode 100644
index 000000000000..2b96ffa55019
--- /dev/null
+++ b/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libyui-ncurses/libyui-ncurses-2.46.4.ebuild,v 1.1 2014/09/23 17:13:37 pinkbyte Exp $
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="UI abstraction library - ncurses plugin"
+HOMEPAGE="https://github.com/libyui/libyui-ncurses"
+SRC_URI="https://github.com/libyui/${PN}/archive/${PN}/master/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0/6"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="static-libs"
+
+RDEPEND="sys-libs/ncurses
+	x11-libs/libyui:${SLOT}
+"
+# Only Boost headers are needed
+DEPEND="${RDEPEND}
+	dev-libs/boost"
+
+S="${WORKDIR}/${PN}-${PN}-master-${PV}"
+
+src_prepare() {
+	cp "${EPREFIX}/usr/share/libyui/buildtools/CMakeLists.common" CMakeLists.txt || die
+
+	# TODO: set proper docs deps and USE flag for building them
+	sed -i -e '/SET_AUTODOCS/d' CMakeLists.txt || die 'sed on CMakeLists.txt failed'
+	sed -i -e 's/src examples/src/' PROJECTINFO.cmake || die 'sed on PROJECTINFO.cmake failed'
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_EXAMPLES=OFF
+		-DENABLE_WERROR=OFF
+		-DDOC_DIR="${EPREFIX}/usr/share/doc/${P}"
+		-DRESPECT_FLAGS=ON
+		$(cmake-utils_use_enable static-libs STATIC)
+	)
+	cmake-utils_src_configure
+}