Use properly generated tarballs

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

4 files changed, 16 insertions, 158 deletions

diff --git a/dev-libs/appstream-glib/ChangeLog b/dev-libs/appstream-glib/ChangeLog
index c4c4483fdb9d..68e948dedf52 100644
--- a/dev-libs/appstream-glib/ChangeLog
+++ b/dev-libs/appstream-glib/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/appstream-glib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/ChangeLog,v 1.9 2014/12/05 12:25:36 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/ChangeLog,v 1.10 2014/12/08 12:34:24 pacho Exp $
+
+*appstream-glib-0.3.3-r1 (08 Dec 2014)
+
+  08 Dec 2014; Pacho Ramos <pacho@gentoo.org> +appstream-glib-0.3.3-r1.ebuild,
+  -appstream-glib-0.3.0.ebuild, -appstream-glib-0.3.2.ebuild,
+  -appstream-glib-0.3.3.ebuild:
+  Use properly generated tarballs
 
 *appstream-glib-0.3.3 (05 Dec 2014)
 
diff --git a/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild b/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild
deleted file mode 100644
index 5651a26baeb9..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.0.ebuild,v 1.5 2014/10/23 19:44:41 maekke Exp $
-
-EAPI=5
-
-inherit autotools eutils bash-completion-r1
-
-MY_P="${PN/-/_}_${PV//./_}"
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://github.com/hughsie/appstream-glib"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
-IUSE="+introspection nls"
-
-# FIXME: yaml is optional but not properly handled in autofoo
-RDEPEND="
-	app-arch/libarchive
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.16.1:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4:2
-	>=net-libs/libsoup-2.24:2.4
-	>=x11-libs/gdk-pixbuf-2.14:2
-	x11-libs/gtk+:3
-	x11-libs/pango
-	dev-libs/libyaml
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-"
-# gtk-doc required until package is released properly
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-1.21
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpm \
-		--disable-static \
-		--enable-dep11 \
-		--enable-man \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	prune_libtool_files
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild b/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild
index 067b3a130d70..ef624c76019c 100644
--- a/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild
+++ b/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild
@@ -1,23 +1,23 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.2.ebuild,v 1.3 2014/11/24 11:13:49 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.3-r1.ebuild,v 1.1 2014/12/08 12:34:24 pacho Exp $
 
 EAPI=5
+GCONF_DEBUG="no"
 
-inherit autotools eutils bash-completion-r1
-
-MY_P="${PN/-/_}_${PV//./_}"
+inherit bash-completion-r1 gnome2
 
 DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://github.com/hughsie/appstream-glib"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="http://people.freedesktop.org/~hughsient/appstream-glib/"
+SRC_URI="http://people.freedesktop.org/~hughsient/${PN}/releases/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/7"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
 IUSE="+introspection nls"
 
-# FIXME: yaml is optional but not properly handled in autofoo
+# FIXME: yaml is optional with --enable-dep11 but not
+# properly handled in autofoo bug#????
 RDEPEND="
 	app-arch/libarchive
 	dev-db/sqlite:3
@@ -31,11 +31,9 @@ RDEPEND="
 	dev-libs/libyaml
 	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
 "
-# gtk-doc required until package is released properly
 DEPEND="${RDEPEND}
 	app-text/docbook-xml-dtd:4.3
 	dev-libs/libxslt
-	>=dev-util/gtk-doc-1.21
 	>=dev-util/gtk-doc-am-1.9
 	>=dev-util/intltool-0.40
 	>=sys-devel/gettext-0.17
@@ -46,14 +44,8 @@ RDEPEND="${RDEPEND}
 	!<dev-util/appdata-tools-0.1.8-r1"
 PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
 
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	eautoreconf
-}
-
 src_configure() {
-	econf \
+	gnome2_src_configure \
 		--disable-rpm \
 		--disable-static \
 		--enable-dep11 \
@@ -62,9 +54,3 @@ src_configure() {
 		$(use_enable introspection) \
 		--with-bashcompletiondir="$(get_bashcompdir)"
 }
-
-src_install() {
-	emake install DESTDIR="${D}"
-
-	prune_libtool_files
-}
diff --git a/dev-libs/appstream-glib/appstream-glib-0.3.3.ebuild b/dev-libs/appstream-glib/appstream-glib-0.3.3.ebuild
deleted file mode 100644
index 6b502d65ceca..000000000000
--- a/dev-libs/appstream-glib/appstream-glib-0.3.3.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/appstream-glib/appstream-glib-0.3.3.ebuild,v 1.1 2014/12/05 12:25:36 pacho Exp $
-
-EAPI=5
-
-inherit autotools eutils bash-completion-r1
-
-MY_P="${PN/-/_}_${PV//./_}"
-
-DESCRIPTION="Provides GObjects and helper methods to read and write AppStream metadata"
-HOMEPAGE="https://github.com/hughsie/appstream-glib"
-SRC_URI="https://github.com/hughsie/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/7"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64"
-IUSE="+introspection nls"
-
-# FIXME: yaml is optional but not properly handled in autofoo
-RDEPEND="
-	app-arch/libarchive
-	dev-db/sqlite:3
-	>=dev-libs/glib-2.16.1:2
-	media-libs/fontconfig
-	>=media-libs/freetype-2.4:2
-	>=net-libs/libsoup-2.24:2.4
-	>=x11-libs/gdk-pixbuf-2.14:2
-	x11-libs/gtk+:3
-	x11-libs/pango
-	dev-libs/libyaml
-	introspection? ( >=dev-libs/gobject-introspection-0.9.8 )
-"
-# gtk-doc required until package is released properly
-# https://github.com/hughsie/appstream-glib/issues/26
-DEPEND="${RDEPEND}
-	app-text/docbook-xml-dtd:4.3
-	dev-libs/libxslt
-	>=dev-util/gtk-doc-1.21
-	>=dev-util/gtk-doc-am-1.9
-	>=dev-util/intltool-0.40
-	>=sys-devel/gettext-0.17
-"
-# ${PN} superseeds appdata-tools, require dummy package until all ebuilds
-# are migrated to appstream-glib
-RDEPEND="${RDEPEND}
-	!<dev-util/appdata-tools-0.1.8-r1"
-PDEPEND=">=dev-util/appdata-tools-0.1.8-r1"
-
-S="${WORKDIR}/${PN}-${MY_P}"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-rpm \
-		--disable-static \
-		--enable-dep11 \
-		--enable-man \
-		$(use_enable nls) \
-		$(use_enable introspection) \
-		--with-bashcompletiondir="$(get_bashcompdir)"
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}