Version bump by teidakankan (bug #377621). Install translations by dragongrot (bug...

Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64

diff --git a/app-misc/emelfm2/ChangeLog b/app-misc/emelfm2/ChangeLog
index 874025bd351a1789a2c110196c9f6cd180c960b8..eb15a7624650563f6c6a21695e805ba661fe2dd1 100644 (file)
--- a/app-misc/emelfm2/ChangeLog
+++ b/app-misc/emelfm2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for app-misc/emelfm2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.46 2011/10/27 05:53:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/ChangeLog,v 1.47 2011/12/29 20:10:20 jer Exp $
+
+*emelfm2-0.8.0 (29 Dec 2011)
+
+  29 Dec 2011; Jeroen Roovers <jer@gentoo.org> -emelfm2-0.7.2-r1.ebuild,
+  -emelfm2-0.7.4.ebuild, +emelfm2-0.8.0.ebuild:
+  Version bump by teidakankan (bug #377621). Install translations by dragongrot
+  (bug #369709).
 
   27 Oct 2011; Alexandre Rostovtsev <tetromino@gentoo.org>
   emelfm2-0.7.2-r1.ebuild, emelfm2-0.7.4.ebuild, emelfm2-0.7.5.ebuild:

diff --git a/app-misc/emelfm2/Manifest b/app-misc/emelfm2/Manifest
index 06f425947a0ea4673e84db904018fb3910c49d0b..f8b09c77fff7008fbbbf001f8532393607192990 100644 (file)
--- a/app-misc/emelfm2/Manifest
+++ b/app-misc/emelfm2/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
-DIST emelfm2-0.7.2.tar.bz2 1053920 RMD160 0322db785ed0fb120b9d752de0cc5043d3165f7d SHA1 26089a11ca863d5728ac759cecf5306f3eae2bba SHA256 0e655d8212a3f3002a337863b2e841f4cedfef1dc704939535278392c3cfe912
-DIST emelfm2-0.7.4.tar.bz2 1069514 RMD160 18a9a1fc4be17dd37d4f64b3950ba9b2c9f0d50a SHA1 43ac0e2030cb270a2df405cfc937f83848bfbce4 SHA256 fa14f7d42c693b70ee2b6b3effef8cc571c19ae38ce1df1cbb6da90d5e95513c
 DIST emelfm2-0.7.5.tar.bz2 1055510 RMD160 ff6913eac2f0cec9be72a943a9a02715bb2a2bb7 SHA1 b3aa34d2e9281d761fbfc96acb3eb6f297590c4e SHA256 6dcd2ca2695f0ceb442a8390558580a19d4fb66d1d89e2b103696a6d4e68ac2c
-EBUILD emelfm2-0.7.2-r1.ebuild 1716 RMD160 ac1dba5104bbf0acbaa8513c036ccd8f2dc6f2b6 SHA1 120ed7eb122895e16354bad0dbef9b397fbd03fc SHA256 373662687fb3eb417dbbe67ffce7c8963481cb4cee808c5f8ea474e60a483c44
-EBUILD emelfm2-0.7.4.ebuild 1506 RMD160 929dd83d5e64bad6178154df3881b1e9c188d050 SHA1 6cece3eb845db60baa67e321cff651aeb599cfff SHA256 4f4c907875cfa2029ac4b560829872b1f88761a05799af4be10deefa0e14202b
+DIST emelfm2-0.8.0.tar.bz2 1085861 RMD160 ba20d1073a2a3597f975d7006d3963df1e81e6e5 SHA1 699ddb8854bea97ce908e2a8984070caf946103b SHA256 85baadcf3d52d77eb8a44a325a444d52cf25164b1151c641dc2b36eb68e333e3
 EBUILD emelfm2-0.7.5.ebuild 1586 RMD160 8910350b04f12811bde3e9e7e4818e1c0ba764d0 SHA1 a7e99fa272bcdb37203dfe316450cdb00ff336d2 SHA256 d2a7390a98c5c98636a98d9b405f62e342ec2a930bc4f55c8aed493a2628013c
-MISC ChangeLog 4630 RMD160 7f44ebe5971fc18f1a02ad5ef047431e95738325 SHA1 af68de352320d7bc214959672fb11a4fbe651a2b SHA256 d2ab2dd57feffdc0d4576f80189170b77478db406b69c6e1acfe95b95942c0d6
+EBUILD emelfm2-0.8.0.ebuild 1616 RMD160 fdb1accda23c49b923f7a8f758e7b6b53ce4f5de SHA1 b0c7cf125597a5a8e12cf375064ffbf1694f659b SHA256 b80b18ee78aa5961c05f6c4640b051487a599f96cfc6b4e80d23e017058afda1
+MISC ChangeLog 4873 RMD160 cd2dbd44e05af1a277550a4d299a80d5da45faf5 SHA1 68c69f9874394c7a1d77cbb0743e554191dc04ad SHA256 8f15a44f19ba7fa457f3e42efdf02f7fd40a2efea10c4a7ff9ebc40da191b898
 MISC metadata.xml 167 RMD160 6f174fdd5033945a3da1b7bbea9796fe17ba2bf8 SHA1 26b8b030985c93a71d6d34f25249320a30b22f36 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk6o8fQACgkQdjK8w9WeBnAfxwD/ejFAGw+woM6dF0VFDhv1jWzj
-Gjf9SQ7EmgZ1049FgWUBALJkpMuvmDVqFG/4lOpZrL6o4VMw5KJZO0lhewPpqJto
-=GlQ2
+iEYEARECAAYFAk78yTYACgkQVWmRsqeSphMvqACdFRD/9mbBqbQNldbN520Ib//0
+DcMAn1+6+pWU/NXlr6Dcn8Ha/gU6wx7E
+=B4IE
 -----END PGP SIGNATURE-----

diff --git a/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild b/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild
deleted file mode 100644 (file)
index d3e9c56..0000000
--- a/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.7.2-r1.ebuild,v 1.10 2011/10/27 05:53:51 tetromino Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A file manager that implements the popular two-pane design"
-HOMEPAGE="http://emelfm2.net/"
-SRC_URI="http://${PN}.net/rel/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~ppc ~ppc64 ~sparc x86"
-IUSE="acl fam gimp kernel_linux nls policykit spell udev"
-
-RDEPEND=">=x11-libs/gtk+-2.12:2
-       acl? ( sys-apps/acl )
-       !kernel_linux? ( fam? ( virtual/fam ) )
-       gimp? ( media-gfx/gimp )
-       policykit? ( sys-auth/polkit )
-       spell? ( app-text/gtkspell:2 )
-       udev? ( sys-fs/udisks
-               dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       nls? ( sys-devel/gettext )"
-
-RESTRICT="test"
-
-pkg_setup() {
-       myconf="DOCS_VERSION=1 WITH_TRANSPARENCY=1 STRIP=0"
-
-       use udev && myconf="${myconf} WITH_DEVKIT=1"
-       use gimp && myconf="${myconf} WITH_THUMBS=1"
-       use acl && myconf="${myconf} WITH_ACL=1"
-       use kernel_linux && myconf="${myconf} WITH_KERNELFAM=1 USE_INOTIFY=1"
-       use spell && myconf="${myconf} EDITOR_SPELLCHECK=1"
-       use nls || myconf="${myconf} I18N=0"
-       use policykit && myconf="${myconf} WITH_POLKIT=1"
-
-       if ! use kernel_linux && use fam; then
-               if has_version "app-admin/gamin"; then
-                       myconf="${myconf} USE_GAMIN=1"
-               else
-                       myconf="${myconf} USE_FAM=1"
-               fi
-       fi
-}
-
-src_compile() {
-       tc-export CC
-       emake LIB_DIR="/usr/$(get_libdir)" PREFIX="/usr" \
-               ${myconf} || die
-}
-
-src_install() {
-       emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
-               ${myconf} install || die
-       newicon icons/${PN}_48.png ${PN}.png
-       prepalldocs
-}

diff --git a/app-misc/emelfm2/emelfm2-0.7.4.ebuild b/app-misc/emelfm2/emelfm2-0.8.0.ebuild
similarity index 73%
rename from app-misc/emelfm2/emelfm2-0.7.4.ebuild
rename to app-misc/emelfm2/emelfm2-0.8.0.ebuild
index ae85b4903c7bb96d5129f265cc45a431aa6e23c2..123c2cfb626d45231df16df46d92f72cea7ad7cc 100644 (file)
--- a/app-misc/emelfm2/emelfm2-0.7.4.ebuild
+++ b/app-misc/emelfm2/emelfm2-0.8.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.7.4.ebuild,v 1.3 2011/10/27 05:53:51 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/emelfm2/emelfm2-0.8.0.ebuild,v 1.1 2011/12/29 20:10:20 jer Exp $
 
-EAPI=2
+EAPI=4
 inherit eutils multilib toolchain-funcs
 
 DESCRIPTION="A file manager that implements the popular two-pane design"
@@ -14,15 +14,15 @@ SLOT="0"
 KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="acl fam gimp kernel_linux nls policykit spell udev"
 
-RDEPEND=">=dev-libs/glib-2.22:2
+COMMON_DEPEND=">=dev-libs/glib-2.26:2
        >=x11-libs/gtk+-2.12:2
        acl? ( sys-apps/acl )
        gimp? ( media-gfx/gimp )
        policykit? ( sys-auth/polkit )
-       spell? ( app-text/gtkspell:2 )
-       udev? ( sys-fs/udisks
-               dev-libs/dbus-glib )"
-DEPEND="${RDEPEND}
+       spell? ( >=app-text/gtkspell-2.0.14:2 )"
+RDEPEND="${COMMON_DEPEND}
+       udev? ( sys-fs/udisks )"
+DEPEND="${COMMON_DEPEND}
        dev-util/pkgconfig
        nls? ( sys-devel/gettext )"
 
@@ -33,7 +33,9 @@ pkg_setup() {
                use ${1} && echo "${2}=1" || echo "${2}=0"
        }
 
+       #363813
        myemelconf=(
+               GTK3=0
                DOCS_VERSION=1
                $(emel_use nls I18N)
                WITH_TRANSPARENCY=1
@@ -47,15 +49,18 @@ pkg_setup() {
                )
 }
 
+src_prepare() {
+       sed -i Makefile -e 's:dbus-glib-1::' || die
+}
+
 src_compile() {
        tc-export CC
        emake LIB_DIR="/usr/$(get_libdir)" PREFIX="/usr" \
-               ${myemelconf[@]} || die
+               ${myemelconf[@]}
 }
 
 src_install() {
        emake LIB_DIR="${D}/usr/$(get_libdir)" PREFIX="${D}/usr" \
-               ${myemelconf[@]} install || die
+               ${myemelconf[@]} install $( use nls && echo install_i18n )
        newicon icons/${PN}_48.png ${PN}.png
-       prepalldocs
 }