x11-libs/librfm: Fix deps, bug #595204 and #599736 by Toralf Förster

Package-Manager: portage-2.3.2

diff --git a/x11-libs/librfm/librfm-5.3.16.3.ebuild b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
similarity index 58%
rename from x11-libs/librfm/librfm-5.3.16.3.ebuild
rename to x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
index ea0262c10c6b340c9a276d0649b940b4e9ac9651..3692f5fbf1601fdf59a5bc5796a02d88540fe303 100644 (file)
--- a/x11-libs/librfm/librfm-5.3.16.3.ebuild
+++ b/x11-libs/librfm/librfm-5.3.16.3-r1.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 inherit autotools eutils
 
-MY_P=${PN}5-${PV}
+MY_P="${PN}5-${PV}"
 
-DESCRIPTION="the basic library used by some rfm applications, such as Rodent filemanager"
+DESCRIPTION="The basic library used by some rfm applications, such as Rodent filemanager"
 HOMEPAGE="http://xffm.org/libxffm.html"
 SRC_URI="mirror://sourceforge/xffm/${PN}/${MY_P}.tar.bz2"
 
@@ -16,26 +16,26 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND=">=dev-libs/glib-2.22.5:2
+RDEPEND="
+       >=dev-libs/glib-2.22.5:2
        >=dev-libs/libdbh-5.0.13
        >=dev-libs/libtubo-5.0.13
        >=dev-libs/libxml2-2.4.0:2
-       >=dev-libs/libzip-0.9
+       >=dev-libs/libzip-0.9:0=
        >=gnome-base/librsvg-2.26:2
-       >=x11-libs/cairo-1.12.6
-       >=x11-libs/gtk+-3.12:3
-       >=x11-libs/pango-1.28.0
-       !<x11-misc/rodent-5"
+       >=x11-libs/cairo-1.12.6[X]
+       >=x11-libs/gtk+-3.12:3[X]
+       >=x11-libs/pango-1.28.0[X]
+       !<x11-misc/rodent-5
+"
 DEPEND="${RDEPEND}
-       virtual/pkgconfig"
+       virtual/pkgconfig
+"
 
-S="${WORKDIR}"/${MY_P}
-
-pkg_setup() {
-       DOCS=( AUTHORS ChangeLog NEWS README TODO )
-}
+S="${WORKDIR}/${MY_P}"
 
 src_prepare() {
+       default
        sed -i -e "s:-O2:${CFLAGS}:" m4/rfm-conditionals.m4 || die
        eautoreconf
 }