summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2013-09-28 19:49:31 +0000
committerPacho Ramos <pacho@gentoo.org>2013-09-28 19:49:31 +0000
commit15c651640513351de760d9fd717f1a017f95bae7 (patch)
treefb48f1d01d3894ff774d355b9fa59da413d8e6c6 /dev-util
parentStable for amd64, wrt bug #437508 (diff)
downloadgentoo-2-15c651640513351de760d9fd717f1a017f95bae7.tar.gz
gentoo-2-15c651640513351de760d9fd717f1a017f95bae7.tar.bz2
gentoo-2-15c651640513351de760d9fd717f1a017f95bae7.zip
Version bump, drop old
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-util')
-rw-r--r--dev-util/glade/ChangeLog8
-rw-r--r--dev-util/glade/glade-3.12.1.ebuild71
-rw-r--r--dev-util/glade/glade-3.8.2.ebuild55
-rw-r--r--dev-util/glade/glade-3.8.4.ebuild51
4 files changed, 58 insertions, 127 deletions
diff --git a/dev-util/glade/ChangeLog b/dev-util/glade/ChangeLog
index 727ac0c6cfef..5f9d338e745b 100644
--- a/dev-util/glade/ChangeLog
+++ b/dev-util/glade/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for dev-util/glade
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.189 2013/04/09 16:42:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/ChangeLog,v 1.190 2013/09/28 19:49:31 pacho Exp $
+
+*glade-3.8.4 (28 Sep 2013)
+
+ 28 Sep 2013; Pacho Ramos <pacho@gentoo.org> +glade-3.8.4.ebuild,
+ -glade-3.12.1.ebuild, -glade-3.8.2.ebuild:
+ Version bump, drop old
09 Apr 2013; Agostino Sarubbo <ago@gentoo.org> glade-3.12.2.ebuild,
glade-3.8.3.ebuild:
diff --git a/dev-util/glade/glade-3.12.1.ebuild b/dev-util/glade/glade-3.12.1.ebuild
deleted file mode 100644
index 1ddda703ad45..000000000000
--- a/dev-util/glade/glade-3.12.1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.12.1.ebuild,v 1.12 2012/12/17 06:03:07 tetromino Exp $
-
-EAPI="4"
-GNOME2_LA_PUNT="yes"
-GCONF_DEBUG="yes"
-
-inherit autotools eutils gnome2 versionator
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3.10"
-KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc +introspection python"
-
-RDEPEND="dev-libs/atk[introspection?]
- >=dev-libs/glib-2.32:2
- >=dev-libs/libxml2-2.4.0:2
- x11-libs/cairo
- x11-libs/gdk-pixbuf:2[introspection?]
- >=x11-libs/gtk+-3.4:3[introspection?]
- x11-libs/pango[introspection?]
- introspection? ( >=dev-libs/gobject-introspection-0.10.1 )
- python? ( >=dev-python/pygobject-2.90.4:3 )
-"
-DEPEND="${RDEPEND}
- app-text/docbook-xml-dtd:4.1.2
- >=app-text/gnome-doc-utils-0.18
- app-text/scrollkeeper
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.41.0
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
-
- dev-libs/gobject-introspection-common
- gnome-base/gnome-common
-"
-# eautoreconf requires:
-# dev-libs/gobject-introspection-common
-# gnome-base/gnome-common
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- G2CONF="${G2CONF}
- --disable-static
- --enable-libtool-lock
- --disable-scrollkeeper
- $(use_enable introspection)
- $(use_enable python)"
-}
-
-src_prepare() {
- # To avoid file collison with other slots, rename help module.
- # Prevent the UI from loading glade:3's gladeui devhelp documentation.
- epatch "${FILESDIR}/${P}-doc-version.patch"
- eautoreconf
- gnome2_src_prepare
-}
-
-src_install() {
- # modify Name in .desktop file to avoid confusion with other slots
- sed -e 's:^\(Name.*=Glade\):\1 '$(get_version_component_range 1-2): \
- -i data/glade.desktop || die "sed of data/glade.desktop failed"
- # modify name in .devhelp2 file to avoid shadowing with glade:3 docs
- sed -e 's:name="gladeui":name="gladeui-2":' \
- -i doc/html/gladeui.devhelp2 || die "sed of gladeui.devhelp2 failed"
- gnome2_src_install
-}
diff --git a/dev-util/glade/glade-3.8.2.ebuild b/dev-util/glade/glade-3.8.2.ebuild
deleted file mode 100644
index 2bc4f5a8a0ec..000000000000
--- a/dev-util/glade/glade-3.8.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.2.ebuild,v 1.10 2012/12/17 06:03:07 tetromino Exp $
-
-EAPI="4"
-GCONF_DEBUG="yes"
-GNOME_ORG_MODULE="glade3"
-GNOME2_LA_PUNT="yes"
-
-inherit eutils gnome2
-
-DESCRIPTION="A user interface designer for GTK+ and GNOME"
-HOMEPAGE="http://glade.gnome.org/"
-
-LICENSE="GPL-2+ FDL-1.1+"
-SLOT="3"
-KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="gnome python"
-
-RDEPEND=">=dev-libs/glib-2.8:2
- >=x11-libs/gtk+-2.24:2
- >=dev-libs/libxml2-2.4:2
- gnome? (
- >=gnome-base/libgnomeui-2
- >=gnome-base/libbonoboui-2 )
- python? ( >=dev-python/pygtk-2.10:2 )
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- >=dev-util/intltool-0.35
- virtual/pkgconfig
- sys-devel/gettext
- app-text/scrollkeeper
- >=app-text/gnome-doc-utils-0.9
- app-text/docbook-xml-dtd:4.1.2
-"
-
-pkg_setup() {
- DOCS="AUTHORS ChangeLog NEWS README TODO"
- G2CONF="${G2CONF}
- --enable-libtool-lock
- --disable-scrollkeeper
- $(use_enable gnome)
- $(use_enable python)"
-}
-
-pkg_preinst() {
- gnome2_pkg_preinst
- preserve_old_lib /usr/$(get_libdir)/libgladeui-1.so.9
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- preserve_old_lib_notify /usr/$(get_libdir)/libgladeui-1.so.9
-}
diff --git a/dev-util/glade/glade-3.8.4.ebuild b/dev-util/glade/glade-3.8.4.ebuild
new file mode 100644
index 000000000000..eb8fc5533ac0
--- /dev/null
+++ b/dev-util/glade/glade-3.8.4.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/glade/glade-3.8.4.ebuild,v 1.1 2013/09/28 19:49:31 pacho Exp $
+
+EAPI="5"
+GCONF_DEBUG="yes"
+GNOME_ORG_MODULE="glade3"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_{6,7} )
+
+inherit eutils gnome2 python-single-r1
+
+DESCRIPTION="A user interface designer for GTK+ and GNOME"
+HOMEPAGE="http://glade.gnome.org/"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="3/11" # subslot = suffix of libgladeui-1.so
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="gnome python"
+
+RDEPEND="
+ >=dev-libs/glib-2.8:2
+ >=x11-libs/gtk+-2.24:2
+ >=dev-libs/libxml2-2.4:2
+ gnome? (
+ >=gnome-base/libgnomeui-2
+ >=gnome-base/libbonoboui-2 )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10:2 )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ >=dev-util/intltool-0.35
+ virtual/pkgconfig
+ sys-devel/gettext
+ app-text/scrollkeeper
+ >=app-text/gnome-doc-utils-0.9
+ app-text/docbook-xml-dtd:4.1.2
+"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+ gnome2_src_configure \
+ --enable-libtool-lock \
+ $(use_enable gnome) \
+ $(use_enable python)
+}