From 525e3bf8bacdff5fcbd90f232da3bb2f1895bed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C5=82awomir=20Nizio?= Date: Sat, 5 Jan 2013 19:34:37 +0100 Subject: [PATCH] [gnome-extra/nautilus-file-roller,app-arch/file-roller] v. bump to 3.6.2 --- app-arch/file-roller/Manifest | 9 ++--- app-arch/file-roller/file-roller-3.4.2.ebuild | 2 +- ...-3.2.2.ebuild => file-roller-3.6.2.ebuild} | 36 ++++++++++--------- .../file-roller/files/3.6.0-packages.match | 30 ++++++++++++++++ gnome-extra/nautilus-file-roller/Manifest | 7 ++-- .../nautilus-file-roller-3.4.2.ebuild | 2 +- ...uild => nautilus-file-roller-3.6.2.ebuild} | 28 +++++++++------ 7 files changed, 73 insertions(+), 41 deletions(-) rename app-arch/file-roller/{file-roller-3.2.2.ebuild => file-roller-3.6.2.ebuild} (79%) create mode 100644 app-arch/file-roller/files/3.6.0-packages.match rename gnome-extra/nautilus-file-roller/{nautilus-file-roller-3.2.2.ebuild => nautilus-file-roller-3.6.2.ebuild} (67%) diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 79d3121e7..9ed09fd1a 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -1,7 +1,2 @@ -AUX 3.1.2-packages.match 527 RMD160 3ae6ba4f7123e1c056d0286a9bdf46fa105039a8 SHA1 8041257948511cdae7c29ad1a7923867f8a0756d SHA256 ec3ad7667cb92562659bf76e22e502b57af18c7a2ca8cabf7834a0fca8573e1b -AUX file-roller-2.10.3-use_bin_tar.patch 504 RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 SHA1 a40077b5ace4be970dae46b44aa5b8ce19a75780 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052 -DIST file-roller-3.2.2.tar.xz 1774864 RMD160 3d3286ae25d33441dfe3529859f1b3d9b988a29b SHA1 dd556f86e3042483912476cf91d4b79236a70df6 SHA256 de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5 -DIST file-roller-3.4.2.tar.xz 1548788 RMD160 ddd7f72039669f00370e7bc16071fb7e6700504f SHA1 40c081fb5c300efcf5365f2ee177e9b22e1cbdd9 SHA256 7085a351c55171718bbf5b9b614a7b9606efb8cbd2eb44cc6c538545444d0cdd -EBUILD file-roller-3.2.2.ebuild 2389 RMD160 dcdf8d831dda512354bb10220add16421af35a36 SHA1 744d7d32dcb23999994055bc3ed0680a0285ae18 SHA256 cd7e9be0b7c5a295e2166f52b240a7b4e90181a32fd756ccfa0c422363bc6550 -EBUILD file-roller-3.4.2.ebuild 2388 RMD160 94eb212e4a9cf3d89045dd44e6eb760ec4be2165 SHA1 dfc34200224c7e5889066d55dd599f4a6fb245e9 SHA256 9fa8e6384ffa040a42c718a8c26a9b3e2011bed67615be7838cf6bde7d03300c -MISC metadata.xml 446 RMD160 dc8e3a9c08916471d488b4012eb73f711b8521db SHA1 af8629f4c093501ee4445384e16a0dda27adb6b9 SHA256 855d22d9ec6384bbec09562c5aebd68e043a50f002ba277818e3b7755b824f50 +DIST file-roller-3.4.2.tar.xz 1548788 SHA256 7085a351c55171718bbf5b9b614a7b9606efb8cbd2eb44cc6c538545444d0cdd +DIST file-roller-3.6.2.tar.xz 1483616 SHA256 47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1 SHA512 15b359cf8197d3d1294dd84e73f7bfbd7649f87b0fae337c83cb2c57335b6cda9da2a9b4a91b91c9cc4236f034e4197040c62410451b09ffaec004fcb41a781c WHIRLPOOL c29f5b22f631d0b694c5257ae870141604cf34bed2fd9d418a7c90cb3cb4684941686acaa756ee1b9a51e7a23d267430895f1f31f135e4ade7e965d2a090349f 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 a2add765d..c5f920bde 100644 --- a/app-arch/file-roller/file-roller-3.4.2.ebuild +++ b/app-arch/file-roller/file-roller-3.4.2.ebuild @@ -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 similarity index 79% rename from app-arch/file-roller/file-roller-3.2.2.ebuild rename to app-arch/file-roller/file-roller-3.6.2.ebuild index 39bdd4296..1ad56b17c 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 +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -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" # 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 packagekit? ( app-admin/packagekit-base ) " DEPEND="${RDEPEND} - sys-devel/gettext >=dev-util/intltool-0.40.0 - dev-util/pkgconfig - app-text/gnome-doc-utils" + sys-devel/gettext + virtual/pkgconfig" # eautoreconf needs: # gnome-base/gnome-common PDEPEND="nautilus? ( ~gnome-extra/nautilus-file-roller-${PV} )" -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 --disable-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 000000000..4085b1911 --- /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 diff --git a/gnome-extra/nautilus-file-roller/Manifest b/gnome-extra/nautilus-file-roller/Manifest index b29e39007..9ed09fd1a 100644 --- a/gnome-extra/nautilus-file-roller/Manifest +++ b/gnome-extra/nautilus-file-roller/Manifest @@ -1,5 +1,2 @@ -DIST file-roller-3.2.2.tar.xz 1774864 RMD160 3d3286ae25d33441dfe3529859f1b3d9b988a29b SHA1 dd556f86e3042483912476cf91d4b79236a70df6 SHA256 de2c93e947f7aabf46124d6384b358c162a7ee1236e4930f2486684979d5ebe5 -DIST file-roller-3.4.2.tar.xz 1548788 RMD160 ddd7f72039669f00370e7bc16071fb7e6700504f SHA1 40c081fb5c300efcf5365f2ee177e9b22e1cbdd9 SHA256 7085a351c55171718bbf5b9b614a7b9606efb8cbd2eb44cc6c538545444d0cdd -EBUILD nautilus-file-roller-3.2.2.ebuild 996 RMD160 745d6290bc2117a423b55134cb63fc5459fcbdcb SHA1 d2f9d67c3f610131429445b77b424ea6e78ee35d SHA256 cba6b97e3356a422b82815172b92c4028551f736121b5c3fa38f320552a121dd -EBUILD nautilus-file-roller-3.4.2.ebuild 1102 RMD160 685a3be2bd674c6e77b3f8bc62965ec8937f9754 SHA1 3c6d0228cf6dd3debd63937ca6d378ea688857d7 SHA256 b79a20e8d4b6b939df56caa11d69c757ae6f35f5723ff65dcd873462adc5ff14 -MISC metadata.xml 212 RMD160 905d4f901a21bd2a5cb23412648afce90647465b SHA1 3647059dd622791ccef80a5f161e69acfd0bb6c0 SHA256 1108b8fcd08dbfca8e3598d8c3d77a3070e4a159f4e18cc0c3c30a7150501da5 +DIST file-roller-3.4.2.tar.xz 1548788 SHA256 7085a351c55171718bbf5b9b614a7b9606efb8cbd2eb44cc6c538545444d0cdd +DIST file-roller-3.6.2.tar.xz 1483616 SHA256 47b026c827fcb0db4df51bf81c1e90f829f287fe2c9b9e65f167a2ef5bfec5f1 SHA512 15b359cf8197d3d1294dd84e73f7bfbd7649f87b0fae337c83cb2c57335b6cda9da2a9b4a91b91c9cc4236f034e4197040c62410451b09ffaec004fcb41a781c WHIRLPOOL c29f5b22f631d0b694c5257ae870141604cf34bed2fd9d418a7c90cb3cb4684941686acaa756ee1b9a51e7a23d267430895f1f31f135e4ade7e965d2a090349f diff --git a/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.4.2.ebuild b/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.4.2.ebuild index d623bd4cf..06603f13a 100644 --- a/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.4.2.ebuild +++ b/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.4.2.ebuild @@ -10,7 +10,7 @@ inherit eutils gnome.org DESCRIPTION="Provides context menu for Nautilus" HOMEPAGE="http://fileroller.sourceforge.net/" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="" KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" diff --git a/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.2.2.ebuild b/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.6.2.ebuild similarity index 67% rename from gnome-extra/nautilus-file-roller/nautilus-file-roller-3.2.2.ebuild rename to gnome-extra/nautilus-file-roller/nautilus-file-roller-3.6.2.ebuild index a82f2a34c..291207fca 100644 --- a/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.2.2.ebuild +++ b/gnome-extra/nautilus-file-roller/nautilus-file-roller-3.6.2.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: $ -EAPI="4" +EAPI="5" GNOME_ORG_MODULE="file-roller" inherit eutils gnome.org @@ -10,29 +10,37 @@ inherit eutils gnome.org DESCRIPTION="Provides context menu for Nautilus" HOMEPAGE="http://fileroller.sourceforge.net/" -LICENSE="GPL-2" +LICENSE="GPL-2+" SLOT="0" IUSE="" -KEYWORDS="~amd64 ~arm ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" +KEYWORDS="~amd64 ~x86" -DEPEND=">=gnome-base/nautilus-3 -" -RDEPEND="${DEPEND} +RDEPEND=" ~app-arch/file-roller-${PV} + >=gnome-base/nautilus-3 +" +DEPEND=">=gnome-base/nautilus-3 + >=dev-libs/glib-2.29.14:2 + sys-devel/gettext + >=app-arch/libarchive-3.0.0:= + >=dev-libs/json-glib-0.14.0 + virtual/pkgconfig + >=x11-libs/gtk+-3.4.0:3 " src_configure() { # --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 --enable-nautilus-actions - --disable-packagekit" + --disable-packagekit + ITSTOOL=$(type -P true)" econf $G2CONF }