Drop old (#508854)
authorPacho Ramos <pacho@gentoo.org>
Thu, 13 Nov 2014 10:42:13 +0000 (10:42 +0000)
committerPacho Ramos <pacho@gentoo.org>
Thu, 13 Nov 2014 10:42:13 +0000 (10:42 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

app-arch/file-roller/ChangeLog
app-arch/file-roller/Manifest
app-arch/file-roller/file-roller-2.32.2.ebuild [deleted file]
app-arch/file-roller/file-roller-3.10.2.1.ebuild [deleted file]
app-arch/file-roller/file-roller-3.12.1.ebuild [deleted file]
app-arch/file-roller/files/file-roller-3.8.4-extract-failure.patch [deleted file]
app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch [deleted file]
app-arch/file-roller/files/file-roller-3.8.4-modifications-time.patch [deleted file]
app-arch/file-roller/files/file-roller-3.8.4-rar-5.patch [deleted file]

index 5439aafb398792f79ffc618b7a275ee7e0c30783..bb8ce0b48bb294bd2a759512c4afdb28d97ab646 100644 (file)
@@ -1,6 +1,14 @@
 # ChangeLog for app-arch/file-roller
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.339 2014/07/23 15:12:59 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.340 2014/11/13 10:42:12 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -file-roller-2.32.2.ebuild,
+  -file-roller-3.10.2.1.ebuild, -file-roller-3.12.1.ebuild,
+  -files/file-roller-3.8.4-extract-failure.patch,
+  -files/file-roller-3.8.4-ignore-errors.patch,
+  -files/file-roller-3.8.4-modifications-time.patch,
+  -files/file-roller-3.8.4-rar-5.patch:
+  Drop old (#508854)
 
   23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> file-roller-3.12.2.ebuild:
   Stable for x86, wrt bug #512012
index f028de5154459338d74a3798a683df4504e00b80..c2d7fa5404d4998d5916059545b4bcf493b953a7 100644 (file)
@@ -3,34 +3,14 @@ Hash: SHA256
 
 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
-AUX file-roller-3.8.4-extract-failure.patch 2066 SHA256 cc8881bc92c4d79accd9dfcc7056c80be5de86f50182a5553d782f3a4b62da7a SHA512 3f125d71e2ea31e84d336cb9b0366290e5f7d155183b9564ce9d6635ca6b3b38782191691246807bac772be41d0e4f4945a8bee4363a95d74022cef25f16c759 WHIRLPOOL 84081c28a5f1898fb10d8b13431a0935de4d5c988b37dbefafb82b9d094627b37cbfbca09b4f06d02daacbee76615933a8d1a632094edacda452fa8f8b85ae8e
-AUX file-roller-3.8.4-ignore-errors.patch 1706 SHA256 b76e46fb4f5f1fff50f3baac058924e0c7e3ee9ad504fa49eb963dd3b0752267 SHA512 04ef3dabfdd23a48ac43d2cc5dd70a7b7de87a9e4dfe9450bff128a96c91bb79eecef474bd4905fa235af6ecd4124a77b3cc91d23dc4a85392e3902c8187fed2 WHIRLPOOL a3eed01cef6c223763c5d5cc44360820f091877f9ca73235fe7f4406acfdb3bb179fca17219d217cad93101ad74c4f4e10d0f3bc9fd52d6431b0c595dbe54b9b
-AUX file-roller-3.8.4-modifications-time.patch 6482 SHA256 c1446b30f51a9f78042b73e0418ad66d55fe99c5db4d9c78583581f64382d4df SHA512 e4a3f0905c24c1a16a6bbc0f60c7d2ca8e4730c486c06815aec49e2c4a0e6dcc6181c107ca1609a8f05885e7b4b4ff257ec596fdc12762969d2ab3df7451c3dd WHIRLPOOL 94e523b2883532192581fa6af026f35627ac2bda2b04244c2d49ca96031fa5de14eb3484a1d8e9f6ec0da08e0b3000b7c7ad167cb17765e3f98ebbd140f57878
-AUX file-roller-3.8.4-rar-5.patch 6831 SHA256 45105e2460a8ef18bffcf00a798f323dee1d761a9a87633bdac40b967c805fde SHA512 af0acef83dea0ee007f6c3db2f6a72552049f25a6131b3b31943c1c4a4beb31435af776cc7d252b91270302bf0f878c9e4f2ffde40e7fcf83ee16b817acc0181 WHIRLPOOL 543dc3ff03a1ac5bc630f4d5749335b06c597f463669b86896610e92b3d6a7c6a1d824867679b8921ca24e53b4dceb959a2c0485e8068bb9a54b20ea4393b1dc
-DIST file-roller-2.32.2.tar.bz2 1901661 SHA256 3ddbe4e4134eab4ff8e97789a1626aec6cbc588190f2f520850d0697037e5755 SHA512 c62153871ed0210972d45ed0fa71eb177602cbc48894907c50ff45e8798d07979377ce4cbe1fbc1c37e5762cd005c5846dd9ac9f5ee93fe860de2babdc0933f0 WHIRLPOOL ea0af0538616532fc644f019d133bf5bfff876c95a3998d63ef58b3fa1b5b3d449c29589125ccdaeea18a1c0c1cafb872e996dd2b174b507c2c804d9c73e32dc
-DIST file-roller-3.10.2.1.tar.xz 1392792 SHA256 fde1104103df71c126e759089f12dc7fa25ec642308649e87d542ee7c3276790 SHA512 8b69c2531b3ad729d208c2b140d1dd6dd156cb34f24465a68c5cb7e94337d2ebbbadf9ecc98993565e525c976e64e454df339fdc914d05815b4cd33055aadfca WHIRLPOOL 5550d89d1a447fe1211185597db85eb0b70371faf8e8597225dc23d0f74c9a77eed237f2da0c02db66b8431b1428d88a08116d243eb942b28e50055ba3fbf629
-DIST file-roller-3.12.1.tar.xz 1397404 SHA256 bb35ae0d3542eee59b916b699f86298dfe93379b1769d6ca1980b2db95672481 SHA512 9685d2dbeaa4711fb125b39c69046e04a1779f112dbe795cf1bb948af2bfd3cc148de196250b8dd76e984c2398c56043af1948a42d4b76f1b6b25700d012f542 WHIRLPOOL 1dc6b9fa212863347eeebfa42124a51378311a4b620bd5ccc082f6ea669afe9f8ee975c597f6ae21b08b670322222e7dce7fc60e9a90850b7500cdd32890f3c1
 DIST file-roller-3.12.2.tar.xz 1396796 SHA256 0677be6618dba609eae2d76420e8a5a8d9a414bcec654e7b71e65b941764eacf SHA512 8e47ca0b8ee619da161d55909647ac6aac5645e7120c5f71f34dd8911b6ca2b530031b8efaeab10d668e9a3428fc4e03159605dac626aa600026719d8741f22f WHIRLPOOL 61be4185d82adbd8dabc6fc9a007490596b373b249cebeb9c2a615fd6cdf6575a31c01196588ae3ab2e839dea2136a976bf03b40fce54ba0dba571e7f7972b5e
-EBUILD file-roller-2.32.2.ebuild 2437 SHA256 1c75a4673b480b42bab8b604011c3c6c111a71ad104fd983cc7406840c0c5b8e SHA512 95db707f855025de91a354d49fa4f7f39b68d647f685635b5de0dc77845ac513a6c90e6939f37e1241fb140f3fe81a85e85ded3aab5a57501e938f42c1e72ba2 WHIRLPOOL 211484cd981cbda33c44c2c5c6b8dc2f63df1916cf0b26b62817557c7ce3693588a49af95a67befd95a0ddc2cce92723502608d74de8a6f75cdfe371ecee3341
-EBUILD file-roller-3.10.2.1.ebuild 2622 SHA256 afe2f84d0fb3517f98afa752a74037b032b9c256fff915a23803e1089c53fdc6 SHA512 1567b18a985fca5433a950e8ebf6cf4a7443cc3f279671f2ed860d435c9d6dd95ec691d4f8057415bfc979629f0719ad00fa062af011abb7c3aba3adce2c89a4 WHIRLPOOL ef7461953d57d7bbed9f2b510a9f566bd3b9c222e7b25fdd4a7a09ef43dedc28f6fe2388367a4b97873bf3b6ec30b9a7331383aeb41827d6f99c6752751b8503
-EBUILD file-roller-3.12.1.ebuild 2620 SHA256 0ae5835099abedc8d60ea4d659a277509dfcbc14e4c36cdbba7b09eaa756be4b SHA512 6685813657270add5bdfec6a809de00484d569f2b7123499c2a3fa9c27a375540fafb4587266a0a87b508b8df0f2998a770fbb1dce77f2bf7b47f7fcfbe154b6 WHIRLPOOL 02ab942ceba71c6fff077026f14aab4c00a37461a43d1a585e2291ba83d0009546f83f301d44df1934d36fb9326c14c48c0651b24505961090b8cfdc6b918202
 EBUILD file-roller-3.12.2.ebuild 2657 SHA256 972ef536cbfc5d68255c552afab49436d76f590910f56fdb47b4bc632d1949f2 SHA512 1088b645b61512ea84ae187156883813080aa543a2618c345a4ed7b1fc718ea8a9f199e88270050222e42393ff455e4ae1a6da1eeb3880db18e4fdd75458d490 WHIRLPOOL 21aa5a3375cd357cbae87a8625f060f6f1ff0d6c4690ffd003a4d5c0804b503f9b6e9fa0773306b5ef9c23c957115b2f7df6f61e2f6f750e06053dfe2f0326d9
-MISC ChangeLog 45829 SHA256 4627a1536ac4dd854c85324e9936c6b8e9b2d0e159902609a574694ac9c2919f SHA512 d02d50054a86a968dee85411a7b716f2ee8afc59652c2ae0f70a23359cc994655a5ed3c47de5ffab1f1059e20597afb932fdad88c6b2d35d9bae60465f0cb7ea WHIRLPOOL e90cfe39d25d6b1f9e6a04fb19417d0dbc6a4c69e3aaab2b934ecdd29ee482f7f4627f7a0e02b44147acbf58ff7649ef913f280d8732bb22913f5d9232382102
+MISC ChangeLog 46178 SHA256 0dd10290080b557bdbb2ad29f6f4ee9363a6ddd3cf273673f000adb4e270dbcd SHA512 0a8f36bdc60ddbfe8614e255afcdeac19819b173876d48a7bf631d14255a4e2b076893ae97db2ad83c7880ef5f367e70cd983237516be9b01e60d04170348c38 WHIRLPOOL fe5a9e2c127854cd53ecf91e92cff9f76d46c081f904dc35177ebd0fa9bc853fed7703217f8b46823b6b457cc5ea71b4a37e7aa7faf2355151a93e0f1f85a793
 MISC metadata.xml 446 SHA256 855d22d9ec6384bbec09562c5aebd68e043a50f002ba277818e3b7755b824f50 SHA512 fb6974a3cc457bfc0c9a17d8c160ff6997e9dafe5f4a4f863316e8e8b7b7a7d246612411eeaf890dce783b01ae74abb15bbda3a095dc3a9ad0c8c9118ee19931 WHIRLPOOL f65ab1874181cbb6c71e145f6ba51562899876bcfcf8bd93624f725455a4731090f64611ef122f6c777cce9a701af73d858ac53f3a90ca3a4ee61abd778a8026
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTz9D8AAoJELp701BxlEWfhcMP/0v3hU7AiPxHyG8Ay4vG8lWr
-9eE7UI0ZsMAxpcISIu0WrGja7RG7OMzM4LCPVoJ8KYOuTRtggUPQOriPV/rLOih4
-TLZ+aGN83SOZuY7ROVIaKIpb87NQxxBIOspw0HfRy9NlwKOyRdBigidFj1LIap83
-9Wl36a6y5xL30G8BcREOTu6lFsRvVFd485ooCI9RenjoyolmK4IqedV06Ey42HEf
-l+QTe54fzq+MnbNQsuJYHAGzxxE2R9Mhr6+sOHAmOdOQB9NCTmLQdEJqBij5uq47
-6NwUbPtuLI/1e7wkRAW6SLhfkcqD4Jz5XeP5R+i2VN+hnGlFBgGUfUv3h8cQZogU
-cqSpjKBhhRzP2Z7Xfh/If9qjADO0LRkHVn7KKipVaPRsLm2KCOYa18ZEYwTRoZAn
-HtiSr7Qe2NZbt0SPpNgIWcyeZ3nPicw7rlRRbSmElLOdDRYf0Uv7gEOTeb10K1Zn
-u72DEhfjJLH+DLjfsV9t6i4NetsLCmutNFWD+HH309BFq/s29NEjfLFBMBhbpBKT
-bVyXB33/YbTnDk+I2MzYa9xZ/DXfIqX6lifXwQsmbM9R3vsZw2sKVOduac7Xj/Tr
-AA1HR/OwmXE1VjWfvSTS+Ij4B1df20/olBCpv7p8YrB2BgpqkPbPhSzneIJVyMAC
-EE9ALa9sca41Dxkglrqj
-=q3I/
+iEYEAREIAAYFAlRkiwUACgkQCaWpQKGI+9QoOgCdH8qIrWIZH1vxemgdCb9sNz1e
+d4wAnRDBdWZY85ozF9jf2zR+L+d6pJBr
+=W2f3
 -----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
deleted file mode 100644 (file)
index aa51498..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2014 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.10 2014/02/20 07:12:55 pacho Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-
-inherit eutils gnome2 multilib
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="alpha amd64 ~arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-IUSE="nautilus"
-
-RDEPEND=">=dev-libs/glib-2.25.5:2
-       >=x11-libs/gtk+-2.21.4:2
-       >=gnome-base/gconf-2.6:2
-       nautilus? ( >=gnome-base/nautilus-2.22.2 )"
-DEPEND="${RDEPEND}
-       sys-devel/gettext
-       >=dev-util/intltool-0.35
-       virtual/pkgconfig
-       app-text/gnome-doc-utils"
-# eautoreconf needs:
-#      gnome-base/gnome-common
-
-pkg_setup() {
-       G2CONF="${G2CONF}
-               --disable-dependency-tracking
-               --disable-scrollkeeper
-               --disable-run-in-place
-               --disable-static
-               --disable-packagekit
-               --disable-deprecations
-               --with-gtk=2.0
-               $(use_enable nautilus nautilus-actions)"
-       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
-       # options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
-       epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
-
-       # Drop DEPRECATED flags as configure option doesn't do it, bug #385453
-       sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
-               copy-n-paste/Makefile.am copy-n-paste/Makefile.in || die
-}
-
-src_install() {
-       gnome2_src_install
-       if use nautilus; then
-               find "${ED}"usr/$(get_libdir)/nautilus -name "*.la" -delete \
-                       || die "la file removal failed"
-       fi
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-
-       elog "${PN} is a frontend for several archiving utilities. If you want a"
-       elog "particular archive format support, see ${HOMEPAGE}"
-       elog "and install the relevant package."
-       elog
-       elog "for example:"
-       elog "  7-zip   - app-arch/p7zip"
-       elog "  ace     - app-arch/unace"
-       elog "  arj     - app-arch/arj"
-       elog "  cpio    - app-arch/cpio"
-       elog "  deb     - app-arch/dpkg"
-       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 "  rpm     - app-arch/rpm"
-       elog "  unstuff - app-arch/stuffit"
-       elog "  zoo     - app-arch/zoo"
-}
diff --git a/app-arch/file-roller/file-roller-3.10.2.1.ebuild b/app-arch/file-roller/file-roller-3.10.2.1.ebuild
deleted file mode 100644 (file)
index cba18ac..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 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.10.2.1.ebuild,v 1.6 2014/03/09 11:53:07 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="nautilus packagekit"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-       >=app-arch/libarchive-3:=
-       >=dev-libs/glib-2.36:2
-       >=dev-libs/json-glib-0.14
-       >=x11-libs/gtk+-3.9.3:3
-       >=x11-libs/libnotify-0.4.3:=
-       sys-apps/file
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/pango
-       nautilus? ( >=gnome-base/nautilus-3 )
-       packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-       dev-util/desktop-file-utils
-       >=dev-util/intltool-0.40.0
-       sys-devel/gettext
-       virtual/pkgconfig
-"
-# eautoreconf needs:
-#      gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-src_prepare() {
-       # Use absolute path to GNU tar since star doesn't have the same
-       # options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
-       epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
-
-       # File providing Gentoo package names for various archivers
-       cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
-
-       gnome2_src_prepare
-}
-
-src_configure() {
-       DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-       # --disable-debug because enabling it adds -O0 to CFLAGS
-       gnome2_src_configure \
-               --disable-run-in-place \
-               --disable-static \
-               --disable-debug \
-               --enable-magic \
-               --enable-libarchive \
-               --with-smclient=xsmp \
-               $(use_enable nautilus nautilus-actions) \
-               $(use_enable packagekit) \
-               ITSTOOL=$(type -P true)
-}
-
-src_install() {
-       gnome2_src_install
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       readme.gentoo_print_elog
-}
diff --git a/app-arch/file-roller/file-roller-3.12.1.ebuild b/app-arch/file-roller/file-roller-3.12.1.ebuild
deleted file mode 100644 (file)
index fcdf61c..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2014 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.12.1.ebuild,v 1.1 2014/04/27 15:21:49 eva Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2 readme.gentoo
-
-DESCRIPTION="Archive manager for GNOME"
-HOMEPAGE="http://fileroller.sourceforge.net/"
-
-LICENSE="GPL-2+ CC-BY-SA-3.0"
-SLOT="0"
-IUSE="nautilus packagekit"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux"
-
-# gdk-pixbuf used extensively in the source
-# cairo used in eggtreemultidnd.c
-# pango used in fr-window
-RDEPEND="
-       >=app-arch/libarchive-3:=
-       >=dev-libs/glib-2.36:2
-       >=dev-libs/json-glib-0.14
-       >=x11-libs/gtk+-3.9.3:3
-       >=x11-libs/libnotify-0.4.3:=
-       sys-apps/file
-       x11-libs/cairo
-       x11-libs/gdk-pixbuf:2
-       x11-libs/libICE
-       x11-libs/libSM
-       x11-libs/pango
-       nautilus? ( >=gnome-base/nautilus-3 )
-       packagekit? ( app-admin/packagekit-base )
-"
-DEPEND="${RDEPEND}
-       dev-util/desktop-file-utils
-       >=dev-util/intltool-0.40.0
-       sys-devel/gettext
-       virtual/pkgconfig
-"
-# eautoreconf needs:
-#      gnome-base/gnome-common
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-${PN} is a frontend for several archiving utilities. If you want a
-particular archive format support, see ${HOMEPAGE}
-and install the relevant package. For example:
-7-zip   - app-arch/p7zip
-ace     - app-arch/unace
-arj     - app-arch/arj
-cpio    - app-arch/cpio
-deb     - app-arch/dpkg
-iso     - app-cdr/cdrtools
-jar,zip - app-arch/zip and app-arch/unzip
-lha     - app-arch/lha
-lzop    - app-arch/lzop
-rar     - app-arch/unrar or app-arch/unar
-rpm     - app-arch/rpm
-unstuff - app-arch/stuffit
-zoo     - app-arch/zoo"
-
-src_prepare() {
-       # Use absolute path to GNU tar since star doesn't have the same
-       # options. On Gentoo, star is /usr/bin/tar, GNU tar is /bin/tar
-       epatch "${FILESDIR}"/${PN}-2.10.3-use_bin_tar.patch
-
-       # File providing Gentoo package names for various archivers
-       cp -f "${FILESDIR}/3.6.0-packages.match" data/packages.match || die
-
-       gnome2_src_prepare
-}
-
-src_configure() {
-       DOCS="AUTHORS ChangeLog HACKING MAINTAINERS NEWS README* TODO"
-       # --disable-debug because enabling it adds -O0 to CFLAGS
-       gnome2_src_configure \
-               --disable-run-in-place \
-               --disable-static \
-               --disable-debug \
-               --enable-magic \
-               --enable-libarchive \
-               --with-smclient=xsmp \
-               $(use_enable nautilus nautilus-actions) \
-               $(use_enable packagekit) \
-               ITSTOOL=$(type -P true)
-}
-
-src_install() {
-       gnome2_src_install
-       readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       readme.gentoo_print_elog
-}
diff --git a/app-arch/file-roller/files/file-roller-3.8.4-extract-failure.patch b/app-arch/file-roller/files/file-roller-3.8.4-extract-failure.patch
deleted file mode 100644 (file)
index fa9d68d..0000000
+++ /dev/null
@@ -1,43 +0,0 @@
-From 40d2c298a7b938a974fe83b609293348a7d59bbd Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Sun, 29 Sep 2013 16:30:29 +0000
-Subject: libarchive: fixed failure when extracting some tar archives
-
-do not try to restore the creation time;
-do not set the G_FILE_ATTRIBUTE_TIME_CREATED_USEC attribute
-
-[bug #709035]
----
-diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
-index 37e3008..e465fe8 100644
---- a/src/fr-archive-libarchive.c
-+++ b/src/fr-archive-libarchive.c
-@@ -428,15 +428,8 @@ _g_file_info_create_from_entry (struct archive_entry *entry,
- 
-       /* times */
- 
--      if (archive_entry_ctime_is_set (entry)) {
--              g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_CREATED, archive_entry_ctime (entry));
--              g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_CREATED_USEC, archive_entry_ctime_nsec (entry));
--      }
--
--      if (archive_entry_mtime_is_set (entry)) {
-+      if (archive_entry_mtime_is_set (entry))
-               g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, archive_entry_mtime (entry));
--              g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, archive_entry_mtime_nsec (entry));
--      }
- 
-       /* username */
- 
-@@ -529,7 +522,8 @@ restore_modification_time (GHashTable    *created_folders,
- 
-               info = g_file_info_new ();
-               g_file_info_set_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED, g_file_info_get_attribute_uint64 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED));
--              g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
-+              if (g_file_info_get_attribute_status (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC) == G_FILE_ATTRIBUTE_STATUS_SET)
-+                      g_file_info_set_attribute_uint32 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC, g_file_info_get_attribute_uint32 (original_info, G_FILE_ATTRIBUTE_TIME_MODIFIED_USEC));
-               result = _g_file_set_attributes_from_info (file, info, cancellable, error);
- 
-               g_object_unref (info);
---
-cgit v0.9.2
diff --git a/app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch b/app-arch/file-roller/files/file-roller-3.8.4-ignore-errors.patch
deleted file mode 100644 (file)
index 712ba74..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-From 80c36ae3c84dce8716eb5b74ddb8c73da5824f13 Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Fri, 11 Oct 2013 19:38:27 +0000
-Subject: ignore errors when setting file attributes
-
-[bug #709932]
----
-diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
-index 44aaad2..19c5a1d 100644
---- a/src/fr-archive-libarchive.c
-+++ b/src/fr-archive-libarchive.c
-@@ -751,7 +751,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
-                                       GFileInfo *info;
- 
-                                       info = _g_file_info_create_from_entry (entry, extract_data);
--                                      _g_file_set_attributes_from_info (file, info, cancellable, &load_data->error);
-+                                      _g_file_set_attributes_from_info (file, info, cancellable, NULL);
-                                       g_hash_table_insert (created_folders, g_object_ref (file), g_object_ref (info));
- 
-                                       g_object_unref (info);
-@@ -774,7 +774,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
-                               if (r != ARCHIVE_EOF)
-                                       load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));
-                               else
--                                      _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, &load_data->error);
-+                                      _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable, NULL);
-                               break;
- 
-                       case AE_IFLNK:
-@@ -805,7 +805,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
-       }
- 
-       if (load_data->error == NULL)
--              restore_modification_time (created_folders, cancellable, &load_data->error);
-+              restore_modification_time (created_folders, cancellable, NULL);
- 
-       if ((load_data->error == NULL) && (r != ARCHIVE_EOF))
-               load_data->error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, archive_error_string (a));
---
-cgit v0.9.2
diff --git a/app-arch/file-roller/files/file-roller-3.8.4-modifications-time.patch b/app-arch/file-roller/files/file-roller-3.8.4-modifications-time.patch
deleted file mode 100644 (file)
index d6c7baa..0000000
+++ /dev/null
@@ -1,186 +0,0 @@
-From 4bf8552f8e60c8d4ec65e360451c6998198052db Mon Sep 17 00:00:00 2001
-From: Paolo Bacchilega <paobac@src.gnome.org>
-Date: Wed, 04 Sep 2013 10:02:11 +0000
-Subject: libarchive: restore the folders modification time correctly
-
-when honoring the skip_older and overwrite flags ignore the
-directories created during the extraction process.
-
-[bug #697756]
----
-diff --git a/src/fr-archive-libarchive.c b/src/fr-archive-libarchive.c
-index 3b73c48..37e3008 100644
---- a/src/fr-archive-libarchive.c
-+++ b/src/fr-archive-libarchive.c
-@@ -33,6 +33,7 @@
- #include "file-utils.h"
- #include "fr-error.h"
- #include "fr-archive-libarchive.h"
-+#include "gio-utils.h"
- #include "glib-utils.h"
- #include "typedefs.h"
- 
-@@ -547,6 +548,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
-       LoadData             *load_data;
-       GHashTable           *checked_folders;
-       GHashTable           *created_folders;
-+      GHashTable           *folders_created_during_extraction;
-       struct archive       *a;
-       struct archive_entry *entry;
-       int                   r;
-@@ -556,6 +558,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
- 
-       checked_folders = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL);
-       created_folders = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, g_object_unref);
-+      folders_created_during_extraction = g_hash_table_new_full (g_file_hash, (GEqualFunc) g_file_equal, g_object_unref, NULL);
-       fr_archive_progress_set_total_files (load_data->archive, extract_data->n_files_to_extract);
- 
-       a = archive_read_new ();
-@@ -590,11 +593,14 @@ extract_archive_thread (GSimpleAsyncResult *result,
-                       archive_read_data_skip (a);
-                       continue;
-               }
-+
-               file = g_file_get_child (extract_data->destination, relative_path);
- 
-               /* honor the skip_older and overwrite options */
- 
--              if (extract_data->skip_older || ! extract_data->overwrite) {
-+              if ((g_hash_table_lookup (folders_created_during_extraction, file) == NULL)
-+                  && (extract_data->skip_older || ! extract_data->overwrite))
-+              {
-                       GFileInfo *info;
- 
-                       info = g_file_query_info (file,
-@@ -652,7 +658,18 @@ extract_archive_thread (GSimpleAsyncResult *result,
-                   && (g_hash_table_lookup (checked_folders, parent) == NULL)
-                   && ! g_file_query_exists (parent, cancellable))
-               {
--                      if (g_file_make_directory_with_parents (parent, cancellable, &load_data->error)) {
-+                      if (! _g_file_make_directory_with_parents (parent,
-+                                                                 folders_created_during_extraction,
-+                                                                 cancellable,
-+                                                                 &local_error))
-+                      {
-+                              if (! g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS))
-+                                      load_data->error = local_error;
-+                              else
-+                                      g_clear_error (&local_error);
-+                      }
-+
-+                      if (load_data->error == NULL) {
-                               GFile *grandparent;
- 
-                               grandparent = g_object_ref (parent);
-@@ -736,7 +753,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
-                                               load_data->error = g_error_copy (local_error);
-                                       g_error_free (local_error);
-                               }
--                              else {
-+                              if (load_data->error == NULL) {
-                                       GFileInfo *info;
- 
-                                       info = _g_file_info_create_from_entry (entry, extract_data);
-@@ -803,6 +820,7 @@ extract_archive_thread (GSimpleAsyncResult *result,
-       if (load_data->error != NULL)
-               g_simple_async_result_set_from_error (result, load_data->error);
- 
-+      g_hash_table_unref (folders_created_during_extraction);
-       g_hash_table_unref (created_folders);
-       g_hash_table_unref (checked_folders);
-       archive_read_free (a);
-diff --git a/src/gio-utils.c b/src/gio-utils.c
-index 9d9f708..b317694 100644
---- a/src/gio-utils.c
-+++ b/src/gio-utils.c
-@@ -1483,3 +1483,73 @@ _g_file_load_buffer_finish (GFile         *file,
- 
-       return TRUE;
- }
-+
-+
-+static gboolean
-+_g_file_make_directory_and_add_to_created_folders (GFile         *file,
-+                                                 GHashTable    *created_folders,
-+                                                 GCancellable  *cancellable,
-+                                                 GError       **error)
-+{
-+      gboolean result;
-+
-+      result = g_file_make_directory (file, cancellable, error);
-+      if (result && (g_hash_table_lookup (created_folders, file) == NULL))
-+              g_hash_table_insert (created_folders, g_object_ref (file), GINT_TO_POINTER (1));
-+
-+      return result;
-+}
-+
-+
-+gboolean
-+_g_file_make_directory_with_parents (GFile         *file,
-+                                   GHashTable    *created_folders,
-+                                   GCancellable  *cancellable,
-+                                   GError       **error)
-+{
-+      GError *local_error = NULL;
-+      GFile  *work_file = NULL;
-+      GList  *list = NULL, *l;
-+
-+      g_return_val_if_fail (G_IS_FILE (file), FALSE);
-+
-+      _g_file_make_directory_and_add_to_created_folders (file, created_folders, cancellable, &local_error);
-+      if ((local_error == NULL) || (local_error->code != G_IO_ERROR_NOT_FOUND)) {
-+              if (local_error != NULL)
-+                      g_propagate_error (error, local_error);
-+              return local_error == NULL;
-+      }
-+
-+      work_file = g_object_ref (file);
-+      while ((local_error != NULL) && (local_error->code == G_IO_ERROR_NOT_FOUND)) {
-+              GFile *parent_file;
-+
-+              parent_file = g_file_get_parent (work_file);
-+              if (parent_file == NULL)
-+                      break;
-+
-+              g_clear_error (&local_error);
-+              _g_file_make_directory_and_add_to_created_folders (parent_file, created_folders, cancellable, &local_error);
-+
-+              g_object_unref (work_file);
-+              work_file = g_object_ref (parent_file);
-+
-+              if ((local_error != NULL) && (local_error->code == G_IO_ERROR_NOT_FOUND))
-+                      list = g_list_prepend (list, parent_file);  /* Transfer ownership of ref */
-+              else
-+                      g_object_unref (parent_file);
-+      }
-+
-+      for (l = list; (local_error == NULL) && (l != NULL); l = l->next)
-+              _g_file_make_directory_and_add_to_created_folders ((GFile *) l->data, created_folders, cancellable, &local_error);
-+
-+      _g_object_unref (work_file);
-+      _g_object_list_unref (list);
-+
-+      if (local_error != NULL) {
-+              g_propagate_error (error, local_error);
-+              return FALSE;
-+      }
-+
-+      return _g_file_make_directory_and_add_to_created_folders (file, created_folders, cancellable, error);
-+}
-diff --git a/src/gio-utils.h b/src/gio-utils.h
-index f784c41..0d7dd3c 100644
---- a/src/gio-utils.h
-+++ b/src/gio-utils.h
-@@ -177,5 +177,10 @@ gboolean _g_file_load_buffer_finish  (GFile                 *file,
-                                     char                 **buffer,
-                                     gsize                 *buffer_size,
-                                     GError               **error);
-+gboolean _g_file_make_directory_with_parents
-+                                   (GFile                 *file,
-+                                    GHashTable            *created_folders,
-+                                    GCancellable          *cancellable,
-+                                    GError               **error);
- 
- #endif /* _GIO_UTILS_H */
---
-cgit v0.9.2
diff --git a/app-arch/file-roller/files/file-roller-3.8.4-rar-5.patch b/app-arch/file-roller/files/file-roller-3.8.4-rar-5.patch
deleted file mode 100644 (file)
index 73168e8..0000000
+++ /dev/null
@@ -1,246 +0,0 @@
-From 065550880248b6a66c2fa3143adc0962d0473283 Mon Sep 17 00:00:00 2001
-From: Alexandre Rostovtsev <tetromino@gentoo.org>
-Date: Sun, 8 Sep 2013 19:02:10 -0400
-Subject: [PATCH] rar: add support for rar-5.00
-
-https://bugzilla.gnome.org/show_bug.cgi?id=707568
----
- src/fr-command-rar.c | 153 +++++++++++++++++++++++++++++++++++++--------------
- src/fr-command-rar.h |   3 +-
- 2 files changed, 115 insertions(+), 41 deletions(-)
-
-diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
-index b67db1f..938bf8c 100644
---- a/src/fr-command-rar.c
-+++ b/src/fr-command-rar.c
-@@ -84,6 +84,82 @@ mktime_from_string (char *date_s,
-       return mktime (&tm);
- }
- 
-+/* Sample rar-5 listing output:
-+
-+RAR 5.00 beta 8   Copyright (c) 1993-2013 Alexander Roshal   22 Aug 2013
-+Trial version             Type RAR -? for help
-+
-+Archive: test.rar
-+Details: RAR 4
-+
-+ Attributes      Size    Packed Ratio   Date   Time   Checksum  Name
-+----------- ---------  -------- ----- -------- -----  --------  ----
-+ -rw-r--r--       453       304  67%  05-09-13 09:55  56DA5EF3  loremipsum.txt
-+----------- ---------  -------- ----- -------- -----  --------  ----
-+                  453       304  67%                            1
-+
-+ *
-+ * Sample rar-4 listing output:
-+ *
-+
-+RAR 4.20   Copyright (c) 1993-2012 Alexander Roshal   9 Jun 2012
-+Trial version             Type RAR -? for help
-+
-+Archive test.rar
-+
-+Pathname/Comment
-+                  Size   Packed Ratio  Date   Time     Attr      CRC   Meth Ver
-+-------------------------------------------------------------------------------
-+ loremipsum.txt
-+                   453      304  67% 05-09-13 09:55 -rw-r--r-- 56DA5EF3 m3b 2.9
-+-------------------------------------------------------------------------------
-+    1              453      304  67%
-+
-+ */
-+
-+static void
-+parse_name_field (char         *line,
-+                FrCommandRar *rar_comm)
-+{
-+      const char *name_field;
-+      FileData   *fdata;
-+
-+      rar_comm->fdata = fdata = file_data_new ();
-+
-+      /* read file name. */
-+
-+      fdata->encrypted = (line[0] == '*') ? TRUE : FALSE;
-+
-+      if (rar_comm->rar4_odd_line)
-+              name_field = line + 1;
-+      else
-+              /* rar-5 output adds trailing spaces to short file names :( */
-+              name_field = g_strchomp (_g_str_get_last_field (line, 8));
-+
-+      if (*name_field == '/') {
-+              fdata->full_path = g_strdup (name_field);
-+              fdata->original_path = fdata->full_path;
-+      }
-+      else {
-+              fdata->full_path = g_strconcat ("/", name_field, NULL);
-+              fdata->original_path = fdata->full_path + 1;
-+      }
-+
-+      fdata->link = NULL;
-+      fdata->path = _g_path_remove_level (fdata->full_path);
-+}
-+
-+static gboolean
-+attr_field_is_dir (const char   *attr_field,
-+                   FrCommandRar *rar_comm)
-+{
-+        if ((attr_field[0] == 'd') ||
-+            (rar_comm->rar5 && attr_field[3] == 'D') ||
-+            (!rar_comm->rar5 && attr_field[1] == 'D'))
-+                return TRUE;
-+
-+        return FALSE;
-+}
- 
- static void
- process_line (char     *line,
-@@ -92,14 +168,18 @@ process_line (char     *line,
-       FrCommand     *comm = FR_COMMAND (data);
-       FrCommandRar  *rar_comm = FR_COMMAND_RAR (comm);
-       char         **fields;
--      const char    *name_field;
- 
-       g_return_if_fail (line != NULL);
- 
-       if (! rar_comm->list_started) {
--              if (strncmp (line, "--------", 8) == 0) {
-+              if (strncmp (line, "Details:", 8) == 0) {
-+                      rar_comm->rar5 = TRUE;
-+                      return;
-+              }
-+              else if (strncmp (line, "--------", 8) == 0) {
-                       rar_comm->list_started = TRUE;
--                      rar_comm->odd_line = TRUE;
-+                      if (! rar_comm->rar5)
-+                          rar_comm->rar4_odd_line = TRUE;
-               }
-               else if (strncmp (line, "Volume ", 7) == 0)
-                       FR_ARCHIVE (comm)->multi_volume = TRUE;
-@@ -111,24 +191,43 @@ process_line (char     *line,
-               return;
-       }
- 
--      if (! rar_comm->odd_line) {
--              FileData *fdata;
-+      if (rar_comm->rar4_odd_line || rar_comm->rar5)
-+              parse_name_field (line, rar_comm);
-+
-+      if (! rar_comm->rar4_odd_line) {
-+              FileData   *fdata;
-+              const char *size_field, *ratio_field, *date_field, *time_field, *attr_field;
- 
-               fdata = rar_comm->fdata;
- 
-               /* read file info. */
- 
-               fields = _g_str_split_line (line, 6);
-+              if (rar_comm->rar5) {
-+                      size_field = fields[1];
-+                      ratio_field = fields[3];
-+                      date_field = fields[4];
-+                      time_field = fields[5];
-+                      attr_field = fields[0];
-+              }
-+              else {
-+                      size_field = fields[0];
-+                      ratio_field = fields[2];
-+                      date_field = fields[3];
-+                      time_field = fields[4];
-+                      attr_field = fields[5];
-+              }
-               if (g_strv_length (fields) < 6) {
-                       /* wrong line format, treat this line as a filename line */
-                       g_strfreev (fields);
-                       file_data_free (rar_comm->fdata);
-                       rar_comm->fdata = NULL;
--                      rar_comm->odd_line = TRUE;
-+                      rar_comm->rar4_odd_line = TRUE;
-+                      parse_name_field (line, rar_comm);
-               }
-               else {
--                      if ((strcmp (fields[2], "<->") == 0)
--                          || (strcmp (fields[2], "<--") == 0))
-+                      if ((strcmp (ratio_field, "<->") == 0)
-+                          || (strcmp (ratio_field, "<--") == 0))
-                       {
-                               /* ignore files that span more volumes */
- 
-@@ -136,10 +235,10 @@ process_line (char     *line,
-                               rar_comm->fdata = NULL;
-                       }
-                       else {
--                              fdata->size = g_ascii_strtoull (fields[0], NULL, 10);
--                              fdata->modified = mktime_from_string (fields[3], fields[4]);
-+                              fdata->size = g_ascii_strtoull (size_field, NULL, 10);
-+                              fdata->modified = mktime_from_string (date_field, time_field);
- 
--                              if ((fields[5][1] == 'D') || (fields[5][0] == 'd')) {
-+                              if (attr_field_is_dir (attr_field, rar_comm)) {
-                                       char *tmp;
- 
-                                       tmp = fdata->full_path;
-@@ -155,7 +254,7 @@ process_line (char     *line,
-                               }
-                               else {
-                                       fdata->name = g_strdup (_g_path_get_basename (fdata->full_path));
--                                      if (fields[5][0] == 'l')
-+                                      if (attr_field[0] == 'l')
-                                               fdata->link = g_strdup (_g_path_get_basename (fdata->full_path));
-                               }
- 
-@@ -167,34 +266,8 @@ process_line (char     *line,
-               }
-       }
- 
--      if (rar_comm->odd_line) {
--              FileData *fdata;
--
--              rar_comm->fdata = fdata = file_data_new ();
--
--              /* read file name. */
--
--              fdata->encrypted = (line[0] == '*') ? TRUE : FALSE;
--
--              name_field = line + 1;
--
--              if (*name_field == '/') {
--                      fdata->full_path = g_strdup (name_field);
--                      fdata->original_path = fdata->full_path;
--              }
--              else {
--                      fdata->full_path = g_strconcat ("/", name_field, NULL);
--                      fdata->original_path = fdata->full_path + 1;
--              }
--
--              fdata->link = NULL;
--              fdata->path = _g_path_remove_level (fdata->full_path);
--      }
--      else {
--
--      }
--
--      rar_comm->odd_line = ! rar_comm->odd_line;
-+      if (! rar_comm->rar5)
-+              rar_comm->rar4_odd_line = ! rar_comm->rar4_odd_line;
- }
- 
- 
-diff --git a/src/fr-command-rar.h b/src/fr-command-rar.h
-index d60e422..09ed270 100644
---- a/src/fr-command-rar.h
-+++ b/src/fr-command-rar.h
-@@ -42,7 +42,8 @@ struct _FrCommandRar
-       FrCommand  __parent;
- 
-       gboolean  list_started;
--      gboolean  odd_line;
-+      gboolean  rar4_odd_line;
-+      gboolean  rar5;
-       FileData *fdata;
- };
- 
--- 
-1.8.3.2
-