From f1b0ed2717faeb624b967eeb7de89fe5a62b8ec8 Mon Sep 17 00:00:00 2001 From: Samuli Suominen Date: Wed, 28 Dec 2011 12:47:10 +0000 Subject: Convert to REQUIRED_USE for xfce_plugins_trash and dbus. Package-Manager: portage-2.2.0_alpha81/cvs/Linux x86_64 --- xfce-base/thunar/ChangeLog | 5 ++++- xfce-base/thunar/Manifest | 18 +++++++++--------- xfce-base/thunar/thunar-1.2.3.ebuild | 12 ++++-------- 3 files changed, 17 insertions(+), 18 deletions(-) (limited to 'xfce-base') diff --git a/xfce-base/thunar/ChangeLog b/xfce-base/thunar/ChangeLog index 7d21ae3ed073..2c518917225d 100644 --- a/xfce-base/thunar/ChangeLog +++ b/xfce-base/thunar/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for xfce-base/thunar # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.130 2011/11/29 00:18:24 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/ChangeLog,v 1.131 2011/12/28 12:47:10 ssuominen Exp $ + + 28 Dec 2011; Samuli Suominen thunar-1.2.3.ebuild: + Convert to REQUIRED_USE for xfce_plugins_trash and dbus. 29 Nov 2011; Samuli Suominen -thunar-1.2.2.ebuild, -thunar-1.2.2-r1.ebuild, -files/thunar-1.2.2-locale.patch: diff --git a/xfce-base/thunar/Manifest b/xfce-base/thunar/Manifest index ec688da77c86..51e791bb4b50 100644 --- a/xfce-base/thunar/Manifest +++ b/xfce-base/thunar/Manifest @@ -4,17 +4,17 @@ Hash: SHA1 DIST Thunar-1.2.1.tar.bz2 4181843 RMD160 ae2892e730a42f866ef2d171762c2cb8a3f8586f SHA1 3517faff327b11871d7ef89aae2a8b9974d6edd7 SHA256 67e9886895771cf3b51af1ac5e13cb9e3892d2546a1a814869f83be06409a49b DIST Thunar-1.2.3.tar.bz2 4176227 RMD160 44bce4ea0c33473cf6aab24e119bac0b86f7567e SHA1 a05d0e14515d70c5ad94cca881822a707d366863 SHA256 e66aa9ad61a9202e15cc7c5fffc7b961da9ab3b4428f874c1ec8e46eb4ffaca6 EBUILD thunar-1.2.1.ebuild 2071 RMD160 3235f476f77d5a810a11ff213cf98524941ed6e8 SHA1 77f5d67f89caabc9007c92686039875420cbe32a SHA256 8a7ea65f66cfbb7f71cc88625b491dbb4f497646f6a75a82f8eaf13e37651521 -EBUILD thunar-1.2.3.ebuild 2072 RMD160 200ffefd35dff30b4b560d5ee47c08f198f4ff58 SHA1 304a4f39abaa9f85f12ef196c743a15d388a34df SHA256 d552c9497e5854c9ec3941908ab3bfec66c532b608b2a7c7b5da539aa57e95a2 -MISC ChangeLog 16842 RMD160 035230dbde6399e34671bf71822b599771d8a935 SHA1 8d4d296142c012d7cd3a96b72ee3eb74720ffbbb SHA256 63e877a064a48bb61ff81aee262a3fa6f5f044e4b3f9062d9f170e89195b7327 +EBUILD thunar-1.2.3.ebuild 2044 RMD160 950ed5c1870755ced3cdbef3058c820fcac0ce62 SHA1 b30d9f04e5b3e3796bf44dea219e90667178214d SHA256 93f893b069f6e699dadbbec5f32f0c9b7876f2cd5140e6792d986a2c5b310cdc +MISC ChangeLog 16977 RMD160 09c9586c794a4a835c68ecda1575fee663c3e94c SHA1 81f5a3fdf80b379ae7d0c11564806d34abdc9fcc SHA256 8fd47cd63cde22e8c08c7c6939f32e5e68c5ad578e0fd78fbb81a51ec8f6929f MISC metadata.xml 159 RMD160 43722935bd7b4db7fe8db681054f2e53c4a5f7ce SHA1 15958ad72e234ba572c9534533c21532eb6bc0fd SHA256 900ea49b6703fce452e205b85226bf1f994725963e5840da501182e7487d0e63 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJO1CQ+AAoJEEdUh39IaPFN1l8H/Rbl6zm/Otl8W/speZs+iy3c -NO479k/I/ogwe/1lJtNkfofwv/mrn8DkJCU/Sv5/ChHIazUfQn8f20yEQ/nV729v -D1M/aOz1jBxS+l06sO0+UVXLUF3DFbvkNVVno+9j75CisBjbiEWOnFHFyMIm69Ys -y2lVJOaD2VnVMyxCzra1fWa4/anoet3vyu4EIbh0RIYmjgIGNNeshaog0VtoqOVj -rkD/HpCRoCSA3VO2/xXkC+sBKh6+8kRUF7vo54iUcmdWsRZ7NWazkpT01uL0Nu/f -ogIwbxNxgT/B+UQjj0xxswPhgImfF4OMJSYkjCAkEXxU/d3j+K6mGlfhhu0nH8w= -=oo6K +iQEcBAEBAgAGBQJO+w+DAAoJEEdUh39IaPFNb2kH/RcES3BnKuxZHdbiVvYJSDGs +BvZacLM0Y1/CJrws2OzCW8O68+d0kaLl9wRfukU5LSJbjnFlljnMOZYBfxnVWpGI +IlAq7cGZ+X4FlWC5H1IQiJ/+ojoJ9ciZ5tSBn6iko3/rkhDFzYMxdZeXrECf58Dr +2VEavNHEiMv1O3uwE20h2Dq2A1RzCWP5Hz0i9xN08Tzpr0wGHcf9/UnQ4mzlIRtm +1dT1ectnqmVlXc5mBO4GR08aLy1paxWffbDGy9QP47K7xGn1vZDTDpcT4GYLe+a1 +/J1gexWhkbd+8VGimxRtVK9YEhWxf6JnGERZ2kJU22iYnGTxiAfZI36b7MWk+10= +=/+yH -----END PGP SIGNATURE----- diff --git a/xfce-base/thunar/thunar-1.2.3.ebuild b/xfce-base/thunar/thunar-1.2.3.ebuild index 0663a4535d1e..886379f053ed 100644 --- a/xfce-base/thunar/thunar-1.2.3.ebuild +++ b/xfce-base/thunar/thunar-1.2.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.3.ebuild,v 1.5 2011/11/26 17:54:42 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/xfce-base/thunar/thunar-1.2.3.ebuild,v 1.6 2011/12/28 12:47:10 ssuominen Exp $ EAPI=4 inherit virtualx xfconf @@ -29,8 +29,7 @@ COMMON_DEPEND=">=xfce-base/exo-0.6 pcre? ( >=dev-libs/libpcre-6 ) startup-notification? ( x11-libs/startup-notification ) udev? ( || ( >=sys-fs/udev-171[gudev] >=sys-fs/udev-145[extras] ) ) - xfce_plugins_trash? ( >=dev-libs/dbus-glib-0.88 - >=xfce-base/xfce4-panel-4.8 )" + xfce_plugins_trash? ( >=xfce-base/xfce4-panel-4.8 )" RDEPEND="${COMMON_DEPEND} x11-misc/shared-mime-info dev-util/desktop-file-utils @@ -41,6 +40,7 @@ DEPEND="${COMMON_DEPEND} dev-util/intltool dev-util/pkgconfig sys-devel/gettext" +REQUIRED_USE="xfce_plugins_trash? ( dbus )" S=${WORKDIR}/${MY_P} @@ -57,11 +57,7 @@ pkg_setup() { --with-html-dir="${EPREFIX}"/usr/share/doc/${PF}/html ) - if use xfce_plugins_trash; then - XFCONF+=( --enable-dbus ) - else - XFCONF+=( --disable-tpa-plugin ) - fi + use xfce_plugins_trash || XFCONF+=( --disable-tpa-plugin ) DOCS=( AUTHORS ChangeLog FAQ HACKING NEWS README THANKS TODO ) } -- cgit v1.2.3-65-gdbad