Version bump, remove old.

Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

diff --git a/net-libs/glib-networking/ChangeLog b/net-libs/glib-networking/ChangeLog
index 084b1f86677979b75eccc9aa306fa1d3f12ab5cd..d525627266085aa06ff706f1774e34a67129003d 100644 (file)
--- a/net-libs/glib-networking/ChangeLog
+++ b/net-libs/glib-networking/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/glib-networking
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.23 2011/12/29 18:01:05 pacho Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/ChangeLog,v 1.24 2012/01/04 20:03:12 pacho Exp $
+
+*glib-networking-2.30.2 (04 Jan 2012)
+
+  04 Jan 2012; Pacho Ramos <pacho@gentoo.org> +glib-networking-2.30.2.ebuild,
+  -glib-networking-2.28.7-r1.ebuild, -glib-networking-2.30.0-r1.ebuild:
+  Version bump, remove old.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> glib-networking-2.30.1-r1.ebuild:
   amd64 stable, bug 393007

diff --git a/net-libs/glib-networking/Manifest b/net-libs/glib-networking/Manifest
index 5be3832273f2259a39a31f69a586c3ca944c12ee..18a1e8eae751ff672a8a2481e4aaf95dedc8297e 100644 (file)
--- a/net-libs/glib-networking/Manifest
+++ b/net-libs/glib-networking/Manifest
@@ -4,18 +4,17 @@ Hash: SHA1
 AUX glib-networking-2.28.7-gnome-proxy-AC_ARG_WITH.patch 987 RMD160 42073eaf04967418ad48b2566ca76f5102741288 SHA1 af4948a6152305cad24294eb5da92e3901c4de5f SHA256 d9bcf47ac0fd511394542d9158322cd546df38cb1b12bf7680b9c129b22e8b9d
 AUX glib-networking-2.30.1-gnome-proxy-test.patch 752 RMD160 428c085867db8e4130858b2ecc94e6eb2b6b4a64 SHA1 6959c6d32a9f111d4bba3dbe1c0e7f977410db2c SHA256 8c7aa53e636b99f158a5e1ac01f50b8ac3d34ba680d9b80203bd584857406d18
 DIST glib-networking-2.28.7.tar.bz2 319260 RMD160 059f5956c96de586db6f457d52909420b0a86f7d SHA1 711d548a88dffb4c3be7ffa1d515ef3efccedc62 SHA256 98bedfbd530c4b1b53c91025fe82290bafd289d249e4eb549c3b90d23a76021c
-DIST glib-networking-2.30.0.tar.xz 285240 RMD160 ce76a267789cced605b61a18e7bd5d5b79cae31f SHA1 6a11675b8a0b3a565f4f8d1e72df78dedfe20b6f SHA256 e28ca1e354d6519efb5c9c01c1f10e8a1a196710dfbcc5ea8f8aade3244e108c
 DIST glib-networking-2.30.1.tar.xz 297072 RMD160 a88088598afeb09241f4d399e84deb8b4f321264 SHA1 5762eb4e37fb595ab0ef12dbbc44514b226c4e06 SHA256 5acc7e76cb66734379d9ad983985c671af12591b84e93cd698fe8ea25d29f7d3
-EBUILD glib-networking-2.28.7-r1.ebuild 1408 RMD160 4bd8f28bde792cab4088109d9bdec8daf856a6f6 SHA1 03b7decf01a451a80e4f7ca63ee05df15e7f7ccf SHA256 3ac2042b00ab62f41d011af0688185f4110889cc127b560b0f6999cc7c1c3d5b
+DIST glib-networking-2.30.2.tar.xz 297336 RMD160 c2ad8faf5f2bd93dd4c9241e5897259032d6505c SHA1 3619af3414ed90a75ceb2849b3b315e8eaed6bd6 SHA256 9f7542500939ca25896f0a74955cd3889758524583f6a15d02e00c9b815559bc
 EBUILD glib-networking-2.28.7.ebuild 1160 RMD160 7bd3bd7e2e178f9eac0c50194de3e8c5c2ed06ed SHA1 38485d31dde8503864d206aee18e585681d15306 SHA256 46b0c7d38bb34c8ca5b0a71e77e0d824bccbb2f72aa16652fd99cf24a6102c07
-EBUILD glib-networking-2.30.0-r1.ebuild 1665 RMD160 d6f168ddb9eabbd51c33aa3b4c615dce9905ebdb SHA1 fe91e9c1879c938c76ada7d92c8db7f707c26832 SHA256 977ee3f0b38fd8c8a65402080d5443b1d87c6863c8de3a317f4f457b1c380241
 EBUILD glib-networking-2.30.1-r1.ebuild 2199 RMD160 9b5b76aa6c6838d135041cda403c9eb7aca7cc61 SHA1 def248ccbd9a974e2376b7c90c1eae4cef27b8e9 SHA256 2b92b75f4af19ef2746b6540949e28c319e666340cc4f4b61dda4d2981423b91
-MISC ChangeLog 4201 RMD160 b8e82598ea7fdbb18275cd896ed1198c2b7b0026 SHA1 a287bfba40676ad661bb86ca6a9d4d0e882fa262 SHA256 fce3c148b6ac4f1966b8f065b25cc682d9ad1e7876d305d0c8a52802ce4ad833
+EBUILD glib-networking-2.30.2.ebuild 1874 RMD160 a8ac33bbfc4ddceb8d847a4e54bfdafc3515d06b SHA1 1c1e0c554c16a3a7ece350a36959803f640c90a5 SHA256 4d0156a72f68f711cd4bea3681e59519777f63faa22e863dcee3a5d17f13da2e
+MISC ChangeLog 4419 RMD160 302b7cf5868d025df092abac9187845aa6ae2d80 SHA1 c52bb404e01912e31ea31a95ee2108e27d2da54e SHA256 adca67cf993e75d20cbb9c1bfbe2e6f9b22d313f31e74502f27aee2174f5f572
 MISC metadata.xml 395 RMD160 18bae0d230824208fc84fdad0c54b73e2e99eeeb SHA1 a07face2c8ec4a0b4bf04b18dbbd9b29a86f20b8 SHA256 a55b4f7f8a8d4bffa2ec51ee271f2f9360e8bafe955871a253f32c16911a395e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk78qucACgkQCaWpQKGI+9TjPgCeP1urILA17ednY6eZHzXc65Ro
-9v0AnRxfP9AUBCWywSkv1NXNi40lUjIe
-=8DY6
+iEYEARECAAYFAk8EsIYACgkQCaWpQKGI+9R9xgCdHmf9WyaQc6TEoIm3xzn1bJB8
+94AAnioVw5jjXSLBeoywsQgwLlhL+6ll
+=qn4v
 -----END PGP SIGNATURE-----

diff --git a/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild b/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild
deleted file mode 100644 (file)
index d08db1e..0000000
--- a/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.28.7-r1.ebuild,v 1.1 2011/10/19 16:09:07 tetromino Exp $
-
-EAPI="3"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-
-inherit autotools eutils gnome2
-
-DESCRIPTION="Network-related giomodules for glib"
-HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy +ssl"
-
-RDEPEND=">=dev-libs/glib-2.27.90:2
-       gnome? ( gnome-base/gsettings-desktop-schemas )
-       libproxy? ( >=net-libs/libproxy-0.4.6-r3 )
-       ssl? ( >=net-libs/gnutls-2.1.7 )
-"
-DEPEND="${RDEPEND}
-       >=dev-util/intltool-0.35.0
-       >=dev-util/pkgconfig-0.9
-       sys-devel/gettext"
-
-pkg_setup() {
-       # AUTHORS, ChangeLog are empty
-       DOCS="NEWS README"
-       G2CONF="${G2CONF}
-               --disable-static
-               --disable-maintainer-mode
-               --with-ca-certificates=/etc/ssl/certs/ca-certificates.crt
-               $(use_with gnome gnome-proxy)
-               $(use_with libproxy)
-               $(use_with ssl gnutls)"
-}
-
-src_prepare() {
-       # bug #387589, https://bugzilla.gnome.org/show_bug.cgi?id=662203
-       # Fixed in upstream git master
-       epatch "${FILESDIR}/${P}-gnome-proxy-AC_ARG_WITH.patch"
-       mkdir m4
-       eautoreconf
-       gnome2_src_prepare
-}

diff --git a/net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
similarity index 53%
rename from net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild
rename to net-libs/glib-networking/glib-networking-2.30.2.ebuild
index 9213568374d5c953fd0d68724bd4721377c1ebbf..9d013b80b908389d4863f81b37b89c67a0925711 100644 (file)
--- a/net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild
+++ b/net-libs/glib-networking/glib-networking-2.30.2.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.0-r1.ebuild,v 1.2 2011/10/19 16:32:21 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/glib-networking/glib-networking-2.30.2.ebuild,v 1.1 2012/01/04 20:03:12 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="no"
 GNOME2_LA_PUNT="yes"
 
-inherit autotools eutils gnome2
+inherit gnome2
+# tests need virtualx
 
 DESCRIPTION="Network-related giomodules for glib"
 HOMEPAGE="http://git.gnome.org/browse/glib-networking/"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86
-~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~sparc-solaris ~x86-solaris"
-IUSE="+gnome +libproxy +ssl"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="+gnome +libproxy +ssl" # test
 
 RDEPEND=">=dev-libs/glib-2.29.16:2
        gnome? ( gnome-base/gsettings-desktop-schemas )
@@ -29,9 +28,10 @@ DEPEND="${RDEPEND}
        >=dev-util/intltool-0.35.0
        >=dev-util/pkgconfig-0.9
        sys-devel/gettext"
+#      test? ( sys-apps/dbus[X] )"
 
-# FIXME: tls tests fail, figure out why
-# ERROR:tls.c:256:on_input_read_finish: assertion failed (error == NULL): Error performing TLS handshake: The request is invalid. (g-tls-error-quark, 1)
+# FIXME: tls tests often fail, figure out why, bug #387799
+# ERROR:tls.c:265:on_input_read_finish: assertion failed (error == NULL): Error performing TLS handshake: The request is invalid. (g-tls-error-quark, 1)
 RESTRICT="test"
 
 pkg_setup() {
@@ -39,18 +39,24 @@ pkg_setup() {
        DOCS="NEWS README"
        G2CONF="${G2CONF}
                --disable-static
-               --disable-maintainer-mode
-               --with-ca-certificates=${EPREFIX}/etc/ssl/certs/ca-certificates.crt
+               --with-ca-certificates="${EPREFIX}"/etc/ssl/certs/ca-certificates.crt
                $(use_with gnome gnome-proxy)
                $(use_with libproxy)
                $(use_with ssl gnutls)"
 }
 
 src_prepare() {
-       # bug #387589, https://bugzilla.gnome.org/show_bug.cgi?id=662203
-       # Fixed in upstream git master
-       epatch "${FILESDIR}/${PN}-2.28.7-gnome-proxy-AC_ARG_WITH.patch"
-       mkdir m4
-       eautoreconf
        gnome2_src_prepare
+
+       # Drop DEPRECATED flags
+       sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' \
+               proxy/libproxy/Makefile.am proxy/libproxy/Makefile.in \
+               proxy/gnome/Makefile.am proxy/gnome/Makefile.in \
+               tls/gnutls/Makefile.am tls/gnutls/Makefile.in || die
 }
+
+#src_test() {
+       # global make check fails if gnome-proxy test is not built
+#      use gnome || cd tls/tests
+#      Xemake check
+#}

diff --git a/net-libs/ptlib/Manifest b/net-libs/ptlib/Manifest
index be3c9b5b66a44a7e968c344f35bafc7edb3091ed..9c572f98cb5604b77b22a41ef5c6f27111065f56 100644 (file)
--- a/net-libs/ptlib/Manifest
+++ b/net-libs/ptlib/Manifest
@@ -4,17 +4,23 @@ Hash: SHA1
 AUX ptlib-2.6.4-vxml-ptones.patch 250 RMD160 b7eddb71af5d331ab104045c47d763bec1933434 SHA1 e7e586d16a13de169447a392662056549ff84912 SHA256 9d678b1439184728eb28ef7495816c59504b16a5bbc90e978f27f590666f865c
 DIST ptlib-2.6.6-htmldoc.tar.bz2 2089135 RMD160 1fa6671316c69942b00830627f9dbe34772a5f6a SHA1 b77782bbfcc7de38515e17cacd1ec886c4a8c274 SHA256 b72ce069519850c76e943a7c38f09181028792e449a60e5b0b09ed2aed5c99c7
 DIST ptlib-2.6.7.tar.bz2 3275152 RMD160 b9f0048057f53bb1869979be865f5baea8280162 SHA1 fb37538665995820a714e2fe5e268553995474e8 SHA256 7dd28225fedd21154d34899b21ee4b6d27c88eb1a9f9931c8e6ced28e8f3b97f
-EBUILD ptlib-2.6.7-r1.ebuild 7381 RMD160 e37b2b8881ed7d1363d0645230ac793217dec8ed SHA1 dba5a79badd8ddf665d9e59c0432b89988a87c07 SHA256 383219c5442e847558c6e643bbcd75d4a325d31bf440c9e11e8b5168d40aa43a
-MISC ChangeLog 4002 RMD160 442cd945fbbde2fe9b1d4601c689d9717d0a5803 SHA1 583aaa1b1bfcc929668a0099aa3fa080a403263b SHA256 3a995933526573f7d8a9d43daad2681ad7049f54e812e9c71cebf7f243c3f533
+EBUILD ptlib-2.6.7-r1.ebuild 7577 RMD160 6d78927c04db6ce5dedfe5dfcdefe4cc50273f4c SHA1 885a06ac4a435aaccacba647cef5b73776d63240 SHA256 7d1bd9fb7195792eee07c8e4940d788aa2765d27f4acfb751f04e919d2d1f9de
+MISC ChangeLog 4145 RMD160 d6bd8f4375dc122ba9eb8311e66b64884c4b025f SHA1 2f711a5738981b04bda80e4f324df688a26931ee SHA256 a83d5a5742e822cde00331907a5085126d90af1d45a7c2a5696be7f04469f1fa
 MISC metadata.xml 1160 RMD160 b259b8631049719fe5c9aed02f15b95232860d41 SHA1 78af21a8a19d1d988329da8a70babd744a4e0e6c SHA256 91aa203d63993f44e881c8ee7908d49596ddd1c03b89ea5b041ac86e2877fdb7
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJOrXJFAAoJEEdUh39IaPFNu/MH/2Qh4cYE62hGhGaOJvHAdEz8
-NieGRZPVqYJWM29zwBy9fVKPCnP4fUPdEVuibmcq7L6wngCsz1hmjLjwfaZzJ0oU
-4FWzW/zq2IPokXOeQcr70onVgk03eOFak3YN17g/ktUxtSA0C0Hxkl/FMyKf32B7
-prRMaHmsODKxT5Py3HVp5se5cwktkrfinUy5P/Vsn4t2t86B7AVQWqmCfTFXTzTp
-ExcyrPdh2YT1FGeCNdHJfYWz0eAYM7wJqD1lMJtMRVrAhbavdZkSt/C/e6dIpg2S
-r5oOh64S0GlhajFSMDwQ9BrIjwlDYHedue061Eg8L8jgLvp9eEs0MY+9kMoVLM4=
-=yEIn
+iQIcBAEBAgAGBQJPBLFrAAoJEO/kOhxWD91kte8QALVNd54RM2If7PjGLwyJSID8
+FB1+1E9klslShU0X5o0NQZAzvIBv9xKF96WHb+DEZvMab8lWDriMux37rSXa/q6t
+psx6J4HS7zJdSgIM6Rc2DVE9Xg6Q74GbhGq9TIsphrajldHh/GC/21FKGnYWuaiP
+1Gz/m/bnOuwky8K/EeTRshrK0PegtSCkPjGNqzyufEhlEt4J9qzJMHOmdTTuBsoB
+8LhSzDfSjGuWCcYCbORWM8OUWaavlWqTsWZZvtVbB+eXRHLXunXp53oq3lYy/PGj
+tgvgMJy4qKtjlRxaT68TXAz3aVhHeC97ghDMrXwK8RbN8xKk6goKcq/RnoQezg4O
+KAbJo1CGcUpS2GduyXLYVL+OCRoPnnRmUkBtycQ1zSx4oKt09iRWOSmQ4nwVsUqk
+NbFrk6Hle2oXgzpqXzbm5GS4+6ZTubbwNtbgfgqDzBqGGhvdqpcfNrA5c/EIjJvT
+4N1yPGtgWKgKStWQNpO9jQZEw+IYg57iD9IRDRJ/HlVahrnqRCkbVvPMSrk8SZwQ
+P5kNqXq+Sd5lC0kU6PqUWjHLnBaGQvrFjRvRsRkdCSDqSQkQPviei62rOpDvC84x
+buqFVkdnUvRYsK4ZVBYVmo2Cn8Vp2CrJNTZyr0q66kbdWV2cJ2o3gi3GDzymi9O+
+nie6fjYthJWQpiPBHuTm
+=K0Ag
 -----END PGP SIGNATURE-----