Version bump for gnome-3.6 with various UI fixes and libarchive support. Drop arm keyword due to json-glib dependency. Update license. Drop old.

Package-Manager: portage-2.2.0_alpha148/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

6 files changed, 83 insertions, 27 deletions

diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog
index a86a7dd2ca5e..dc6d48af37c7 100644
--- a/app-arch/file-roller/ChangeLog
+++ b/app-arch/file-roller/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.307 2012/05/31 03:05:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.308 2012/12/16 08:31:41 tetromino Exp $
+
+*file-roller-3.6.2 (16 Dec 2012)
+
+  16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  +files/3.6.0-packages.match, file-roller-2.32.2.ebuild,
+  -file-roller-3.2.2.ebuild, file-roller-3.4.2.ebuild,
+  +file-roller-3.6.2.ebuild:
+  Version bump for gnome-3.6 with various UI fixes and libarchive support.
+  Drop arm keyword due to json-glib dependency. Update license. Drop old.
 
   31 May 2012; Zac Medico <zmedico@gentoo.org> file-roller-2.32.2.ebuild:
   inherit multilib for get_libdir
diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest
index bb2335c76889..f0d6b6c359fb 100644
--- a/app-arch/file-roller/Manifest
+++ b/app-arch/file-roller/Manifest
@@ -1,10 +1,25 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 3.1.2-packages.match 527 SHA256 ec3ad7667cb92562659bf76e22e502b57af18c7a2ca8cabf7834a0fca8573e1b SHA512 903fcee873421e37269cf5ef35251de03f0d7352af2b3370b0887d6fceaf89f96bb4875c9ce03613752c6a10c7d601d53f669d1b74ca6b898a0c39087d441342 WHIRLPOOL b2cdc682a6bfa96a17d9032ffbd21993dd12bce2378fa1ae63bbc2a190ddbf1302f80276991a32c38916c8da305ae295692e081451e6cbf967c3103f0d7ef4b4
+AUX 3.6.0-packages.match 571 SHA256 3888ee8a6cb163d0e7813fde1d0ea028f2e47410aff8bec1e52c219e6bb7296d SHA512 899ff4ae7a8df9790ff3eb74f85b7d4b6ab7e7cd22cb2e3f5fcbf7006f9a327dfff799ecf30fae66c24097b81afaa8167ea972f37a8b983b09a2ebf1ee044212 WHIRLPOOL afd71f74d2776db559c5a60342f1c26e9d718321bc433ff7b99d98b6e22d42ede7f67901ff0c5b1d172a3ebd3ef5a067506085818f8514b0f15ece5ddf2684aa
 AUX file-roller-2.10.3-use_bin_tar.patch 504 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052 SHA512 e93b69af0e281590a362930580f13f2b85efec98d9a40c6b8becf3731c70713be106dbfbff9f4a7e783fc0dc0f72fdb78a063d5ab7d0c9c280a90fc58b778667 WHIRLPOOL 13e8bfa47665be629119adaeaa0b31092aa409916410bdf39caca11b2f87c4f949e2153037d0d52d51ee88c1009dd1b6265a4cc525da8f7e9621d4931d15887c
 DIST file-roller-2.32.2.tar.bz2 1901661 SHA256 3ddbe4e4134eab4ff8e97789a1626aec6cbc588190f2f520850d0697037e5755 SHA512 c62153871ed0210972d45ed0fa71eb177602cbc48894907c50ff45e8798d07979377ce4cbe1fbc1c37e5762cd005c5846dd9ac9f5ee93fe860de2babdc0933f0 WHIRLPOOL ea0af0538616532fc644f019d133bf5bfff876c95a3998d63ef58b3fa1b5b3d449c29589125ccdaeea18a1c0c1cafb872e996dd2b174b507c2c804d9c73e32dc
-DIST file-roller-3.2.2.tar.xz 1774864 SHA256 de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5 SHA512 973555ed85eb9468d6cb1a0ab1dba805be1fee5324c84fb4e43b0fd18911ad4d9fae2858832974103d3135d5e9ca9be12e7184b01b8006fe9f50ee7d97fbeb30 WHIRLPOOL 7eec5db86b620e931f73b3397f60a926cd494e5148b1785b2316ecb6e688f599b94a770465f3547656b64f1217ad55b40646522e6080604c16dab27fd29d6c02
 DIST file-roller-3.4.2.tar.xz 1548788 SHA256 7085a351c55171718bbf5b9b614a7b9606efb8cbd2eb44cc6c538545444d0cdd SHA512 1fc9f6cea6c590744d0baa1fa455c032faaa5f131498dca501f2a03b4bac929a41d5f1f4d4f15c3c886357cd0f01faa3a326a64304916eb2c0553698c7a7239b WHIRLPOOL 4f47150a62a4c2ee10c18f05bdf25b3d9768b2289beccceaa9004b4b18cbcbced889bc1c036b0f60a0243dae607aee227a61392efaa873b998959e737a088c05
-EBUILD file-roller-2.32.2.ebuild 2436 SHA256 40c934085300e8ae2284e5f01df798e7314c934162d945fd846a4154a3e906be SHA512 8cc31f1b68a08e70f0f8f0761250cd79dde065369b149c55495e8649cb946070f2278a7fe15384f7e970f83aaca13d09bc65eb3d54e0edf109bcaff576d0447f WHIRLPOOL 7c26145d72220cc3d35b4944c46b7e24c176be9ad11014c69bb7315c42651d189a020c0ee9e30c049b016da58c359096c509aadf6e7b0e4083414bd1a874f4da
-EBUILD file-roller-3.2.2.ebuild 2483 SHA256 d1c9ae957448407f826ac2a4596785280311eec3eb5a9e7cc52e5aedcb6b7730 SHA512 824a6d9ade704ca96c8b463724824364bb2d8d4de53cbc8b5b6da2b842802bcf861a27378ca1cc222ce6f5c816bead340600afde7463b9fb6e85442c75d37d08 WHIRLPOOL 10c6d353dfc1c71bb9603d1170a43e1cd031ae47c5a2431330bbcbbd799d5f5c0a2324ae4223f545abffdc676744bd362a1eb2d9b132d28a809685e6ae90d780
-EBUILD file-roller-3.4.2.ebuild 2486 SHA256 a25ed2d31927bdcd98e03de1118fe9c6aa77d0c6168527577ba561c4daf5104e SHA512 ed433a1b4909d08d419a8ce4f6a4ada75d45c0ba1d240dd117128fc6dfee6c7abdda51e453eb38b08e8207d64f14cec432a43ad471030137e8d0f0b66027c626 WHIRLPOOL a39952aad569606e770ea59497a05a7d9021247c8ce2f3e4a92f7d2c6c556c061e1fb6abe3767029355dca778f79e39de82ae53eefd6953075520e598db42790
-MISC ChangeLog 40953 SHA256 3cf40bfd473db5d4f50cefce627e475433fd134c575fe69bd7d197b07965a6c5 SHA512 02aa9591a8f98329a0ac36a8f99810517d6460147e1bd8755fc5db60f1426b1315944128bc2eb05eac8e9b9f67db55ac4747d72f4bf5bf91378d544eae783ee2 WHIRLPOOL 7fdbd9397607ffa2160baf0f4556c071c18a5bd7a56fbb98280a9c77d2c868ca51354fb31c316d892e97dc72634b670927ef8ed1f9778a6fa870c4f9825e74d5
+DIST file-roller-3.6.2.tar.xz 1483616 SHA256 47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1 SHA512 15b359cf8197d3d1294dd84e73f7bfbd7649f87b0fae337c83cb2c57335b6cda9da2a9b4a91b91c9cc4236f034e4197040c62410451b09ffaec004fcb41a781c WHIRLPOOL c29f5b22f631d0b694c5257ae870141604cf34bed2fd9d418a7c90cb3cb4684941686acaa756ee1b9a51e7a23d267430895f1f31f135e4ade7e965d2a090349f
+EBUILD file-roller-2.32.2.ebuild 2439 SHA256 e831af3708694be41a1f51130d4779490493ae6515ce07fcb055cada4453b26a SHA512 b4089c5dc7193b47de92fc22fd276470219d66e24df31e05b7bf2bade64ed92ff41280957d387db7a2ed0c12fa02cb3bc27f752f0a3f0ed1f16b361d0df6aa67 WHIRLPOOL b1bb0dc560ccc9313c1d397323aa375e5055cc65dfeeb7691f7110d7b5e84f07b17d133f737c9f4f725bf7e7d0853a17d18310598a6e762f273a911f99acac28
+EBUILD file-roller-3.4.2.ebuild 2487 SHA256 cfc9fc15ed22d5c6fa0020250b4a3db23dfd47d8f8564911ce1ad1583df25962 SHA512 d079888e0c1b0ef1a075467ccb9fe64808a46ddb8527ab60501b80b108414a8ff0644b2e62705c9980d05681c89f908df7901a9faabd19cacd44f6d4307ae15f WHIRLPOOL 71e0d5b4c2e6c6f712b2a7244cb026be58ee8cb8dba5a08a39f3c781129c801ab34d3e705957c17aca9465fc79d4f7cd94f1b4985ccff8d199f6c4898afe471d
+EBUILD file-roller-3.6.2.ebuild 2592 SHA256 b2bfd74830d4d79d458df3e6317796b0360f1f4d9487a084eba6e920aedf8b4a SHA512 fd079bec88c8068c94ad719ce2f461d5c06ab69cd36360b79645cafa28b45728b73c86921fae581f3bd199a19466d3489f83305b237873dad032cc5355d83652 WHIRLPOOL 27062be0e3122d3a71896c0329a98c3bd76a2fbdc0d9ae079e0400146dadbdcbb863734551306682575cfadfd5e50bf83eba57e16db90e4224e7723ea9e7671d
+MISC ChangeLog 41340 SHA256 13fdf901326d0c420c14219535d7a02df4e0221029bc281b8e615ad12422a390 SHA512 d26dffe63f0342586ec854c579912f173f3a49dab95242c45a45f9ad581947ef4ac7a92d8fb59d5be22d1801ba50ec818324059aaa27b47f46a86648ab0757bb WHIRLPOOL e5465313ffa974824a5c7c0da575da5068a5d36aa01ed5747322b89a31b2828092ee63cc8da568bf3a8e9bf2bfa03c43c25a73d2fc10f3493f87821ec63a1ddb
 MISC metadata.xml 446 SHA256 855d22d9ec6384bbec09562c5aebd68e043a50f002ba277818e3b7755b824f50 SHA512 fb6974a3cc457bfc0c9a17d8c160ff6997e9dafe5f4a4f863316e8e8b7b7a7d246612411eeaf890dce783b01ae74abb15bbda3a095dc3a9ad0c8c9118ee19931 WHIRLPOOL f65ab1874181cbb6c71e145f6ba51562899876bcfcf8bd93624f725455a4731090f64611ef122f6c777cce9a701af73d858ac53f3a90ca3a4ee61abd778a8026
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQzYbwAAoJEJ0WA1zPCt1hUcYIAIS2fDc6+AQHgvNsBgVa70ql
+iQ7uAYvjK51lq9YHLp+pKXXqeWw7AMdUqlaXIA/7Tv8VjOrQ3SPQD0fQqNuixV1Q
+8pc1fGDtbuE2H1Ignw9MM0pEgA8a//p7Icncr0WT3LPTVwcJrE1o4fiSRRiRUNt9
+dQH1+uvi6NLLR7QxdNY5G1GoTKwYftow8+m+at7O2G0nWXrtx3rUXOfjGi/CMqCU
+HK9wzwXzpQQ/BgPmCOfbPkD22a7fSpPGmPHTRal5f/9kr7N8oM+wobXF+IWsdb0e
+CTWUbGsqmCU0Dv7Haeud6CUlGSLNjO/eC4ZaLAw/1cz5gxpv/r/h6g3XQR3L0S0=
+=uHr1
+-----END PGP SIGNATURE-----
diff --git a/app-arch/file-roller/file-roller-2.32.2.ebuild b/app-arch/file-roller/file-roller-2.32.2.ebuild
index baebeeb4cf05..97760ab44ac7 100644
--- a/app-arch/file-roller/file-roller-2.32.2.ebuild
+++ b/app-arch/file-roller/file-roller-2.32.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.32.2.ebuild,v 1.8 2012/05/31 03:05:51 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.32.2.ebuild,v 1.9 2012/12/16 08:31:41 tetromino Exp $
 
 EAPI="3"
 GCONF_DEBUG="no"
@@ -10,7 +10,7 @@ inherit eutils gnome2 multilib
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="http://fileroller.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 IUSE="nautilus"
diff --git a/app-arch/file-roller/file-roller-3.4.2.ebuild b/app-arch/file-roller/file-roller-3.4.2.ebuild
index 2c9617dcc284..6a82d969898e 100644
--- a/app-arch/file-roller/file-roller-3.4.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.4.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.4.2.ebuild,v 1.1 2012/05/19 23:23:02 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.4.2.ebuild,v 1.2 2012/12/16 08:31:41 tetromino Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
@@ -11,7 +11,7 @@ inherit eutils gnome2
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="http://fileroller.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
 SLOT="0"
 IUSE="nautilus packagekit"
 KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
diff --git a/app-arch/file-roller/file-roller-3.2.2.ebuild b/app-arch/file-roller/file-roller-3.6.2.ebuild
index 355420cef62d..5b4f78f984d3 100644
--- a/app-arch/file-roller/file-roller-3.2.2.ebuild
+++ b/app-arch/file-roller/file-roller-3.6.2.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.2.2.ebuild,v 1.2 2012/05/03 01:58:53 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-3.6.2.ebuild,v 1.1 2012/12/16 08:31:41 tetromino Exp $
 
-EAPI="4"
+EAPI="5"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
@@ -11,10 +11,10 @@ inherit eutils gnome2
 DESCRIPTION="Archive manager for GNOME"
 HOMEPAGE="http://fileroller.sourceforge.net/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ CCPL-Attribution-ShareAlike-3.0"
 SLOT="0"
 IUSE="nautilus packagekit"
-KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
 
 # gdk-pixbuf used extensively in the source
 # cairo used in eggtreemultidnd.c
@@ -23,35 +23,38 @@ RDEPEND=">=dev-libs/glib-2.29.14:2
 	sys-apps/file
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2
-	>=x11-libs/gtk+-3.0.2:3
 	x11-libs/pango
+	x11-libs/libSM
+	x11-libs/libICE
+	>=x11-libs/gtk+-3.4.0:3
+	>=app-arch/libarchive-3.0.0:=
+	>=x11-libs/libnotify-0.4.3:=
+	>=dev-libs/json-glib-0.14.0
 	nautilus? ( >=gnome-base/nautilus-3 )
 	packagekit? ( app-admin/packagekit-base )
 "
 DEPEND="${RDEPEND}
-	sys-devel/gettext
 	>=dev-util/intltool-0.40.0
-	virtual/pkgconfig
-	app-text/gnome-doc-utils"
+	sys-devel/gettext
+	virtual/pkgconfig"
 # eautoreconf needs:
 #	gnome-base/gnome-common
 
-pkg_setup() {
+src_prepare() {
 	# --disable-debug because enabling it adds -O0 to CFLAGS
 	G2CONF="${G2CONF}
 		--disable-dependency-tracking
-		--disable-scrollkeeper
 		--disable-run-in-place
 		--disable-static
-		--disable-schemas-compile
 		--disable-debug
 		--enable-magic
+		--enable-libarchive
+		--with-smclient=xsmp
 		$(use_enable nautilus nautilus-actions)
-		$(use_enable packagekit)"
+		$(use_enable packagekit)
+		ITSTOOL=$(type -P true)"
 	DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README TODO"
-}
 
-src_prepare() {
 	gnome2_src_prepare
 
 	# Use absolute path to GNU tar since star doesn't have the same
@@ -59,7 +62,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
 
 	# File providing Gentoo package names for various archivers
-	cp -f "${FILESDIR}/3.1.2-packages.match" data/packages.match || die
+	cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
 }
 
 pkg_postinst() {
@@ -78,9 +81,8 @@ pkg_postinst() {
 	elog "  iso     - app-cdr/cdrtools"
 	elog "  jar,zip - app-arch/zip and app-arch/unzip"
 	elog "  lha     - app-arch/lha"
-	elog "  lzma    - app-arch/xz-utils"
 	elog "  lzop    - app-arch/lzop"
-	elog "  rar     - app-arch/unrar"
+	elog "  rar     - app-arch/unrar or app-arch/unar"
 	elog "  rpm     - app-arch/rpm"
 	elog "  unstuff - app-arch/stuffit"
 	elog "  zoo     - app-arch/zoo"
diff --git a/app-arch/file-roller/files/3.6.0-packages.match b/app-arch/file-roller/files/3.6.0-packages.match
new file mode 100644
index 000000000000..4085b19112b4
--- /dev/null
+++ b/app-arch/file-roller/files/3.6.0-packages.match
@@ -0,0 +1,30 @@
+[Package Matches]
+arj=app-arch/arj
+binutils=sys-devel/binutils
+bzip2=app-arch/bzip2
+cpio=app-arch/cpio
+dpkg=app-arch/dpkg
+genisoimage=virtual/cdrtools
+gzip=app-arch/gzip
+lha=app-arch/lha
+lrzip=app-arch/lrzip
+lzip=app-arch/lzip
+lzma=app-arch/xz-utils
+lzop=app-arch/lzop
+ncompress=app-arch/ncompress
+p7zip=app-arch/p7zip
+p7zip-full=
+p7zip-rar=
+rar=app-arch/rar
+rpm=app-arch/rpm
+rzip=app-arch/rzip
+tar=app-arch/tar
+unace=app-arch/unace
+unalz=
+unarchiver=app-arch/unar
+unrar=app-arch/unrar
+unstaff=
+unzip=app-arch/unzip
+xz=app-arch/xz-utils
+zip=app-arch/zip
+zoo=app-arch/zoo