summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-16 19:38:00 +0000
committerAlexandre Rostovtsev <tetromino@gentoo.org>2012-12-16 19:38:00 +0000
commit9265e89662779131d0a67a6c18f865947f0c08d7 (patch)
tree86f09d0f5bdc2ca0d573a5232fa34fe3d6722d21 /app-misc/gnote
parentRemoved old (bug #439444 by azemilian). (diff)
downloadgentoo-2-9265e89662779131d0a67a6c18f865947f0c08d7.tar.gz
gentoo-2-9265e89662779131d0a67a6c18f865947f0c08d7.tar.bz2
gentoo-2-9265e89662779131d0a67a6c18f865947f0c08d7.zip
Update license, EAPI5-ize and de-9999-ize ebuild.
(Portage version: 2.2.0_alpha148/cvs/Linux x86_64, signed Manifest commit with key CF0ADD61)
Diffstat (limited to 'app-misc/gnote')
-rw-r--r--app-misc/gnote/ChangeLog5
-rw-r--r--app-misc/gnote/gnote-3.6.1.ebuild28
2 files changed, 12 insertions, 21 deletions
diff --git a/app-misc/gnote/ChangeLog b/app-misc/gnote/ChangeLog
index c54d894651fe..d90b40ee25f0 100644
--- a/app-misc/gnote/ChangeLog
+++ b/app-misc/gnote/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for app-misc/gnote
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.26 2012/12/16 15:27:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/ChangeLog,v 1.27 2012/12/16 19:38:00 tetromino Exp $
+
+ 16 Dec 2012; Alexandre Rostovtsev <tetromino@gentoo.org> gnote-3.6.1.ebuild:
+ Update license, EAPI5-ize and de-9999-ize ebuild.
*gnote-3.6.1 (16 Dec 2012)
diff --git a/app-misc/gnote/gnote-3.6.1.ebuild b/app-misc/gnote/gnote-3.6.1.ebuild
index 85f0991524fe..d633acc8a005 100644
--- a/app-misc/gnote/gnote-3.6.1.ebuild
+++ b/app-misc/gnote/gnote-3.6.1.ebuild
@@ -1,26 +1,19 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.6.1.ebuild,v 1.1 2012/12/16 15:27:38 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/gnote/gnote-3.6.1.ebuild,v 1.2 2012/12/16 19:38:00 tetromino Exp $
-EAPI="4"
+EAPI="5"
GCONF_DEBUG="no"
GNOME2_LA_PUNT="yes"
inherit gnome2
-if [[ ${PV} = 9999 ]]; then
- inherit gnome2-live
-fi
DESCRIPTION="Desktop note-taking application"
HOMEPAGE="http://live.gnome.org/Gnote"
-LICENSE="GPL-3+"
+LICENSE="GPL-3+ FDL-1.1"
SLOT="0"
-if [[ ${PV} = 9999 ]]; then
- KEYWORDS=""
-else
- KEYWORDS="~amd64 ~x86"
-fi
+KEYWORDS="~amd64 ~x86"
IUSE="debug"
# Automagic glib-2.32 dep
@@ -29,10 +22,10 @@ COMMON_DEPEND="
>=dev-cpp/glibmm-2.28:2
>=dev-cpp/gtkmm-3.4:3.0
>=dev-libs/boost-1.34
- >=dev-libs/glib-2.32
+ >=dev-libs/glib-2.32:2
>=dev-libs/libxml2-2:2
dev-libs/libxslt
- >=sys-apps/util-linux-2.16
+ >=sys-apps/util-linux-2.16:=
>=x11-libs/gtk+-3:3
x11-libs/libX11
"
@@ -43,17 +36,12 @@ DEPEND="${DEPEND}
>=dev-util/intltool-0.35.0
virtual/pkgconfig
"
-if [[ ${PV} = 9999 ]]; then
- DEPEND="${DEPEND}
- app-text/yelp-tools"
-fi
src_prepare() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
G2CONF="${G2CONF}
--disable-static
- $(use_enable debug)"
- [[ ${PV} != 9999 ]] && G2CONF="${G2CONF} ITSTOOL=$(type -P true)"
+ $(use_enable debug)
+ ITSTOOL=$(type -P true)"
# Do not alter CFLAGS
sed 's/-DDEBUG -g/-DDEBUG/' -i configure.ac configure || die