diff options
| -rw-r--r-- | x11-libs/desktop-agnostic/Manifest | 2 | ||||
| -rw-r--r-- | x11-libs/desktop-agnostic/desktop-agnostic-9999.ebuild | 54 |
2 files changed, 28 insertions, 28 deletions
diff --git a/x11-libs/desktop-agnostic/Manifest b/x11-libs/desktop-agnostic/Manifest index 18fc5c6..fd6fa88 100644 --- a/x11-libs/desktop-agnostic/Manifest +++ b/x11-libs/desktop-agnostic/Manifest @@ -1,2 +1,2 @@ AUX desktop-agnostic-various-fixes.patch 54137 RMD160 5c64d37a1107ff780f9e2c74aaee4528025a2f68 SHA1 67b5508dfb0677f0a738f3853fd1f4ab5d98a092 SHA256 8e6d3adf8712c9e79f67a6be3740a57cac4a5d89c2e201042e7f3e5e95b77cdc -EBUILD desktop-agnostic-9999.ebuild 1578 RMD160 41980f6cb433bf969deff4ba0043c6acc3d52b53 SHA1 d172ba55963e1f5f8e0e9bf2fce9ed422c6b9c92 SHA256 60b48bbfbb38ba44019cb13ee7505b76b72fa70c5ab9a0b56cae5478ec25aaff +EBUILD desktop-agnostic-9999.ebuild 1575 RMD160 015b658eba7cf75dd9f8f82f9bcc63e5702b7b2a SHA1 0b7f3b67242e8043e3a0d1d267185dfba8610efe SHA256 f0fa51b197902f8475f12def17b53d40eed1e848ddfecec3be11a215284404e5 diff --git a/x11-libs/desktop-agnostic/desktop-agnostic-9999.ebuild b/x11-libs/desktop-agnostic/desktop-agnostic-9999.ebuild index e922347..b284d2b 100644 --- a/x11-libs/desktop-agnostic/desktop-agnostic-9999.ebuild +++ b/x11-libs/desktop-agnostic/desktop-agnostic-9999.ebuild @@ -2,38 +2,36 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="2" -NEEDS_PYTHON=2.4 +EAPI="3" + +PYTHON_DEPEND=2:2.4 inherit python bzr +EBZR_REPO_URI="lp:libdesktop-agnostic" + DESCRIPTION="A desktop-agnostic library for GLib-based projects" HOMEPAGE="https://launchpad.net/libdesktop-agnostic" SRC_URI="" -EBZR_REPO_URI="lp:libdesktop-agnostic" LICENSE="LGPL-2.1 GPL-2" SLOT="0" -KEYWORDS="" -IUSE="debug gconf gnome -gnome-vfs -xfce" +KEYWORDS="~x86 ~amd64" +IUSE="debug glade gnome gnome-vfs xfce" -SHARED_DEPEND=">=dev-libs/glib-2.16 +RDEPEND=">=dev-libs/glib-2.16 >=x11-libs/gtk+-2.12 + >=dev-libs/gir-repository-0.6.3 + >=dev-libs/gobject-introspection-0.6.3 >=dev-python/pygobject-2.12 >=dev-python/pygtk-2.12 - gconf? ( >=gnome-base/gconf-2.0 ) - gnome? ( - gnome-base/gnome-desktop - ) - gnome-vfs? ( - gnome-base/gnome-vfs:2 - ) - xfce? ( xfce-base/thunar )" - -DEPEND="${SHARED_DEPEND} - dev-libs/gobject-introspection - >=dev-lang/vala-0.7.7" -RDEPEND="${SHARED_DEPEND}" + gnome? ( gnome-base/gnome-desktop ) + gnome-vfs? ( gnome-base/gnome-vfs:2 ) + xfce? ( xfce-base/thunar:1 )" +DEPEND="${RDEPEND} + >=dev-libs/gobject-introspection-0.6.3 + >=dev-lang/vala-0.7.0" +RDEPEND="${RDEPEND}" src_prepare() { # See https://bugs.launchpad.net/libdesktop-agnostic/+bug/519831 @@ -42,10 +40,8 @@ src_prepare() { src_configure() { local cfg="keyfile" de="glib" vfs="gio" myconf="" - if use gconf; then - cfg="gconf,${cfg}" - fi if use gnome; then + cfg="gconf" de="gnome,${de}" fi if use gnome-vfs; then @@ -57,15 +53,19 @@ src_configure() { if use debug; then myconf="${myconf} --enable-debug" fi - ./waf configure --prefix=/usr --with-glade --config-backends=${cfg} \ - --desktop-entry-backends=${de} --vfs-backends=${vfs} \ - ${myconf} || die "Could not configure ${PN}." + ./waf configure \ + --prefix=/usr \ + --config-backends=${cfg} \ + --desktop-entry-backends=${de} \ + --vfs-backends=${vfs} \ + $(use_with glade) \ + ${myconf} || die "configure failed" } src_compile() { - ./waf || die "Could not compile ${PN}." + ./waf || die "compile failed" } src_install() { - ./waf install --destdir="${D}" || die "Could not install ${PN}." + ./waf install --destdir="${D}" || die "install failed" } |