Version bump, remove old.
authorPacho Ramos <pacho@gentoo.org>
Sat, 31 Dec 2011 19:18:28 +0000 (19:18 +0000)
committerPacho Ramos <pacho@gentoo.org>
Sat, 31 Dec 2011 19:18:28 +0000 (19:18 +0000)
Package-Manager: portage-2.1.10.44/cvs/Linux x86_64

gnome-extra/gnome-web-photo/ChangeLog
gnome-extra/gnome-web-photo/gnome-web-photo-0.10.5.ebuild [moved from gnome-extra/gnome-web-photo/gnome-web-photo-0.10.2.ebuild with 76% similarity]
gnome-extra/libgda/ChangeLog
gnome-extra/libgda/libgda-4.2.12.ebuild [moved from gnome-extra/libgda/libgda-4.2.10.ebuild with 85% similarity]
gnome-extra/libgda/libgda-5.0.0.ebuild [deleted file]
gnome-extra/libgda/libgda-5.0.1.ebuild [deleted file]

index 8a39055589becf2b6e8ec3083109002663a98144..91c0570c7e13fbfbc5b24a35b23b9eb1a0b08eab 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/gnome-web-photo
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/ChangeLog,v 1.16 2011/12/29 17:45:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/ChangeLog,v 1.17 2011/12/31 19:16:17 pacho Exp $
+
+*gnome-web-photo-0.10.5 (31 Dec 2011)
+
+  31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +gnome-web-photo-0.10.5.ebuild,
+  -gnome-web-photo-0.10.2.ebuild:
+  Version bump, remove old.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> gnome-web-photo-0.10.4.ebuild:
   amd64 stable, bug 393007
similarity index 76%
rename from gnome-extra/gnome-web-photo/gnome-web-photo-0.10.2.ebuild
rename to gnome-extra/gnome-web-photo/gnome-web-photo-0.10.5.ebuild
index 60bca45eddc3fcdc5dbbdeefb3c68b5c843a9d75..6bc49b76024186058bae0fd4b11ff2743640b5cc 100644 (file)
@@ -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/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.2.ebuild,v 1.2 2011/11/06 06:09:27 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-web-photo/gnome-web-photo-0.10.5.ebuild,v 1.1 2011/12/31 19:16:17 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -16,9 +16,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE=""
 
 RDEPEND=">=dev-libs/glib-2.14:2
-       >=x11-libs/gtk+-2.20:2
-       gnome-base/gconf:2
-       >=net-libs/webkit-gtk-1.1.23:2
+       >=x11-libs/gtk+-2.99.3:3
+       >=net-libs/webkit-gtk-1.1.23:3
 "
 DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.19
@@ -27,5 +26,5 @@ DEPEND="${RDEPEND}
 
 pkg_setup() {
        DOCS="AUTHORS ChangeLog HACKING NEWS README TODO"
-       G2CONF="${G2CONF} --with-gtk=2.0"
+       G2CONF="${G2CONF} --with-gtk=3.0"
 }
index 090826f7e5e8136b659a012d0a7831696db452c7..02b3e907d6ac9614be076bae51668ecc5f8491c1 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.188 2011/12/29 17:48:08 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.189 2011/12/31 19:18:28 pacho Exp $
+
+*libgda-4.2.12 (31 Dec 2011)
+
+  31 Dec 2011; Pacho Ramos <pacho@gentoo.org> +libgda-4.2.12.ebuild,
+  -libgda-4.2.10.ebuild, -libgda-5.0.0.ebuild, -libgda-5.0.1.ebuild:
+  Version bump, remove old.
 
   29 Dec 2011; Pacho Ramos <pacho@gentoo.org> libgda-4.2.11.ebuild:
   amd64 stable, bug 393007
similarity index 85%
rename from gnome-extra/libgda/libgda-4.2.10.ebuild
rename to gnome-extra/libgda/libgda-4.2.12.ebuild
index 2ff735c7071921e2bc44aca84e14b4601dc6c481..7ab42d270615bc0d47392c22c1758c42f5c79236 100644 (file)
@@ -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/gnome-extra/libgda/libgda-4.2.10.ebuild,v 1.1 2011/11/01 11:29:34 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-4.2.12.ebuild,v 1.1 2011/12/31 19:18:28 pacho Exp $
 
 EAPI="4"
 GCONF_DEBUG="yes"
@@ -12,12 +12,7 @@ DESCRIPTION="Gnome Database Access Library"
 HOMEPAGE="http://www.gnome-db.org/"
 LICENSE="GPL-2 LGPL-2"
 
-# MDB support currently works with CVS only, so disable it in the meantime
-# and use libgda:5 for that support then
-#
-# vala support doesn't build, see upstream bug #663153
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mysql oci8 postgres sourceview ssl"
-# vala
+IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
 
 SLOT="4"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
@@ -44,11 +39,10 @@ RDEPEND="
        introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
        json?   ( dev-libs/json-glib )
        ldap?   ( net-nds/openldap )
+       mdb?    ( >app-office/mdbtools-0.5 )
        mysql?  ( virtual/mysql )
        postgres? ( dev-db/postgresql-base )
        ssl?    ( dev-libs/openssl )"
-#      vala?   ( >=dev-lang/vala-0.14:0.14 )
-#      mdb?    ( >app-office/mdbtools-0.5 )
 
 DEPEND="${RDEPEND}
        >=dev-util/pkgconfig-0.18
@@ -76,11 +70,13 @@ pkg_setup() {
                fi
        fi
 
+       # Disable vala bindings, they collide with dev-lang/vala's libgda-4.0.vapi
        G2CONF="${G2CONF}
                --with-unique
                --disable-scrollkeeper
                --disable-static
                --enable-system-sqlite
+               --disable-vala
                $(use_with berkdb bdb /usr)
                $(use_with gnome-keyring)
                $(use_with gtk ui)
@@ -91,13 +87,10 @@ pkg_setup() {
                $(use_with java java $JAVA_HOME)
                $(use_enable json)
                $(use_with ldap)
+               $(use_with mdb mdb /usr)
                $(use_with mysql mysql /usr)
                $(use_with postgres postgres /usr)
-               $(use_enable ssl crypto)
-               --disable-vala
-               --without-mdb"
-#              VALAC=$(type -p valac-0.14)"
-#              $(use_with mdb mdb /usr)
+               $(use_enable ssl crypto)"
 
        if use bindist; then
                # firebird license is not GPL compatible
@@ -112,8 +105,6 @@ pkg_setup() {
        # Not in portage
        G2CONF="${G2CONF}
                --disable-default-binary"
-
-       export XDG_DATA_HOME="${T}/.local"
 }
 
 src_prepare() {
diff --git a/gnome-extra/libgda/libgda-5.0.0.ebuild b/gnome-extra/libgda/libgda-5.0.0.ebuild
deleted file mode 100644 (file)
index 5ed4bd5..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.0.ebuild,v 1.1 2011/10/30 05:58:42 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND="
-       app-text/iso-codes
-       >=dev-libs/glib-2.16:2
-       >=dev-libs/libxml2-2
-       dev-libs/libxslt
-       sys-libs/readline
-       sys-libs/ncurses
-       berkdb?   ( sys-libs/db )
-       !bindist? ( firebird? ( dev-db/firebird ) )
-       gtk? (
-               >=x11-libs/gtk+-3.0.0:3
-               canvas? ( x11-libs/goocanvas:2.0 )
-               sourceview? ( x11-libs/gtksourceview:3.0 )
-               graphviz? ( media-gfx/graphviz )
-       )
-       gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-       http? ( >=net-libs/libsoup-2.24:2.4 )
-       introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-       json?     ( dev-libs/json-glib )
-       ldap?     ( net-nds/openldap )
-       mdb?      ( >app-office/mdbtools-0.5 )
-       mysql?    ( virtual/mysql )
-       postgres? ( dev-db/postgresql-base )
-       ssl?      ( dev-libs/openssl )
-       >=dev-db/sqlite-3.6.22:3"
-
-DEPEND="${RDEPEND}
-       >=dev-util/pkgconfig-0.18
-       >=dev-util/intltool-0.35.5
-       >=app-text/gnome-doc-utils-0.9
-       doc? ( >=dev-util/gtk-doc-1 )"
-
-# XXX: some tests fail when run from portage (but pass when building by hand)
-RESTRICT="test"
-
-pkg_setup() {
-       DOCS="AUTHORS ChangeLog NEWS README"
-
-       if use canvas || use graphviz || use sourceview; then
-               if ! use gtk; then
-                       ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-                       ewarn "Disabling for now."
-                       G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-               else
-                       G2CONF="${G2CONF}
-                               $(use_with canvas goocanvas)
-                               $(use_with graphviz)
-                               $(use_with sourceview gtksourceview)"
-               fi
-       fi
-
-       # XXX: vala bindings have build problems: https://bugzilla.gnome.org/show_bug.cgi?id=663009
-       G2CONF="${G2CONF}
-               --disable-scrollkeeper
-               --disable-static
-               --enable-system-sqlite
-               --disable-vala
-               $(use_with berkdb bdb /usr)
-               $(use_with gnome-keyring)
-               $(use_with gtk ui)
-               $(use_with http libsoup)
-               $(use_enable introspection)
-               $(use_with java java $JAVA_HOME)
-               $(use_enable json)
-               $(use_with ldap)
-               $(use_with mdb mdb /usr)
-               $(use_with mysql mysql /usr)
-               $(use_with postgres postgres /usr)
-               $(use_enable ssl crypto)"
-
-       if use bindist; then
-               # firebird license is not GPL compatible
-               G2CONF="${G2CONF} --without-firebird"
-       else
-               G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-       fi
-
-       use berkdb && append-cppflags "-I$(db_includedir)"
-       use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-       # Not in portage
-       G2CONF="${G2CONF}
-               --disable-default-binary"
-
-       export XDG_DATA_HOME="${T}/.local"
-
-       python_set_active_version 2
-       python_pkg_setup
-}
-
-src_prepare() {
-       # Fix build order for generated content, upstream #630958
-       #epatch "${FILESDIR}/${PN}-9999-fix-build-order.patch"
-
-       # Fix compilation failure of keyword_hash.c, upstream #630959
-       #epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
-       # Disable broken tests so we can check the others
-       epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch"
-
-       # Prevent file collisions with libgda:4
-       epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
-       epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-       epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-       # Move files with mv (since epatch can't handle rename diffs) and
-       # update pre-generated gtk-doc files
-       local f
-       for f in tools/browser/doc/gda-browser* ; do
-               mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-       done
-       for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-               sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-                       -i ${f} || die "sed ${f} failed"
-               mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-       done
-       for f in control-center/data/*_gda-control-center.png ; do
-               mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-                       die "mv ${f} failed"
-       done
-
-       python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
-
-       eautoreconf
-       gnome2_src_prepare
-}
-
-src_test() {
-       emake check XDG_DATA_HOME="${T}/.local" || die "tests failed"
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       local d
-       for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-               python_mod_optimize ${d}
-       done
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-       local d
-       for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-               python_mod_cleanup ${d}
-       done
-}
diff --git a/gnome-extra/libgda/libgda-5.0.1.ebuild b/gnome-extra/libgda/libgda-5.0.1.ebuild
deleted file mode 100644 (file)
index 990b6e6..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-5.0.1.ebuild,v 1.1 2011/11/16 18:38:49 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-PYTHON_DEPEND="2"
-
-inherit autotools db-use eutils flag-o-matic gnome2 java-pkg-opt-2 python
-
-DESCRIPTION="Gnome Database Access Library"
-HOMEPAGE="http://www.gnome-db.org/"
-LICENSE="GPL-2 LGPL-2"
-
-IUSE="berkdb bindist canvas doc firebird gnome-keyring gtk graphviz http +introspection json ldap mdb mysql oci8 postgres sourceview ssl vala"
-SLOT="5"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-# FIXME: sqlite is automagic, but maybe it is a hard-dep
-# FIXME: autoconf is a hell of inconsistencies
-RDEPEND="
-       app-text/iso-codes
-       >=dev-libs/glib-2.16:2
-       >=dev-libs/libxml2-2
-       dev-libs/libxslt
-       sys-libs/readline
-       sys-libs/ncurses
-       berkdb?   ( sys-libs/db )
-       !bindist? ( firebird? ( dev-db/firebird ) )
-       gtk? (
-               >=x11-libs/gtk+-3.0.0:3
-               canvas? ( x11-libs/goocanvas:2.0 )
-               sourceview? ( x11-libs/gtksourceview:3.0 )
-               graphviz? ( media-gfx/graphviz )
-       )
-       gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )
-       http? ( >=net-libs/libsoup-2.24:2.4 )
-       introspection? ( >=dev-libs/gobject-introspection-0.6.5 )
-       json?     ( dev-libs/json-glib )
-       ldap?     ( net-nds/openldap )
-       mdb?      ( >app-office/mdbtools-0.5 )
-       mysql?    ( virtual/mysql )
-       postgres? ( dev-db/postgresql-base )
-       ssl?      ( dev-libs/openssl )
-       >=dev-db/sqlite-3.6.22:3"
-
-DEPEND="${RDEPEND}
-       >=dev-util/pkgconfig-0.18
-       >=dev-util/intltool-0.35.5
-       >=app-text/gnome-doc-utils-0.9
-       doc? ( >=dev-util/gtk-doc-1 )
-       vala? ( >=dev-lang/vala-0.14:0.14[vapigen] )"
-
-pkg_setup() {
-       DOCS="AUTHORS ChangeLog NEWS README"
-
-       if use canvas || use graphviz || use sourceview; then
-               if ! use gtk; then
-                       ewarn "You must enable USE=gtk to make use of canvas, graphivz or sourceview USE flag."
-                       ewarn "Disabling for now."
-                       G2CONF="${G2CONF} --without-goocanvas --without-graphivz --without-gtksourceview"
-               else
-                       G2CONF="${G2CONF}
-                               $(use_with canvas goocanvas)
-                               $(use_with graphviz)
-                               $(use_with sourceview gtksourceview)"
-               fi
-       fi
-
-       G2CONF="${G2CONF}
-               --disable-scrollkeeper
-               --disable-static
-               --enable-system-sqlite
-               $(use_with berkdb bdb /usr)
-               $(use_with gnome-keyring)
-               $(use_with gtk ui)
-               $(use_with http libsoup)
-               $(use_enable introspection)
-               $(use_with java java $JAVA_HOME)
-               $(use_enable json)
-               $(use_with ldap)
-               $(use_with mdb mdb /usr)
-               $(use_with mysql mysql /usr)
-               $(use_with postgres postgres /usr)
-               $(use_enable ssl crypto)
-               $(use_enable vala)"
-
-       if use bindist; then
-               # firebird license is not GPL compatible
-               G2CONF="${G2CONF} --without-firebird"
-       else
-               G2CONF="${G2CONF} $(use_with firebird firebird /usr)"
-       fi
-
-       use berkdb && append-cppflags "-I$(db_includedir)"
-       use oci8 || G2CONF="${G2CONF} --without-oracle"
-
-       # Not in portage
-       G2CONF="${G2CONF}
-               --disable-default-binary"
-
-       export XDG_DATA_HOME="${T}/.local"
-
-       python_set_active_version 2
-       python_pkg_setup
-}
-
-src_prepare() {
-       # Fix compilation failure of keyword_hash.c, upstream #630959
-       #epatch "${FILESDIR}/${PN}-4.2.0-missing-include-in-keyword_hash-generator.patch"
-
-       # Disable broken tests so we can check the others
-       epatch "${FILESDIR}/${PN}-4.99.4-disable-broken-tests.patch"
-
-       # Prevent file collisions with libgda:4
-       epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-help-collision.patch"
-       epatch "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
-       epatch "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"
-       # Move files with mv (since epatch can't handle rename diffs) and
-       # update pre-generated gtk-doc files
-       local f
-       for f in tools/browser/doc/gda-browser* ; do
-               mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-       done
-       for f in tools/browser/doc/html/gda-browser.devhelp* ; do
-               sed -e 's:name="gda-browser":name="gda-browser-5.0":' \
-                       -i ${f} || die "sed ${f} failed"
-               mv ${f} ${f/gda-browser/gda-browser-5.0} || die "mv ${f} failed"
-       done
-       for f in control-center/data/*_gda-control-center.png ; do
-               mv ${f} ${f/_gda-control-center.png/_gda-control-center-5.0.png} ||
-                       die "mv ${f} failed"
-       done
-
-       python_convert_shebangs -r 2 libgda-report/RML/trml2{html,pdf}
-
-       # Fix valac version
-       sed -e 's:"$VALA_BINDIR/valac":"$VALA_BINDIR/valac-0.14":' \
-               -i configure.ac || die "sed failed"
-
-       eautoreconf
-       gnome2_src_prepare
-}
-
-pkg_postinst() {
-       gnome2_pkg_postinst
-       local d
-       for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-               python_mod_optimize ${d}
-       done
-}
-
-pkg_postrm() {
-       gnome2_pkg_postrm
-       local d
-       for d in /usr/share/libgda-5.0/gda_trml2{html,pdf} ; do
-               python_mod_cleanup ${d}
-       done
-}