summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2013-06-30 18:27:08 +0000
committerMike Frysinger <vapier@gentoo.org>2013-06-30 18:27:08 +0000
commitd40773d1a9a701a2b9ca92136bfcdcbdca98a38e (patch)
treedbc0a4e9174427755a351b449822c215b13f64d8
parentRestore addpredict call to grub-9999. (diff)
downloadgentoo-2-d40773d1a9a701a2b9ca92136bfcdcbdca98a38e.tar.gz
gentoo-2-d40773d1a9a701a2b9ca92136bfcdcbdca98a38e.tar.bz2
gentoo-2-d40773d1a9a701a2b9ca92136bfcdcbdca98a38e.zip
Update SRC_URI to upstream generated one pointed out by Steffen.
(Portage version: 2.2.0_alpha179/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
-rw-r--r--net-libs/libqmi/ChangeLog6
-rw-r--r--net-libs/libqmi/libqmi-1.4.0.ebuild12
-rw-r--r--net-libs/libqmi/libqmi-9999.ebuild12
3 files changed, 17 insertions, 13 deletions
diff --git a/net-libs/libqmi/ChangeLog b/net-libs/libqmi/ChangeLog
index 87c673c861ae..70b07258fec5 100644
--- a/net-libs/libqmi/ChangeLog
+++ b/net-libs/libqmi/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-libs/libqmi
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/ChangeLog,v 1.10 2013/06/26 09:08:30 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/ChangeLog,v 1.11 2013/06/30 18:27:08 vapier Exp $
+
+ 30 Jun 2013; Mike Frysinger <vapier@gentoo.org> libqmi-1.4.0.ebuild,
+ libqmi-9999.ebuild:
+ Update SRC_URI to upstream generated one pointed out by Steffen.
26 Jun 2013; Tony Vroon <chainsaw@gentoo.org> Manifest:
Repeat Zac Medico's fix now that the awkward autogenerated tarball has been
diff --git a/net-libs/libqmi/libqmi-1.4.0.ebuild b/net-libs/libqmi/libqmi-1.4.0.ebuild
index c1f5c6b66f1b..5f31fcffcbeb 100644
--- a/net-libs/libqmi/libqmi-1.4.0.ebuild
+++ b/net-libs/libqmi/libqmi-1.4.0.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-1.4.0.ebuild,v 1.1 2013/06/18 21:29:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-1.4.0.ebuild,v 1.2 2013/06/30 18:27:08 vapier Exp $
EAPI="4"
-inherit multilib autotools
+inherit multilib
if [[ ${PV} == "9999" ]] ; then
- inherit git-2
+ inherit git-2 autotools
EGIT_REPO_URI="git://anongit.freedesktop.org/libqmi"
else
KEYWORDS="~amd64 ~arm ~x86"
- SRC_URI="http://cgit.freedesktop.org/libqmi/snapshot/${P}.tar.gz"
+ SRC_URI="http://www.freedesktop.org/software/libqmi/${P}.tar.xz"
fi
DESCRIPTION="QMI modem protocol helper library"
@@ -21,10 +21,10 @@ SLOT="0"
IUSE="doc static-libs test"
RDEPEND=">=dev-libs/glib-2.32"
-# We have to always depend on gtk-doc since eautoreconf uses it #469214
DEPEND="${RDEPEND}
- dev-util/gtk-doc
+ doc? ( dev-util/gtk-doc )
virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
src_prepare() {
[[ -e configure ]] || eautoreconf
diff --git a/net-libs/libqmi/libqmi-9999.ebuild b/net-libs/libqmi/libqmi-9999.ebuild
index 171e2e165f46..8ccc73cee670 100644
--- a/net-libs/libqmi/libqmi-9999.ebuild
+++ b/net-libs/libqmi/libqmi-9999.ebuild
@@ -1,16 +1,16 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-9999.ebuild,v 1.5 2013/06/18 21:27:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libqmi/libqmi-9999.ebuild,v 1.6 2013/06/30 18:27:08 vapier Exp $
EAPI="4"
-inherit multilib autotools
+inherit multilib
if [[ ${PV} == "9999" ]] ; then
- inherit git-2
+ inherit git-2 autotools
EGIT_REPO_URI="git://anongit.freedesktop.org/libqmi"
else
KEYWORDS="~amd64 ~arm ~x86"
- SRC_URI="http://cgit.freedesktop.org/libqmi/snapshot/${P}.tar.gz"
+ SRC_URI="http://www.freedesktop.org/software/libqmi/${P}.tar.xz"
fi
DESCRIPTION="QMI modem protocol helper library"
@@ -21,10 +21,10 @@ SLOT="0"
IUSE="doc static-libs test"
RDEPEND=">=dev-libs/glib-2.32"
-# We have to always depend on gtk-doc since eautoreconf uses it #469214
DEPEND="${RDEPEND}
- dev-util/gtk-doc
+ doc? ( dev-util/gtk-doc )
virtual/pkgconfig"
+[[ ${PV} == "9999" ]] && DEPEND+=" dev-util/gtk-doc" #469214
src_prepare() {
[[ -e configure ]] || eautoreconf