projects / gentoo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9953c1e)
Use tinyxml[stl], bug #383335. Drop some versions
authorBernard Cafarelli <voyageur@gentoo.org>
Mon, 3 Oct 2011 17:08:39 +0000 (17:08 +0000)
committerBernard Cafarelli <voyageur@gentoo.org>
Mon, 3 Oct 2011 17:08:39 +0000 (17:08 +0000)
Package-Manager: portage-2.2.0_alpha60/cvs/Linux x86_64

net-ftp/filezilla/ChangeLog patch | blob | history
net-ftp/filezilla/Manifest patch | blob | history
net-ftp/filezilla/filezilla-3.3.0.1.ebuild [deleted file] patch | blob | history
net-ftp/filezilla/filezilla-3.4.0.ebuild [deleted file] patch | blob | history
net-ftp/filezilla/filezilla-3.5.0.ebuild [deleted file] patch | blob | history
net-ftp/filezilla/filezilla-3.5.1.ebuild patch | blob | history

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 68162ffb51dbceaef6365a9007fc415a34330ff5..7314d50f6c97beffa8071d5971014978394e2d07 100644 (file)
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.81 2011/08/29 12:20:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.82 2011/10/03 17:08:39 voyageur Exp $
+
+  03 Oct 2011; Bernard Cafarelli <voyageur@gentoo.org>
+  -filezilla-3.3.0.1.ebuild, -filezilla-3.4.0.ebuild, -filezilla-3.5.0.ebuild,
+  filezilla-3.5.1.ebuild:
+  Use tinyxml[stl], bug #383335. Drop some versions
 
 *filezilla-3.5.1 (29 Aug 2011)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index d687dff803d3723a85573e0f8053a9ace907aa2e..ac55b4daac68649bcd107472041a723545ab8090 100644 (file)
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -2,22 +2,16 @@
 Hash: SHA256
 
 AUX filezilla-3.3.5.1-debug.patch 423 RMD160 52f27e41a509e27bb0d12e45c7dfe0be27980307 SHA1 4e567a5f431b3565c3d966a3d2b7a1a44d9b0bda SHA256 6093c67c850f33d23ed278b601e269f08f38cba0b49090f4b0ad58ddbc961e2e
-DIST FileZilla_3.3.0.1_src.tar.bz2 3113486 RMD160 1bfbc885773229c4c72ad8c82001fadd555b9b3d SHA1 51ecb7c79c53466595c5691945ad83b49415f1b4 SHA256 67abea4b429e759eabafc510d342e04d9da0bfd18ab52c5d8d5e58523b023caa
 DIST FileZilla_3.3.4.1_src.tar.bz2 3231505 RMD160 d863f90f8944a66c7d316470cd2affaec1e6b930 SHA1 0b6ce2b46480dc64d959dced54dcc1eaaa08e82a SHA256 2843ab4c89743cfecc5418f9ede1d20147f30cb38e97b148657a7f81c2147185
-DIST FileZilla_3.4.0_src.tar.bz2 3323200 RMD160 387e3e94513102d7575b1b91497b2fca6bc414ca SHA1 09f3ba8bf62d43c31cfb59e263d8f06550a63828 SHA256 b09add065c8382228722a943e30503748ee9466e4becccd9f4d9738962e127fc
-DIST FileZilla_3.5.0_src.tar.bz2 3348649 RMD160 c3ffc60ced15b7055c34d6ef07c97f516e6f276d SHA1 0d351b74bbe70cbfea1d315fd07193089e6e1c9d SHA256 e6037f6248099cf434f369578e533891dab7384e54f50ee30071881627ab3d76
 DIST FileZilla_3.5.1_src.tar.bz2 3364243 RMD160 6f5c7e9db07cb1b5cc43de194f35a032a6f966b8 SHA1 e4b2048cf8740e05cfff8e444a9059f79784e3f6 SHA256 62abc6a7ced8e92a2a557c58935c773d656bd211aa937313f435a0d4b763ab05
-EBUILD filezilla-3.3.0.1.ebuild 1230 RMD160 168d65fdd758e17247ccdd507693d368422cdd3b SHA1 5d99aa99f904c6d95ba32cfc9fad2291a6609194 SHA256 0de412cbf6a685b3ec86e73f3e8b332a9f7f6f678ccda2a91d85a1da7bb13319
 EBUILD filezilla-3.3.4.1.ebuild 1252 RMD160 c07c735861214b1a4a7260a5312c5e16aee409e4 SHA1 c25f0f12caa37d0e3c4a5185b9e05cbe37829585 SHA256 3a3f7d9e33031f84eb9fe1258acd5f41bda3c07e2ce9f2806a04ca5d5411dc88
-EBUILD filezilla-3.4.0.ebuild 1376 RMD160 18bfe03d9ce444a6ce0af56d9194a172bdfca7d1 SHA1 102d9c4ba21716b3999372c6dd36d6477b65f642 SHA256 a87a57fcf18bd90eded330054fd5c134f111f545ac8345060ceeaf38897ff67f
-EBUILD filezilla-3.5.0.ebuild 1397 RMD160 3b472e9cdff1800896614441f726ce9b031c74a0 SHA1 ff89cec619be5f8de1f5fb4a128aaaa05ae21556 SHA256 a9107c4923d0e005c918b794685cfe4ab78fcbf24f203c3456585096f807f78f
-EBUILD filezilla-3.5.1.ebuild 1397 RMD160 816fc3f469e31c278252fe8464a5902914f8b717 SHA1 1928afe2fad7e463934e756cc84e60fcd8a3ad99 SHA256 2c0eab5940d6a4b46844d61b58f0f44d419d43ccc8046bcbcad95bae708b174a
-MISC ChangeLog 14856 RMD160 4d0f26f35685b8f718a12ac43474bd4bb945b13f SHA1 fa8b2d255ee737f5c7ba61aaec6af929e0171f76 SHA256 b0235e4c8489de7f324f7ca721aa269118b66790a962f646a044232dd8490d8a
+EBUILD filezilla-3.5.1.ebuild 1439 RMD160 316c738df33755b1e1502a408ea38dda00a0c112 SHA1 278d5f8c6b57480a7f48ba15f7c4c602c5597d01 SHA256 8e61990c3eefb1b45e532475646df9f0269740af7a8dffbda8a34c889a19d951
+MISC ChangeLog 15069 RMD160 554ffa34ee8177599890e7af9e67d05575bdb4a3 SHA1 507b57943c2b9e477cf77fad8a6b0a2cf2927c1a SHA256 c14694aa08266e462ce9f681caa7544105a456d72c0ea8c55a66bc6c4496b7c4
 MISC metadata.xml 358 RMD160 847093b8297b203ca89664d66e195f763d50e751 SHA1 a61011a0ee29bdb9a156e297a414bc2902598156 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk5bhDMACgkQFYEBGcdFJfKVhAD+JBebP7lwRSrUV25rBF/RQ2bJ
-FnUMQOj2MwTu8n0FKpcA/1b7c205c4zaJzFx+0aUoymVSoWcGDWoYadHDyEqNGTa
-=AXtA
+iF4EAREIAAYFAk6J7CMACgkQFYEBGcdFJfJEywEAoWlbmnG8asslcFzilsRLuZYh
+0EuQn3IjrDomwMm8+e8A/3XxuhdILCY5DCb9tw9Atz09o0P0Zr5BgrYQnj4epU3N
+=AqTk
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild b/net-ftp/filezilla/filezilla-3.3.0.1.ebuild
deleted file mode 100644 (file)
index cdaee95..0000000
--- a/net-ftp/filezilla/filezilla-3.3.0.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.3.0.1.ebuild,v 1.8 2010/08/19 19:00:02 voyageur Exp $
-
-EAPI=2
-
-WX_GTK_VER="2.8"
-
-inherit eutils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ia64 ppc sparc x86"
-IUSE="dbus nls test"
-
-RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
-       net-dns/libidn
-       >=net-libs/gnutls-2.8.3
-       >=x11-libs/wxGTK-2.8.9:2.8[X]
-       dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       >=sys-devel/libtool-1.4
-       nls? ( >=sys-devel/gettext-0.11 )
-       test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_configure() {
-       econf $(use_with dbus) $(use_enable nls locales) \
-               --with-tinyxml=builtin \
-               --disable-autoupdatecheck || die "econf failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       doicon src/interface/resources/48x48/${PN}.png || die "doicon failed"
-
-       dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/net-ftp/filezilla/filezilla-3.4.0.ebuild b/net-ftp/filezilla/filezilla-3.4.0.ebuild
deleted file mode 100644 (file)
index a0890df..0000000
--- a/net-ftp/filezilla/filezilla-3.4.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.4.0.ebuild,v 1.3 2011/04/26 10:59:43 voyageur Exp $
-
-EAPI=2
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="dbus nls test"
-
-RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
-       >=dev-libs/tinyxml-2.6.1-r1[-stl]
-       net-dns/libidn
-       >=net-libs/gnutls-2.8.3
-       >=x11-libs/wxGTK-2.8.9:2.8[X]
-       x11-misc/xdg-utils
-       dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       >=sys-devel/libtool-1.4
-       nls? ( >=sys-devel/gettext-0.11 )
-       test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-3.3.5.1-debug.patch
-       eautoreconf
-}
-
-src_configure() {
-       econf $(use_with dbus) $(use_enable nls locales) \
-               --with-tinyxml=system \
-               --disable-autoupdatecheck || die "econf failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       doicon src/interface/resources/48x48/${PN}.png || die "doicon failed"
-
-       dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/net-ftp/filezilla/filezilla-3.5.0.ebuild b/net-ftp/filezilla/filezilla-3.5.0.ebuild
deleted file mode 100644 (file)
index 2cce6fb..0000000
--- a/net-ftp/filezilla/filezilla-3.5.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.5.0.ebuild,v 1.1 2011/05/23 09:49:59 voyageur Exp $
-
-EAPI=2
-
-WX_GTK_VER="2.8"
-
-inherit autotools eutils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE="dbus nls test"
-
-RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
-       >=dev-db/sqlite-3.7
-       >=dev-libs/tinyxml-2.6.1-r1[-stl]
-       net-dns/libidn
-       >=net-libs/gnutls-2.8.3
-       >=x11-libs/wxGTK-2.8.9:2.8[X]
-       x11-misc/xdg-utils
-       dbus? ( sys-apps/dbus )"
-DEPEND="${RDEPEND}
-       dev-util/pkgconfig
-       >=sys-devel/libtool-1.4
-       nls? ( >=sys-devel/gettext-0.11 )
-       test? ( dev-util/cppunit )"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_prepare() {
-       epatch "${FILESDIR}"/${PN}-3.3.5.1-debug.patch
-       eautoreconf
-}
-
-src_configure() {
-       econf $(use_with dbus) $(use_enable nls locales) \
-               --with-tinyxml=system \
-               --disable-autoupdatecheck || die "econf failed"
-}
-
-src_install() {
-       emake DESTDIR="${D}" install || die "emake install failed"
-
-       doicon src/interface/resources/48x48/${PN}.png || die "doicon failed"
-
-       dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/net-ftp/filezilla/filezilla-3.5.1.ebuild b/net-ftp/filezilla/filezilla-3.5.1.ebuild
index e56e8acc190932d37d9bc9ec91db15d6021e500a..df9a3b31464b38ebcb53a7c8c3571ead49e7b784 100644 (file)
--- a/net-ftp/filezilla/filezilla-3.5.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.5.1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.5.1.ebuild,v 1.1 2011/08/29 12:20:25 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.5.1.ebuild,v 1.2 2011/10/03 17:08:39 voyageur Exp $
 
 EAPI=2
 
 WX_GTK_VER="2.8"
 
-inherit autotools eutils multilib wxwidgets
+inherit autotools eutils flag-o-matic multilib wxwidgets
 
 MY_PV=${PV/_/-}
 MY_P="FileZilla_${MY_PV}"
@@ -22,7 +22,7 @@ IUSE="dbus nls test"
 
 RDEPEND=">=app-admin/eselect-wxwidgets-0.7-r1
        >=dev-db/sqlite-3.7
-       >=dev-libs/tinyxml-2.6.1-r1[-stl]
+       >=dev-libs/tinyxml-2.6.1-r1[stl]
        net-dns/libidn
        >=net-libs/gnutls-2.8.3
        >=x11-libs/wxGTK-2.8.9:2.8[X]
@@ -38,6 +38,7 @@ S="${WORKDIR}"/${PN}-${MY_PV}
 
 src_prepare() {
        epatch "${FILESDIR}"/${PN}-3.3.5.1-debug.patch
+       append-flags -DTIXML_USE_STL
        eautoreconf
 }
 
Unnamed repository; edit this file 'description' to name the repository.