diff options
| -rw-r--r-- | app-editors/gedit-plugins/Manifest | 2 | ||||
| -rw-r--r-- | app-editors/gedit-plugins/gedit-plugins-3.0.4.ebuild | 2 | ||||
| -rw-r--r-- | gnome-base/gnome-applets/Manifest | 12 | ||||
| -rw-r--r-- | gnome-base/gnome-applets/gnome-applets-9999.ebuild | 2 | ||||
| -rw-r--r-- | gnome-base/gnome-extra-apps/Manifest | 2 | ||||
| -rw-r--r-- | gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild | 2 | ||||
| -rw-r--r-- | gnome-extra/gucharmap/Manifest | 3 | ||||
| -rw-r--r-- | gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild | 62 | ||||
| -rw-r--r-- | gnome-extra/gucharmap/gucharmap-3.0.1-r300.ebuild (renamed from gnome-extra/gucharmap/gucharmap-3.0.1.ebuild) | 24 | ||||
| -rw-r--r-- | profiles/updates/2Q-2011 | 3 |
10 files changed, 90 insertions, 24 deletions
diff --git a/app-editors/gedit-plugins/Manifest b/app-editors/gedit-plugins/Manifest index eb58490e..26a1eb7d 100644 --- a/app-editors/gedit-plugins/Manifest +++ b/app-editors/gedit-plugins/Manifest @@ -1,2 +1,2 @@ DIST gedit-plugins-3.0.4.tar.bz2 1652953 RMD160 43cf1a690f52188e445f662450ea84980cca4b7a SHA1 e16aff8acb9eb6762baf0caba81209f977c77dc9 SHA256 fb945ead17798365773ace0c88099b6162b775581a78745e825f5bdc16aec98b -EBUILD gedit-plugins-3.0.4.ebuild 2471 RMD160 577a9f77fa7f77e2f9f77e8fec8fb9d89cb08d92 SHA1 c0c5540179acbbf8eebbd21a38e3a6d4c152b114 SHA256 756cd09dbb5ecd85d57fcc9fafa34f607e2f2f89a15db8168d726f404783bcb2 +EBUILD gedit-plugins-3.0.4.ebuild 2476 RMD160 d0b5b53a44da2ad26b634e46edb34332a35b4251 SHA1 6c8ed8c25c875390addc21b5b6d02f743a1f3e05 SHA256 c298bafa779c94966433bcac4ebd6939263705f137ceca4d0fa9802053ddf621 diff --git a/app-editors/gedit-plugins/gedit-plugins-3.0.4.ebuild b/app-editors/gedit-plugins/gedit-plugins-3.0.4.ebuild index 2c57407e..5fa9eba0 100644 --- a/app-editors/gedit-plugins/gedit-plugins-3.0.4.ebuild +++ b/app-editors/gedit-plugins/gedit-plugins-3.0.4.ebuild @@ -34,7 +34,7 @@ RDEPEND=">=app-editors/gedit-3.0.0[python?] x11-libs/pango[introspection] x11-libs/gdk-pixbuf:2[introspection] ) - charmap? ( >=gnome-extra/gucharmap-3.0.0[introspection] ) + charmap? ( >=gnome-extra/gucharmap-3.0.0:2.90[introspection] ) synctex? ( >=dev-python/dbus-python-0.82 ) terminal? ( x11-libs/vte:2.90[introspection] )" DEPEND="${RDEPEND} diff --git a/gnome-base/gnome-applets/Manifest b/gnome-base/gnome-applets/Manifest index 167541ac..be4f6a67 100644 --- a/gnome-base/gnome-applets/Manifest +++ b/gnome-base/gnome-applets/Manifest @@ -1,11 +1 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -EBUILD gnome-applets-9999.ebuild 3720 RMD160 ea47d7ab0cb00a6b675cc8b53bac16fb89e881ee SHA1 39674565f36d7e94d08c5c6d83fe9f46c534c6ed SHA256 b32cc6906899df0fe464a7f5874a5b3fe7dcc1201449a3c6c38d3c194d74b543 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.17 (GNU/Linux) - -iEYEARECAAYFAk3ByEQACgkQ1fmVwcYIWAb4GQCfcysytpUHaNp2IsbmZaOnCXEa -jHgAnRLiQEmL7z3Qx/yL+7heP86r/dzI -=j4A4 ------END PGP SIGNATURE----- +EBUILD gnome-applets-9999.ebuild 3725 RMD160 0d4bfe39b92f7663fcbf5aed957a4ebd641a0963 SHA1 9058b9e699c89071dbc779a3a3428b9e376a2eb6 SHA256 7822408618e0705e9019ae73c61efcc5cb801b94d3e174d75702aead99f92f51 diff --git a/gnome-base/gnome-applets/gnome-applets-9999.ebuild b/gnome-base/gnome-applets/gnome-applets-9999.ebuild index e44d64ba..0712c207 100644 --- a/gnome-base/gnome-applets/gnome-applets-9999.ebuild +++ b/gnome-base/gnome-applets/gnome-applets-9999.ebuild @@ -46,7 +46,7 @@ RDEPEND=">=x11-libs/gtk+-3.0.0:3 gnome-base/gnome-settings-daemon gnome-base/libgnome - >=gnome-extra/gucharmap-2.33.0 + >=gnome-extra/gucharmap-2.33.0:2.90 >=gnome-base/libgtop-2.11.92 ) gstreamer? ( >=media-libs/gstreamer-0.10.2 diff --git a/gnome-base/gnome-extra-apps/Manifest b/gnome-base/gnome-extra-apps/Manifest index 32abfff9..2ac12c00 100644 --- a/gnome-base/gnome-extra-apps/Manifest +++ b/gnome-base/gnome-extra-apps/Manifest @@ -1 +1 @@ -EBUILD gnome-extra-apps-3.0.0.ebuild 1265 RMD160 470c61aee2a62ab0b377acedc1f0d26e90d9ea6e SHA1 955385513bef608b906388dd186e8dce05e4ea59 SHA256 e482416ece385920ad6c04d29fe36e49fb6d6c53b2c8fa597fb4fae7b65b311a +EBUILD gnome-extra-apps-3.0.0.ebuild 1270 RMD160 b8a13c06c2f510e138f5922b55d8795581892a66 SHA1 4d8698502e5326fa5dae0cadbc092b57e6f34b00 SHA256 dff15e6bb66ad88752cc9b6b7e7563a7497e5ac362bbba3fc451700aa5bd758d diff --git a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild index af463dba..c3c10fb0 100644 --- a/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild +++ b/gnome-base/gnome-extra-apps/gnome-extra-apps-3.0.0.ebuild @@ -28,7 +28,7 @@ RDEPEND=" >=gnome-extra/gnome-system-monitor-${PV} >=gnome-extra/gnome-tweak-tool-${PV} >=gnome-extra/gnome-utils-${PV} - >=gnome-extra/gucharmap-${PV} + >=gnome-extra/gucharmap-${PV}:2.90 >=mail-client/evolution-${PV} >=media-sound/sound-juicer-2.99 >=media-video/cheese-${PV} diff --git a/gnome-extra/gucharmap/Manifest b/gnome-extra/gucharmap/Manifest index 6378829a..689f251b 100644 --- a/gnome-extra/gucharmap/Manifest +++ b/gnome-extra/gucharmap/Manifest @@ -1,2 +1,3 @@ DIST gucharmap-3.0.1.tar.bz2 3275481 RMD160 21caa11259ea3fbd845db378a68b2bb95bffdffa SHA1 1825f5076577e9e4c46a1687a42d66c8292ebaa3 SHA256 948a376f13af98ffe6be29c73f1d89d2dbc201abd697bb6e85c717d8242dcf75 -EBUILD gucharmap-3.0.1.ebuild 1174 RMD160 d50bd260cbf5e56c01dc9fc2ab40d462e89951d3 SHA1 7c592b3fdb6064481c73e000ce4e8e492cc5cfd9 SHA256 455198ab68a851eed0f2525095bb2ee6e61dce7a481510b95678134725edfa08 +EBUILD gucharmap-3.0.1-r200.ebuild 1651 RMD160 4144d5df9b17357cc0ec877088403d1d8e89c4b7 SHA1 774ab2ef6040b7593b93b200255f71731cb0bffa SHA256 f78ff03e94207c9d5527ba9e07aecb561adeb061b7ced14fecacc426909f96e7 +EBUILD gucharmap-3.0.1-r300.ebuild 1525 RMD160 db36735784743e82d89fc3a5dd7470d391f600c4 SHA1 7a4a02b0d0c8b08e1f330383c7e648e63b423592 SHA256 6800e0276997bf368ea5cc2d3416ec8c177b681205ce97744b85bae4202546df diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild new file mode 100644 index 00000000..b718b9c5 --- /dev/null +++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r200.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gucharmap/gucharmap-2.32.1.ebuild,v 1.1 2010/11/19 21:53:00 pacho Exp $ + +EAPI="3" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit gnome2 + +DESCRIPTION="Unicode character map viewer library" +HOMEPAGE="http://live.gnome.org/Gucharmap" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="cjk doc +introspection" + +RDEPEND=">=dev-libs/glib-2.16.3[introspection?] + >=x11-libs/pango-1.2.1[introspection?] + >=x11-libs/gtk+-2.14.0:2[introspection?] + + introspection? ( >=dev-libs/gobject-introspection-0.9.0 )" +DEPEND="${RDEPEND} + app-text/scrollkeeper + >=dev-util/pkgconfig-0.9 + >=dev-util/intltool-0.40 + + sys-devel/gettext + + doc? ( >=dev-util/gtk-doc-1.0 )" + +pkg_setup() { + G2CONF="${G2CONF} + --disable-static + --disable-scrollkeeper + --disable-maintainer-mode + --with-gtk=2.0 + --disable-charmap + --disable-gconf + $(use_enable introspection) + $(use_enable cjk unihan)" + # gconf is only needed for the gucharmap program + DOCS="AUTHORS ChangeLog NEWS README TODO" +} + +src_prepare() { + # .desktop and schema files are only needed for the gucharmap program + sed -e 's:desktop_DATA\s*=.*:desktop_DATA = :' \ + -e 's:schema_DATA\s*=.*:schema_DATA = :' \ + -i Makefile.* || die "sed Makefile.* failed" + + gnome2_src_prepare +} + +pkg_postinst() { + gnome2_pkg_postinst + if ! has_version "gnome-extra/gucharmap:2.90" ; then + ewarn "Note: ${PF} includes only the gucharmap-2 library." + ewarn "If you need the gucharmap program, emerge gucharmap:2.90" + fi +} diff --git a/gnome-extra/gucharmap/gucharmap-3.0.1.ebuild b/gnome-extra/gucharmap/gucharmap-3.0.1-r300.ebuild index b93d93d2..bccb8df0 100644 --- a/gnome-extra/gucharmap/gucharmap-3.0.1.ebuild +++ b/gnome-extra/gucharmap/gucharmap-3.0.1-r300.ebuild @@ -8,20 +8,22 @@ GNOME2_LA_PUNT="yes" inherit gnome2 -DESCRIPTION="Unicode character map viewer" +DESCRIPTION="Unicode character map viewer and library" HOMEPAGE="http://live.gnome.org/Gucharmap" -LICENSE="GPL-2 LGPL-2.1" -SLOT="0" +LICENSE="GPL-3" +SLOT="2.90" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" IUSE="cjk doc gnome +introspection test" -RDEPEND=">=dev-libs/glib-2.16.3 - >=x11-libs/pango-1.2.1 - >=x11-libs/gtk+-3.0.0:3 +COMMON_DEPEND=">=dev-libs/glib-2.16.3[introspection?] + >=x11-libs/pango-1.2.1[introspection?] + >=x11-libs/gtk+-3.0.0:3[introspection?] gnome? ( gnome-base/gconf:2 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0 )" +RDEPEND="${COMMON_DEPEND} + !!<gnome-extra/gucharmap-3:0" DEPEND="${RDEPEND} app-text/scrollkeeper >=dev-util/pkgconfig-0.9 @@ -42,5 +44,13 @@ pkg_setup() { $(use_enable gnome gconf) $(use_enable introspection) $(use_enable cjk unihan)" - DOCS="ChangeLog NEWS README TODO" + DOCS="AUTHORS ChangeLog NEWS README TODO" +} + +src_prepare() { + # prevent file collisions with slot 0 + sed -e "s:GETTEXT_PACKAGE=gucharmap$:GETTEXT_PACKAGE=gucharmap-${SLOT}:" \ + -i configure.ac configure || die "sed configure.ac configure failed" + + gnome2_src_prepare } diff --git a/profiles/updates/2Q-2011 b/profiles/updates/2Q-2011 index fbfd3ba3..2b5cd769 100644 --- a/profiles/updates/2Q-2011 +++ b/profiles/updates/2Q-2011 @@ -1 +1,4 @@ slotmove =net-libs/rest-0.7* 0 0.7 +slotmove =gnome-extra/gucharmap-2.33.2 0 2.90 +slotmove =gnome-extra/gucharmap-3.0.0 0 2.90 +slotmove =gnome-extra/gucharmap-3.0.1 0 2.90 |