From 4003872d3601090eb90c0dbc05ec5af75210ced3 Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Thu, 5 Jan 2012 22:15:01 +0000 Subject: [PATCH] Default to Adwaita theme over Clearlooks to proper gtk3 support, otherwise people still get ugly gtk3 theme if they don't manually set Adwaita. Drop DEPRECATED flags and disable esd support as esound will go away. Remove old. Package-Manager: portage-2.1.10.44/cvs/Linux x86_64 --- gnome-base/libgnome/ChangeLog | 12 +++- gnome-base/libgnome/Manifest | 15 ++--- gnome-base/libgnome/libgnome-2.30.0.ebuild | 64 ------------------- ....32.0.ebuild => libgnome-2.32.1-r1.ebuild} | 34 ++++++---- 4 files changed, 36 insertions(+), 89 deletions(-) delete mode 100644 gnome-base/libgnome/libgnome-2.30.0.ebuild rename gnome-base/libgnome/{libgnome-2.32.0.ebuild => libgnome-2.32.1-r1.ebuild} (62%) diff --git a/gnome-base/libgnome/ChangeLog b/gnome-base/libgnome/ChangeLog index a906b89733aa..6aa439532a1c 100644 --- a/gnome-base/libgnome/ChangeLog +++ b/gnome-base/libgnome/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-base/libgnome -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.211 2011/04/10 12:41:37 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/ChangeLog,v 1.212 2012/01/05 22:15:01 pacho Exp $ + +*libgnome-2.32.1-r1 (05 Jan 2012) + + 05 Jan 2012; Pacho Ramos +libgnome-2.32.1-r1.ebuild, + -libgnome-2.30.0.ebuild, -libgnome-2.32.0.ebuild: + Default to Adwaita theme over Clearlooks to proper gtk3 support, otherwise + people still get ugly gtk3 theme if they don't manually set Adwaita. Drop + DEPRECATED flags and disable esd support as esound will go away. Remove old. 10 Apr 2011; Samuli Suominen libgnome-2.32.1.ebuild: Punt useless static libraries and libtool files. diff --git a/gnome-base/libgnome/Manifest b/gnome-base/libgnome/Manifest index c6c1ca4b9c40..c87c628048fa 100644 --- a/gnome-base/libgnome/Manifest +++ b/gnome-base/libgnome/Manifest @@ -1,21 +1,18 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA1 AUX libgnome-2.26.0-branding.patch 839 RMD160 044966b14e3735c4b95a865f9ff35eeb4aae1b33 SHA1 ea7befc52039d1f5bf19e0cde2d5a18d3eb1a04e SHA256 b7bfd8ea5a29e860d291abd3866ade0a0fa4d6bd9538c8cd7c2b2f6afd2b473a AUX libgnome-2.28.0-menus-have-icons.patch 538 RMD160 f5655320509e0729c78811760f9dbabf9c1d1fe6 SHA1 60a54e3cc5316ba0a27db919661158841d0e0c60 SHA256 55cba8a533b509bf2ae20b7679f4502f3b240f08caf976f99240f57acd111d75 DIST gentoo-gdm-theme-r3.tar.bz2 411703 RMD160 9188c8f2661163be72595a6b4924fae0648e7df5 SHA1 246a7ce67ad9d826b1cca6d90b53369b88be72ac SHA256 c7cbe97757ff93f0ffd42f9d9fb702278a361e830940a03901cda9943f44ba68 -DIST libgnome-2.30.0.tar.bz2 1736034 RMD160 b3b6cad9593feed7b4dc91e48e1559a3954d8e40 SHA1 202c58f1aec5240439af032a88ad087a1805d1cf SHA256 3ed932b94f16614cb03c7661f39b574845970c6ce3ca46e46338409283856f1f -DIST libgnome-2.32.0.tar.bz2 1731179 RMD160 6568dd1fea181c82006ff85f68465df58ed9584d SHA1 8053b1d888b6285df0dd39c2e0bb03569f73fc09 SHA256 d65e49bf075eb2b3efebec38ceb409693154d18396365765da1a71630bc3dd02 DIST libgnome-2.32.1.tar.bz2 1776006 RMD160 e425910756737363ef910e9d2d5cd3820d009441 SHA1 a6bc277ff90ca2f83b91c5bc5222f03ab553a52b SHA256 b2c63916866485793b87398266dd7778548c1734923c272a94d84ee011b6f7a4 -EBUILD libgnome-2.30.0.ebuild 1726 RMD160 f4e7699dc4f6b12bfac91d35bf01532253ebce25 SHA1 14a9c67750fca1a4b5de6110f321362dbd2c1338 SHA256 ab9e4331d18cdf8bf30ab8e65b5e6972fb3609d31d4368493c7109285f81c95c -EBUILD libgnome-2.32.0.ebuild 1751 RMD160 af773e19b6fe0d6cca787c265df4000bf0ed23ee SHA1 f01ed45cd258620a45fcc222157813b43ac84932 SHA256 df26ed6ad2d2434710ea3c1718a3a7b3ddc61cf94d8c3355aac3c9c925fe76cd +EBUILD libgnome-2.32.1-r1.ebuild 1962 RMD160 42d50813e4e1980f998c1cf743b0d72c63ed22d7 SHA1 036424ff644af453115da663c8978ca4db5d2677 SHA256 0386064a362777bfb6a97fc5eb966a8650c1a26a2e3e689b522f21ee4a9bc33e EBUILD libgnome-2.32.1.ebuild 1836 RMD160 afa1df40ac8f5bdb60b937bba075d635799075f6 SHA1 4233c8f5d3f27de5a2855bce9fed729df2df93d7 SHA256 c1006c7ff700b8a92957bb0fa9c215a83f577166c65437eb3e316d94a95f7770 -MISC ChangeLog 25104 RMD160 9dd9c724be4df1650932ebb6f5dc4896cc16d883 SHA1 552ca515b43e134a3bee8843cdd8feee66d80906 SHA256 8f9062e9a406cf9632d474a813ada815d6fd15e874eb9f527dbcefc830c8b898 +MISC ChangeLog 25494 RMD160 42fce6904ef55222aa04ba5de5ecee57e02d4681 SHA1 d40c3cf48a8415329858340e7f0985d3a6d455f1 SHA256 d9250e4e18cad07f670f017e41e59575ddc6b2f48768d0ea05e21f99ffb8a472 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk2hpYsACgkQXkR9YqOcLPHzegD/RijHgUBne0goLaaDuUL7SRae -2b/2Q+HxY+U2FzTWIwMA/0/sVUulCB7POzA7f8UmA1sxSN1TpVLaNUNKtEN8cv1P -=1BVs +iEYEARECAAYFAk8GIOsACgkQCaWpQKGI+9QGtgCfUqTqipRg/JGHlzFkzgxQBeZl +2RwAnAmN6i/VcDtm1tXUP6Pf1wFCTanQ +=P1dH -----END PGP SIGNATURE----- diff --git a/gnome-base/libgnome/libgnome-2.30.0.ebuild b/gnome-base/libgnome/libgnome-2.30.0.ebuild deleted file mode 100644 index a47b0b93fa2f..000000000000 --- a/gnome-base/libgnome/libgnome-2.30.0.ebuild +++ /dev/null @@ -1,64 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.30.0.ebuild,v 1.8 2010/10/17 15:09:03 armin76 Exp $ - -EAPI="2" - -inherit gnome2 eutils - -DESCRIPTION="Essential Gnome Libraries" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ~mips ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="branding doc esd" - -SRC_URI="${SRC_URI} - branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" - -RDEPEND=">=gnome-base/gconf-2 - >=dev-libs/glib-2.16 - >=gnome-base/gnome-vfs-2.5.3 - >=gnome-base/libbonobo-2.13 - >=dev-libs/popt-1.7 - esd? ( - >=media-sound/esound-0.2.26 - >=media-libs/audiofile-0.2.3 )" - -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - >=dev-util/pkgconfig-0.17 - doc? ( >=dev-util/gtk-doc-1 )" - -PDEPEND="gnome-base/gvfs" - -DOCS="AUTHORS ChangeLog NEWS README" - -pkg_setup() { - G2CONF="${G2CONF} --disable-schemas-install $(use_enable esd)" -} - -src_prepare() { - gnome2_src_prepare - - # Make sure menus have icons. People don't like change - epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch" - - use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch - - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed failed" -} - -src_install() { - gnome2_src_install - - if use branding; then - # Add gentoo backgrounds - dodir /usr/share/pixmaps/backgrounds/gnome/gentoo - insinto /usr/share/pixmaps/backgrounds/gnome/gentoo - doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed" - doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed" - fi -} diff --git a/gnome-base/libgnome/libgnome-2.32.0.ebuild b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild similarity index 62% rename from gnome-base/libgnome/libgnome-2.32.0.ebuild rename to gnome-base/libgnome/libgnome-2.32.1-r1.ebuild index c267a652c3bc..e2cadc49a07f 100644 --- a/gnome-base/libgnome/libgnome-2.32.0.ebuild +++ b/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild @@ -1,32 +1,31 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.0.ebuild,v 1.3 2010/12/11 22:34:13 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-base/libgnome/libgnome-2.32.1-r1.ebuild,v 1.1 2012/01/05 22:15:01 pacho Exp $ -EAPI="3" +EAPI="4" GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" +GNOME_TARBALL_SUFFIX="bz2" inherit gnome2 eutils DESCRIPTION="Essential Gnome Libraries" -HOMEPAGE="http://www.gnome.org/" +HOMEPAGE="http://library.gnome.org/devel/libgnome/stable/" LICENSE="LGPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris" -IUSE="branding doc esd" +IUSE="branding doc" SRC_URI="${SRC_URI} branding? ( mirror://gentoo/gentoo-gdm-theme-r3.tar.bz2 )" RDEPEND=">=gnome-base/gconf-2 - >=dev-libs/glib-2.16 + >=dev-libs/glib-2.16:2 >=gnome-base/gnome-vfs-2.5.3 >=gnome-base/libbonobo-2.13 >=dev-libs/popt-1.7 - media-libs/libcanberra - esd? ( - >=media-sound/esound-0.2.26 - >=media-libs/audiofile-0.2.3 )" + media-libs/libcanberra" DEPEND="${RDEPEND} >=dev-lang/perl-5 @@ -38,9 +37,10 @@ PDEPEND="gnome-base/gvfs" pkg_setup() { G2CONF="${G2CONF} + --disable-static --disable-schemas-install --enable-canberra - $(use_enable esd)" + --disable-esd" DOCS="AUTHORS ChangeLog NEWS README" } @@ -51,6 +51,12 @@ src_prepare() { epatch "${FILESDIR}/${PN}-2.28.0-menus-have-icons.patch" use branding && epatch "${FILESDIR}"/${PN}-2.26.0-branding.patch + + # Default to Adwaita theme over Clearlooks to proper gtk3 support + sed -i -e 's/Clearlooks/Adwaita/' schemas/desktop_gnome_interface.schemas.in.in || die + + # Drop DEPRECATED flags + sed -i -e 's:-D[A-Z_]*DISABLE_DEPRECATED:$(NULL):g' libgnome/Makefile.* || die } src_install() { @@ -58,9 +64,9 @@ src_install() { if use branding; then # Add gentoo backgrounds - dodir /usr/share/pixmaps/backgrounds/gnome/gentoo || die "dodir failed" + dodir /usr/share/pixmaps/backgrounds/gnome/gentoo insinto /usr/share/pixmaps/backgrounds/gnome/gentoo - doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png || die "doins 1 failed" - doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png || die "doins 2 failed" + doins "${WORKDIR}"/gentoo-emergence/gentoo-emergence.png + doins "${WORKDIR}"/gentoo-cow/gentoo-cow-alpha.png fi } -- 2.26.2