Revert change to postinst behavior in existing ebuild versions. The schema compile fix is now only in 0.4.0-r1.

(Portage version: 2.2.0_alpha134/cvs/Linux x86_64)

4 files changed, 102 insertions, 30 deletions

diff --git a/net-im/telepathy-logger/ChangeLog b/net-im/telepathy-logger/ChangeLog
index 174d1ee14e59..42bbc2b1cd90 100644
--- a/net-im/telepathy-logger/ChangeLog
+++ b/net-im/telepathy-logger/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-im/telepathy-logger
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/ChangeLog,v 1.42 2012/10/09 23:30:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/ChangeLog,v 1.43 2012/10/09 23:45:42 tetromino Exp $
+
+*telepathy-logger-0.4.0-r1 (09 Oct 2012)
+
+  09 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
+  telepathy-logger-0.2.12-r1.ebuild, telepathy-logger-0.4.0.ebuild,
+  +telepathy-logger-0.4.0-r1.ebuild:
+  Revert change to postinst behavior in existing ebuild versions. The schema
+  compile fix is now only in 0.4.0-r1.
 
   09 Oct 2012; Alexandre Rostovtsev <tetromino@gentoo.org>
   -telepathy-logger-0.2.12.ebuild, telepathy-logger-0.2.12-r1.ebuild,
diff --git a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
index 35323e726c15..48e698c3e426 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild,v 1.8 2012/10/09 23:30:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.2.12-r1.ebuild,v 1.9 2012/10/09 23:45:43 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
-inherit gnome2 python virtualx
+inherit gnome2-utils python virtualx
 
 DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used."
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/Logger"
@@ -33,27 +31,34 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig
 "
 
-pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		--enable-call
-		--enable-debug
-		--enable-public-extensions
-		--disable-coding-style-checks
-		--disable-Werror
-		--disable-static"
+DOCS=(AUTHORS ChangeLog NEWS README)
 
+pkg_setup() {
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
-	gnome2_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		--enable-call \
+		--enable-debug \
+		--enable-public-extensions \
+		--disable-coding-style-checks \
+		--disable-Werror \
+		--disable-static
 }
 
 src_test() {
 	gnome2_environment_reset
 	Xemake check || die "make check failed"
 }
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die "la files removal failed"
+}
diff --git a/net-im/telepathy-logger/telepathy-logger-0.4.0-r1.ebuild b/net-im/telepathy-logger/telepathy-logger-0.4.0-r1.ebuild
new file mode 100644
index 000000000000..5fdc8185f54e
--- /dev/null
+++ b/net-im/telepathy-logger/telepathy-logger-0.4.0-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.4.0-r1.ebuild,v 1.1 2012/10/09 23:45:43 tetromino Exp $
+
+EAPI="4"
+PYTHON_DEPEND="2:2.5"
+GCONF_DEBUG="no"
+GNOME2_LA_PUNT="yes"
+
+inherit gnome2 python virtualx
+
+DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used."
+HOMEPAGE="http://telepathy.freedesktop.org/wiki/Logger"
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86 ~x86-linux"
+IUSE="+introspection"
+
+RDEPEND=">=dev-libs/glib-2.25.11:2
+	>=sys-apps/dbus-1.1
+	>=dev-libs/dbus-glib-0.82
+	>=net-libs/telepathy-glib-0.18.0[introspection?]
+	dev-libs/libxml2
+	dev-libs/libxslt
+	dev-db/sqlite:3
+	introspection? ( >=dev-libs/gobject-introspection-0.9.6 )"
+DEPEND="${RDEPEND}
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35
+	virtual/pkgconfig"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog NEWS README"
+	G2CONF="${G2CONF}
+		$(use_enable introspection)
+		--enable-debug
+		--enable-public-extensions
+		--disable-coding-style-checks
+		--disable-Werror
+		--disable-static"
+
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+	gnome2_src_prepare
+}
+
+src_test() {
+	gnome2_environment_reset
+	Xemake check || die "make check failed"
+}
diff --git a/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild b/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
index 498aa207a24e..dc3e149691b2 100644
--- a/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
+++ b/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild
@@ -1,13 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild,v 1.5 2012/10/09 23:30:05 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-logger/telepathy-logger-0.4.0.ebuild,v 1.6 2012/10/09 23:45:42 tetromino Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
 
-inherit gnome2 python virtualx
+inherit gnome2-utils python virtualx
 
 DESCRIPTION="Telepathy Logger is a session daemon that should be activated whenever telepathy is being used."
 HOMEPAGE="http://telepathy.freedesktop.org/wiki/Logger"
@@ -32,25 +30,30 @@ DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
 pkg_setup() {
-	DOCS="AUTHORS ChangeLog NEWS README"
-	G2CONF="${G2CONF}
-		$(use_enable introspection)
-		--enable-debug
-		--enable-public-extensions
-		--disable-coding-style-checks
-		--disable-Werror
-		--disable-static"
-
 	python_set_active_version 2
 	python_pkg_setup
 }
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
-	gnome2_src_prepare
+}
+
+src_configure() {
+	econf \
+		$(use_enable introspection) \
+		--enable-debug \
+		--enable-public-extensions \
+		--disable-coding-style-checks \
+		--disable-Werror \
+		--disable-static
 }
 
 src_test() {
 	gnome2_environment_reset
 	Xemake check || die "make check failed"
 }
+
+src_install() {
+	default
+	find "${D}" -name "*.la" -delete || die "la files removal failed"
+}