diff options
| author |   Gilles Dartiguelongue <eva@gentoo.org> | 2013-04-07 10:49:28 +0000 |
|---|---|---|
| committer | Gilles Dartiguelongue <eva@gentoo.org> | 2013-04-07 10:49:28 +0000 |
| commit | d4f5ec1ceabfed94f90962faffa909dee77cb5f0 (patch) | |
| tree | bb7cbce570a1063ab2d2000b02736f00de7d8c2f /app-office | |
| parent | Version bump. (diff) | |
| download | gentoo-2-d4f5ec1ceabfed94f90962faffa909dee77cb5f0.tar.gz gentoo-2-d4f5ec1ceabfed94f90962faffa909dee77cb5f0.tar.bz2 gentoo-2-d4f5ec1ceabfed94f90962faffa909dee77cb5f0.zip | |
Apply team policy.
(Portage version: 2.2.0_alpha171/cvs/Linux x86_64, signed Manifest commit with key C6085806)
Diffstat (limited to 'app-office')
| -rw-r--r-- | app-office/glabels/ChangeLog | 5 | ||||
| -rw-r--r-- | app-office/glabels/glabels-3.0.1-r1.ebuild | 23 |
2 files changed, 18 insertions, 10 deletions
diff --git a/app-office/glabels/ChangeLog b/app-office/glabels/ChangeLog index 5a56413ff94f..262e88e83b2c 100644 --- a/app-office/glabels/ChangeLog +++ b/app-office/glabels/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-office/glabels # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.69 2013/04/07 07:34:38 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/ChangeLog,v 1.70 2013/04/07 10:49:28 eva Exp $ + + 07 Apr 2013; Gilles Dartiguelongue <eva@gentoo.org> glabels-3.0.1-r1.ebuild: + Apply team policy. *glabels-3.0.1-r1 (07 Apr 2013) diff --git a/app-office/glabels/glabels-3.0.1-r1.ebuild b/app-office/glabels/glabels-3.0.1-r1.ebuild index 9e93097999e3..dbffc38ee66f 100644 --- a/app-office/glabels/glabels-3.0.1-r1.ebuild +++ b/app-office/glabels/glabels-3.0.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.1-r1.ebuild,v 1.1 2013/04/07 07:34:38 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-office/glabels/glabels-3.0.1-r1.ebuild,v 1.2 2013/04/07 10:49:28 eva Exp $ EAPI="5" GCONF_DEBUG="no" @@ -15,7 +15,8 @@ SLOT="0" KEYWORDS="~amd64 ~ppc ~sparc ~x86" IUSE="barcode eds" -RDEPEND=">=dev-libs/glib-2.28.2:2 +RDEPEND=" + >=dev-libs/glib-2.28.2:2 >=x11-libs/gtk+-3.0.9:3 >=dev-libs/libxml2-2.7.8:2 >=gnome-base/librsvg-2.32.0:2 @@ -24,20 +25,18 @@ RDEPEND=">=dev-libs/glib-2.28.2:2 barcode? ( >=app-text/barcode-0.98 >=media-gfx/qrencode-3.1 ) - eds? ( >=gnome-extra/evolution-data-server-2.30.3 )" + eds? ( >=gnome-extra/evolution-data-server-2.30.3 ) +" DEPEND="${RDEPEND} - virtual/pkgconfig - dev-util/gtk-doc-am app-text/scrollkeeper app-text/gnome-doc-utils app-text/docbook-xml-dtd:4.1.2 + dev-util/gtk-doc-am >=dev-util/intltool-0.28 + virtual/pkgconfig " -src_prepare() { - G2CONF="${G2CONF} - $(use_with eds libebook) - --disable-static" +src_prepare() { # Fix desktop entry, upstream bug #684612 sed -i -e 's/.png//' data/desktop/glabels-3.0.desktop.in || die sed -i -e '/Encoding/d' data/desktop/glabels-3.0.desktop.in || die @@ -45,3 +44,9 @@ src_prepare() { # Fix building with eds-3.6 (from master) epatch "${FILESDIR}/${PN}-3.0.1-eds-3.6.patch" } + +src_configure() { + gnome2_src_configure \ + $(use_with eds libebook) \ + --disable-static +} |