From: Pacho Ramos Date: Wed, 5 Oct 2011 22:08:26 +0000 (+0000) Subject: Drop DEPRECATED flags as configure option doesn't do it, bug #385453 by Juergen Rose... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=47d64bd426801a6209b61e596aa84baf9f80e33c;p=gentoo.git Drop DEPRECATED flags as configure option doesn't do it, bug #385453 by Juergen Rose. Remove old. Package-Manager: portage-2.1.10.20/cvs/Linux x86_64 --- diff --git a/app-arch/file-roller/ChangeLog b/app-arch/file-roller/ChangeLog index 1aa6756299d9..3edb2b9bef12 100644 --- a/app-arch/file-roller/ChangeLog +++ b/app-arch/file-roller/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-arch/file-roller # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.301 2011/10/05 17:05:55 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/ChangeLog,v 1.302 2011/10/05 22:08:26 pacho Exp $ + + 05 Oct 2011; Pacho Ramos -file-roller-2.32.1.ebuild, + file-roller-2.32.2.ebuild: + Drop DEPRECATED flags as configure option doesn't do it, bug #385453 by + Juergen Rose. Remove old. 05 Oct 2011; Kacper Kowalik file-roller-2.32.2.ebuild: diff --git a/app-arch/file-roller/Manifest b/app-arch/file-roller/Manifest index 85926c73ea62..fd60e2ff19ad 100644 --- a/app-arch/file-roller/Manifest +++ b/app-arch/file-roller/Manifest @@ -3,20 +3,16 @@ Hash: SHA1 AUX file-roller-2.10.3-use_bin_tar.patch 504 RMD160 0af7af1c83953554e58c3a2f82ae3edb2e6b7e55 SHA1 a40077b5ace4be970dae46b44aa5b8ce19a75780 SHA256 c22e742893800c4302df40af66b1eabeab700fea7326eada849f919bdd76c052 AUX file-roller-3.0.2-pointer-arithmetic.patch 1315 RMD160 5ebb9e69c75d2ba8c926135167fb914ad23eca47 SHA1 818365abc605ba49e2e394352406ea92730e7a43 SHA256 3aca914f7d0609e8ebe54e4966edb916d05cb51f136683a7fc8bbafb3a7a77cc -DIST file-roller-2.32.1.tar.bz2 1916180 RMD160 09a313112fcd621f80669645ce93af5961947b25 SHA1 48eb7e1cac561804a2f9ad4fdeef8e5cce8adc62 SHA256 a9109d9c871c022eb0553eeedc98520bad42ba3099088c16a9f7df817f60cc92 DIST file-roller-2.32.2.tar.bz2 1901661 RMD160 cbeb4f8dc83db87338735e57c4f87333c4b018f4 SHA1 38ce495a27b482f1e9983304f95959393674676e SHA256 3ddbe4e4134eab4ff8e97789a1626aec6cbc588190f2f520850d0697037e5755 DIST file-roller-3.0.2.tar.bz2 1996994 RMD160 751499940adb37df265bb0a492fb3c6abeca79b9 SHA1 b242c30b4f364a3c10fba9cc2d215f67e5bf5508 SHA256 a612f05c44f82328175ddca1b4a1da214d9c305797370b78435f490b250af3d1 -EBUILD file-roller-2.32.1.ebuild 2240 RMD160 17a8b70ffc82dc1c99b4b6ffb47bd4035f80ea11 SHA1 f08b8fdf7f5d4c25fbd77818c4cee161def5cbb5 SHA256 d7c9fc4363d6a17a261ecc5ae3a5bc6bdcc19de262d18bb01f46b44956385460 -EBUILD file-roller-2.32.2.ebuild 2244 RMD160 c45f20cfbd73356a3c5f76c82f3dc3a4eb97f2e1 SHA1 f44212b1be8a402d18116f38998171f166dd2e5f SHA256 9f230396a30e95279b3701ca56bd0ff6f3612508482d60eaaeb11d3227e750d6 +EBUILD file-roller-2.32.2.ebuild 2426 RMD160 32aa4e00aaf63d6363151f228a3320cf0c811deb SHA1 86d74f0d5a5bdf8ac447e94d804ee5be514d2b6f SHA256 85cf20b1081a7345dd63ef3c2cf4522a339f81b283e70a3a43495caee9bfa0ba EBUILD file-roller-3.0.2-r1.ebuild 2304 RMD160 dd957845ca771019a89840ad19e88206a42ce213 SHA1 b85f06cd48d5c7dbc2800df0084fe221570da414 SHA256 ad5ef923a676694a2bc94e46d015393c3503fe333a7e6c32f130a19de50d5257 -MISC ChangeLog 39799 RMD160 380066e08884a80c1db6803c1cbc82c5e865fdef SHA1 a2164ead52098e6f42bba2ddc44f8630312fa15b SHA256 9cbb9254c1745d2ef833077e951a9b7a18b02c8e62589c22ec123771b67c601e +MISC ChangeLog 40000 RMD160 5fc4746f2fa4746d5ef61fa4d9d2dc8825a2606d SHA1 00d98db9a9b1281ba98907dd4dd6437d10c262d2 SHA256 6e476ae7a0ddd17cc3e78dcfccf0844b61890d2bd1270a9839310ad7628aafed MISC metadata.xml 446 RMD160 dc8e3a9c08916471d488b4012eb73f711b8521db SHA1 af8629f4c093501ee4445384e16a0dda27adb6b9 SHA256 855d22d9ec6384bbec09562c5aebd68e043a50f002ba277818e3b7755b824f50 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.18 (GNU/Linux) +Version: GnuPG v2.0.17 (GNU/Linux) -iJwEAQECAAYFAk6MjnkACgkQIiMqcbOVdxT44wP+OHH+g8DeLhFS33uLFe9Azqxl -+W6Cm8l+4wVKSxxI9LWo6EwteBYa7eawnrvy3/X8upsobSzcsiqvFj4slco1q5S0 -1xLrv2M93ZFYuPni12ACeA1HHO88kASfDlEuMevLVRSPE92jjomNyC9YhO7uTzVi -RP5tnjM2ro9ToF1xVZY= -=vQqn +iEYEARECAAYFAk6M1WAACgkQCaWpQKGI+9RkeACdEQyPl1ob5U8L1BZZ4IKHWq+C +hBoAnRWT1xF0AwU2NMWhqb4fIm5Eidu3 +=OTqq -----END PGP SIGNATURE----- diff --git a/app-arch/file-roller/file-roller-2.32.1.ebuild b/app-arch/file-roller/file-roller-2.32.1.ebuild deleted file mode 100644 index 117dcd6c4361..000000000000 --- a/app-arch/file-roller/file-roller-2.32.1.ebuild +++ /dev/null @@ -1,81 +0,0 @@ -# Copyright 1999-2011 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.1.ebuild,v 1.8 2011/03/22 18:43:24 ranger Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit eutils gnome2 - -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 - dev-util/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 -} - -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 achive 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-2.32.2.ebuild b/app-arch/file-roller/file-roller-2.32.2.ebuild index 698c0f2b46c2..75a0871f948f 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-2011 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.5 2011/10/05 17:05:55 xarthisius Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-arch/file-roller/file-roller-2.32.2.ebuild,v 1.6 2011/10/05 22:08:26 pacho Exp $ EAPI="3" GCONF_DEBUG="no" @@ -46,6 +46,10 @@ 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() {