diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-11-13 12:05:52 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-11-13 12:05:52 +0000 |
| commit | 0ee7b665cf1fd4f10bf53df491ac78838d3c0763 (patch) | |
| tree | c432689d2234d6c75fee600ae739fb37aef8fc60 | |
| parent | Drop package due bug #508854 (diff) | |
| download | historical-0ee7b665cf1fd4f10bf53df491ac78838d3c0763.tar.gz historical-0ee7b665cf1fd4f10bf53df491ac78838d3c0763.tar.bz2 historical-0ee7b665cf1fd4f10bf53df491ac78838d3c0763.zip | |
Drop old (#508854)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4
81 files changed, 158 insertions, 3656 deletions
diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog index b463e3bb5c38..eaecf0da1acb 100644 --- a/gnome-extra/evolution-data-server/ChangeLog +++ b/gnome-extra/evolution-data-server/ChangeLog @@ -1,6 +1,19 @@ # ChangeLog for gnome-extra/evolution-data-server # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.403 2014/11/11 11:40:44 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.404 2014/11/13 11:47:52 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -evolution-data-server-2.32.3-r3.ebuild, + -evolution-data-server-3.12.7.1.ebuild, + -files/e-d-s-camel-skip-failing-test.patch, + -files/evolution-data-server-2.31-gentoo_etc_services.patch, + -files/evolution-data-server-2.32.3-g_thread_init.patch, + -files/evolution-data-server-2.32.3-gmodule-explicit.patch, + -files/evolution-data-server-2.32.3-imap-move.patch, + -files/evolution-data-server-2.32.3-libical-0.48.patch, + -files/evolution-data-server-2.32.3-libxml2-2.9.patch, + -files/fix_relink_command.pl: + Drop old (#508854) *evolution-data-server-3.12.8 (11 Nov 2014) diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest index a1aff16902f6..aba45d99cca5 100644 --- a/gnome-extra/evolution-data-server/Manifest +++ b/gnome-extra/evolution-data-server/Manifest @@ -2,29 +2,16 @@ Hash: SHA256 AUX calentry.schema 3661 SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431 SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 WHIRLPOOL 2255a4b0b98f55476388bb97ac5bf1bf2b7107b56c2a93f55142e7ae0892c8f93874fd0731663362bacb4ad85302a6cb8a22a7228bba0724fb45d1eb37f406a1 -AUX e-d-s-camel-skip-failing-test.patch 660 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5 SHA512 c5bd8e1d86c000dc9dcfe0ab4d78df7d064fafb650c086b31e5b15e4e2ea269627eaf19b9743b7354e32a60e0aced19979d1c84be329b557cfcd23e019765121 WHIRLPOOL c21875187b5e86c9ca712b3d29cb81c2e9c923e08690fdbf12b86d8aa06e01707478230d67b855a0035c4dfa6e667a63d0ee5bbacd36ca9a1d99b7132fd7c90a -AUX evolution-data-server-2.31-gentoo_etc_services.patch 1350 SHA256 1dae07ed5cb124c2da6e0d28f4e64555b6fb2bc012ceee3506f0af6e3e41102a SHA512 738d5c38239a509949f49d2b6c8cee1bf9996ca501b0daaae9b194bb8a487c0841e80fcbb467ff0fcd6369c3e78154619c48459bd559700a66e4033ce88cecb2 WHIRLPOOL 027c8020ba7f2d1d4f6a7b43dffbdbddd29c0c28e7082aee8a9c653f3fb78f78789da45481aaca0250b5c8905bc2ba78cdeb535a2b426b2e97c7ba79409f4f7c -AUX evolution-data-server-2.32.3-g_thread_init.patch 5091 SHA256 23d3bd95ab952dd572547b64e1c430443586094cd8049b5034c12811fb7be162 SHA512 79e7606a9d2e2f1b3358dd47dd2b66152c008f57cbbdd411e5373da16441fbcb6776ea03a9a7badeb04370e026b0cc1944769fa3466b6593d003c234296c3573 WHIRLPOOL 61c19d778226795699d6748dd3fb7c471e74577f6341d7d611f691abc96ba1c15821e891077cd7a8ca3cea4be28bf8019c1c2eee1f8dfe4e3cad4deb23be0f8e -AUX evolution-data-server-2.32.3-gmodule-explicit.patch 2137 SHA256 cb936b70909a9a6588de0c8ba8b1c2fe2f9a5b288620c40d992774a9302f05df SHA512 cb6b4cc2bc8c825de2d7073f3e874d98860bba8b0aad1f042f5069516733995faa713a6ea85907770f42df0204a55b1745da2a142b6f272f6b482d55533189fc WHIRLPOOL d8e727759ace5e110fcf146bfe1df54f1abaab797465485d012bad537a9550404885a107beab02f8e78aa9e317a47ac1178e03fcab03a83be72e889414db1ce4 -AUX evolution-data-server-2.32.3-imap-move.patch 2647 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f SHA512 f3def00fcf4b392b1e4f9c5d222897ea5f0f767557d7a790f72bab76c994332c273d27af509d5037519b872dffacd85a8cf204a4c2b2b38b3fc68719a3346c3c WHIRLPOOL c9428f28c92c24522fa46f572e030435ef807aea049186c3e20b300c1948521b08f2f88b6b22fa7567d14929eed7332ba3e8d923cda0a64b9655921d2372f716 -AUX evolution-data-server-2.32.3-libical-0.48.patch 920 SHA256 7d38183419b479502623382252be86fabd707a8dbb1f1ff20c6e5e07207dad11 SHA512 112f1722e5ca8e763ed8a16bb73c7dd86d90e40baa50df2fe6fbc094c0db8305b4f7f057d60301626cd4c784279dfaf45aa6ede0a5ea6cdc6b236464568f0bb3 WHIRLPOOL 5192f3bceed1d17806f057849518b9e0e1ed5f482a9e111bfc6fc90aad6af96325951ced570753d4b7025f7b568cafbf85632b09184a50a58c1c5fc2b5611748 -AUX evolution-data-server-2.32.3-libxml2-2.9.patch 4438 SHA256 db65f8053098409e13a59365cbe4c6a0ae1edcfd7e850330ac0dc9edf74daf7c SHA512 e76d902e3be48324024dec5a5f3898c1d21f0900a4787df85612e557503a5f3982227f72dddfa340c11e4d1e4d0fbeca58efa75e10feb44adcf2cf9fe64b0b89 WHIRLPOOL 666e1f356ff5f5f6fb5c9c5630e88b0b4fb2af445ad7eae6838ee66154efa5d8da33cc243c59ed870196c12cf0e207e72e48049b0065af428e2ca310826e15fa -AUX fix_relink_command.pl 4074 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9b56c3c188d43fadc7dabc2 SHA512 bb6d512f00e976c708395d9552aaa30afab17ad09c04e57488a11505565542396f450d9121c6ff0d8becca84778ade24873a39fcc785aa62e523fc038f1fe054 WHIRLPOOL e94d4b6c51936b9184401cf36f7cf108cbec2f806bf0a4660289cdd7ebe8a370bb396f77d9cb9d463c741eeaacb655c7771f113b0a79f7b429b4569d1e28e43a -DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2 -DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580 DIST evolution-data-server-3.12.4.tar.xz 5450044 SHA256 5e424ec560e46e0b26d290d04ad5146d9b313a956abcf99ef46ac3d8633060c7 SHA512 24e3ff14c54845c22e038034ea537e5a1f9a57cd7d7aab8a5b16db3a40bf394282c47467b2b5829ab577e275eaabcd566b4a9ba1a18dd185f4dbe0818ff94cc8 WHIRLPOOL f8989993970adbcd10fd3511d4ad0ceeff6897509c4f048c3c993be6ef6de858fe1a20889eaeebda096b31b159a5b0dfd68cea191bfad88330c2662cf295ee41 -DIST evolution-data-server-3.12.7.1.tar.xz 5390360 SHA256 7b2cc3169267801aef2b76a832a7df72af7bd1931fe1d98f474df9f306d4f79e SHA512 7fb39aa68d141eb51fed246e940c58baac612f58caad01a6880c285fe7393049276130462f8e3b992ac6ea0d1adf6339c90170db62f01028f265ecc5b447ef8f WHIRLPOOL 2975b69f0e3379f6341569180ecc7db310e888c1b874e38f12e9f7f1e6da569d4084177db18b9244337e5ce06135dddf35f078febd16a1b7c9a84ad87adb469c DIST evolution-data-server-3.12.8.tar.xz 5392696 SHA256 06fb4b9a1137b77a53e94eb69e4aeedd8f92d1bd1cfa0175f607660dd3b30818 SHA512 570b2c7b160a625517bc85de690f3fad03bef0fbb8bd2019e597f3a4071833478bae64c253a4fcb97c9025b8f1f97e927729caa484c207bb486d9891faccfcd6 WHIRLPOOL 15e9b3bae7b1e24c10e497a9b17571a26bc35e15b871d6a56ad5076a2795f2a86aa1b3d753f4dc1fe98b0c38155522a9bde983d3484c65e6a94b3d684840c259 -EBUILD evolution-data-server-2.32.3-r3.ebuild 5155 SHA256 131f1419171c2d7a877f7290948965dba3d3316cf24401bd48962e1e8993d661 SHA512 4340c7b1bac68b292d8a5a9c1fa51a316554d8307bdc7f2ce5cf28dfdf2c8ff58a9cecf350190359f20c39bf419931669ff8bbb540e7549f1b9c19798a10b27e WHIRLPOOL a12d27c6cc552b31c7407b1c583fd707cc01bd02ded30e5791ab26d82b6b4d8a6958846e3a2b34f91707b06f80c602e6efbb61d81d4b9a48c95758c92616cddd EBUILD evolution-data-server-3.12.4.ebuild 3418 SHA256 fad4cbd71ebb534ab8349a655e9f708817736ed98fa9d3be7c858433ec45a0c7 SHA512 f329f0d073e21f473e98fc4b0a8b1945c13f776c540648a1673a8e299182fc8032623fb5eb063330090002754304acd9c06820c4d965d5c7e00356957140b647 WHIRLPOOL 284db3b3144be320d4f17f33beabd0c8dc1221804613a73ae5396a009e852109ad8ce263feca5970967d3e7ddff926b114ddda8feba456b3d9e7faf66a78ab91 -EBUILD evolution-data-server-3.12.7.1.ebuild 3462 SHA256 73e519ab24a6191a1da403bd2e7a69fcc9e8ec76de20c7e27497352eb3f2deab SHA512 786fd059553d3f08c2d84898e502fc2f60fec43f7fe265685b3fadf0ce2a3b7878eb95758ff2286243e8a9c5cf4ce4636aec9e48cb681eef9114d1d5a326ea01 WHIRLPOOL d100acc89db52768e2000256af6609e82c783e41ff16ea112ed27058573aa88cc063025f29278e44461662300a5d3fa3c1a2c66bcd34f88258e21440218edb04 EBUILD evolution-data-server-3.12.8.ebuild 3461 SHA256 079e3dc7267e2e680b3019d4ee43554cdeda7be568e697961827baa2918a49f2 SHA512 12f9b3f5e65549afc8ed6603d07a8f26784bed648ac14505d1a8f9a7bbf97c2fe51431004833d3970a79aedb97b7c69b019d33f04831290ade4aff1f6ad3f28c WHIRLPOOL 0ee1d6fb2561675863894b02a13ee2e2f0c46d56f566364458adc75adf5e5abae14dbc1a280af216b3eca2ea4ab41694a8830eaefbd85e1f428dfa4595906807 -MISC ChangeLog 78021 SHA256 90eba639f1a0a2b22a6c564901b9b7e9f49bd705b53da46c50f05d7f9f7be8cd SHA512 989ed67a769c8e1458e3c4ecf826c1e49e3ff35f30786dc3d52f8cf09d65deb66bc33c97d839531aa3dfa771eadcbe20f6ae3958dc45459203e5e6894a554173 WHIRLPOOL d5afce51cb55f7811b1eb4d556333d825f34e3752f2121ef6047ea5d0eed9939ae87a960f9a33cdb05657425b15b8284da2b8937a6a31179db566d85cae5b1f3 +MISC ChangeLog 78606 SHA256 0a0788f4d9cef2d8b92248083be9cea0c56207008cddc5870d7b8b44e5224fd3 SHA512 fd1903b598cc2218297ebf1fdafb03e7f479ca4d0dc7351cb21f800defa358646f4cb61cc88ad3d833c4f88f7cb153c4486f31627929f40df6a8f474806e66a3 WHIRLPOOL 85b82c33888c1675430bf744bc1555ddd2649606cebe6dd0b61fb604df4d58f97706468029d91b6f7199bea1b65a6fa84e7e1c7c8c4fe5d0d3cb2861c7530c87 MISC metadata.xml 506 SHA256 3b17f5d3335559ed8198c33f0866c39d854a452218344082d4453dddf555710b SHA512 4916d65f5fc5ccf4ddb5bd12717e3d839e01240df064c0b485f106713aa28573dd9a79944d2f4db0371fd766f8ff2938580b91fc90d2a72e44b9829f4e026b89 WHIRLPOOL 6b863b456d3e3c87a88cfcdfaaa105b4620524d840af99cafb9a70ea6ae619113e3c5e9575f3f7d4e487a695aa26aa3246e79c36059fa555f158d5fc3923a86a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlRh9b0ACgkQCaWpQKGI+9SqGQCdFQwbxcTm4WLwiBrplKn9O7HO -8W8An2T1EcoS3Cs9kcTpy8I2dRqQ7cmg -=HC52 +iEYEAREIAAYFAlRkmmoACgkQCaWpQKGI+9RX7ACfaWMN2b/O1bXP6YP3H7jXAlY2 +h68An1IO2X2nGwiCJLS7gi6PO2gqHpcg +=o/Vk -----END PGP SIGNATURE----- diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild deleted file mode 100644 index 128e8594dec0..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild +++ /dev/null @@ -1,170 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild,v 1.10 2013/02/24 11:25:55 ago Exp $ - -EAPI="5" -GCONF_DEBUG="no" -GNOME_TARBALL_SUFFIX="bz2" -WANT_AUTOMAKE="1.11" - -inherit autotools db-use eutils flag-o-matic gnome2 versionator virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="http://projects.gnome.org/evolution/" - -SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.xz" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" - -IUSE="ipv6 kerberos gnome-keyring ldap +weather" - -RDEPEND=">=dev-libs/glib-2.25.12:2 - >=x11-libs/gtk+-2.24:2 - >=gnome-base/gconf-2 - >=dev-db/sqlite-3.5:= - >=dev-libs/libgdata-0.6.3:= - >=dev-libs/libical-0.43:= - >=net-libs/libsoup-2.4:2.4 - >=dev-libs/libxml2-2:= - >=sys-libs/db-4:= - sys-libs/zlib:= - virtual/libiconv - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - gnome-keyring? ( gnome-base/libgnome-keyring ) - kerberos? ( virtual/krb5 ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( - >=dev-libs/libgweather-2.25.4:2 - <dev-libs/libgweather-2.91:2 ) -" -DEPEND="${RDEPEND} - dev-util/gperf - virtual/pkgconfig - >=dev-util/intltool-0.35.5 - sys-devel/bison - >=gnome-base/gnome-common-2 - >=dev-util/gtk-doc-am-1.9" -# eautoreconf needs: -# >=gnome-base/gnome-common-2 - -src_prepare() { - DOCS="ChangeLog MAINTAINERS NEWS TODO" - - # ssl stuff always enabled as recommended in upstream bug #642984 - G2CONF="${G2CONF} - $(use_enable gnome-keyring) - $(use_enable ipv6) - $(use_with kerberos krb5 /usr) - $(use_with ldap openldap) - $(use_with weather) - --disable-gtk3 - --enable-largefile - --with-libdb=/usr - --enable-ssl - --enable-smime" - - # Adjust to gentoo's /etc/service - epatch "${FILESDIR}/${PN}-2.31-gentoo_etc_services.patch" - - # GNOME bug 611353 (skips failing test atm) - epatch "${FILESDIR}/e-d-s-camel-skip-failing-test.patch" - - # GNOME bug 621763 (skip failing test-ebook-stress-factory--fifo) - sed -e 's/\(SUBDIRS =.*\)ebook/\1/' \ - -i addressbook/tests/Makefile.{am,in} \ - || die "failing test sed 1 failed" - - # Apply multiple backports and fixed from master and 2.32 branches - # - # 009 and 010 patches are broken, bug #372651 - rm "${WORKDIR}/${P}-patches"/009*.patch || die - rm "${WORKDIR}/${P}-patches"/010*.patch || die - epatch "${WORKDIR}/${P}-patches"/*.patch - - # Upstream bug #655167 - Messages moved from IMAP Inbox reappear - epatch "${FILESDIR}/${P}-imap-move.patch" - - # Fix building with glib-2.32, bug #412109 - epatch "${FILESDIR}/${P}-gmodule-explicit.patch" - epatch "${FILESDIR}/${P}-g_thread_init.patch" - - # Upstream bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48) - epatch "${FILESDIR}/${P}-libical-0.48.patch" - - # Fix building with libxml2-2.9, backported from eds-3.6 - epatch "${FILESDIR}/${P}-libxml2-2.9.patch" - - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # FIXME: Fix compilation flags crazyness - sed 's/^\(AM_CPPFLAGS="\)$WARNING_FLAGS/\1/' \ - -i configure.ac configure || die "sed 3 failed" - - sed -e "/AM_INIT_AUTOMAKE/s/-Werror//" -i configure.ac || die - - eautoreconf - gnome2_src_prepare -} - -src_install() { - # Prevent this evolution-data-server from linking to libs in the installed - # evolution-data-server libraries by adding -L arguments for build dirs to - # every .la file's relink_command field, forcing libtool to look there - # first during relinking. This will mangle the .la files installed by - # make install, but we don't care because we will be punting them anyway. - perl "${FILESDIR}/fix_relink_command.pl" . \ - || die "fix_relink_command.pl failed" - - gnome2_src_install - - if use ldap; then - MY_MAJORV=$(get_version_component_range 1-2) - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema || die "doins failed" - dosym /usr/share/${PN}-${MY_MAJORV}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - unset ORBIT_SOCKETDIR - unset SESSION_MANAGER - export XDG_DATA_HOME="${T}" - unset DISPLAY - Xemake check || die "Tests failed." -} - -pkg_preinst() { - gnome2_pkg_preinst - - for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \ - libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \ - libedata-book-1.2.so.2 libebook-1.2.so.9 \ - libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8 - do - preserve_old_lib /usr/$(get_libdir)/$lib - done -} - -pkg_postinst() { - gnome2_pkg_postinst - - for lib in libcamel-provider-1.2.so.14 libedata-cal-1.2.so.7 \ - libgdata-1.2.so libgdata-google-1.2.so libcamel-1.2.so.14 \ - libedata-book-1.2.so.2 libebook-1.2.so.9 \ - libedataserver-1.2.so.13 libecal-1.2.so.7 libedataserverui-1.2.so.8 - do - preserve_old_lib_notify /usr/$(get_libdir)/$lib - done - - if use ldap; then - elog "" - elog "LDAP schemas needed by evolution are installed in /etc/openldap/schema" - fi -} diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild deleted file mode 100644 index de6770038bc8..000000000000 --- a/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.12.7.1.ebuild,v 1.1 2014/10/15 15:41:55 leio Exp $ - -EAPI="5" -GCONF_DEBUG="no" -# python3 not really supported, bug #478678 -PYTHON_COMPAT=( python2_7 pypy pypy2_0 ) -VALA_MIN_API_VERSION="0.18" -VALA_USE_DEPEND="vapigen" - -inherit db-use flag-o-matic gnome2 python-any-r1 vala virtualx - -DESCRIPTION="Evolution groupware backend" -HOMEPAGE="https://wiki.gnome.org/Apps/Evolution" - -# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+". -LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat" -SLOT="0/49" # subslot = libcamel-1.2 soname version -IUSE="api-doc-extras +gnome-online-accounts +gtk +introspection ipv6 ldap kerberos vala +weather" -REQUIRED_USE="vala? ( introspection )" - -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris" - -RDEPEND=" - >=app-crypt/gcr-3.4 - >=app-crypt/libsecret-0.5[crypt] - >=dev-db/sqlite-3.5:= - >=dev-libs/glib-2.36:2 - >=dev-libs/libgdata-0.10:= - >=dev-libs/libical-0.43:= - >=net-libs/libsoup-2.42:2.4 - >=dev-libs/libxml2-2 - >=dev-libs/nspr-4.4:= - >=dev-libs/nss-3.9:= - >=sys-libs/db-4:= - - dev-libs/icu:= - sys-libs/zlib:= - virtual/libiconv - - gtk? ( - >=app-crypt/gcr-3.4[gtk] - >=x11-libs/gtk+-3.2:3 - ) - gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8 ) - introspection? ( >=dev-libs/gobject-introspection-0.9.12 ) - kerberos? ( virtual/krb5:= ) - ldap? ( >=net-nds/openldap-2:= ) - weather? ( >=dev-libs/libgweather-3.8:2= ) -" -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/gdbus-codegen - dev-util/gperf - >=dev-util/gtk-doc-am-1.14 - >=dev-util/intltool-0.35.5 - >=gnome-base/gnome-common-3.5.5 - >=sys-devel/gettext-0.17 - virtual/pkgconfig - vala? ( $(vala_depend) )" -# eautoreconf needs: -# >=gnome-base/gnome-common-2 - -# Some tests fail due to missings locales. -# Also, dbus tests are flacky, bugs #397975 #501834 -# It looks like a nightmare to disable those for now. -RESTRICT="test" - -pkg_setup() { - python-any-r1_pkg_setup -} - -src_prepare() { - use vala && vala_src_prepare - - # Fix relink issues in src_install - ELTCONF="--reverse-deps" - - gnome2_src_prepare - - # Fix compilation flags crazyness, upstream bug #653157 - sed 's/^\(AM_CFLAGS="\)$WARNING_FLAGS/\1/' \ - -i configure || die "sed failed" -} - -src_configure() { - # /usr/include/db.h is always db-1 on FreeBSD - # so include the right dir in CPPFLAGS - append-cppflags "-I$(db_includedir)" - - # phonenumber does not exist in tree - gnome2_src_configure \ - $(use_enable api-doc-extras gtk-doc) \ - $(use_with api-doc-extras private-docs) \ - $(use_enable gnome-online-accounts goa) \ - $(use_enable gtk) \ - $(use_enable introspection) \ - $(use_enable ipv6) \ - $(use_with kerberos krb5 "${EPREFIX}"/usr) \ - $(use_with ldap openldap) \ - $(use_enable vala vala-bindings) \ - $(use_enable weather) \ - --enable-google \ - --enable-largefile \ - --enable-smime \ - --with-libdb="${EPREFIX}"/usr \ - --without-phonenumber \ - --disable-examples \ - --disable-uoa -} - -src_install() { - gnome2_src_install - - if use ldap; then - insinto /etc/openldap/schema - doins "${FILESDIR}"/calentry.schema - dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema - fi -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - unset ORBIT_SOCKETDIR - unset SESSION_MANAGER - unset DISPLAY - Xemake check -} diff --git a/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch b/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch deleted file mode 100644 index 3c07f0959139..000000000000 --- a/gnome-extra/evolution-data-server/files/e-d-s-camel-skip-failing-test.patch +++ /dev/null @@ -1,22 +0,0 @@ -We are currently skipping this test so we can pass make check -Upstream bug: https://bugzilla.gnome.org/show_bug.cgi?id=611353 -diff --git a/calendar/tests/ecal/test-ecal-get-free-busy.c b/calendar/tests/ecal/test-ecal-get-free-busy.c -index 8ecdf7e..471d807 100644 ---- a/calendar/tests/ecal/test-ecal-get-free-busy.c -+++ b/calendar/tests/ecal/test-ecal-get-free-busy.c -@@ -10,6 +10,7 @@ - gint - main (gint argc, gchar **argv) - { -+#if 0 - ECal *cal; - gchar *uri = NULL; - GList *users = NULL; -@@ -34,6 +35,6 @@ main (gint argc, gchar **argv) - - g_list_foreach (free_busy, (GFunc) g_object_unref, NULL); - g_list_free (free_busy); -- -+#endif - return 0; - } diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch deleted file mode 100644 index b7c7dceebc98..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.31-gentoo_etc_services.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 02cc551defa9cb222216b4ae03a9e883a9abcb64 Mon Sep 17 00:00:00 2001 -From: Romain Perier <mrpouet@gentoo.org> -Date: Mon, 28 Sep 2009 21:34:36 +0200 -Subject: [PATCH] Adjust imap+pop3 stuffs to gentoo services - ---- - camel/providers/imap/camel-imap-store.c | 2 +- - camel/providers/pop3/camel-pop3-store.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c -index a5eb640..1574e79 100644 ---- a/camel/providers/imap/camel-imap-store.c -+++ b/camel/providers/imap/camel-imap-store.c -@@ -846,7 +846,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex) - fallback_port = ssl_options[i].fallback_port; - } else { - mode = MODE_CLEAR; -- serv = (gchar *) "imap"; -+ serv = (gchar *) "imap2"; - fallback_port = IMAP_PORT; - } - -diff --git a/camel/providers/pop3/camel-pop3-store.c b/camel/providers/pop3/camel-pop3-store.c -index 89be794..a79c06b 100644 ---- a/camel/providers/pop3/camel-pop3-store.c -+++ b/camel/providers/pop3/camel-pop3-store.c -@@ -268,7 +268,7 @@ connect_to_server_wrapper (CamelService *service, CamelException *ex) - fallback_port = ssl_options[i].fallback_port; - } else { - mode = MODE_CLEAR; -- serv = (gchar *) "pop3"; -+ serv = (gchar *) "pop-3"; - fallback_port = POP3S_PORT; - } - - --- -1.6.5.rc1 - diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch deleted file mode 100644 index d85910a79245..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-g_thread_init.patch +++ /dev/null @@ -1,149 +0,0 @@ -From ffdfc6c7005e967a96f9ad0ea32ce782f0126a56 Mon Sep 17 00:00:00 2001 -From: Milan Crha <mcrha@redhat.com> -Date: Mon, 24 Oct 2011 09:42:17 +0200 -Subject: [PATCH] Call g_thread_init() conditionally - -[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32] ---- - addressbook/libedata-book/e-data-book-factory.c | 2 ++ - calendar/backends/file/e-cal-backend-file.c | 2 ++ - calendar/libedata-cal/e-data-cal-factory.c | 2 ++ - camel/camel-index-control.c | 4 +++- - camel/camel-text-index.c | 2 ++ - camel/providers/imapx/test-imapx.c | 2 ++ - camel/tests/lib/camel-test.c | 2 ++ - libedataserverui/test-name-selector.c | 2 ++ - servers/groupwise/soap-test.c | 2 ++ - 9 files changed, 19 insertions(+), 1 deletions(-) - -diff --git a/addressbook/libedata-book/e-data-book-factory.c b/addressbook/libedata-book/e-data-book-factory.c -index 310ee2b..7c25f9c 100644 ---- a/addressbook/libedata-book/e-data-book-factory.c -+++ b/addressbook/libedata-book/e-data-book-factory.c -@@ -602,7 +602,9 @@ main (gint argc, gchar **argv) - - g_type_init (); - g_set_prgname (E_PRGNAME); -+ #if !GLIB_CHECK_VERSION(2,31,0) - if (!g_thread_supported ()) g_thread_init (NULL); -+ #endif - - factory = g_object_new (E_TYPE_DATA_BOOK_FACTORY, NULL); - -diff --git a/calendar/backends/file/e-cal-backend-file.c b/calendar/backends/file/e-cal-backend-file.c -index 9bacb88..3721240 100644 ---- a/calendar/backends/file/e-cal-backend-file.c -+++ b/calendar/backends/file/e-cal-backend-file.c -@@ -3786,7 +3786,9 @@ main(gint argc, gchar **argv) - FILE* fin = NULL; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - context = g_option_context_new ("- test utility for e-d-s file backend"); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); -diff --git a/calendar/libedata-cal/e-data-cal-factory.c b/calendar/libedata-cal/e-data-cal-factory.c -index db9cc1c..aa35082 100644 ---- a/calendar/libedata-cal/e-data-cal-factory.c -+++ b/calendar/libedata-cal/e-data-cal-factory.c -@@ -911,7 +911,9 @@ main (gint argc, gchar **argv) - - g_type_init (); - g_set_prgname (E_PRGNAME); -+ #if !GLIB_CHECK_VERSION(2,31,0) - if (!g_thread_supported ()) g_thread_init (NULL); -+ #endif - - #ifdef HAVE_ICAL_UNKNOWN_TOKEN_HANDLING - ical_set_unknown_token_handling_setting (ICAL_DISCARD_TOKEN); -diff --git a/camel/camel-index-control.c b/camel/camel-index-control.c -index 771cba2..9c15971 100644 ---- a/camel/camel-index-control.c -+++ b/camel/camel-index-control.c -@@ -124,7 +124,9 @@ gint main(gint argc, gchar **argv) - if (argc<2) - do_usage(argv[0]); - -- g_thread_init(NULL); -+ #if !GLIB_CHECK_VERSION(2,31,0) -+ g_thread_init (NULL); -+ #endif - camel_init(NULL, 0); - - if (!strcmp(argv[1], "compress")) -diff --git a/camel/camel-text-index.c b/camel/camel-text-index.c -index e242669..8240608 100644 ---- a/camel/camel-text-index.c -+++ b/camel/camel-text-index.c -@@ -1851,7 +1851,9 @@ gint main (gint argc, gchar **argv) - - printf ("Camel text index tester!\n"); - -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - camel_init (NULL, 0); - - idx = (CamelIndex *)camel_text_index_new ("textindex", O_CREAT|O_RDWR|O_TRUNC); -diff --git a/camel/providers/imapx/test-imapx.c b/camel/providers/imapx/test-imapx.c -index ede8d65..6db0ab7 100644 ---- a/camel/providers/imapx/test-imapx.c -+++ b/camel/providers/imapx/test-imapx.c -@@ -36,7 +36,9 @@ main (gint argc, gchar *argv[]) - } - - uri = argv[1]; -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - system ("rm -rf /tmp/test-camel-imapx"); - camel_init ("/tmp/test-camel-imapx", TRUE); - camel_provider_init (); -diff --git a/camel/tests/lib/camel-test.c b/camel/tests/lib/camel-test.c -index 44a20ae..42703e8 100644 ---- a/camel/tests/lib/camel-test.c -+++ b/camel/tests/lib/camel-test.c -@@ -99,8 +99,10 @@ camel_test_init(gint argc, gchar **argv) - setup = 1; - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - /* yeah, we do need ot thread init, even though camel isn't compiled with enable threads */ - g_thread_init (NULL); -+ #endif - - path = g_strdup_printf ("/tmp/camel-test"); - if (mkdir (path, 0700) == -1 && errno != EEXIST) -diff --git a/libedataserverui/test-name-selector.c b/libedataserverui/test-name-selector.c -index 71552b1..8f92e2d 100644 ---- a/libedataserverui/test-name-selector.c -+++ b/libedataserverui/test-name-selector.c -@@ -83,7 +83,9 @@ gint - main (gint argc, gchar **argv) - { - gtk_init (&argc, &argv); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - camel_init (NULL, 0); - -diff --git a/servers/groupwise/soap-test.c b/servers/groupwise/soap-test.c -index 221a8b7..0ab93f0 100644 ---- a/servers/groupwise/soap-test.c -+++ b/servers/groupwise/soap-test.c -@@ -49,7 +49,9 @@ gint - main (gint argc, gchar *argv[]) - { - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - - /* Hostname Eg: http(s)://domain_name:/port_number/soap */ - if (argc != 3 && argc != 4) { --- -1.7.8.5 - diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch deleted file mode 100644 index 3e1f4ed3f936..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-gmodule-explicit.patch +++ /dev/null @@ -1,52 +0,0 @@ -From be8a4f87a7187e0da249cd66444125d25e76afb1 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Diego=20L=C3=B3pez=20Le=C3=B3n?= <dieguitoll@gmail.com> -Date: Tue, 29 Nov 2011 19:34:12 -0600 -Subject: [PATCH] Bug 664819 - gmodule-2.0 dependency must be explicit - -[Alexandre Rostovtsev <tetromino@gentoo.org>: backport to 2.32.3] ---- - configure.ac | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0879fcf..9ff3dab 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -319,6 +319,7 @@ dnl Check for base dependencies early. - dnl *********************************** - PKG_CHECK_MODULES(GNOME_PLATFORM, - [gio-2.0 >= glib_minimum_version -+ gmodule-2.0 >= glib_minimum_version - $GTK_MODULE - gconf-2.0 >= gconf_minimum_version - libxml-2.0 >= libxml_minimum_version -@@ -1198,7 +1199,7 @@ AC_DEFUN([EVO_SET_COMPILE_FLAGS], [ - dnl ****************************** - dnl libedataserver flags - dnl ****************************** --E_DATA_SERVER_DEPS="gio-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr" -+E_DATA_SERVER_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 libsoup-2.4 gconf-2.0 $mozilla_nspr" - - EVO_SET_COMPILE_FLAGS(E_DATA_SERVER, $E_DATA_SERVER_DEPS, $MANUAL_NSPR_CFLAGS, $MANUAL_NSPR_LIBS) - AC_SUBST(E_DATA_SERVER_CFLAGS) -@@ -1213,7 +1214,7 @@ EVO_SET_COMPILE_FLAGS(E_DATA_SERVER_UI, $E_DATA_SERVER_UI_DEPS, , ) - AC_SUBST(E_DATA_SERVER_UI_CFLAGS) - AC_SUBST(E_DATA_SERVER_UI_LIBS) - --E_BACKEND_DEPS="gio-2.0 libxml-2.0 gconf-2.0" -+E_BACKEND_DEPS="gio-2.0 gmodule-2.0 libxml-2.0 gconf-2.0" - - dnl ****************************** - dnl libebackend flags -@@ -1356,7 +1357,7 @@ fi - - AM_CONDITIONAL(ENABLE_LARGEFILE, [test "x$enable_largefile" = "xyes"]) - --EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS) -+EVO_SET_COMPILE_FLAGS(CAMEL, gio-2.0 gmodule-2.0 $mozilla_nss sqlite3 >= sqlite_minimum_version, $KRB5_CFLAGS $MANUAL_NSS_CFLAGS $LARGEFILE_CFLAGS, -lz $KRB5_LIBS $MANUAL_NSS_LIBS) - AC_SUBST(CAMEL_CFLAGS) - AC_SUBST(CAMEL_LIBS) - AC_SUBST(CAMEL_GROUPWISE_CFLAGS) --- -1.7.8.5 - diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch deleted file mode 100644 index 1fd7830dd720..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-imap-move.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 3ac86d14dc1ea89424de3c83e4d4b21eb1d1020e Mon Sep 17 00:00:00 2001 -From: Michel Dänzer <daenzer@debian.org> -Date: Wed, 02 Nov 2011 07:35:56 +0000 -Subject: Bug #655167 - Messages moved from IMAP Inbox reappear - ---- -diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c -index 77faa64..751e6cd 100644 ---- a/camel/providers/imap/camel-imap-folder.c -+++ b/camel/providers/imap/camel-imap-folder.c -@@ -68,11 +68,6 @@ enum { - PROP_CHECK_FOLDER = 0x2500 - }; - --enum { -- /* used when moving messages and has real trash folder set with a google account */ -- CAMEL_MESSAGE_IMAP_MOVED = CAMEL_MESSAGE_FOLDER_FLAGGED << 1 --}; -- - extern gint camel_application_is_exiting; - - static gboolean imap_rescan (CamelFolder *folder, gint exists, GCancellable *cancellable, GError **error); -@@ -1417,7 +1412,7 @@ get_matching (CamelFolder *folder, - } - } - -- if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_MESSAGE_IMAP_MOVED)) == CAMEL_MESSAGE_DELETED) { -+ if (deleted_uids && (info->info.flags & (CAMEL_MESSAGE_DELETED | CAMEL_IMAP_MESSAGE_MOVED)) == CAMEL_MESSAGE_DELETED) { - g_ptr_array_add (deleted_uids, (gpointer) camel_pstring_strdup (camel_message_info_uid (info))); - info->info.flags &= ~CAMEL_MESSAGE_DELETED; - } else if (junked_uids && (info->info.flags & CAMEL_MESSAGE_JUNK) != 0) { -@@ -1747,7 +1742,7 @@ imap_synchronize_sync (CamelFolder *folder, - info->info.flags &= ~CAMEL_MESSAGE_DELETED; - } - -- info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_MESSAGE_IMAP_MOVED); -+ info->info.flags &= ~(CAMEL_MESSAGE_FOLDER_FLAGGED | CAMEL_IMAP_MESSAGE_MOVED); - ((CamelImapMessageInfo *) info)->server_flags = info->info.flags & CAMEL_IMAP_SERVER_FLAGS; - info->info.dirty = TRUE; /* Sync it back to the DB */ - if (((CamelMessageInfo *) info)->summary) -@@ -2841,7 +2836,7 @@ do_copy (CamelFolder *source, - CamelMessageInfoBase *info = (CamelMessageInfoBase *) camel_folder_summary_get (source->summary, uids->pdata[i]); - - if (info) -- info->flags |= CAMEL_MESSAGE_IMAP_MOVED; -+ info->flags |= CAMEL_IMAP_MESSAGE_MOVED; - } - } - last = uid; ---- a/camel/providers/imap/camel-imap-summary.h~ 2011-04-21 21:35:36.000000000 +0200 -+++ b/camel/providers/imap/camel-imap-summary.h 2012-02-12 18:15:16.419609530 +0100 -@@ -53,7 +53,9 @@ - G_BEGIN_DECLS - - enum { -- CAMEL_IMAP_MESSAGE_RECENT = 1<<17 -+ CAMEL_IMAP_MESSAGE_RECENT = 1 << 17, -+ /* used when moving messages and has real trash folder set with a google account */ -+ CAMEL_IMAP_MESSAGE_MOVED = 1 << 18 - }; - - typedef struct _CamelImapSummary CamelImapSummary; diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch deleted file mode 100644 index dd4e20b06a78..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libical-0.48.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 830fa86226aa2c4fd0687aef605c93920888e3c4 Mon Sep 17 00:00:00 2001 -From: Milan Crha <mcrha@redhat.com> -Date: Mon, 30 Jan 2012 18:25:41 +0000 -Subject: Bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48) - ---- -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c -index 694e64a..50cece5 100644 ---- a/calendar/backends/caldav/e-cal-backend-caldav.c -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c -@@ -422,6 +422,24 @@ ecalcomp_get_etag (ECalComponent *comp) - - str = icomp_x_prop_get (icomp, X_E_CALDAV "ETAG"); - -+ /* libical 0.48 escapes quotes, thus unescape them */ -+ if (str && strchr (str, '\\')) { -+ gint ii, jj; -+ -+ for (ii = 0, jj = 0; str[ii]; ii++) { -+ if (str[ii] == '\\') { -+ ii++; -+ if (!str[ii]) -+ break; -+ } -+ -+ str[jj] = str[ii]; -+ jj++; -+ } -+ -+ str[jj] = 0; -+ } -+ - return str; - } - --- -cgit v0.9.0.2 diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch deleted file mode 100644 index 765e4aea8ca1..000000000000 --- a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch +++ /dev/null @@ -1,121 +0,0 @@ -From 9792cbd0f131a972e132a60fa59c89244dea793d Mon Sep 17 00:00:00 2001 -From: Colin Walters <walters@verbum.org> -Date: Mon, 13 Aug 2012 09:50:50 -0400 -Subject: [PATCH] Bug 681321 - Support both old and new-buf libxml2 APIs - -libxml2 changed the API for xmlOutputBuffer incompatibly. -See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html ---- - calendar/backends/caldav/e-cal-backend-caldav.c | 35 +++++++++++++++++++------ - 1 file changed, 27 insertions(+), 8 deletions(-) - -diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c -index 80c5a39..4343857 100644 ---- a/calendar/backends/caldav/e-cal-backend-caldav.c -+++ b/calendar/backends/caldav/e-cal-backend-caldav.c -@@ -499,6 +499,19 @@ quote_etag (const gchar *etag) - return ret; - } - -+static gconstpointer -+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, -+ gsize *out_len) -+{ -+#ifdef LIBXML2_NEW_BUFFER -+ *out_len = xmlOutputBufferGetSize (buf); -+ return xmlOutputBufferGetContent (buf); -+#else -+ *out_len = buf->buffer->use; -+ return buf->buffer->content; -+#endif -+} -+ - /* ************************************************************************* */ - - static gboolean -@@ -1035,6 +1048,8 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) - xmlDocPtr doc; - xmlNodePtr root, node; - xmlNsPtr ns, nsdav; -+ gconstpointer buf_content; -+ gsize buf_size; - gboolean result = TRUE; - - g_return_val_if_fail (cbdav != NULL, TRUE); -@@ -1069,11 +1084,11 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav) - soup_message_headers_append (message->request_headers, - "Depth", "0"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1131,6 +1146,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint - xmlDocPtr doc; - xmlNsPtr nsdav; - xmlNsPtr nscd; -+ gconstpointer buf_content; -+ gsize buf_size; - gboolean result; - - priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav); -@@ -1211,11 +1228,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint - soup_message_headers_append (message->request_headers, - "Depth", "1"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1499,6 +1516,8 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - xmlDocPtr doc; - xmlNodePtr root, node; - xmlNsPtr nsdav; -+ gconstpointer buf_content; -+ gsize buf_size; - gchar *owner = NULL; - - g_return_val_if_fail (cbdav != NULL, FALSE); -@@ -1527,11 +1546,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); - soup_message_headers_append (message->request_headers, "Depth", "0"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); -@@ -1577,11 +1596,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav) - soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION); - soup_message_headers_append (message->request_headers, "Depth", "0"); - -+ buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size); - soup_message_set_request (message, - "application/xml", - SOUP_MEMORY_COPY, -- (gchar *) buf->buffer->content, -- buf->buffer->use); -+ buf_content, buf_size); - - /* Send the request now */ - send_and_handle_redirection (priv->session, message, NULL); --- -1.8.1.2 - diff --git a/gnome-extra/evolution-data-server/files/fix_relink_command.pl b/gnome-extra/evolution-data-server/files/fix_relink_command.pl deleted file mode 100644 index 12106c3856d6..000000000000 --- a/gnome-extra/evolution-data-server/files/fix_relink_command.pl +++ /dev/null @@ -1,108 +0,0 @@ -#!/usr/bin/perl -# Fix the relink_command field of .la files in the specified directory tree -# to add "-L$dir/.libs" for every .la file that is specified in a relative -# $dir; place these new -L directives before the first relative .la file. -# -# E.g. : -# relink_command="(cd /tmp/foo/libfoo; /bin/sh /tmp/foo/libtool --silent --tag CC --mode=relink gcc -O2 foo.lo bar/libbar.la ../baz/libbaz.la /usr/lib/libfrob.la -lm)" -# will become -# relink_command="(cd /tmp/foo/libfoo; /bin/sh /tmp/foo/libtool --silent --tag CC --mode=relink gcc -O2 foo.lo -Lbar/.libs -L../baz/.libs bar/libbar.la ../baz/libbaz.la /usr/lib/libfrob.la -lm)" -# -# Such a procedure should ensure that during relinking, libraries in the -# local build tree will be looked at before libraries installed systemwide. -# -# Limitations: it is assumed that relink_command is one line. It is assumed -# that any spaces in paths are escaped using '\'. -# -# Copyright (c) 2011 Alexandre Rostovtsev <tetromino@gmail.com> -# -# This program is free software; you can redistribute it and/or modify it -# under the same terms as Perl itself. -use strict; -use warnings; - -use Cwd qw(realpath); -use File::Basename; -use File::Find; - -my %processed = (); -sub process_la_file { - my $filename = $_; # relative to cwd - my $pretty_filename = $File::Find::name; # relative to initial cwd - if (-d $filename) { return; } - - # don't process a single .la file multiple times (e.g. if symlinked) - my $realpath = realpath($filename); - if ($processed{$realpath}) { - print "$pretty_filename ($realpath) was already processed\n"; - return; - } else { - $processed{$realpath}++; - } - - # preserve the .la file's mtime in order to avoid triggering make rules - my $mtime = (stat $filename)[9]; - open(my $fh, '<', $filename) or die $!; - my $text; - my $changes; # whether the file has been changed - while (<$fh>) { - if (/relink_command=/) { - my ($start, $added, $end); - my $ignore = 0; # number of words to not check for similariy to - # an .la filename, following and including the - # current word - # split by unescaped spaces - for my $word (split /(?<!\\) /) { - if ($word =~ /^-/) { - # ignore command-line options; ignore filename after -o - $ignore++; - $ignore++ if $word eq '-o' ; - } - if ($word =~ m:^[^/].*\.la\W*$: and not $ignore) { - $added .= "-L" . dirname($word) . "/.libs "; - $end .= "$word "; - $changes++; - } else { - if ($end) { - $end .= "$word "; - } else { - $start .= "$word "; - } - } - $ignore-- if $ignore > 0; - } - $_ = "$start$added$end"; - print "Added '$added' to relink_command in $pretty_filename\n" if $changes; - } - $text .= $_; - } - close $fh; - if ($changes) { - open($fh, '>', $filename) or die $!; - print $fh $text; - close $fh; - # Perl's utime does not support sub-second time :/ - # And Time::HiRes doesn't help. As a workaround, round up the number of - # seconds in order to avoid triggering make rules. - utime $mtime + 1, $mtime + 1, $filename; - } -} - -if (not @ARGV or $ARGV[0] eq '-h' or $ARGV[0] eq '--help') { - warn <<endhelp; -Usage: fix_relink_command.pl [LAFILENAMES or DIRECTORIES] - -Adds extra -L\$dir/.libs arguments to the relink_command field of .la files -in order to ensure that during relinking, libraries in the local build tree -will be looked at before ones installed systemwide. - -If a filename is given, will process that .la file. If a directory is given, -will recursively process all .la files in it (but will not recurse into -symlinked or hidden directories). -endhelp - exit; -} - -find({ wanted => \&process_la_file, - preprocess => sub {grep { if (-d $_) { /^[^.]/ } else { /\.la$/ } } sort @_} - }, @ARGV); diff --git a/gnome-extra/gconf-editor/ChangeLog b/gnome-extra/gconf-editor/ChangeLog index 4f009e2687da..06c9b2dee976 100644 --- a/gnome-extra/gconf-editor/ChangeLog +++ b/gnome-extra/gconf-editor/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for gnome-extra/gconf-editor # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.185 2014/04/26 19:00:45 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/ChangeLog,v 1.186 2014/11/13 11:49:57 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -gconf-editor-2.32.0.ebuild: + Drop old (#508854) 26 Apr 2014; Pacho Ramos <pacho@gentoo.org> -gconf-editor-3.0.1.ebuild: drop old diff --git a/gnome-extra/gconf-editor/Manifest b/gnome-extra/gconf-editor/Manifest index 4a358c343d56..7a7c0b2b129a 100644 --- a/gnome-extra/gconf-editor/Manifest +++ b/gnome-extra/gconf-editor/Manifest @@ -3,16 +3,14 @@ Hash: SHA256 AUX gconf-editor-3.0.1-assertion-crash.patch 1194 SHA256 395e2cee14e0246c0da88c19fc0dcf4a0684c519905be34dbcebb97c3fb577ef SHA512 5fbe8a51d4f678f7444cfd8683ce171280031c8870a18efea709a5f0667f7701893f6d0d65df72cc6267b01f7a34c925529c5b814ab47a9a270568b3391b6bfc WHIRLPOOL c00a21a4d5af2703a681b2d61223ca64499b8c30e24c43e24cb13e08138bdbc3c0dac73e083863886475b2f775b294e14138f4b1e35d3412792676e1dc7fb33c AUX gconf-editor-3.0.1-drop-accel.patch 1383 SHA256 c37e88038127dee1372a32b16160c5ecb0ea829293defe24c5b5859778b75b9f SHA512 c50c4fbbd25170ca7a7261f590862927e5f68eb5d1529ac5252175caa28ea916484d284e307580297f23e2ee8df7822f12e75c2912f8ab808946997d032fedff WHIRLPOOL cb2f3fe9f0f21acf802242eb55e0d663729612707b7886c7fc8f0def102b7c61e408016112a5c64190be71fa8adf93129734434e37b9ad2b4fe3c4170aff2816 -DIST gconf-editor-2.32.0.tar.bz2 1397117 SHA256 c6d1d35ce5d136121ad76efe1c4033425bb2ad3800e711bd1bca9ce869c12a1f DIST gconf-editor-3.0.1.tar.xz 1452468 SHA256 3064e84967b4b4216f5c7e065cfec8c52019438a590e9ed81366af2770660944 SHA512 faaf237233d94730902d7c8e231545841862451f5998ef06bc3d51f6cdf0bc16bd1cecfc6b6a9e0ccc5197a06bb4f89068bfb478f900f3272ba03a2d94ec2f49 WHIRLPOOL 991a5b7d6b02b3472a9207bb5750d18552ba5da15570f7f884950b838177431a42b1ebb0131bbf3f76abe8f6098a2af88e542ec88d22135f9c8684da0543703f -EBUILD gconf-editor-2.32.0.ebuild 853 SHA256 0a6c2a456de557e411e481ac2a6efc0cedb28ffa08c4b167851cb33c21f74ac5 SHA512 bd620269fd7ecbf11fa65802135e802ff95c2f1d7915d5e2a537a3c5cb3e40c0c5fda0f4feb1d1c3d3400e51b189feeaebfef1c01e5ce8071dfba9e187e3bc5c WHIRLPOOL 1180218fc35d1822d23effbb87fe837aaecbf6d29d79d5cd95ec7e106db0325dcf8143012996215358093f754059045728904f35fe0a902362f4eaa3517ea78f EBUILD gconf-editor-3.0.1-r1.ebuild 1042 SHA256 84d5f0053cd15e0eff0d0f9dd850d32f680bfbf13defaa7c585f744f2f89af8c SHA512 af8339d963f0a78f03325ae68ecadc644095d604d93abb68857615f0423d3e77b15eb63e387b604e89304627bd409c0c86b68db822488d1ee8af324ee8a7bdb1 WHIRLPOOL 8f10d0c62338eea9ade6dda9a095281d4cc6e5b56225e951ff2bb0f1af0b4dd1081f529bde5b7262569a5985384c7b999e3f532711752d99526eb02a3edafdf7 -MISC ChangeLog 22650 SHA256 5be570deba1c92bd42c40ffa245921020dd250aed93093b96a0a90dcfbc5b2ec SHA512 3414759111f3a00f4261e4c6b84b948456f4792c0c6a3dee070795c41193eb3d81a816d6b24788fb1308c44173bd8c5f0167d744a2466240bf862e14ee60bd37 WHIRLPOOL 5cdb0621e3cdd8beb187712da99930375d40486abbd58c3fd1d263f7bf59e42b7fe3463beec2100ae3d609df717369e40761c9de0bba7058acca5422ab197975 +MISC ChangeLog 22747 SHA256 e3781859973a9aea599762507cab88cf5e8a13dad1b2cdd1d93d36fc51cda901 SHA512 fad760ffc8c3a0816c97b70bf7046d5b01bc8ac3c55a57ad803c45fa4697ab3f19a472dd6f2cce37c9f47abb3295539c919e43fd0471ff3423a1a565f4eebfdd WHIRLPOOL b7af497154d3a16b96f301c9de76b725d657632ba96f982045d399d39e2a78b547923922d97b8be66b4f4fff7be96f28baf2bd35b8eacc44f8e77a0031c1e391 MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlNcAl4ACgkQCaWpQKGI+9RS3gCggBI3js+VFA3FT6dPkDU1fhhN -EzYAnRMHJFVsEPQ6Znaqnoj9+Dqq1xtV -=8p0h +iEYEAREIAAYFAlRkmuYACgkQCaWpQKGI+9RBuQCeOKd7lVkJplEZt2R0F6QMnpAD +u/sAn3baQvJ8E+VsOXLfDbsQgeQ9LZun +=UVgA -----END PGP SIGNATURE----- diff --git a/gnome-extra/gconf-editor/gconf-editor-2.32.0.ebuild b/gnome-extra/gconf-editor/gconf-editor-2.32.0.ebuild deleted file mode 100644 index 1793de3cfc59..000000000000 --- a/gnome-extra/gconf-editor/gconf-editor-2.32.0.ebuild +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gconf-editor/gconf-editor-2.32.0.ebuild,v 1.8 2012/05/05 06:25:22 jdhore Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="An editor to the GNOME 2 config system" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="" - -RDEPEND=">=x11-libs/gtk+-2.20:2 - >=gnome-base/gconf-2.12" -DEPEND="${RDEPEND} - app-text/scrollkeeper - sys-devel/gettext - app-text/gnome-doc-utils - >=dev-util/intltool-0.35 - virtual/pkgconfig - ~app-text/docbook-xml-dtd-4.1.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - --disable-scrollkeeper - --with-gtk=2.0" -} diff --git a/gnome-extra/gnome-color-manager/ChangeLog b/gnome-extra/gnome-color-manager/ChangeLog index 3484d3df0a69..8ddc98199d0a 100644 --- a/gnome-extra/gnome-color-manager/ChangeLog +++ b/gnome-extra/gnome-color-manager/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/gnome-color-manager # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.52 2014/07/24 18:36:03 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/ChangeLog,v 1.53 2014/11/13 11:51:48 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/gnome-color-manager-2.32.0-libnotify-0.7.patch, + -gnome-color-manager-2.32.0.ebuild, -gnome-color-manager-3.10.1.ebuild, + metadata.xml: + Drop old (#508854) 24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> gnome-color-manager-2.32.0.ebuild: diff --git a/gnome-extra/gnome-color-manager/Manifest b/gnome-extra/gnome-color-manager/Manifest index 8cb8a45c603c..9778cf4c270f 100644 --- a/gnome-extra/gnome-color-manager/Manifest +++ b/gnome-extra/gnome-color-manager/Manifest @@ -1,23 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gnome-color-manager-2.32.0-libnotify-0.7.patch 732 SHA256 a4ac10d8bda2fb8e9d7580524d086b87cede2b8188f2cace17032f735b7773dd SHA512 f1f89a14c8f5e59fc37bb733673a106ffad549c0e6cac857b08da3d66f87a801f10ceb49b22d650119a252a619a7b60378c344ab4a07455175b40690d1187c6b WHIRLPOOL fc072bbe0ea317972aef48dd2b76f6d0a7bc5493efdfddd09eb64f2da2a1ef0b53122aa3e00c5fe7cdb93a8c3e3942fb013fa49de8a797446f948badf37baad6 -DIST gnome-color-manager-2.32.0.tar.bz2 2491525 SHA256 fa287ef12d329643d1f01b8f35c2b104dd293cd30e91a012f04929c203da54cf SHA512 d21286f2dac6f1984aa4210892489c2faefd47eddb89d5ecfd05afd7590cfd3fbf446a75194a44feabbdc9b35feb20dee06f87fe208e641335fb3efa8c170915 WHIRLPOOL 905aad3a609b8393d617b311e25c7286a9f8181303db6731faacb5f117a0d2ebd3d4db08b9ae13afd3f5e9a3b86df1bce0dada391eb1bd456d42552813c8bd48 -DIST gnome-color-manager-3.10.1.tar.xz 2611472 SHA256 2944627f4166aaac08ba9d73614cbd79eba93573bd7d32e17a12082e30fb1399 SHA512 a4fbc712fd63d9a32b4656b66684c5a409489d851a2bf7fcfae626c15cd9333fec7c73a5ecc410087aa2f8556051d648a2b416228ea70ab4a7f5405a4b7906cd WHIRLPOOL 1a8549d0e5b7f3108231c7d9865847dee37d3f19b2e8f55b174b1a1bd02fc6ef51b92e4e0992d7e65aa49fc9cfcf6e5491229aa16a09fabee2e4dcac589b2836 DIST gnome-color-manager-3.12.3.tar.xz 2618564 SHA256 ce62f9d2d8702547b5083f800a2747cb6c8fd5a04a71e2dc6928166951d1d039 SHA512 991f2e98f60255ad28fb05d616ea0ac970cdc51558bd33ded5a89ab792f5c807f689c1a3ca4de4ae260a5e399afe75dac7c05b897423bf9a1052533452b8f555 WHIRLPOOL e310e478c93b158f21606e36b17e00f86ddfff05ff86655404fdccd88c43cf29ed96de0a731cb70ec29d440cc3bc3a43461767b25942cdfffba5ef3af80aec1e -EBUILD gnome-color-manager-2.32.0.ebuild 1290 SHA256 41c8c2ff4dc04b2dbcf84ad7336caf3f812ab292140da7720e39a2e14e406141 SHA512 4e3da781510a746d20f995ed2e6dee8187285919c6ba1e95bdd32cc7bd183293a67acfe0eeb8d8d533d4dddd59ebe6fb76a73953a1d6364f08695d4d3578b10f WHIRLPOOL dd148e71770a79bf6c882381d9d37e136dabaa6d387ca59cbba301df928211b505417385ef48d6a05fa642c6d32c3933469fb212ac07deb8becd72685ba59c86 -EBUILD gnome-color-manager-3.10.1.ebuild 1855 SHA256 f7b343091234c013087a1a5aa11a6094a8fff146fdf89083dc228e8246ce53f1 SHA512 86538c5d74d7e0e9a3f13f57cd9400fd9cc28cf4cd3aa76c1fd9c2d37bc0e5be1d283b30cb4b85d9f34c07dbf5ba4908b0e9d819a0d7f8b3ef9aaa742e1e95df WHIRLPOOL c9722997b9e4d5274a7ea43e761f4a402a324de161941949774275787055471127278482c9292e8b200d782e0e29644c1f6a0624f6114ed334b0b43e30e3ccb6 EBUILD gnome-color-manager-3.12.3.ebuild 1621 SHA256 4a2c7a27f88814294a74f5d71a9e801718012ea079098d7958341ee62fada33a SHA512 6b3342e9142911321f0ebde541695514ff3e9680635fd89b7e3583eebbbb6f4cff95fa5ea5fa739083ddfc94230b3633b2549f185da4718f6e0c5f0b090a6610 WHIRLPOOL 0849a4b03b6c8d1a3ffeb9625068c6348bac04ba8ca744338f87b43516f8a15a334ee0284233c9bf85ea2573c2fb24ad60f43bd5872e9cefed0a1461773867a3 -MISC ChangeLog 9224 SHA256 27a6d41b6eabb8d058ba90507d04dd29c65513e93a4d3968b97d49649375d591 SHA512 a012d3faad3831b28231d18027fae43db08b1af739c558eaf4227214202b115e12a402471fca76bdf02fbf22568538e1ceb315437d2c2b0fe95494c86337077d WHIRLPOOL ad32bedb4733cba0501507039fe76b5af650d0a1689eb53f8402bf998123bdf6dc3f476eb674b45145678387ede2c085bed0bd9182b3237d4711c2cc9819b6e3 -MISC metadata.xml 405 SHA256 f82bb70feca62d01a995a6a970f1f71863e0ebb21ea32a7d21b100ba781f14d3 SHA512 1afde296b80e385f277629445443ec20e37a2fe0f6c2dbf1670075603d0e93b9231adc46c47bd6a3523bd01809f7628ad4026e90e86ab703875bfcf7e317c04c WHIRLPOOL 22fe14171a739cea6712e366b9a388ca2d7ada1b100d987549eb307296143b552a9398e35d50cef1a5178cfeabc248c898a6c36ba4b700e4e42de7bc607fce5f +MISC ChangeLog 9435 SHA256 318ac40edd53204d58bff26ddd1443ff8310c798b931887c2bb5faf975a38858 SHA512 015d244dc94b2e304afd2e54ecd4f6c354b8981afc2de55a9064d1505348597ad56f5210fafd529d9e6f925309ea634d6e5afa2780ef087323551d7f3967562d WHIRLPOOL 16fd7fcd8e2a8b1e914ed9e1d1c29cfbc2ea81a3f2590079c68f978eb118b3e65288f607bbde0798e55e4e013215585bc50a46fa3ae39eab6f72bb8b9be823d4 +MISC metadata.xml 300 SHA256 40344389e8d928bd34eeaa918b5685d5b40ba83472e046b13422602166deeaf9 SHA512 f1cedba854d9c25e3d4f19e708363bba3747a530eecd981a349f5383c3d1af7b8843a737135b07212f9a737eca0bb7be0c14560d46cf0d2ce9cfe03671a3d003 WHIRLPOOL 63dff33c530b6d4584d8856d6a79e7ca924d4a0da6e46b0cc8e9f15ebe65abd051a1139b4119ba6575c0043b8ada26f826616f6c6fb94e3b92324a7b7bee7682 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQEcBAEBCAAGBQJT0VIRAAoJEEdUh39IaPFNfXEH/RhJVUtxCrZCCk7Kdnt1jA2h -yHTwsJWBmV9iM38LKMfJO6DwQeeKMA7rlQZ9/BeTtIjOkIEZkVK2aO9zbUn19o6k -hjwSsSwu+gYEDZqmu2JJ0VP4LtxGs1X1tr2Yg6t9464IBmdjiQt9+41aj/ozKdAd -uSURxQZEgJx1AGvzjsAyr8l8FCYmB/E8Y1Oz63NP0g/MyMhqZ7mahu3KFKUTU320 -trDAPC82BrxKckvIor0GIPjZn/hQAkbQa66Xh7J6BdQwAsSanrJ8cJ8rmz6Ok8Dh -dIVXUbf+kw4g5kMqraQJV6juHJDDR2XwZsx8lMSPtD55iMWAchhutGSlgY1uuPQ= -=Rt3/ +iEYEAREIAAYFAlRkm1UACgkQCaWpQKGI+9SXSQCfSUEI6ThYdveTxLWPJDo7AG4j +GtQAn3gPPMgXwMmDQJBUzOVJQn4Gbpeb +=9TEJ -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch b/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch deleted file mode 100644 index 7b3fe5b4273d..000000000000 --- a/gnome-extra/gnome-color-manager/files/gnome-color-manager-2.32.0-libnotify-0.7.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- src/gcm-session.c -+++ src/gcm-session.c -@@ -28,6 +28,10 @@ - #include <gconf/gconf-client.h> - #include <libnotify/notify.h> - -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - #include "egg-debug.h" - #include "gcm-dbus.h" - #include "gcm-client.h" -@@ -145,7 +149,12 @@ - NotifyNotification *notification; - - /* show a bubble */ -- notification = notify_notification_new (title, message, GCM_STOCK_ICON, NULL); -+ notification = notify_notification_new (title, message, GCM_STOCK_ICON -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ ); -+#else -+ , NULL); -+#endif - notify_notification_set_timeout (notification, GCM_SESSION_NOTIFY_TIMEOUT); - notify_notification_set_urgency (notification, NOTIFY_URGENCY_LOW); - diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild deleted file mode 100644 index 03cb39639e06..000000000000 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-2.32.0.ebuild,v 1.12 2014/07/24 18:36:03 ssuominen Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit eutils gnome2 - -DESCRIPTION="Color profile manager for the GNOME desktop" -HOMEPAGE="http://projects.gnome.org/gnome-color-manager/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="doc" - -RDEPEND=">=dev-libs/glib-2.14:2 - >=dev-libs/dbus-glib-0.73 - >=dev-libs/libunique-1:1 - >=gnome-base/gconf-2 - >=gnome-base/gnome-desktop-2.14:2 - media-gfx/sane-backends - media-libs/lcms:0 - media-libs/libcanberra[gtk] - media-libs/tiff - net-print/cups - virtual/libgudev - x11-libs/libX11 - x11-libs/libXxf86vm - x11-libs/libXrandr - >=x11-libs/gtk+-2.14:2 - x11-libs/libnotify - >=x11-libs/vte-0.22:0 -" -DEPEND="${RDEPEND} - app-text/gnome-doc-utils - app-text/scrollkeeper - >=dev-util/intltool-0.35 - doc? ( >=dev-util/gtk-doc-1.9 ) -" - -# FIXME: run test-suite with files on live file-system -RESTRICT="test" - -pkg_setup() { - # Always enable tests since they are check_PROGRAMS anyway - G2CONF="${G2CONF} --enable-tests --disable-packagekit" -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch - gnome2_src_prepare -} diff --git a/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild b/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild deleted file mode 100644 index 88d350914055..000000000000 --- a/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-color-manager/gnome-color-manager-3.10.1.ebuild,v 1.6 2014/04/27 21:45:29 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Color profile manager for the GNOME desktop" -HOMEPAGE="http://projects.gnome.org/gnome-color-manager/" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="clutter packagekit raw" - -# Need gtk+-3.3.8 for https://bugzilla.gnome.org/show_bug.cgi?id=673331 -COMMON_DEPEND=" - >=dev-libs/glib-2.31.10:2 - gnome-base/gnome-desktop:3= - >=media-libs/lcms-2.2:2 - >=media-libs/libcanberra-0.10[gtk3] - media-libs/libexif - media-libs/tiff - - x11-libs/libX11 - x11-libs/libXrandr - >=x11-libs/gtk+-3.3.8:3 - >=x11-libs/vte-0.25.1:2.90 - >=x11-misc/colord-0.1.34:0= - >=x11-libs/colord-gtk-0.1.20 - - clutter? ( - >=media-libs/clutter-1.12:1.0 - media-libs/clutter-gtk:1.0 - media-libs/mash:0.2 ) - packagekit? ( app-admin/packagekit-base ) - raw? ( media-gfx/exiv2 ) -" -RDEPEND="${COMMON_DEPEND}" - -# docbook-sgml-{utils,dtd:4.1} needed to generate man pages -DEPEND="${COMMON_DEPEND} - app-text/docbook-sgml-dtd:4.1 - app-text/docbook-sgml-utils - dev-libs/libxslt - >=dev-util/intltool-0.35 - virtual/pkgconfig -" - -# FIXME: run test-suite with files on live file-system -RESTRICT="test" - -src_configure() { - # Always enable tests since they are check_PROGRAMS anyway - gnome2_src_configure \ - --disable-static \ - --enable-tests \ - $(use_enable clutter) \ - $(use_enable packagekit) \ - $(use_enable raw exiv) \ - ITSTOOL=$(type -P true) -} - -pkg_postinst() { - gnome2_pkg_postinst - - if ! has_version media-gfx/argyllcms ; then - elog "If you want to do display or scanner calibration, you will need to" - elog "install media-gfx/argyllcms" - fi -} diff --git a/gnome-extra/gnome-color-manager/metadata.xml b/gnome-extra/gnome-color-manager/metadata.xml index b244738d263c..9ac3de3710d5 100644 --- a/gnome-extra/gnome-color-manager/metadata.xml +++ b/gnome-extra/gnome-color-manager/metadata.xml @@ -3,8 +3,6 @@ <pkgmetadata> <herd>gnome</herd> <use> - <flag name="clutter">Use <pkg>media-libs/clutter</pkg> to render color - gamut representations</flag> <flag name="packagekit">Enable support for the distro-neutral package manager GUI <pkg>app-admin/packagekit</pkg></flag> </use> diff --git a/gnome-extra/gnome-power-manager/ChangeLog b/gnome-extra/gnome-power-manager/ChangeLog index ccdef8cfea58..3fb238c99319 100644 --- a/gnome-extra/gnome-power-manager/ChangeLog +++ b/gnome-extra/gnome-power-manager/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for gnome-extra/gnome-power-manager # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.197 2014/09/26 20:38:15 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/ChangeLog,v 1.198 2014/11/13 11:53:51 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/gnome-power-manager-2.32.0-close-fd.patch, + -files/gnome-power-manager-2.32.0-convert-percentage.patch, + -files/gnome-power-manager-2.32.0-duplicated-battery.patch, + -files/gnome-power-manager-2.32.0-libnotify-0.7.patch, + -files/gnome-power-manager-2.32.0-no-xfce.patch, + -files/gnome-power-manager-2.32.0-xbacklight-crash.patch, + -gnome-power-manager-2.32.0-r3.ebuild, metadata.xml: + Drop old (#508854) 26 Sep 2014; Pacho Ramos <pacho@gentoo.org> -gnome-power-manager-3.10.1.ebuild, -gnome-power-manager-3.12.0.ebuild, diff --git a/gnome-extra/gnome-power-manager/Manifest b/gnome-extra/gnome-power-manager/Manifest index 15c2a4c72135..77b62f215e67 100644 --- a/gnome-extra/gnome-power-manager/Manifest +++ b/gnome-extra/gnome-power-manager/Manifest @@ -1,23 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gnome-power-manager-2.32.0-close-fd.patch 741 SHA256 66711f18dfa9c491ea0aaf911617fb189d4616f96795ac314ef8eb6d7fc05b5f SHA512 fb053bdccdbaff9f51011ce006c858ed14aed7b8c034d925001d2ad0fbf7c791dd572d8b2460e1c5f5eec1ef94117616b94649fab496649eca418e2e2c7dbff9 WHIRLPOOL 190ca2254b3da25dc311f399da48b53a7548ace1c8d8ffd6f09976eef41d47a5683ecafb4485fafaaad6d69821b1267e6577660d42bdd889773d1f83b94203cc -AUX gnome-power-manager-2.32.0-convert-percentage.patch 1012 SHA256 3580861a2ed7e783ad07c95c42c99b6f000b96033eda352c259680e3973c2242 SHA512 5450bc57c5f1bce083cc3ee65c2eeae279ca4e3d18606a6e234d18347af00472c3f94215f7ccfd9abf8a84bb35305ea0ee0a79ac3a1a19536db47554a9cca5a6 WHIRLPOOL 6f7fd204fa3464eead351092e1f82f32aa5705c12d71a2871b0ba74f6afbcd5dfe5dd257feb26ebb73573b45e737540618ed1b8a9f8ad7aaec1da4ddb0766199 -AUX gnome-power-manager-2.32.0-duplicated-battery.patch 652 SHA256 c0c629364797e87a96bfd144a3b8e5287f6a8b75ba7d387b14dd5230e4125ba4 SHA512 0fc982a75d05b43b7d3039ed92e936a17171cd91a6b2207227d4692855e18ba93b448907452d9aaff0c8f7a725ed9c61f1c76bf69c9006be3348065fa8abdce1 WHIRLPOOL 46aea361a7c8f1c51148c9f17b0e4eadbf9b343cfbc8d9731850703c5412e6aba78de0aca886abb051ff643eb3dc848d1684055cf4a621d72e7cea5b9ab7fbc2 -AUX gnome-power-manager-2.32.0-libnotify-0.7.patch 1106 SHA256 50e2f726281805f2b1eb3fbce2e8aa7a4258de12a20bb09e57527235c82760d2 SHA512 c8b3067f1229b2907e645ce204ca998bd8c2129bda522a9ba71963aca385427be5c68d178595ff4dc6731c1d4661c1d13a62562ebb1ca4887ef85f4d6b0dfc61 WHIRLPOOL adcf5a71a90c7b53eee63cb3affb4842ff55276dbc6c47e57540596ff72d97cac850df5c04849028cc5cc1446792e3e4d8779a338ca7d5c20ab80d714c284347 -AUX gnome-power-manager-2.32.0-no-xfce.patch 1253 SHA256 a08eb3ff292bba66dd0c3478185cf617ec1ffe8742772452165d06820bf7e6fc SHA512 26bffac2dddbde2fa46523960591f00de4f241fdf23ab21014768a024f61c64f9ad82f176817af9b8a92617c878fb4c0cdfcac3be43a99d4f5edf6eaa06ea1ee WHIRLPOOL 15b1e20d302b237b93f0eb530f0aefb2e46df330c9aa7817aa8cb7a9a467d063f600f53344b0ce8fc2ef47ab224ad8719919ec7eb3975dfa7809d965b6e917a1 -AUX gnome-power-manager-2.32.0-xbacklight-crash.patch 858 SHA256 b4ebcd2aa0c012fb6e5cd7c09643801af0ad30ae0ba51d93e9c3793325fc390a SHA512 b004db4daf2f602996860ea2bb908294202c535f587d7971ccfd383225c765c66694e932ee49fa4165d5172506110ed0644dbacf3b696226816108ea36988774 WHIRLPOOL 399977f9ac5228259f3e8fff494cfd44765dfd0c19ca382f0b39927d03a6557b7a793f63f653f98276915bb2dc0da1d0264a0da1e3f92802877af9fa3b97ca9f -DIST gnome-power-manager-2.32.0-keyboard-backlight.patch.xz 16632 SHA256 3f57906b0fea33ab1e6fa20e8772ae7dd685413a7ae64e182b15a80bc4d1a58b SHA512 4ea404bffbc5a6360419f346dc0fc9df22f097dd3ad826de8d35d6a9d0debfd15870150fbf954fd462ca988d3c75b8ed2e869e9f0d0e92905d9a8de7ff5d81ad WHIRLPOOL ab839ac342d8fd60aeba7d65e62d7fed2bbf44874273a0f25e5d9bf08b6d8cfc490b49445f96149d9de64e923a6cebafcda5f2e7f10d4fb4aae281ee999b74f2 -DIST gnome-power-manager-2.32.0.tar.bz2 3892164 SHA256 17fa301bf7e133285c0e054ae3be2b0f690c48f59b09f67e04d6ed339b330476 SHA512 dc6addb33d2a7d486209342613df0037f1d3a7099f7a7b4b8ce29255276191e367a49774c0b14b6c4341a192f56154454db9e3fca06d73195fd311ba832185fa WHIRLPOOL c8314490b22ee6dec0c6acac77459e5008f7c0c99b9c304c7ed6c2f4c0333ab18394e60c7bcb81e3441bc9fd04f59fb2ad38bf594766dce14ae97a98152f2fca DIST gnome-power-manager-3.12.2.tar.xz 466820 SHA256 f025a35810434e9d1b1fa69e581d2e399db4c87625baa3850232a6666b6cbc19 SHA512 94091eeb653b7bc761e3ca42650f1855c299348bd2c785d4c4a26ac9425e617d478cadefc27dcc5fee8aa36849fc6ddf5df4d2eb5169b2df843ee638b1b7e4fe WHIRLPOOL 67348b6b8cecc6eada1091b5de5be5a74e019bbbf45ca82542e69a311e3c27a95a1c15a62eaba340184b4587c4f4f56df8ccb7312c4ed8da5e8b271a64c2f368 -EBUILD gnome-power-manager-2.32.0-r3.ebuild 3989 SHA256 2e67cfc7ad39ee336e40081778164dbe9cea1d48735741ab42c8e48c4c57d808 SHA512 99854381e96cc9b87916629e420dd4b6c8af5c3a693a3be298c9f9655d9b136f512cd13c2abf9dca8444ee0edec097e59d79998da3544a7c9849c256878cff22 WHIRLPOOL b6e13c129d30a51a919aeb47d61b27f5dc16c4cf3ba0d8ffc0775b3ce71d6038b86e297bb140483c6f75f4af41901856731625bac29a80776f09661f027a7c6b EBUILD gnome-power-manager-3.12.2.ebuild 1555 SHA256 adb073ce2a48245aac61e8143032413f2fda1f60a154735ea1f4254a49503ce0 SHA512 2e1cdd72bf13bcdd487dc85c9caf7625c5efd6fc6fabb3c6c7da47b3487f863f35c019cf00e71adf4bbee1cfb2e825748b0a8f76832884bb31fcf9345af6cd10 WHIRLPOOL 2424f72dcf129e44c767709a4e2a69011a8e07ac0045f17e07560ad8e9a2177634b800d211d9abf29a3893a966c5a04031127cd291760956028d6955563eeb8f -MISC ChangeLog 33275 SHA256 6e941c59ff1a8102284b10c9318d10cdaea96c0ef3f370816782b993ca4f5862 SHA512 c4ac63eec8303af90c04bfab8d369a9afa93f7720c9a0d18bfd5350edf9be866adba9647757869b767342cddb1ad77bcd5be1cbd35042f92abc69db052bd798d WHIRLPOOL c2022a1d24a4b762e0a78435a2bb3446711c8cba9a4977a2849077fc71f606cab369389224e5fbfde555215e05b378b228ca1ad6739b7f593cae11a6d573a3f5 -MISC metadata.xml 400 SHA256 1c5d6e0a437c1a1c04299a5d1823ab8551019bd7ae120dac19670cc72fa22cf7 SHA512 7b119f2023d172590e884096d474fba4ff2bd95bdb2ff6b5390401ff5ffd3efd66cd2a0ac3b54be3389b5c88113eaa2cee77a90d6e71861e1ecf7bdefd853a56 WHIRLPOOL 01491b961fffe22ea484b375eebdbcd6ed0a9d255b85fbd2e790bb33c21c324dec33029546fed6b2a9c439f0ae613e7ee68554b723d08a7b74e5a3eb133e34fc +MISC ChangeLog 33742 SHA256 7fb2686843662f1ee9914b1c3509088122ed56a00b048a4844e9e094f9f9a4e9 SHA512 dd191e375d54d99adc0f63b618f44d82d894508ede2c8317cbcf9da28f3b0611c9dee676a24d9127175d74fa475da67b87a27a087bdace4632673bb76470ad4a WHIRLPOOL a353ac7b01de42edc25334f0bfb43b705afe2d7e5d2633c97979d48b7f02babdd0f4cc7b2f46328af95bec4c24a55b8b951f7a1a3a0ffff0403d500516ca917c +MISC metadata.xml 327 SHA256 c637c578d6e7ad44f064423088e395d8b28f68192abcaa18f06760608c0491e8 SHA512 d5bc35925ea2030fd7fa5f369b5761cc75861a9ab7ceabc2f5e5868d43781daf005a2c9e5f1abe12d5e852a033fcdcde6395d3a1063a7736eb2fdbd8b1432fb5 WHIRLPOOL a71de3b447a7dcf1693c27a4bffd9bbaad5e6cfbe17cdaa22ec8950c9416da38a90e1ea2130a46a5085a5c2eacbebfe307638762535ea5a541b261c68fb6d833 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQlzrgACgkQCaWpQKGI+9T6EACcDwe9227hiLDWoD5RdlJHy2uJ -wMgAmwVqf+eTh0oQwJvSLQyZLTU2Y5oo -=c7gg +iEYEAREIAAYFAlRkm9EACgkQCaWpQKGI+9SafQCcCVdo//U8ECpMaX/xT0CJzNnw +9EgAmwQ3bbEurcfXZvgsnG9g5jh2cjbw +=aH/B -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-close-fd.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-close-fd.patch deleted file mode 100644 index 65d1d2bdd77a..000000000000 --- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-close-fd.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 074178fed01bbac4cc3a5e3f90c573614e4de179 Mon Sep 17 00:00:00 2001 -From: Antoine Jacoutot <ajacoutot@openbsd.org> -Date: Tue, 24 May 2011 11:15:08 +0000 -Subject: Don't try to close a non-opened fd - -On OpenBSD we do not use /proc. As a result, gnome-power-manager segfaults on -startup due to a reverse logic in the code. - -Signed-off-by: Richard Hughes <richard@hughsie.com> ---- -diff --git a/src/gpm-load.c b/src/gpm-load.c -index eab0129..3b0f572 100644 ---- a/src/gpm-load.c -+++ b/src/gpm-load.c -@@ -192,7 +192,7 @@ gpm_load_get_cpu_values (long unsigned *cpu_idle, long unsigned *cpu_total) - *cpu_total = cpu_user + cpu_nice + cpu_system + *cpu_idle; - ret = TRUE; - out: -- if (!fd) -+ if (fd) - fclose (fd); - return ret; - } --- -cgit v0.9 diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-convert-percentage.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-convert-percentage.patch deleted file mode 100644 index bfbb914d2c71..000000000000 --- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-convert-percentage.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6204c3cbb1b915d788e373485a452a1e571f6a99 Mon Sep 17 00:00:00 2001 -From: Pedro Martinez-Julia <pedromj@um.es> -Date: Mon, 07 Mar 2011 22:31:40 +0000 -Subject: Fixed #644143, how to convert from percentage to discrete and vice-versa. - -Signed-off-by: Richard Hughes <richard@hughsie.com> ---- -diff --git a/src/egg-discrete.c b/src/egg-discrete.c -index a051282..fe910cc 100644 ---- a/src/egg-discrete.c -+++ b/src/egg-discrete.c -@@ -47,7 +47,7 @@ egg_discrete_from_percent (guint percentage, guint levels) - egg_warning ("levels is 0!"); - return 0; - } -- return ((gfloat) percentage * (gfloat) (levels - 1)) / 100.0f; -+ return (guint) ((((gfloat) percentage * (gfloat) (levels - 1)) / 100.0f) + 0.5f); - } - - /** -@@ -69,7 +69,7 @@ egg_discrete_to_percent (guint discrete, guint levels) - egg_warning ("levels is 0!"); - return 0; - } -- return (guint) ((gfloat) discrete * (100.0f / (gfloat) (levels - 1))); -+ return (guint) (((gfloat) discrete * (100.0f / (gfloat) (levels - 1))) + 0.5f); - } - - /** --- -cgit v0.9 diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-duplicated-battery.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-duplicated-battery.patch deleted file mode 100644 index 4134b9e76286..000000000000 --- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-duplicated-battery.patch +++ /dev/null @@ -1,20 +0,0 @@ -Description: Don't add hot-added battery to device list, because libupower-glib - already does that (LP: #616443) -Author: Maxim Levitsky <maximlevitsky@gmail.com> -Bug-Ubuntu: https://launchpad.net/bugs/616443 -Forwarded: no -Last-Update: <2011-06-13> - ---- gnome-power-manager-2.32.0.orig/src/gpm-engine.c -+++ gnome-power-manager-2.32.0/src/gpm-engine.c -@@ -886,10 +886,7 @@ out: - static void - gpm_engine_device_added_cb (UpClient *client, UpDevice *device, GpmEngine *engine) - { -- /* add to list */ -- g_ptr_array_add (engine->priv->array, g_object_ref (device)); - gpm_engine_check_recall (engine, device); -- - gpm_engine_recalculate_state (engine); - } - diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-libnotify-0.7.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-libnotify-0.7.patch deleted file mode 100644 index d021f2930eca..000000000000 --- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-libnotify-0.7.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- src/gpm-manager.c -+++ src/gpm-manager.c -@@ -43,6 +43,10 @@ - #include <libupower-glib/upower.h> - #include <libnotify/notify.h> - -+#ifndef NOTIFY_CHECK_VERSION -+#define NOTIFY_CHECK_VERSION(x,y,z) 0 -+#endif -+ - #include "egg-debug.h" - #include "egg-console-kit.h" - -@@ -480,12 +484,16 @@ - /* close any existing notification of this class */ - gpm_manager_notify_close (manager, *notification_class); - -+#if NOTIFY_CHECK_VERSION (0, 7, 0) -+ notification = notify_notification_new (title, message, icon); -+#else - /* if the status icon is hidden, don't point at it */ - if (manager->priv->status_icon != NULL && - gtk_status_icon_is_embedded (manager->priv->status_icon)) - notification = notify_notification_new_with_status_icon (title, message, icon, manager->priv->status_icon); - else - notification = notify_notification_new (title, message, icon, NULL); -+#endif - notify_notification_set_timeout (notification, timeout); - notify_notification_set_urgency (notification, urgency); - g_signal_connect (notification, "closed", G_CALLBACK (gpm_manager_notification_closed_cb), notification_class); diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-no-xfce.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-no-xfce.patch deleted file mode 100644 index f0ff41185d08..000000000000 --- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-no-xfce.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 1f9807874036b6dbedb0fd44c02c836046d99cbe Mon Sep 17 00:00:00 2001 -From: Vincent Untz <vuntz@gnome.org> -Date: Thu, 17 Feb 2011 20:23:50 +0000 -Subject: Do not use g-p-m in XFCE - -XFCE now comes with xfce4-power-manager, so g-p-m is just duplicating -the work. - -https://bugzilla.gnome.org/show_bug.cgi?id=642616 ---- -diff --git a/data/gnome-power-manager.desktop.in.in b/data/gnome-power-manager.desktop.in.in -index 726e156..3e7b821 100644 ---- a/data/gnome-power-manager.desktop.in.in -+++ b/data/gnome-power-manager.desktop.in.in -@@ -6,7 +6,7 @@ Exec=gnome-power-manager - Terminal=false - Type=Application - Categories= --OnlyShowIn=GNOME;XFCE; -+OnlyShowIn=GNOME; - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=gnome-power-manager - X-GNOME-Bugzilla-Component=gnome-power-manager -diff --git a/data/gnome-power-statistics.desktop.in.in b/data/gnome-power-statistics.desktop.in.in -index 1f9f9c3..8328cea 100644 ---- a/data/gnome-power-statistics.desktop.in.in -+++ b/data/gnome-power-statistics.desktop.in.in -@@ -6,7 +6,7 @@ Exec=gnome-power-statistics - Terminal=false - Type=Application - Categories=GNOME;GTK;System;Monitor; --OnlyShowIn=GNOME;XFCE; -+OnlyShowIn=GNOME; - NoDisplay=true - StartupNotify=true - X-GNOME-Bugzilla-Bugzilla=GNOME --- -cgit v0.9 diff --git a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-xbacklight-crash.patch b/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-xbacklight-crash.patch deleted file mode 100644 index c97b877d12b6..000000000000 --- a/gnome-extra/gnome-power-manager/files/gnome-power-manager-2.32.0-xbacklight-crash.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Don't crash on systems which don't have XBACKLIGHT. -Author: Chris Coulson <chris.coulson@canonical.com> -Bug-Ubuntu: https://launchpad.net/bugs/614039 -Bug: http://bugs.gnome.org/627711 -Forwarded: yes, http://bugs.gnome.org/attachment.cgi?id=168554 - -Index: gnome-power-manager-2.31.91/src/gpm-brightness.c -=================================================================== ---- gnome-power-manager-2.31.91.orig/src/gpm-brightness.c 2010-09-02 14:54:48.775141000 +1000 -+++ gnome-power-manager-2.31.91/src/gpm-brightness.c 2010-09-02 14:54:56.415141000 +1000 -@@ -526,6 +526,10 @@ - if (!brightness->priv->has_extension) - return FALSE; - -+ /* Return immediately if we can't use XRandR */ -+ if (!brightness->priv->has_extension) -+ return FALSE; -+ - /* do for each screen */ - length = brightness->priv->resources->len; - for (i=0; i<length; i++) { diff --git a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild b/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild deleted file mode 100644 index 4a168a32d28d..000000000000 --- a/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-power-manager/gnome-power-manager-2.32.0-r3.ebuild,v 1.8 2014/05/31 22:24:48 ssuominen Exp $ - -EAPI="4" -GNOME_TARBALL_SUFFIX="bz2" -GCONF_DEBUG="no" - -inherit autotools eutils gnome2 virtualx - -DESCRIPTION="A session daemon for GNOME that makes it easy to manage your laptop or desktop system" -HOMEPAGE="http://projects.gnome.org/gnome-power-manager/" -SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${PN}-2.32.0-keyboard-backlight.patch.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="+applet doc policykit test" - -# FIXME: Interactive testsuite (upstream ? I'm so...pessimistic) -RESTRICT="test" - -COMMON_DEPEND=">=dev-libs/glib-2.13.0:2 - >=x11-libs/gtk+-2.17.7:2 - >=gnome-base/gnome-keyring-0.6.0 - >=dev-libs/dbus-glib-0.71 - >=x11-libs/libnotify-0.4.3 - >=x11-libs/libwnck-2.10.0:1 - >=x11-libs/cairo-1 - >=gnome-base/gconf-2.10:2[policykit?] - >=media-libs/libcanberra-0.10[gtk] - || ( <sys-power/upower-0.99 sys-power/upower-pm-utils ) - >=dev-libs/libunique-1.1:1 - >=x11-apps/xrandr-1.3 - >=x11-proto/xproto-7.0.15 - x11-libs/libX11 - x11-libs/libXext - applet? ( - || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) - ) -" -RDEPEND="${COMMON_DEPEND} - >=sys-auth/consolekit-0.4[policykit?] - policykit? ( gnome-extra/polkit-gnome )" -DEPEND="${COMMON_DEPEND} - x11-proto/randrproto - - sys-devel/gettext - app-text/scrollkeeper - app-text/docbook-xml-dtd:4.3 - virtual/pkgconfig - >=dev-util/intltool-0.35 - >=app-text/gnome-doc-utils-0.3.2 - doc? ( - app-text/xmlto - app-text/docbook-sgml-utils - app-text/docbook-xml-dtd:4.4 - app-text/docbook-sgml-dtd:4.1 - app-text/docbook-xml-dtd:4.1.2 )" - -# docbook-sgml-utils and docbook-sgml-dtd-4.1 used for creating man pages -# (files under ${S}/man). -# docbook-xml-dtd-4.4 and -4.1.2 are used by the xml files under ${S}/docs. - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable applet applets) - $(use_enable doc docbook-docs) - $(use_enable policykit gconf-defaults) - $(use_enable test tests) - --enable-compile-warnings=minimum" - DOCS="AUTHORS ChangeLog NEWS README TODO" -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed libtoolize failed" - - # Drop debugger CFLAGS from configure - sed -e 's:^CPPFLAGS="$CPPFLAGS -g"$::g' \ - -i configure.ac configure || die "debugger sed failed" - - # glibc splits this out, whereas other libc's do not tend to - if use elibc_glibc; then - sed -e 's/-lresolv//' \ - -i configure.ac configure || die "resolv sed failed" - fi - - # Fixed bgo#644143, how to convert from percentage to discrete and vice-versa. - epatch "${FILESDIR}/${P}-convert-percentage.patch" - - # Don't try to close a non-opened fd - epatch "${FILESDIR}/${P}-close-fd.patch" - - # Do not use g-p-m in XFCE - epatch "${FILESDIR}/${PN}-2.32.0-no-xfce.patch" - - # Don't crash on systems which don't have XBACKLIGHT - epatch "${FILESDIR}/${PN}-2.32.0-xbacklight-crash.patch" - - # Add keyboard backlight support including dimming on idle and keyboard control - epatch "${WORKDIR}/${PN}-2.32.0-keyboard-backlight.patch" - - # Fix duplicated battery, upstream bug #636915 - epatch "${FILESDIR}/${PN}-2.32.0-duplicated-battery.patch" - - # FIXME: This is required to prevent maintainer mode after "debugger sed" - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - gnome2_src_prepare - - # This needs to be after eautoreconf to prevent problems like bug #356277 - if ! use doc; then - # Remove the docbook2man rules here since it's not handled by a proper - # parameter in configure.in. - sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \ - || die "docbook sed failed" - fi -} - -src_test() { - unset DBUS_SESSION_BUS_ADDRESS - dbus-launch Xemake check || die "Test phase failed" -} diff --git a/gnome-extra/gnome-power-manager/metadata.xml b/gnome-extra/gnome-power-manager/metadata.xml index 0c1a047c61ab..13f2b4adffba 100644 --- a/gnome-extra/gnome-power-manager/metadata.xml +++ b/gnome-extra/gnome-power-manager/metadata.xml @@ -6,7 +6,4 @@ Power Manager daemon for the GNOME desktop environment that makes it easy to manage your laptop or desktop system. </longdescription> - <use> - <flag name='applet'>Build battery monitor applet</flag> - </use> </pkgmetadata> diff --git a/gnome-extra/gnome-system-monitor/ChangeLog b/gnome-extra/gnome-system-monitor/ChangeLog index ac077dbfbd9d..950fdfef5389 100644 --- a/gnome-extra/gnome-system-monitor/ChangeLog +++ b/gnome-extra/gnome-system-monitor/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for gnome-extra/gnome-system-monitor # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.253 2014/08/10 21:20:11 slyfox Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/ChangeLog,v 1.254 2014/11/13 11:55:35 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/gnome-system-monitor-2.28.2-gmodule.patch, + -files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch, + -gnome-system-monitor-2.28.2-r1.ebuild, -gnome-system-monitor-3.10.2.ebuild: + Drop old (#508854) 10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> gnome-system-monitor-2.28.2-r1.ebuild: diff --git a/gnome-extra/gnome-system-monitor/Manifest b/gnome-extra/gnome-system-monitor/Manifest index 5d2816d0f014..fa6de952fa25 100644 --- a/gnome-extra/gnome-system-monitor/Manifest +++ b/gnome-extra/gnome-system-monitor/Manifest @@ -1,22 +1,15 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gnome-system-monitor-2.28.2-gmodule.patch 1060 SHA256 932108963ec09ef385711cbb8e8407bce077e2da099cb28b6280be551ab1f9fe SHA512 42dacdb5ddd9ef8c9a9fd348cfe62e316cc17ad263eb01b907a6f46bfcf9599c50655ded0802f28477df54fc2b6ae309ab889996cfd73792273456b301a5a195 WHIRLPOOL 34d40b5643bb0c3baf3ddab5d9598c2223d383c3ca5aeacafc9c9c15358c9305c49f4d6700fb6c40d89312949a320f69a09cd269fe3d7de0ff98c61249d53f90 AUX gnome-system-monitor-3.12.2-configure-wnck.patch 926 SHA256 086154cb531a5aa3df5ddedcc77d9ca1c76a2fb360a909fc8e964e3a09128fcc SHA512 f8c04b949aced33078aeff7191f9db2702edeeddb1cac8ea2e57f023de9ae3d093ad43786cc96048ec72baa0b294b998e26d4e709e9cdeed0ac614724dfeb5c6 WHIRLPOOL 3d2eabea026ae381e6a2f035d825220823152a4e1f2300ebc355bcd279a099ec7fff9757f27f120c9d3ed4dbfeae334f80d0931fc4ecd38f1f12101429fced15 -AUX gnome-system-monitor-3.8.2.1-fix-grid-display.patch 1503 SHA256 e150f599957e2f47bc94cba88a84335a3e7f3f756673c28452522c9328631a50 SHA512 f43be161037b4a795f62e972f0016579ea84bc17ee40a45d00bf98489f334b8bb7f7f0fc1b7e7f59dbc85846d23f7d4d45dce64551ac47a935936358ba3abe37 WHIRLPOOL c6b880c9fb25d0d7cec1b9437119d5d84b68d2fbf60a55bbfd38d1617b71481467588e87959aaa203fd83e3dfc11745c1f1cdbf3eb312ad4cb158052caaa2a47 -DIST gnome-system-monitor-2.28.2-patches.tar.bz2 6400 SHA256 d649ec0e5a63453b3e752fee5cc933ffed4b8d7653d15b039bdeaf3f7c514a06 SHA512 bbfe8a7d7feaaa2b7d95906ce985405e59a9a756002040761055bc2347355c569783bc57c9f52b4ac429f5ef6de921a1bede13a378a58d8c294533d9825f03b3 WHIRLPOOL 940caf04d2bd88acfc8e757906e214dc0aa991af44b098b261380771abe23edc4d634f6807b12c464df01f15c6f0a1e73628e818b84003a1e61693acc0a45a55 -DIST gnome-system-monitor-2.28.2.tar.bz2 2432252 SHA256 b628edfd39e3a6b374ce133f367d3568475eb4e981a367f4f9d62a9784e5ae59 SHA512 41d77fa9055ecfa1b379d7fd35c8f6401773f07a640f0b11e787cc985387d264cdb718aa0eed68e8b54f74abd301a98dbe8360160bda1e8e33459f83b3426e27 WHIRLPOOL 9782e92ee8d8e37fdd61dcb2af31ed8a68caa45e39eb2f6f3324d4484bad5b78723b1c03bdd699c6e6cf3c5de0e268f01105aaece6f7e3042118910407fe1c04 -DIST gnome-system-monitor-3.10.2.tar.xz 1999248 SHA256 bd009e15672afe4ad3ebd7ed286cce79b9f76420fd39bc77a5826b29134b9db0 SHA512 42cf597e7b14e0205cd35d589db1ec06aa7a0a5aeb1007d15aa53b0d6400d07ecb358f076a6a1c19abe5a196160bdec8ce59de5a09283d3061fc670aae43c869 WHIRLPOOL a944758aba7923a493ba757642007bd446a5b9de9a0364ef16a6710d65207b24507dfd6c021640c0dab4fe9bdd6ada0aba0fbbdad02ff89c4acfa31cd6f12a39 DIST gnome-system-monitor-3.12.2.tar.xz 811892 SHA256 ba074e2157302d91d73b68e13207bf85452b84234e429b1ec9b9a7b1c70736d8 SHA512 64474d899e2fab57398e3583d39b5874fb468f508e9be9e0d2667cb9c78c5de40b106024957cbeedf8980064ae6d8b9f8569cd970fc6de7813b4f5d43b1549d1 WHIRLPOOL 7d07224b26ae900e0212b96972e592faedf4a7d6356a46f6f7124ce556537e4f533cb41af4147d5e0b9b4dd61fb6f10c4ee73f1fa07a888e48223f49a17becf0 -EBUILD gnome-system-monitor-2.28.2-r1.ebuild 1431 SHA256 900e89fc54a2b1136bbe1240373a4e513d10181979b56b591eb7c6ff5faed8da SHA512 d13c92ed85c05c9f1026d935844d7e38d4af71fb12d8852ac2ca5d3f3992e047b512927ade336af371b7d94ea2ccff91bf4eb72a60977d57747aaab967dab801 WHIRLPOOL 8a2c944122efe1353617d4e93525406e96f7bf1ad079a809f285202fcbb2732fb1e64077c3629fef008e41ba8bde727e0488142a519563bdf66c2486d4c19b9f -EBUILD gnome-system-monitor-3.10.2.ebuild 1091 SHA256 efd71a83b6f959e452983846136d134073a32e8cc791b7809686750b289c2a8c SHA512 c0f59e4e30b908bc7adf300ed0ecb4cba1ad7fcbd24ccfef884a088407685609d366391f23555ba02fc5f618e462f0c77c8b96488b0ec539853dbcd208317220 WHIRLPOOL bd95f8ca2dc1feec1bb079cc9cbff7fa18a67a9ef6685c89b5b28cd8e9025c64144aee0e105cac2f7ed4785501c2141735e93b45e9c5e4d8b887613f8b278815 EBUILD gnome-system-monitor-3.12.2.ebuild 1241 SHA256 a3c3ea583a43ab29ae99b93d215e4a6b7f0db97c31dba4ba7f6b958121262922 SHA512 c71a0ba0de479aeba442d8579fc1b8254ebdada62f1c409853f80924757895687031c9882dea370823f9093f49e1fe690cf76a3798671e802feb5855eb1db429 WHIRLPOOL 1e63f96354370f29e3eac208bd37fea1a201b64d43840edc413ce10543c622b3aa1452a67943099cd2fd79d06db1802032e3f1c8a4b38466893d150ddfcaf605 -MISC ChangeLog 36825 SHA256 bbb76b916ff97f7e577e2b3e410f60eb10dd59e98d38e6e27c780962f3d10858 SHA512 eae12d63d70fba609a7352316e9d139810d22ebf90ada013044c5aa3dce13d97f652a7fc65311fc1dd52d378c777e49092b546d66dbb0583e1348e822236351d WHIRLPOOL 38423cf5d168c83b6bb2f92cb488a80c3823ff758e72bb3ff034ef2b3b0bcbc03a783cb99fa0fde439be36c6511907384f87b1ab315d2f51bfe054c4d7c17d6d +MISC ChangeLog 37085 SHA256 d49df32f7b5e9bf566f0f8f5c732179c3392629a466e809e01cf4726e324e53c SHA512 9088d66cd6705d810c813487c8ec12b3e182f2dedc577a012a6eb9f62f62c60d611d16c70aaa2d4392f6a3f883a1d7ffcb67e93c56eb45c90cd051476dbad9bd WHIRLPOOL fa675c43c9c524c572ad7ebf08b074d4f187775fbe47a462786284e6b92ab425d52e0ca2ff3c413d1783a1bcd37f6b987df5bf9724c5ae5fe681ffdd9c9755c5 MISC metadata.xml 287 SHA256 30b48346b173b2d4f21545e7902416f5f6dd4ce2bb2c34efec34ae8a0d1b77e4 SHA512 6891bcbdb167ff5d04864dbb507775987f86443033d4c925d8183d50a2bffd0204648f726d8a9eeeb56d9ba5b5ff9198993a68ac3e28a28efec6eb7ff09fd52c WHIRLPOOL 72e5f4a6b3bdbc53b2f580d88eadd16ce558664b8fe2b76c6e406955cd268b36f6017fee106855f5d412e2c23c1a99f1cdcf3bb494238b391257a49cd0ce5ab2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlPn4gwACgkQcaHudmEf86paPQCfaHitcROboFuM0r4LzhxGDKPj -kBoAn2YHyc6cCJLj+SQSGUNGbtu47ZAK -=fxsW +iEYEAREIAAYFAlRknDgACgkQCaWpQKGI+9T7LgCcCTXRJrakp9BxYmhX2WUK8BgB +HfoAmgJaEBDA+ipePVHFM7q9vdtnL86X +=PE/K -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.28.2-gmodule.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.28.2-gmodule.patch deleted file mode 100644 index 142ca62d588c..000000000000 --- a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-2.28.2-gmodule.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.in b/configure.in -index b60062b..1133b65 100644 ---- a/configure.in -+++ b/configure.in -@@ -37,7 +37,7 @@ LIBXML_REQUIRED=2.0 - RSVG_REQUIRED=2.12 - DBUS_REQUIRED=0.7 - --PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) -+PKG_CHECK_MODULES(PROCMAN, glib-2.0 >= $GLIB_REQUIRED gmodule-2.0 >= $GLIB_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgtop-2.0 >= $LIBGTOP_REQUIRED libwnck-1.0 >= $LIBWNCK_REQUIRED gtk+-2.0 >= $GTK_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gtkmm-2.4 >= $GTKMM_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED librsvg-2.0 >= $RSVG_REQUIRED glibmm-2.4 >= $GLIBMM_REQUIRED giomm-2.4 >= $GIOMM_REQUIRED dbus-glib-1 >= $DBUS_REQUIRED) - - - AC_ARG_ENABLE(more-warnings, diff --git a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch b/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch deleted file mode 100644 index ab5571abd32b..000000000000 --- a/gnome-extra/gnome-system-monitor/files/gnome-system-monitor-3.8.2.1-fix-grid-display.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 22708897fcafa545d767309c0f15d8167848a63c Mon Sep 17 00:00:00 2001 -From: Robert Roth <robert.roth.off@gmail.com> -Date: Wed, 10 Jul 2013 21:27:58 +0000 -Subject: Fixed graph grids not rendered issue (Bug 693677). - -Fixed graph grids not being rendered issue by -redrawing the grids in case of state flags changes, so when the window -gets focused, the grid is redrawn. -http://bugzilla.gnome.org/show_bug.cgi?id=693677 ---- -diff --git a/src/load-graph.cpp b/src/load-graph.cpp -index 4bbac9d..6ede62f 100644 ---- a/src/load-graph.cpp -+++ b/src/load-graph.cpp -@@ -216,6 +216,20 @@ load_graph_configure (GtkWidget *widget, - } - - static gboolean -+load_graph_state_changed (GtkWidget *widget, -+ GtkStateFlags *flags, -+ gpointer data_ptr) -+{ -+ LoadGraph * const graph = static_cast<LoadGraph*>(data_ptr); -+ -+ graph->clear_background(); -+ -+ load_graph_queue_draw (graph); -+ -+ return TRUE; -+} -+ -+static gboolean - load_graph_draw (GtkWidget *widget, - cairo_t * context, - gpointer data_ptr) -@@ -782,6 +796,8 @@ LoadGraph::LoadGraph(guint type) - G_CALLBACK (load_graph_configure), graph); - g_signal_connect (G_OBJECT(disp), "destroy", - G_CALLBACK (load_graph_destroy), graph); -+ g_signal_connect (G_OBJECT(disp), "state-flags-changed", -+ G_CALLBACK (load_graph_state_changed), graph); - - gtk_widget_set_events (disp, GDK_EXPOSURE_MASK); - --- -cgit v0.9.2 diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild deleted file mode 100644 index 58e18f4e0b55..000000000000 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-2.28.2-r1.ebuild,v 1.8 2014/08/10 21:20:11 slyfox Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit autotools gnome2 eutils - -DESCRIPTION="Process viewer and system resource monitor for Gnome" -HOMEPAGE="http://library.gnome.org/users/gnome-system-monitor/" - -SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-patches.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="" - -RDEPEND=">=dev-libs/glib-2.20:2 - >=gnome-base/gconf-2:2 - >=x11-libs/libwnck-2.5:1 - >=gnome-base/libgtop-2.23.1:2 - >=x11-libs/gtk+-2.20:2 - >=x11-themes/gnome-icon-theme-2.15.3 - >=dev-cpp/gtkmm-2.8:2.4 - >=dev-cpp/glibmm-2.16:2 - dev-libs/libxml2:2 - >=gnome-base/librsvg-2.12:2 - >=dev-libs/dbus-glib-0.70" - -DEPEND="${RDEPEND} - virtual/pkgconfig - >=app-text/scrollkeeper-0.3.11 - >=dev-util/intltool-0.35 - app-text/gnome-doc-utils" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} --disable-scrollkeeper" -} - -src_prepare() { - # Apply multiple fixes from 2.32 and master branches - epatch "${WORKDIR}/${P}-patches"/*.patch - - # Underlinking, bug #497108 - epatch "${FILESDIR}/${P}-gmodule.patch" - - rm missing || die # missing script too old, causes autoreconf warnings - eautoreconf - gnome2_src_prepare -} diff --git a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild b/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild deleted file mode 100644 index ffc1ebfae72b..000000000000 --- a/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-system-monitor/gnome-system-monitor-3.10.2.ebuild,v 1.6 2014/03/29 22:05:41 tetromino Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="The Gnome System Monitor" -HOMEPAGE="https://help.gnome.org/users/gnome-system-monitor/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="systemd +X" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" - -RDEPEND=" - >=dev-libs/glib-2.37.3:2 - >=gnome-base/libgtop-2.28.2:2 - >=x11-libs/gtk+-3.9.5:3[X(+)] - >=x11-themes/gnome-icon-theme-2.31 - >=dev-cpp/gtkmm-3.3.18:3.0 - >=dev-cpp/glibmm-2.34:2 - >=dev-libs/libxml2-2.0:2 - >=gnome-base/librsvg-2.35:2 - - systemd? ( >=sys-apps/systemd-38:0= ) - X? ( >=x11-libs/libwnck-2.91.0:3 ) -" -DEPEND="${RDEPEND} - >=app-text/gnome-doc-utils-0.20 - >=dev-util/intltool-0.41.0 - virtual/pkgconfig - - systemd? ( !=sys-apps/systemd-43* ) -" - -src_configure() { - gnome2_src_configure \ - $(use_enable systemd) \ - $(use_enable X wnck) \ - ITSTOOL=$(type -P true) -} diff --git a/gnome-extra/gnome-user-docs/ChangeLog b/gnome-extra/gnome-user-docs/ChangeLog index 77c941592694..30181e664c60 100644 --- a/gnome-extra/gnome-user-docs/ChangeLog +++ b/gnome-extra/gnome-user-docs/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/gnome-user-docs # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.80 2014/07/23 15:18:21 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/ChangeLog,v 1.81 2014/11/13 11:56:24 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -gnome-user-docs-2.32.0.ebuild, + -gnome-user-docs-3.10.3.ebuild: + Drop old (#508854) 23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> gnome-user-docs-3.12.2.ebuild: Stable for x86, wrt bug #512012 diff --git a/gnome-extra/gnome-user-docs/Manifest b/gnome-extra/gnome-user-docs/Manifest index 7ec1f2468bc8..78a7b963ad16 100644 --- a/gnome-extra/gnome-user-docs/Manifest +++ b/gnome-extra/gnome-user-docs/Manifest @@ -1,28 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST gnome-user-docs-2.32.0.tar.bz2 17858824 SHA256 d42c4435590e5b79c8fcf1d917aee485096c02cdc84338bc31f769219ccc87f7 SHA512 d180295b46338f27f827a1dafb2da129cf34c8453e95adc60ee3205c5623038d08ca2aa744d55a67dbe8054b381de0d3c77293663053dc92a556b27cd1cfeb4a WHIRLPOOL 30ac61319d421a20b81831849aae54055b3a8df4720e636b0562e71abd579920f9c53f5e1a24934faf7d9e5bf5e8bfe8e5702489c234b6ad4da32ef4c3fed9e0 -DIST gnome-user-docs-3.10.3.tar.xz 11798784 SHA256 960b6373ea52e41e3deb3501930e024005b29d2cc958bfadc87450a291d2a905 SHA512 c3d93b9114119d42c930cde206e1682a1e8a3df6b324875aaf4d6c6c5cc5a6707c3185c0a1477b91aab69b3d5c623ed5c15554221789725139744041c7d85fd8 WHIRLPOOL 3d6d0db030447a29cfc4c698980d099c23fe9b74be6b2b69e246bd0d655ec18d4f7a7be9ce77ae56bae7928e789c76285d31ba5bb831023921fe1e3c4f856428 DIST gnome-user-docs-3.12.2.tar.xz 13486968 SHA256 4d9ec70d0c91ffda73942e5d496d28f0855aec356d281a7d5f7393a32e2d44b2 SHA512 4e90da0d18d883b881c0fab2d1d204ed47f5bb11518984aa4d7ee8c949b4d83721d3626b91a7f3b23e21ae4c45fdffa0e179aaa0fda714030de161f453137650 WHIRLPOOL 288ab15219eff1f90d97bcdaa0e12a325acf362315b6ef86b0e0a712ea93cf36c1e8a03c0ee88f3c312bbb154566d94e4e046c4dfd687e553ede7bcdb7be4261 -EBUILD gnome-user-docs-2.32.0.ebuild 732 SHA256 763a4214431a94929cc44f3a375383271757a83c824df364fc1f2a4c95dcffa4 SHA512 2f3172b2f0da14ea564c82da93e2274f35eee2e18f5ebee540d7fe6e1c2863b5da51e277e09c36f15c8e4a792e7a97e80153defcf123b0739e2f55bf9b0509c0 WHIRLPOOL 18e59d5dfc00462fcd544672656ce995e301de11c3ba28dd2c86cb6a08bd63e3c44af427faf75dd84d4035ad232f194d241325ed3e8a0c28d2a9e6c936c44137 -EBUILD gnome-user-docs-3.10.3.ebuild 1087 SHA256 5e71f58080f57a2c19a93afbce20e4684131ab6722887d3818b6bb99bb2f284a SHA512 fe194a08354b6a92649d8d9618983b4f835f1518be95de397667b77cc0580207bf11597efd6506d58d582388884cdb50942ef1fa33db8336247f348abd7178f5 WHIRLPOOL 280565a6234b1a080acb4150fc437fb32e53195c12aba58960794ac157e6e3bb05781afe1d66b1c000c6be7f08419d9e87d65a207d49b0b8aaacb14278252e5f EBUILD gnome-user-docs-3.12.2.ebuild 1085 SHA256 ad33f1927be5e100cc5b108b809ba62b0ef8bee69e330963913e091cbe2dfe9a SHA512 0c17b6a9652cf6f93787f9b1fbe1cc249878974482afe6c9946af8889d677d6d1e820b2bed5844bab3dc96cea4337cf01ef6a16afd1673616567528683fd09d9 WHIRLPOOL 8b9b61e4e6ff3599034ddc164f1a209a7b7dde3862196710f93d72ae9115b5e3fdec2318717100fa327c79ef5f3ab5329fc4db71407dbd7b9981aa84859dace8 -MISC ChangeLog 24311 SHA256 59292e509cb5b713b8721dfec8d1686705df470a0e8c9d348220e7e24a0716a7 SHA512 76d3878f67c2e72f2987c3a28e778ec14786c01d17003cd7287349d2e7e3245a64ca38a43ee3bdb5e7f6af740cec1eac397aaa76a5c90591f10a03d20c4a2475 WHIRLPOOL 1cbee8c014b10ce857373d357cf499db2f966946313ce3e833cfaa5fc621f3ae83b4bdd5e196f3f14f0432e13c466d7b0ad9f030e03f93e5209634e52038a175 +MISC ChangeLog 24447 SHA256 066b305e7a21d924ca5c369b8eb12c61812b7e06b82cdc86cd18d07808a98cda SHA512 13d080bb764cc67de040f86c568a0ae4a4be3f3e1c6d9b6c49417694f5e81264f7f241f0c1f6a4881e3e99ede4472b7d18852fcb800d0aae9c937a34842297f4 WHIRLPOOL fa73b73b232241bcd0b088f7d2ca624102e2907bfd842817149c4d8d4e27dfcd5dc46453795d23d769e5570fb3ecee6474f416744afcda0adc40bc3d82672b98 MISC metadata.xml 160 SHA256 4d793ecb79b17794248102d8409d16bc27b1022c72038bd2d1241e129693d5f2 SHA512 677650c05f31fc27035e12f3f5e4b095715dfe12d2d3483f800bfbc6e986a98dbb1997cd52ad7a177b5c120c9b87fe5a2452a4f0f9852ac9a58262e0c5d576c9 WHIRLPOOL 070602fb27fee6a25035c9e93f5c2422270a5781fd11dac318d3f5c32cf9e49163abf7999729df230d3e181b6a1362982744e1f0ac016bf59a3458ae23abbb83 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJTz9I+AAoJELp701BxlEWfuwgP/ioMHTCGro9apb5PaXyJmCS8 -+aQaB/bCp37+QOTi8uruF6MC1ArTBVqxiqN3bgaPApWngOy6ks5fkSbqXA3kNMIc -yOE71HzmX040yRzkusrI1dPZBonzGN/FU1dPwLXOyxWAfP4Lu4OnssdGaoWmKX5M -1tRpZKN0vOMT+IpIlD21AQDlX22NYWLeqCfICH5M9qgjL+6vS1Koe9LGxSon0K2w -/HDAIVFyvOGJnS4dyXPsHyY1cCfxNtbSfVtKxMfhShItbnbFDITp7c63zuoej6VP -RQyBu0CbjmS/vD87aVxuEd94roliUkq4tMo5E9BcilRBCLybl7f0IAAcdSO6OlFO -FLFzzwyNpMVZfr9q9mDHlXanw2r7lt5a3KCxW0j4WJCi0IyjUDy1rMa/ycm+trGy -VgslbOoVRjP/LJw19oQlVlblo8l4VBSdoTLHJOchgqg+87Gx1VbB3o1DFd1aekP9 -0lFp18pjDS2JTk7WNwZAzMl9sFpORSrtwcoY0/V5b0oZheaehx0l+MMMMdGvQPWs -DAt6ISQL1bkx8A7zuCoOtDhmzHOso9T+XkP0ma9JuxnknAWL2BuVSIifkh1RqX8e -2wcJFnnBUxSzfqNJDR7i2NU7N8Tic8LGYx7S+sCm5GheMTWwn5BRtnWQ48SIjd3Y -H1KlCgS1d++G/J7s4iEq -=JWzc +iEYEAREIAAYFAlRknGkACgkQCaWpQKGI+9SazQCfaF9oDzqwIKAWVObzOXpAUvTt +VZ4Anj8XNhevRkuBW1DQWllQ9d4OlicY +=ZPjW -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild deleted file mode 100644 index 44bca15361da..000000000000 --- a/gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-2.32.0.ebuild,v 1.8 2012/05/05 06:25:23 jdhore Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="GNOME end user documentation" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="FDL-1.1" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="test" - -RDEPEND="" -DEPEND="app-text/scrollkeeper - >=app-text/gnome-doc-utils-0.5.6 - virtual/pkgconfig - test? ( - ~app-text/docbook-xml-dtd-4.1.2 - ~app-text/docbook-xml-dtd-4.3 )" - -pkg_setup() { - G2CONF="${G2CONF} --disable-scrollkeeper" - DOCS="AUTHORS ChangeLog NEWS README" -} diff --git a/gnome-extra/gnome-user-docs/gnome-user-docs-3.10.3.ebuild b/gnome-extra/gnome-user-docs/gnome-user-docs-3.10.3.ebuild deleted file mode 100644 index 7e5de6f3658d..000000000000 --- a/gnome-extra/gnome-user-docs/gnome-user-docs-3.10.3.ebuild +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-docs/gnome-user-docs-3.10.3.ebuild,v 1.5 2014/03/09 12:00:26 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="GNOME end user documentation" -HOMEPAGE="https://git.gnome.org/browse/gnome-user-docs" - -LICENSE="CC-BY-3.0" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86 ~x86-fbsd" -IUSE="test" - -RDEPEND="" -DEPEND=" - test? ( dev-libs/libxml2 ) -" -# eautoreconf requires: -# app-text/yelp-tools -# rebuilding translations requires: -# app-text/yelp-tools -# dev-util/gettext - -# This ebuild does not install any binaries -RESTRICT="binchecks strip" - -src_configure() { - # itstool is only needed for rebuilding translations - # xmllint is only needed for tests - gnome2_src_configure \ - $(usex test "" XMLLINT=$(type -P true)) \ - ITSTOOL=$(type -P true) -} - -src_compile() { - # Do not compile; "make all" with unset LINGUAS rebuilds all translations, - # which can take > 2 hours on a Core i7. - return -} diff --git a/gnome-extra/gnome-user-share/ChangeLog b/gnome-extra/gnome-user-share/ChangeLog index 4e8fb41cb79c..5d3c4881e975 100644 --- a/gnome-extra/gnome-user-share/ChangeLog +++ b/gnome-extra/gnome-user-share/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gnome-user-share # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.37 2014/05/27 06:51:19 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/ChangeLog,v 1.38 2014/11/13 11:56:56 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/gnome-user-share-2.30.1-libnotify-0.7.patch, + -gnome-user-share-2.30.1.ebuild: + Drop old (#508854) 27 May 2014; Pacho Ramos <pacho@gentoo.org> -gnome-user-share-3.10.1.ebuild, gnome-user-share-3.10.2.ebuild: diff --git a/gnome-extra/gnome-user-share/Manifest b/gnome-extra/gnome-user-share/Manifest index 2e2ec63eeb11..8cf0182a2d1c 100644 --- a/gnome-extra/gnome-user-share/Manifest +++ b/gnome-extra/gnome-user-share/Manifest @@ -1,17 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gnome-user-share-2.30.1-libnotify-0.7.patch 1340 SHA256 60fcfe4a7120b7a917e2aec227f3a40fe4993bc9c80f2722f856fbe4e6e4994e SHA512 93c8a5f1355d3a7f7da759c68e633d820e3206eaa72bf5c7a828a25c1d6fa79968c18c0c61f9003eee18d7e0a9c6af37d89867bc686d4d91155652e11d777d43 WHIRLPOOL bdc427c967186bcb6ac66476f50acf035fa7c3ae4c27a93d05afa645ed4c18998261b44ad2ece0dd5a238090d3e28c611faacb6ef1721212cffd3919eaf8bd84 -DIST gnome-user-share-2.30.1.tar.bz2 959747 SHA256 30ba07420a495450f80b4be001601150453ddc3504ff23c486fd1541ff5a1bfe DIST gnome-user-share-3.10.2.tar.xz 383320 SHA256 1d1ea57a49224c36e7cba04f80265e835639377f474a7582c9e8ac946eda0f8f SHA512 792a7444475d6f02c53a9661192dc5550b2c7ca29975d5c9d33d9ef481440d9e4bca5f7f70861df4503e8331044a1db10fe6501cdaccc8f9d314c239c308078e WHIRLPOOL cf3c605ce1801797d5e915e266f7fa73aeb35b10efa07ca2b1a5b69cbb185910956b9342f7dc83ef4e5e3deb1ae0db3586b5e83566c48d4c1951fd6530a3abd1 -EBUILD gnome-user-share-2.30.1.ebuild 1637 SHA256 456a713dc4ae2f8d4e52d28db857fc4ca9b11660dc72e25a01e2b82d5c40086b SHA512 d2240550201ab0fdfb64c588f5a423718251f884545ea643b2644062db7752116922a385b1432713235fd5da0c503a177592322ca8be0d26ccdcf1558bdbaa72 WHIRLPOOL 02821c56fb26ae22f16084cc3aad0e5bbf3ade2320c5b14cee4bfce8abe54fc2f274012a707eaac67ee605ec5e29dcb85c7a54baeae826c73e5b6ec05ae20166 EBUILD gnome-user-share-3.10.2.ebuild 1347 SHA256 22981ed73b3b6ce2c7c5914c9dc11c5b3dc51adc8251f0cf8df5475b36790d9e SHA512 7a11672e8f2fdbf21747b84d7aaf76c66ab5d1f89ee1cbffb482d5e2967744d77aa1c68b2ff8198611422838fb4f78136a923c19c680766ee6e2fa44945c64e5 WHIRLPOOL 8506680fe0ba99eb5ac5ec678e7985a1a72a76d36ba0bcfbf7279cf70475d86c3bb0d43c2b821fdcf88b3ef6e5f4c01d43106fc9771f53d6e303dabf72eb3e4b -MISC ChangeLog 6196 SHA256 364c738122ea213317c192c1c2138c9cf820bdd2f38137677314ec33875185cb SHA512 f9de8b2ada550f491dddabcc58ed50696e1091d5af01f3a0f5788f7a184a4bf6db720cf1f19b045b68b11b11e6cf7e5889cd1736f1f00f18fe1c23fa9c55ecab WHIRLPOOL 305c7e653f410e2985383d6b48fd323ab20e28205563c52bf70af48743562da0b64c615b1fdf0bc5e14a1695e357ee019309e762facee79643007f6a32575766 +MISC ChangeLog 6353 SHA256 fa1d154821501b190665d65fa36a19aefcedb75f3d011db061f38676e23e0830 SHA512 a2d71fbdb1d40cecb63b3a1f2a9bc3c313bb33b23ca0edfea686db380e33df758fdb3b39044e2d3507dddb64bc07f4f7c77729749df9a4cfd7bb615da7524ad0 WHIRLPOOL 4eceb3e616847d649db8b6683b44dfdc7fc6dd0e6e31027b4855344a62e867bbeb9417a9721f579baa3675688677104f1038feacd679213c26450d8dffb7e79c MISC metadata.xml 306 SHA256 185c811ac4adbf390d2d997eaba05f7a5115bc35e1b1baa5e75165a9afe1cb18 SHA512 29dd6f73edaf9bc1cd3963758834c9b070b4781a5cc8e25be9ae236b8534d83d5b585a9f5e1a488e1605ac051af6793462d7e226318d228f460b0a77ae2c7915 WHIRLPOOL bc260875f60e4b96d4f2bcf6a976f6a4486be064bbaf26de72a37e3da79957b14ce04f5fd2214c5e9a4dd29a6a5e4c9b8dea4fe42acd4c8dadf6dd1b5e0c1534 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlOENewACgkQCaWpQKGI+9QscQCfevSuOGBcLUcSdJbntcPR37fm -A9QAn151V5hK+n7+Gz7SV7d5bkhRpxDZ -=pnrx +iEYEAREIAAYFAlRknIkACgkQCaWpQKGI+9SflACfdiUjWNqzQlV767ji226YFQFS +x4gAnRmT1t/DYRfK8YShMc7GlhT5m/vI +=NV8L -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-user-share/files/gnome-user-share-2.30.1-libnotify-0.7.patch b/gnome-extra/gnome-user-share/files/gnome-user-share-2.30.1-libnotify-0.7.patch deleted file mode 100644 index 73c5a9ab8f01..000000000000 --- a/gnome-extra/gnome-user-share/files/gnome-user-share-2.30.1-libnotify-0.7.patch +++ /dev/null @@ -1,31 +0,0 @@ -http://pkgs.fedoraproject.org/gitweb/?p=gnome-user-share.git;a=blob;f=notify.patch;hb=HEAD - ---- src/obexpush.c -+++ src/obexpush.c -@@ -139,10 +139,9 @@ show_notification (const char *filename) - /* Translators: %s is the name of the filename received */ - notification_text = g_strdup_printf(_("You received \"%s\" via Bluetooth"), display); - g_free (display); -- notification = notify_notification_new_with_status_icon (_("You received a file"), -- notification_text, -- "dialog-information", -- GTK_STATUS_ICON (statusicon)); -+ notification = notify_notification_new (_("You received a file"), -+ notification_text, -+ "dialog-information"); - - notify_notification_set_timeout (notification, NOTIFY_EXPIRES_DEFAULT); - -@@ -218,10 +217,10 @@ device_is_authorised (const char *bdaddr - char *device_path; - GHashTable *props; - -- g_message ("checking adapter %s", g_ptr_array_index (adapters, i)); -+ g_message ("checking adapter %s", (char *)g_ptr_array_index (adapters, i)); - - adapter = dbus_g_proxy_new_for_name (connection, "org.bluez", -- g_ptr_array_index (adapters, i), "org.bluez.Adapter"); -+ (char *)g_ptr_array_index (adapters, i), "org.bluez.Adapter"); - - if (dbus_g_proxy_call (adapter, "FindDevice", NULL, - G_TYPE_STRING, bdaddr, G_TYPE_INVALID, diff --git a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild b/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild deleted file mode 100644 index 2b5c99ebf763..000000000000 --- a/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-user-share/gnome-user-share-2.30.1.ebuild,v 1.10 2012/05/06 05:39:00 tetromino Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit eutils gnome2 multilib - -DESCRIPTION="Personal file sharing for the GNOME desktop" -HOMEPAGE="http://www.gnome.org/" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="" - -# FIXME: could libnotify be made optional ? -# is consolekit needed or not ? -# FIXME: gnome-bluetooth is a hard-dep -# bluetooth is pure runtime dep (dbus) -RDEPEND=">=dev-libs/glib-2.16.0 - >=x11-libs/gtk+-2.14:2 - >=app-mobilephone/obex-data-server-0.4 - >=dev-libs/dbus-glib-0.70 - dev-libs/libunique:1 - >=gnome-base/gconf-2.10:2 - >=gnome-base/nautilus-2 - media-libs/libcanberra[gtk] - >=net-wireless/gnome-bluetooth-2.27.7.2:2 - >=net-wireless/bluez-4.18 - >=sys-apps/dbus-1.1.1 - >=www-apache/mod_dnssd-0.6 - =www-servers/apache-2.2*[apache2_modules_dav,apache2_modules_dav_fs,apache2_modules_authn_file,apache2_modules_auth_digest,apache2_modules_authz_groupfile] - >=x11-libs/libnotify-0.7" -DEPEND="${RDEPEND} - sys-devel/gettext - >=dev-util/intltool-0.35 - virtual/pkgconfig - app-text/gnome-doc-utils - app-text/docbook-xml-dtd:4.1.2" - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - --with-httpd=apache2 - --with-modules-path=/usr/$(get_libdir)/apache2/modules/" -} - -src_prepare() { - epatch "${FILESDIR}"/${P}-libnotify-0.7.patch - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - # nautilus does not need la files - find "${ED}" -name "*.la" -delete -} diff --git a/gnome-extra/gnome-utils/ChangeLog b/gnome-extra/gnome-utils/ChangeLog index 8973c74cc1f6..95e3691ec55e 100644 --- a/gnome-extra/gnome-utils/ChangeLog +++ b/gnome-extra/gnome-utils/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for gnome-extra/gnome-utils # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.237 2014/02/22 22:00:08 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/ChangeLog,v 1.238 2014/11/13 11:58:20 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/gnome-utils-2.32.0-fix-uninitialized.patch, + -files/gnome-utils-2.32.0-new-icons.patch, + -files/gnome-utils-2.32.0-new-icons2.patch, + -files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch, + -gnome-utils-2.32.0-r2.ebuild, metadata.xml: + Drop old (#508854) 22 Feb 2014; Pacho Ramos <pacho@gentoo.org> gnome-utils-3.8.0.ebuild: Fix wrong commit, bug 502160 diff --git a/gnome-extra/gnome-utils/Manifest b/gnome-extra/gnome-utils/Manifest index d0393d5a8d9e..763f5955dfcd 100644 --- a/gnome-extra/gnome-utils/Manifest +++ b/gnome-extra/gnome-utils/Manifest @@ -1,20 +1,13 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX gnome-utils-2.32.0-fix-uninitialized.patch 903 SHA256 e4ded0888d6350452ffc4053edd3c5133fc86807c76c4a6f9d2e311ec2fe3919 SHA512 838a0c2728e937ef2e1e65de24d77b7233318e1bc66c16a071ec9da83bad33a9eae6648a45e1650a070ce755142eb76a130fd5604b2cdcd58b4ed8a8a93c1ed6 WHIRLPOOL 32f7523e00b6e0babcbc52e8496622385c3f9333fae0c71cfdabd65af6352c8663bf8eb7dace6970f76ea5f77f72d725de323769fc3c18f6e6f7feb648789705 -AUX gnome-utils-2.32.0-new-icons.patch 5478 SHA256 9410f0dd5cc2f7484330f5fdaa336355e0b43cd5501ec118db5d14136f870b36 SHA512 fb4bc13a07ae1955118f2df7aa294052a99dc459a1583ca2ff6c1d9c79667e8ad5fea616933791383c4a5ca836e8c52f049e8677e1d48c93bd25857a22430f65 WHIRLPOOL 73d1d0fc53cd0cf259fa90dfa3f0218855a44f56165e36063d92b17d0aa26a4538eeb143c73ffce8bbaf9751e2fdf3d210749a1d0c07a41205d9518c10b9a1d6 -AUX gnome-utils-2.32.0-new-icons2.patch 564 SHA256 31edf1380334941fc092d21be21ba320fdaf0de0498268f981fcbf798d20f3ca SHA512 dcf7e8cd550bf02b31344f5e074092af1e7dd34fd80ebaf01e6f4a23b71ff0af6429cc582510fb23145f2ad922490786749670c9aa662a5f3e7c4965d33e8201 WHIRLPOOL 0dd5d092d41412ca26a2c51c2b78b8a68d7f18f00fd2e6dddd457c8e3437ee6ac06d4ebf6818b3ca5c1b87fc991c0e4b99bd4d0ebd68a8f6c595031ea1a8f50f -AUX gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch 1676 SHA256 5632f8a8bd3ed0af34f24aaa9b42639b7bae350e9f40995b0db8748d47a0aa08 SHA512 b64528f450d34af7f0a303beb53839919a7160676050040864498bf16cb632aef2bd4ab2cc52e1bd287a3d5f998fa15dc014e4fc33ba9dc07e1e3129bf7beb41 WHIRLPOOL 07d3764ceb992c9895ccdf82718f21328c9998fe8de6ab2d3326ee8f3fb6411105c5f450c74562306070f3dd7bffd586e940554c391c1723326cb2096b1da956 -DIST gnome-utils-2.32.0-icons.tar.xz 153632 SHA256 234e86914fa49daf3b11ffe7efb7090a3caf4146dce41414724b597e0e9c508e SHA512 208f547ce95aa4d31d9e605132187fcf5076738c44c6513ccc9c291735d3b64b11f3de8c2e544f585a5a2d4cf02eafcbd1ac670e5beb50dbd4063538f3f668fd WHIRLPOOL 2fe200b8a3383f84e21e594209aeb8d4b36f58812b8b965f73f4084904baea1733bcb1cbfabf874e8a2bf77dc33b3cd7f7e563574f8f961a2acddd457a602b6d -DIST gnome-utils-2.32.0.tar.bz2 7705320 SHA256 033a55cf442096b28ea6292043354feafe000d1e5f4ebb962a9b6d72eb9a93fa SHA512 77d0cbbe6982ee9a7c08bfddfdd010416188cae02a633f76e7fbe9eb927206bf80a6b95475290f032995fb9afe8afb9ab8a986679ae4e9226d1b40a1243d0435 WHIRLPOOL 60deb4e802ac45753ca294975c7f08d916690b82c646c3d1013f0157ac7c27a0e13e01240fba04673c9c6a2d52c5ac1e11bb5a7aceefd14c60a6dce0fc5ea3c7 -EBUILD gnome-utils-2.32.0-r2.ebuild 2517 SHA256 10f2ac17f0d2a4bb4b9c501462d04c48df1d6f43909fd7ca71dea79d6421d79a SHA512 dd103b986e09f9b0d06875fb8503c138494f7912be74e184b817b95f5f44bdb6e73735e2b6d84c570e1b062352a8c5c965c998aeeecc078436e821683339d54d WHIRLPOOL 819103993a8e12f8c3afbe0358b4ad7b9c3e51d2c901bffcddfe92a8bbb2ac449feabc49125aeaac95f1017433a0c9c9b04601ad9bedd15095d528dc82958e60 EBUILD gnome-utils-3.8.0.ebuild 729 SHA256 634ffe469f6c794bc6c6892aa5c0069a7a430697955832fcba763041009940f1 SHA512 c2f72267aacd13901b7153320a0c566ee91caf7de20685ae014f69606e7fce9088c1727e5b56b089d58ea649591350366b9d3c29655b962711e828bf68a4e6d2 WHIRLPOOL 5155c52534dba1cf3be44fdeeb16f534ed33cece30d265bf0b190ea714018aad95b47c3b199429220cb609714ebd7e870dd1ab80391306ed95aa917e0822d9e8 -MISC ChangeLog 30953 SHA256 9737ee75a7b89e32367f5c47556fea1655e08e73a6cdb33ea4bd10b5ecad9adc SHA512 c8f09975c94d212632c1ee3c9b4d663f0abd90fa4cec69062ac37504fabc74e44b60fd548f27d3175eb9c00f1d501ed07dab0e3352cb491a7027bec42d50a30c WHIRLPOOL 0bc1acf4421ed4404846ef64d6b01f73c7a16c2105e9fdd99569a737f38a022acc0f72594aafbc1f751bcaf78d050f4a6eb349312205be65e5016028bd83f357 -MISC metadata.xml 305 SHA256 3c6d345a89e0c8dbacd26f232e8220bd2558bc90cff9041e3e07f2f44ce4bb85 SHA512 79170bd678b349d369a81373a81a33432425d7a9e2d8ff494511e326bbe00de5bfb2601a2d898c532b0d2e6557660d72f78380bcc56fadcc6470bf7e6620859b WHIRLPOOL be8cc6fb95531b56f9db629ea8471dcffaec4b89fa1a2a862ea6c48cd816d902952e17f12f0daaf58d0e0ad35ce1fc13645edd1461818674f1d4bc934c1b3686 +MISC ChangeLog 31264 SHA256 3ef51a6a3943a1967f490deb80088525cac7dbc94b858c1afc1a66760432e9eb SHA512 296727c43c98330f9e31c5a521b82569ff03e1d4328ce5dc739e7e1869cd11ba77154f9a1d9648fa5a3dff4dd1f8e9c63e43174a9730609b1a1e62a939923592 WHIRLPOOL a0984e636d94901e50839aafa18e5270a0d556c954ea8612d564b5e240b5cf5d3024301b702d2a4e7dce60f4f5cb538e26f5cec3def7bc3f9a81ae4255147ef1 +MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.22 (GNU/Linux) +Version: GnuPG v2 -iEYEAREIAAYFAlMJHekACgkQCaWpQKGI+9QK4ACfdbJri3SnqmPUgRw6/aE9NIZ2 -4rMAn0o53vdNwHx9kZkua5I7u+mQa6pR -=971z +iEYEAREIAAYFAlRknN0ACgkQCaWpQKGI+9Te3QCfROF64+xpfoucx9ohcrBpQwvB +CAgAnigsT+VPiGhc9fJWkzBEbt4Al65c +=t+FW -----END PGP SIGNATURE----- diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-fix-uninitialized.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-fix-uninitialized.patch deleted file mode 100644 index de6328cb94e3..000000000000 --- a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-fix-uninitialized.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 731213444231504c558216930a0bfe5010a2ea67 Mon Sep 17 00:00:00 2001 -From: Paolo Borelli <pborelli@gnome.org> -Date: Fri, 05 Nov 2010 23:52:30 +0000 -Subject: [logview] Fix uninitialized variable - -If buffer_lines is empty date is never initialized. ---- -diff --git a/logview/logview-utils.c b/logview/logview-utils.c -index cd43f07..793a89d 100644 ---- a/logview/logview-utils.c -+++ b/logview/logview-utils.c -@@ -136,7 +136,8 @@ log_read_dates (const char **buffer_lines, time_t current) - { - int current_year, offsetyear, i, n, rangemin, rangemax, timestamp_len = 0; - GSList *days = NULL; -- GDate *date, *newdate; -+ GDate *date = NULL; -+ GDate *newdate; - struct tm *tmptm; - char *date_string; - Day *day; -@@ -274,4 +275,4 @@ log_read_dates (const char **buffer_lines, time_t current) - days = g_slist_sort (days, days_compare); - - return days; --} -\ No newline at end of file -+} --- -cgit v0.9 diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons.patch deleted file mode 100644 index 951d709e7d8f..000000000000 --- a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons.patch +++ /dev/null @@ -1,169 +0,0 @@ -From 440b7c685f17ab79396944c010bf4e508325e7a8 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Wed, 16 Mar 2011 15:48:49 +0000 -Subject: logview: add new high-res icon - -Courtesy of Lapo Calamandrei. - -https://bugzilla.gnome.org/show_bug.cgi?id=643986 ---- -diff --git a/configure.ac b/configure.ac -index ffe068f..5284219 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -376,6 +376,7 @@ AC_CONFIG_FILES([ - - logview/Makefile - logview/data/Makefile -+ logview/data/icons/Makefile - logview/tests/Makefile - logview/help/Makefile - -diff --git a/logview/data/Makefile.am b/logview/data/Makefile.am -index 5507d63..efa3671 100644 ---- a/logview/data/Makefile.am -+++ b/logview/data/Makefile.am -@@ -1,3 +1,5 @@ -+SUBDIRS=icons -+ - xmldir = $(pkgdatadir) - xml_DATA = logview-toolbar.xml logview-filter.ui - -diff --git a/logview/data/gnome-system-log.desktop.in.in b/logview/data/gnome-system-log.desktop.in.in -index aafdd94..1375969 100644 ---- a/logview/data/gnome-system-log.desktop.in.in -+++ b/logview/data/gnome-system-log.desktop.in.in -@@ -2,7 +2,7 @@ - _Name=Log File Viewer - _Comment=View or monitor system log files - Exec=gnome-system-log --Icon=logviewer -+Icon=logview - Terminal=false - Type=Application - StartupNotify=true -diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am -new file mode 100644 -index 0000000..5131cf9 ---- a/dev/null -+++ b/logview/data/icons/Makefile.am -@@ -0,0 +1,61 @@ -+NULL = -+ -+public_icons_themes = \ -+ hicolor \ -+ $(NULL) -+ -+public_icons = \ -+ hicolor_apps_16x16_logview.png \ -+ hicolor_apps_22x22_logview.png \ -+ hicolor_apps_32x32_logview.png \ -+ hicolor_apps_48x48_logview.png \ -+ hicolor_apps_256x256_logview.png \ -+ $(NULL) -+ -+noinst_DATA = \ -+ $(NULL) -+ -+EXTRA_DIST = \ -+ $(public_icons) \ -+ $(noinst_DATA) \ -+ $(NULL) -+ -+############################################################################### -+ -+gtk_update_icon_cache = gtk-update-icon-cache -f -t -+ -+update-icon-cache: -+ @-if test -z "$(DESTDIR)"; then \ -+ echo "Updating Gtk icon cache."; \ -+ for theme in $(public_icons_themes); do \ -+ $(gtk_update_icon_cache) $(datadir)/icons/$$theme; \ -+ done; \ -+ else \ -+ echo "*** Icon cache not updated. After (un)install, run this:"; \ -+ for theme in $(public_icons_themes); do \ -+ echo "*** $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \ -+ done; \ -+ fi -+ -+install-icons: -+ for icon in $(public_icons); do \ -+ THEME=`echo $$icon | cut -d_ -f1`; \ -+ CONTEXT=`echo $$icon | cut -d_ -f2`; \ -+ SIZE=`echo $$icon | cut -d_ -f3`; \ -+ ICONFILE=`echo $$icon | cut -d_ -f4`; \ -+ mkdir -p $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \ -+ $(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ -+ done -+ -+uninstall-icons: -+ -for icon in $(public_icons); do \ -+ THEME=`echo $$icon | cut -d_ -f1`; \ -+ CONTEXT=`echo $$icon | cut -d_ -f2`; \ -+ SIZE=`echo $$icon | cut -d_ -f3`; \ -+ ICONFILE=`echo $$icon | cut -d_ -f4`; \ -+ rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \ -+ done -+ -+install-data-local: install-icons update-icon-cache -+ -+uninstall-local: uninstall-icons update-icon-cache -diff --git a/logview/data/icons/hicolor_apps_16x16_logview.png b/logview/data/icons/hicolor_apps_16x16_logview.png -new file mode 100644 -index 0000000..34638e0 ---- a/dev/null -+++ b/logview/data/icons/hicolor_apps_16x16_logview.png -Binary files differ -diff --git a/logview/data/icons/hicolor_apps_22x22_logview.png b/logview/data/icons/hicolor_apps_22x22_logview.png -new file mode 100644 -index 0000000..ff6fad5 ---- a/dev/null -+++ b/logview/data/icons/hicolor_apps_22x22_logview.png -Binary files differ -diff --git a/logview/data/icons/hicolor_apps_256x256_logview.png b/logview/data/icons/hicolor_apps_256x256_logview.png -new file mode 100644 -index 0000000..45334bf ---- a/dev/null -+++ b/logview/data/icons/hicolor_apps_256x256_logview.png -Binary files differ -diff --git a/logview/data/icons/hicolor_apps_32x32_logview.png b/logview/data/icons/hicolor_apps_32x32_logview.png -new file mode 100644 -index 0000000..943028d ---- a/dev/null -+++ b/logview/data/icons/hicolor_apps_32x32_logview.png -Binary files differ -diff --git a/logview/data/icons/hicolor_apps_48x48_logview.png b/logview/data/icons/hicolor_apps_48x48_logview.png -new file mode 100644 -index 0000000..b00429e ---- a/dev/null -+++ b/logview/data/icons/hicolor_apps_48x48_logview.png -Binary files differ -diff --git a/logview/logview-app.c b/logview/logview-app.c -index a4a5415..6ce64bb 100644 ---- a/logview/logview-app.c -+++ b/logview/logview-app.c -@@ -75,7 +75,7 @@ logview_app_set_window (LogviewApp *app) - retval = TRUE; - } - -- gtk_window_set_default_icon_name ("logviewer"); -+ gtk_window_set_default_icon_name ("logview"); - - return retval; - } -diff --git a/logview/logview-window.c b/logview/logview-window.c -index 50eca54..9398cf8 100644 ---- a/logview/logview-window.c -+++ b/logview/logview-window.c -@@ -768,7 +768,7 @@ logview_about (GtkWidget *widget, GtkWidget *window) - "translator_credits", strcmp (logview_about_translator_credits, - "translator-credits") != 0 ? - logview_about_translator_credits : NULL, -- "logo_icon_name", "logviewer", -+ "logo_icon_name", "logview", - NULL); - g_free (license_trans); - --- -cgit v0.9 diff --git a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons2.patch b/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons2.patch deleted file mode 100644 index 072463b5a1ae..000000000000 --- a/gnome-extra/gnome-utils/files/gnome-utils-2.32.0-new-icons2.patch +++ /dev/null @@ -1,22 +0,0 @@ -From 104f536687255ac939ab4e779081ef30aa033d15 Mon Sep 17 00:00:00 2001 -From: Cosimo Cecchi <cosimoc@gnome.org> -Date: Mon, 21 Mar 2011 16:50:00 +0000 -Subject: logview: ship the SVG source for the new hires icon - ---- -(limited to 'logview/data/icons/Makefile.am') - -diff --git a/logview/data/icons/Makefile.am b/logview/data/icons/Makefile.am -index 5131cf9..65be8d4 100644 ---- a/logview/data/icons/Makefile.am -+++ b/logview/data/icons/Makefile.am -@@ -13,6 +13,7 @@ public_icons = \ - $(NULL) - - noinst_DATA = \ -+ logview.svg \ - $(NULL) - - EXTRA_DIST = \ --- -cgit v0.9 diff --git a/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch b/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch deleted file mode 100644 index 0acdf24c4784..000000000000 --- a/gnome-extra/gnome-utils/files/gnome-utils-3.2.1-glib-2.32-gtk-3.4.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 0c4555bc321b27b8f6d54be63562ed315a6bddcb Mon Sep 17 00:00:00 2001 -From: Alexandre Rostovtsev <tetromino@gentoo.org> -Date: Sun, 15 Apr 2012 00:16:59 -0400 -Subject: [PATCH] font-viewer: fix building with glib-2.32 gtk+-3.4 - -Due to changes in glib's and gtk's pkgconfig files, freetype2 must -now be checked for explicitly, and gthread flags explicitly added. ---- - configure.ac | 4 ++++ - font-viewer/Makefile.am | 6 +++++- - 2 files changed, 9 insertions(+), 1 deletions(-) - -diff --git a/configure.ac b/configure.ac -index b25d4ec..c8a07f6 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -104,6 +104,10 @@ PKG_CHECK_MODULES(GCONF, gconf-2.0) - AC_SUBST(GCONF_CFLAGS) - AC_SUBST(GCONF_LIBS) - -+PKG_CHECK_MODULES(FREETYPE2, freetype2) -+AC_SUBST(FREETYPE2_CFLAGS) -+AC_SUBST(FREETYPE2_LIBS) -+ - # For each cycle: - # first release: increment major += 1, minor = micro = 0; - # each release before API freeze: minor += 1; -diff --git a/font-viewer/Makefile.am b/font-viewer/Makefile.am -index ed8d380..74ecb95 100644 ---- a/font-viewer/Makefile.am -+++ b/font-viewer/Makefile.am -@@ -1,6 +1,8 @@ - - INCLUDES = \ -+ $(FREETYPE2_CFLAGS) \ - $(GIO_CFLAGS) \ -+ $(GTHREAD_CFLAGS) \ - $(GTK_CFLAGS) \ - -DDIRECTORY_DIR=\"$(directorydir)\" \ - -DGNOMELOCALEDIR=\"$(datadir)/locale\" -@@ -14,7 +16,9 @@ ftstream_SOURCES = \ - ftstream-vfs.c - - gnome_thumbnail_font_LDADD = \ -+ $(FREETYPE2_LIBS) \ - $(GIO_LIBS) \ -+ $(GTHREAD_LIBS) \ - $(GTK_LIBS) - - gnome_thumbnail_font_SOURCES = \ -@@ -24,7 +28,7 @@ gnome_thumbnail_font_SOURCES = \ - totem-resources.h - - gnome_font_viewer_LDADD = \ -- $(XFT_LIBS) \ -+ $(FREETYPE2_LIBS) \ - $(GIO_LIBS) \ - $(GTK_LIBS) - --- -1.7.8.5 - diff --git a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild b/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild deleted file mode 100644 index 5ee009ca994c..000000000000 --- a/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild +++ /dev/null @@ -1,85 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gnome-utils/gnome-utils-2.32.0-r2.ebuild,v 1.9 2012/05/05 02:22:38 tetromino Exp $ - -EAPI="4" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" -GNOME_TARBALL_SUFFIX="bz2" - -inherit gnome2 eutils autotools - -DESCRIPTION="Utilities for the Gnome desktop" -HOMEPAGE="https://live.gnome.org/GnomeUtils" -SRC_URI="${SRC_URI} http://dev.gentoo.org/~pacho/gnome/${P}-icons.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux" -IUSE="bonobo doc ipv6 test" - -RDEPEND=">=dev-libs/glib-2.20:2 - >=x11-libs/gtk+-2.20:2 - >=gnome-base/libgtop-2.12 - >=gnome-base/gconf-2:2 - >=media-libs/libcanberra-0.4[gtk] - x11-libs/libXext - x11-libs/libX11 - bonobo? ( || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) )" - -DEPEND="${RDEPEND} - x11-proto/xextproto - app-text/gnome-doc-utils - app-text/scrollkeeper - >=dev-util/intltool-0.40 - virtual/pkgconfig - doc? ( >=dev-util/gtk-doc-1.10 ) - dev-util/gtk-doc-am - gnome-base/gnome-common" - -pkg_setup() { - if ! use debug; then - G2CONF="${G2CONF} --enable-debug=minimum" - fi - - G2CONF="${G2CONF} - $(use_enable ipv6) - $(use_enable bonobo gdict-applet) - --disable-maintainer-flags - --enable-zlib - --disable-static - --disable-schemas-install - --disable-scrollkeeper" - DOCS="AUTHORS ChangeLog NEWS README THANKS" -} - -src_prepare() { - # Fix uninitialized variable preventing crashes (already fixed in master) - epatch "${FILESDIR}/${P}-fix-uninitialized.patch" - - # Provide updated icons - epatch "${FILESDIR}/${P}-new-icons.patch" - epatch "${FILESDIR}/${P}-new-icons2.patch" - - # Remove idiotic -D.*DISABLE_DEPRECATED cflags - # This method is kinda prone to breakage. Recheck carefully with next bump. - # bug 339074 - LC_ALL=C find . -iname 'Makefile.am' -exec \ - sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 1 failed" - # Do Makefile.in after Makefile.am to avoid automake maintainer-mode - LC_ALL=C find . -iname 'Makefile.in' -exec \ - sed -e '/-D[A-Z_]*DISABLE_DEPRECATED/d' -i {} + || die "sed 2 failed" - - if ! use test ; then - sed -e 's/ tests//' -i logview/Makefile.{am,in} || die "sed 3 failed" - fi - - # Fix intltoolize broken file, see upstream #577133 - sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in \ - || die "sed failed" - - intltoolize --force --copy --automake || die "intltoolize failed" - eautoreconf - - gnome2_src_prepare -} diff --git a/gnome-extra/gnome-utils/metadata.xml b/gnome-extra/gnome-utils/metadata.xml index b1fd14e1d978..da6fd63d0085 100644 --- a/gnome-extra/gnome-utils/metadata.xml +++ b/gnome-extra/gnome-utils/metadata.xml @@ -2,8 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> -<use> - <flag name="bonobo">Enable applets (gdict one) still not ported to - DBUS, requiring deprecated bonobo support in gnome-panel.</flag> -</use> </pkgmetadata> diff --git a/gnome-extra/gtkhtml/ChangeLog b/gnome-extra/gtkhtml/ChangeLog index 7e93e3e7e729..72159cd60f22 100644 --- a/gnome-extra/gtkhtml/ChangeLog +++ b/gnome-extra/gtkhtml/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for gnome-extra/gtkhtml # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.295 2014/10/15 15:46:18 leio Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/ChangeLog,v 1.296 2014/11/13 11:59:18 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/gtkhtml-3.32.2-g_thread_init.patch, -gtkhtml-3.32.2.ebuild, + -gtkhtml-4.8.4.ebuild: + Drop old (#508854) *gtkhtml-4.8.5 (15 Oct 2014) diff --git a/gnome-extra/gtkhtml/Manifest b/gnome-extra/gtkhtml/Manifest index 0a5ddf77b350..54f23f8486eb 100644 --- a/gnome-extra/gtkhtml/Manifest +++ b/gnome-extra/gtkhtml/Manifest @@ -1,11 +1,16 @@ -AUX gtkhtml-3.32.2-g_thread_init.patch 669 SHA256 a633ca81745ff46e0b9aaa8c6748014779d64bb38f8ca4d290f6e6046dcce115 SHA512 9462abc3c0b3d3c7edfde95af27334bb0be5bcdd78c59e0e33b53bd5dfaa4bce1227d380c87b71956c544463fe5d4c4be1d32b2e71224215e8609be5be93d735 WHIRLPOOL 3f102b287b684078d5b2a9ea2d4d12e881157346a6d648581c30d8330a91149de74051fa4755fefe96637d123add41157b8979b2253ffac25bac5305975ccaba -DIST gtkhtml-3.32.2.tar.bz2 1217025 SHA256 8746053cf709e1de37c7ac775ab1364ddda4b75167660ed7f98a237b3797e39f SHA512 a641a6e2208ad9db9ab3c3dc4696cf010b70f64d302b6f889a275db396544570ee5c894835a18ea94699375d0e2fd91fd7414a0546ce5f62bcb6d603d331b1d5 WHIRLPOOL e6563edfd31a430853533dbdc3a07101e919c672b3ce79f6cf94167067c615e60b5677712cfa5672767895f099cc548efe821d1b1515e1f84c5ddd19a5f9a73f +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + DIST gtkhtml-4.8.3.tar.xz 1049224 SHA256 e72a6e9b180217aefb1d9dbd8a2fd41f00419cd1f268e1a7e1e2aef2b54a8341 SHA512 175e86974a3b9499d20166a11a1b30c680dd1b55baae32f3595153994daf42c628685cbc2db683354d8476b2c78b36490e929bebe3c8b2aa8248e40c2188b4da WHIRLPOOL d3cb784e63770c7292457105f28dcb0c66960775c60c11dbf106130a69fae5a1f1abdfd4ac7fbbfcb688954401cd903ad321633ea9fa43eca3657b39c9b7e8db -DIST gtkhtml-4.8.4.tar.xz 1049712 SHA256 00363771f5c5fef28ec90bcd643d9375d61efa6c88e770e874c3b64d3cf3b25d SHA512 f7bb5ba73722809d7388fc98a19beb5cf0df01e8be8ce0b46c4c7bd4e0c64fb672f2318ffcf3094994ba094f77574669836156200f5f2ae6bf4869ce38abdb86 WHIRLPOOL 0b688681630ce9ab7c50c6d224d449ebf86a7ba598babb917b04c646b4bf81741268bfb97991345d4b4c64b20d0753fdf846af4475a7e4b3b32b57a25e9548c9 DIST gtkhtml-4.8.5.tar.xz 1049900 SHA256 2ff5bbec4d8e7eca66a36f7e3863a104e098ce9b58e6d0374de7cb80c3d93e8d SHA512 c35d67b22254570a92739c73a610230659a2ac63ab5e5a135a634655e679b39ad876cdf6abec4adabd0a9ba9ef87834745d03c7e0c005372bfe5485adff5ade3 WHIRLPOOL 665ab2d5319f3824ac26328b012bce0419b0c031b982ed0ef380679f8966f485c2813c2ea0e3a56688c610e1e3fc663592ab7c16cd546292c88254dd9e716d61 -EBUILD gtkhtml-3.32.2.ebuild 1558 SHA256 9ae4640bc5f92399fcf828250bdc2c634bb6dd5512524a9da44e3288dd9ea74b SHA512 575c1c92d70a9f7d1d085322d34f9f67f8de591f1e06aa2bfd6dcd07a945e9d6481e8b192b89d9f90840a1ecdb2ec6d4b5644cf39d405df2a06907fdde3c58e6 WHIRLPOOL 0a45f575f85b3552a70cefa959062b576cb6fc4909fbed5b58db3d3a9de4296a38eb0ee125d6f1d814bab589b417da5829e5464c80a35e864fd97562af4f3d60 EBUILD gtkhtml-4.8.3.ebuild 1104 SHA256 56154fc23d3de726585585ca3c02c89afb4a4ece9b91a5bdf6d2388c16ec5399 SHA512 b18d5c2e8869d97028f7b11360b476a16edffbdb6b0ec25bd5d57bb9255cc881f3c9b9455c32fd1b591a699f35fcaf26448dccf7c1368e407e97be453982872d WHIRLPOOL ca3f98b521593da1e6565ac3fd9233147b97b86c0d0b84cbb119f2e8b06275a9d60e3cd834413a0991479ea9d54eac565b28af5e4c4dbed6b9d603731fce99cc -EBUILD gtkhtml-4.8.4.ebuild 1108 SHA256 abdce9734c53665b716a8b87ae7e68cd600f08d52fdf58e78e140ed46255eed6 SHA512 d758e311b5653c1c9d295fb9c4e9de48cb384960fd65c2513e547b3b09387f92b1a53516dfa3fd265ccb5a6157e31e72cd490434c7b618a376cac7389a68ecb9 WHIRLPOOL 4d7e175ff512f5eb9fc0551ac35d6b4b8cc3aef3395f91e7675653cf65a08b356a022c282333a90581bf5898222170b7781a757630a5e676adb599ff5cc49727 EBUILD gtkhtml-4.8.5.ebuild 1107 SHA256 252df57c911ae56bed5273366cc995e51f0db1011d17f4f20e707ad79d2d64ac SHA512 dc59fce90539556e9a8b8cb704cff54ba1b976278f4e06509f182ac0efd8162d69f29baf5710c99513c911fdc915e9755c283354b51b7840af7ba987f6fad20e WHIRLPOOL 5bb5a27fc26e43b276e027e4297b462b600c401c73a252e8f501a07a6e55b8ef089bbbbd11b29b681a1282516bf7518fc4bb3ac795b44ee0b11564f0f9617446 -MISC ChangeLog 41349 SHA256 7b28f87ab089ed662c70e2de0d97a8e3092a036c1ab3da2d4d2c0bf0de41e75b SHA512 140a9c85bc422e80ad48cb5460b5a187af29f85e54f72a979fe9223514e390585d39dc6b64c34927c327c7b662f3f147d84de49bfa7a18f3c4042fff211f31f3 WHIRLPOOL 8c286a28b4b210077ec55b4d4eab30f4c89fe9c4f0bce69c959392743987f14385eb787544da77c62c5b28d293f4b1a2409e0b78f5264b634063944551ec7180 +MISC ChangeLog 41512 SHA256 33121b22eb36a3fa09eee448984f61cc27a6ba485cfab1e267e68bc859ab1d89 SHA512 94394c1e29499507002f92e8f3dbeafba0482c9010cca30b807fb45804c72a3e6eb2ff62f5d04a96b6ead3aab44a6057ec2ff51bb754e566a195ac882a54ddcc WHIRLPOOL 87259e8b13cee56705612a32974b96c39da9c8bc8ff3ea460b834024f8b8b96ad6e1d6cfed29119188d5fffd0794966e9f1c33e76280799e7cd0ccaf011f087e MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEAREIAAYFAlRknRcACgkQCaWpQKGI+9T+MgCfW8X0x/7/Cm6Z/NJ8FsFkp6Qy +w8sAnAoMS07i8ZgH74NTAOVPGO7o9oaF +=bpfR +-----END PGP SIGNATURE----- diff --git a/gnome-extra/gtkhtml/files/gtkhtml-3.32.2-g_thread_init.patch b/gnome-extra/gtkhtml/files/gtkhtml-3.32.2-g_thread_init.patch deleted file mode 100644 index 5109cbc8db0b..000000000000 --- a/gnome-extra/gtkhtml/files/gtkhtml-3.32.2-g_thread_init.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b9882960dab978b85cbd32fc9b31e588c8c817ff Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <eva@gentoo.org> -Date: Wed, 10 Oct 2012 23:37:48 +0200 -Subject: [PATCH] Drop deprecated g_thread_init - ---- - components/editor/main.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/components/editor/main.c b/components/editor/main.c -index 0a0a37f..3c729a2 100644 ---- a/components/editor/main.c -+++ b/components/editor/main.c -@@ -373,8 +373,6 @@ main (gint argc, gchar **argv) - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - textdomain (GETTEXT_PACKAGE); - -- g_thread_init (NULL); -- - gtk_init (&argc, &argv); - - editor = gtkhtml_editor_new (); --- -1.7.12 - diff --git a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild b/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild deleted file mode 100644 index 9e4b3090864f..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-3.32.2.ebuild,v 1.9 2012/12/17 11:58:19 tetromino Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit eutils gnome2 - -DESCRIPTION="Lightweight HTML rendering/printing/editing engine" -HOMEPAGE="http://projects.gnome.org/evolution/" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="3.14" -KEYWORDS="alpha amd64 arm ia64 ppc ppc64 sh sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.24:2 - >=x11-libs/gtk+-2.20:2 - >=x11-themes/gnome-icon-theme-2.22.0 - >=gnome-base/orbit-2 - >=app-text/enchant-1.1.7 - gnome-base/gconf:2 - >=app-text/iso-codes-0.49 - >=net-libs/libsoup-2.26.0:2.4" -DEPEND="${RDEPEND} - x11-proto/xproto - sys-devel/gettext - >=dev-util/intltool-0.40.0 - virtual/pkgconfig" - -pkg_setup() { - ELTCONF="--reverse-deps" - G2CONF="${G2CONF} - --disable-static - --disable-deprecated-warning-flags" - DOCS="AUTHORS BUGS ChangeLog NEWS README TODO" -} - -src_prepare() { - # Fix build with recent glib, bug #436462 - epatch "${FILESDIR}/${P}-g_thread_init.patch" - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - # Remove .la files since old will be removed anyway while updating - find "${ED}" -name "*.la" -delete || die "remove of la files failed" -} - -pkg_preinst() { - gnome2_pkg_preinst - preserve_old_lib /usr/$(get_libdir)/libgtkhtml-editor.so.0 -} - -pkg_postinst() { - gnome2_pkg_postinst - preserve_old_lib_notify /usr/$(get_libdir)/libgtkhtml-editor.so.0 -} diff --git a/gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild b/gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild deleted file mode 100644 index 16b62a980311..000000000000 --- a/gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/gtkhtml/gtkhtml-4.8.4.ebuild,v 1.1 2014/10/02 11:45:36 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Lightweight HTML rendering/printing/editing engine" -HOMEPAGE="https://git.gnome.org/browse/gtkhtml" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="4.0" -KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="" - -# orbit is referenced in configure, but is not used anywhere else -RDEPEND=" - >=x11-libs/gtk+-3.2:3 - >=x11-libs/cairo-1.10:= - x11-libs/pango - >=app-text/enchant-1.1.7:= - gnome-base/gsettings-desktop-schemas - >=app-text/iso-codes-0.49 - >=net-libs/libsoup-2.26.0:2.4 -" -DEPEND="${RDEPEND} - x11-proto/xproto - sys-devel/gettext - >=dev-util/intltool-0.40.0 - virtual/pkgconfig -" - -src_configure() { - gnome2_src_configure --disable-static -} - -src_install() { - gnome2_src_install - - # Don't collide with 3.14 slot - mv "${ED}"/usr/bin/gtkhtml-editor-test{,-${SLOT}} || die -} diff --git a/gnome-extra/mousetweaks/ChangeLog b/gnome-extra/mousetweaks/ChangeLog index 02dfa5bed1aa..b6ee42fb1231 100644 --- a/gnome-extra/mousetweaks/ChangeLog +++ b/gnome-extra/mousetweaks/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/mousetweaks # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/ChangeLog,v 1.82 2014/07/23 15:18:27 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/ChangeLog,v 1.83 2014/11/13 12:03:20 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -mousetweaks-2.32.1.ebuild, + -mousetweaks-3.10.0.ebuild: + Drop old (#508854) 23 Jul 2014; Agostino Sarubbo <ago@gentoo.org> mousetweaks-3.12.0.ebuild: Stable for x86, wrt bug #512012 diff --git a/gnome-extra/mousetweaks/Manifest b/gnome-extra/mousetweaks/Manifest index 5c203d84cbd4..b675b6f2fc2f 100644 --- a/gnome-extra/mousetweaks/Manifest +++ b/gnome-extra/mousetweaks/Manifest @@ -1,28 +1,14 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST mousetweaks-2.32.1.tar.bz2 2195347 SHA256 70d2e8ba0f5021a9e70fecab2ea5cb5f2c03941e676607bec37f2304d9b86d08 SHA512 8dfe270777e825c0cc5e2b5462ea5c3776964855186be017d75abf4abd23aae48276edd31864f47aa1f9e87adc9c5799e5df006c72099941efeb1200c039b31f WHIRLPOOL cf8d3f2aeea3205cef04b76974917754070a9457757e0fb3d0d8c463c777edac246a6b061d95e751d7d2bd66ab7a30485413295f0fb3b70656d54e4af1d75d0a -DIST mousetweaks-3.10.0.tar.xz 285580 SHA256 12fa50eca2e442057a1b816b4aa78d0b8a17f854cf01f4d339d82ff0172b57dd SHA512 8e5c5dee809e2476299347a8b9ab9e80a9be223e0a418434d83f45835942fd83a3b99e95bfd635b8fff6e77b27bb9eafeab0e71dc12d6ea095a2fe839c0cb677 WHIRLPOOL 5b11191cfd95d2124ad385ae9706b0351fac97aa2d5d3cd1ea40b4575e26a72d76b3e939cf6465a2d0f6e51f0d9c285f1cba218e8f84564b3caec300bf49fa79 DIST mousetweaks-3.12.0.tar.xz 287236 SHA256 c0db478ccb390665e3201e9d1ce08b1c6573a697b797c9e828debb94b1ae3b97 SHA512 9e2180ad6ba1abec34a4e2846c31d9195c835a60657be146f2d9526a9c08b1fa4d5b42003203d7c94ec38066a99f10bcd37057d113c4c57f3e401199138de1c0 WHIRLPOOL 7bc760d7e851ec95038ccb303c694b710fa920a9ed85fca68b5df25daf80fc5f45cf7f2694cef3fcac65b28e2e973a7e638403e9151e6548550353bb5b59dedf -EBUILD mousetweaks-2.32.1.ebuild 889 SHA256 73e608b4544a81ff1595d0b04d5e152767f2eaf672ec58aa2c7ca247a85008e3 SHA512 91614da11db3907461057085f35e4833d05209c5963059047bc127ac188e374a887f5279d74d4101b8bf6ad272da35a0b9f91b14c11dfb517f52edce2c8a816c WHIRLPOOL ebebdab1a65d4ddccabe615fba98a7ba5967cc8c09c3a406110dc777ea755e7053eec1c470a687242c2ed932656da0d3d9c09c1bfba59b58674caaa07f67e340 -EBUILD mousetweaks-3.10.0.ebuild 821 SHA256 430b8c62c1bf33eb48309f30ec1c2cdc77867ec3ed2f0a4f5b112b2fdc547d7f SHA512 9daaf2e4f6ea959785f457004ea41ec2d75575bd7d8ce081d5b12b9652cddddd2cbda99eb3c52dc22ca40a1eb5d09f906dee9cb40ce7bd16f2c0a474fcbdc033 WHIRLPOOL 7d01493bf71ad5b57ede60bb4a0e4bd7733ba63d21f6a311bee847f907c8bfcbdfa42ea841ef9b12eff164c580b575ed91ce84a95ed62ae853c5e57e12636b52 EBUILD mousetweaks-3.12.0.ebuild 730 SHA256 cbf584dbc9936e70dbe18c8e0a72c2bad8d7e57026b6795f3d45035dfd581e60 SHA512 4c96ff791df1584c99ff70c38be33648af7b92a4e581d0fd86ff4e76d9b17af06fa4f9088461116444004379a6164980c00f4efe71c573420ee7af56b76d2e65 WHIRLPOOL 2942ba4cece4a914a55c9c9ef1696b7be6a31ebf3f5e1c2cee93909105620874e394066c2cf6175c58b7cf158f8a0840fcd321373e94b082bc84ca71997154cc -MISC ChangeLog 11688 SHA256 52b9a29d1bc8425b0e0990eb57e85df6babf1119ad71d5b2106cea6a47a74e53 SHA512 1da0251c67a122cc8ed76399f4b0a6fa5f822f7e7c061a1f4ffcc37237f7d4fe41c7195397ee76f609f35ab46b3eba77ee99d20ab4d5bda5740f9f0abcc14188 WHIRLPOOL c291baef5cb09500ae5c2bf0044f7ef16acd0154b09f6622426a231591e1ee978303a52016674f9ee088bf48680ef79667a36ad4d8c8611d915a67ef1d9d6949 +MISC ChangeLog 11816 SHA256 69fb0b0643257cfd42f18e11df864131e8ac261f9e12b39d5227636eedf70e5c SHA512 aeaec0f19d2c97c07acbb1f0cb6e85cd488398db0fd0bc1a0e5b07a02083014cc968ccd609045163e48ac92e8c8068d08d6fc1f06a488b5d4d429f2bdfcb6492 WHIRLPOOL ee00d902862471bb0b10ecc055ea0a6a75569ed94011e27371eb7625ebe42f4ff510eb79f85129382a55baa78d12ba2b3c176193908782bc1a30a356e8607043 MISC metadata.xml 887 SHA256 5f27918edcd5d2213bc89f0a53291cbf727bb7701a8bcb48bd73e63037c622be SHA512 ad0d0582971ed3ff59da37fedddaaa839e5d083cc673a16d7a3dfeabf2ab3f8792df247bf6c53f7beb3236fea762de5b5f25eda0acbeeb655b44a31b4ad1db8b WHIRLPOOL f31afd726494cba06bc5002cd79de5bc60fe423e1a3cddc0b5eec586e7b0946f95407b38e914050e6852fd52752800bedb37b72870ecc09be2678d08c89da266 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJTz9JEAAoJELp701BxlEWfY0oP/2Q9SpOlJ3v9l2bN0JhbR0/i -QbJyXVSYTO9fWYCloRKqTc2WdV7RFXf/eoJfr1adaOrAxkgYpttog5/3TnZjnEQi -d+PTwLHyfYiRelEOF8QML1VUkmlOrtTSfeVdxz+gFx+43SvpmIJMEu4uQfPkyksa -snhCtra3tLd78079vSfhSgr7bABK7syYs9UzdgGFrx2QEz+rmhDwIw1GFAatAo8F -nAzN7LVoh+YFyKOZ62Th/67q2ON8xVNyiJZ2W2lxcX//IkUmp1EkiasVrJs/bRXo -CarQbHpWPNSPT8MwgwUkvxf93uYfWzOnljt0uJtRKWJzX4RQVsZyGHlShfi4wrje -4P7utSVpMrUmXMFL1hQyfGgEGwmYzksaHDLyiqWo9l/UWWah1jJn/1eJ2tIEOgTS -cP9eyCuRLxspWdsLlvfmmdcaFF0Q+VwwIurdy9XUUdRTdIJ1w02Lm4b7XUSdJX45 -Obd7lZyewn8VSNeOp2jCZ+QNSMI+KXiUcLZB58BTtbzjDL7brlLm2qKR062CVdLb -ZGf2aJzpwnK3y2RG9VpueoFG6lnoowF8zgV5sTCzcEM3Mdze7Q8NchtUIO0mqcPx -7QEEfXlwSWZLc4y1EhkDZRYoHR/lkeROrbOOGJ51dfAKC9jJPFi1VvocDcXdhwkJ -QnHbuPpIdtwK5c2u1NgV -=OiIx +iEYEAREIAAYFAlRkngkACgkQCaWpQKGI+9TTrwCfccfHgZjkDC16DGrpjhXY7Q28 +oncAn3kfpgZWA1+u7QhvJlqUTLkbYtHq +=/oBm -----END PGP SIGNATURE----- diff --git a/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild b/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild deleted file mode 100644 index 054592301453..000000000000 --- a/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/mousetweaks-2.32.1.ebuild,v 1.9 2012/05/05 06:25:17 jdhore Exp $ - -EAPI="3" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop" -HOMEPAGE="http://live.gnome.org/Mousetweaks/Home" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.25.9:2 - >=x11-libs/gtk+-2.18:2 - >=gnome-base/gconf-2.16:2 - || ( gnome-base/gnome-panel[bonobo] <gnome-base/gnome-panel-2.32 ) - - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXfixes - x11-libs/libXcursor" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - virtual/pkgconfig" -# eautoreconf needs: -# gnome-base/gnome-common - -pkg_setup() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" -} diff --git a/gnome-extra/mousetweaks/mousetweaks-3.10.0.ebuild b/gnome-extra/mousetweaks/mousetweaks-3.10.0.ebuild deleted file mode 100644 index 505982f627e9..000000000000 --- a/gnome-extra/mousetweaks/mousetweaks-3.10.0.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/mousetweaks/mousetweaks-3.10.0.ebuild,v 1.5 2014/03/09 12:00:47 pacho Exp $ - -EAPI="5" -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Mouse accessibility enhancements for the GNOME desktop" -HOMEPAGE="http://live.gnome.org/Mousetweaks/Home" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="" - -RDEPEND=" - >=dev-libs/glib-2.25.9:2 - >=x11-libs/gtk+-3:3 - >=gnome-base/gsettings-desktop-schemas-0.1 - - x11-libs/libX11 - x11-libs/libXtst - x11-libs/libXfixes - x11-libs/libXcursor -" -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - virtual/pkgconfig -" - -src_install() { - DOCS="AUTHORS ChangeLog MAINTAINERS NEWS README" - gnome2_src_install -} diff --git a/gnome-extra/nautilus-actions/ChangeLog b/gnome-extra/nautilus-actions/ChangeLog index 236d6f4b5b12..e65ea7a2fd36 100644 --- a/gnome-extra/nautilus-actions/ChangeLog +++ b/gnome-extra/nautilus-actions/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/nautilus-actions # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-actions/ChangeLog,v 1.11 2014/09/04 12:16:50 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-actions/ChangeLog,v 1.12 2014/11/13 12:04:01 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -nautilus-actions-3.2.2-r200.ebuild, metadata.xml: + Drop old (#508854) *nautilus-actions-3.2.4 (04 Sep 2014) diff --git a/gnome-extra/nautilus-actions/Manifest b/gnome-extra/nautilus-actions/Manifest index 5c88429db454..78dba16b06d4 100644 --- a/gnome-extra/nautilus-actions/Manifest +++ b/gnome-extra/nautilus-actions/Manifest @@ -1,18 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST nautilus-actions-3.2.2.tar.xz 8946424 SHA256 214af9fd2a7f561366bf88446f9b79182e696a303da8e15c7a8a1ffaeaca11c4 SHA512 c501b6d6b2da768e52edabf93a71c0584b1b467db4c255cf4c6da2ca0023f830333570a754ef96b685ebed95d6daca8ebc4e95e760288f8cd9a121bd3711c8ff WHIRLPOOL c31b7cb1406faca0fcec2f1bbb5a8e2d09aa51342533d8774a80e0b7553a19b7d72cd0869783bff6efa19b525433a431299f76ee08c11466e7ba89676ef9e2d6 DIST nautilus-actions-3.2.3.tar.xz 8238308 SHA256 e2469e656fe3a246263c0c77cd99e2403dc519af357f3af5b79b9f2df753412a SHA512 1b9e4e622ef66b1a05b0a9426fd0de929d8d890a836c4fe83cd127e94e07b33652d6087c9c556e0b56b7724c5f7e328a7e56df3aad517f4add940a96f460ff45 WHIRLPOOL 22d371653b644f67f2258f0a2fbea92539c538bb361d3e7195d12f8f2cb911d132a548d0950c997ab9dfa259c404d69c19f6c8f524674eb6b71133ba02ccbfd1 DIST nautilus-actions-3.2.4.tar.xz 5148812 SHA256 10206c952ed3e916241168ebffd7ade9b9bcc18429ab33dfe24d9517a7371567 SHA512 1f8e90fe040b76b0ce9a26f99725e717e6c60a1a838339ec1e26acb5db46b1382e6468e6cabc542e51438b63da2501728cd117e9f77a1710a296e9bd59e402f0 WHIRLPOOL b8d9f8bef9138157c48ab0e3c8388108d242ef0ac0e5aaca74ac3d3ee92d8f84964e47ef19b805974da5630b7a6f6f5188204b5606c0e0fc113b5ac517221018 -EBUILD nautilus-actions-3.2.2-r200.ebuild 1328 SHA256 97c82e437afb6d8c18a86982c5a4bede929ffb614d7534bd6de04e24e67374f5 SHA512 3a9d60b75fd20120f0d412f00628436ca64e3acdeae2f879b2da8c1b19171d45f54429991583b35fef92711af97b90bc000632b79b7169c5582dcfefd46bf242 WHIRLPOOL fc14ee2fe1d53de183e0f84c58b5f004590f7e18f2def29f3bead88a33a13728ba6ec9c6332ba0dc785d7fbabce70f4cfe93a397f3bd603ecccf2dd870caf7b6 EBUILD nautilus-actions-3.2.3.ebuild 1352 SHA256 1af39f9c7afe1b7e33477e493ccfe439e18efce201c2ae17e244397f7481e6fb SHA512 f4b95a206c34da7d46e5e77f313be8f9b75c0638d25bb84e7cce1bd02d5264c8d33edde7292aade953931f31c5293ff50093990bc9414c74fbd866fe0c139d3f WHIRLPOOL f6b8b3624a9cec7476a9bd4207a24f305e989e0b834b073bf43d6f5f438e215349c41d3f44927f1e53581fbea1320eda09cb74c3e2b67ec549a931be8f10c99b EBUILD nautilus-actions-3.2.4.ebuild 1354 SHA256 b933daf40a0498ea341bbed664d43132b954279c8c863f8312d0857360fe6c2f SHA512 532f33d0af4580fee77442d6dd21af5c2ba74563e1d75bfa6a3b7472f68b4f8b48608a70445443b09d82c3500c5b959333c2391ce8c55a02494818209c255b9b WHIRLPOOL c7b1b09dc93bf952c218cfb6d5e13456e9aff819fe153830880f983feb19db876a7b2af253a21358ca3336a6d1e2d335d9206b16ada4051977f3b3b24d4e1403 -MISC ChangeLog 1998 SHA256 549290a601acc14afeb30445ecf34de8cd164bdc1512c45fb8fccbd2cd0254f1 SHA512 d00c6aa7842fe7894272b7b4fb724ea58779b5f8589fb0528b48f978858c9577dbd5154a9d7087984e70b41033cb1fbe29c4ccc96a2abe184ab3e783449599f2 WHIRLPOOL fb3031c35a46fe533afe8aac6cbe7d0c685c06fd34271e9f7579cd01ff78826e261575c95a90fd0ebdd04084f9214efd700eb38277027c034d83057e05662a91 -MISC metadata.xml 231 SHA256 4cffb737db9395e312eabf1ed0121e16324bafefd65091c606f502280c9a5a38 SHA512 60d0b361a99d05013b0d1a39c457fb46b19ea3e678078be526922114b94b65463a127540db555b108610da2cfaffe60c401498cc7c8b7cd13bc201b379a9892d WHIRLPOOL 247fa22da027e8fc6ca844122a33cea44ba58beae0ab4716c70763e20ac5c5ea1ffa49198cb2f381f6109298dd22fe9d5a35adeff69b957b1fb83a992bde1a91 +MISC ChangeLog 2119 SHA256 003eb7aa21deb66ed4e16768bbe71d9528a2b663da7a0658bb3d4e70d673814c SHA512 66de92345d4874ddd3f1e1a472361485eeef145cb337dd17c8b2fc30c3d137186fd06348d30d8413b7e535d861870a14f692dbc2093d34bfbc7627a961cc7e7d WHIRLPOOL b3fdb15a4cab887d23bf4ca3e290ebde4408a1ea1e936be3eb63ae98762978ee8ba9700e4d11af9731c4d40531945b58215d2b8e49dbaedd486b03190268d29f +MISC metadata.xml 158 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 SHA512 7fbfbd2b3ed1b81867d55648509f778fdbe2091af53727b3426a3c7f453ae7e1663a99fdd2101508b8d6c85b3158459c93551b77a6a394f02d7e11cbc8a5ecf4 WHIRLPOOL 4bcd5662974877d42ebc4361b6eb412bfeea2af7144b436ce7ed152327d554afc321c376625ba0bb85a704b70d86e3c4882dff3573047acddd8ffccf655d4f7e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQIWDMACgkQCaWpQKGI+9QBrgCfby0XrOkB5ix5h0/gczoGGXv2 -85cAn0OoAgGu688YZBSZuXVRMrTUPt3K -=8EgC +iEYEAREIAAYFAlRknjMACgkQCaWpQKGI+9SNGgCeNB4LdTb8Nl+8Z2u9xn8VfFhK +unYAn0l3bmh+MrMa/nHvz0pBQObehHB9 +=Ofks -----END PGP SIGNATURE----- diff --git a/gnome-extra/nautilus-actions/metadata.xml b/gnome-extra/nautilus-actions/metadata.xml index 1410f408c9bf..da6fd63d0085 100644 --- a/gnome-extra/nautilus-actions/metadata.xml +++ b/gnome-extra/nautilus-actions/metadata.xml @@ -2,7 +2,4 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> -<use> - <flag name="deprecated">Enable deprecated functions</flag> -</use> </pkgmetadata> diff --git a/gnome-extra/nautilus-actions/nautilus-actions-3.2.2-r200.ebuild b/gnome-extra/nautilus-actions/nautilus-actions-3.2.2-r200.ebuild deleted file mode 100644 index 4babd4ec8c56..000000000000 --- a/gnome-extra/nautilus-actions/nautilus-actions-3.2.2-r200.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-actions/nautilus-actions-3.2.2-r200.ebuild,v 1.4 2013/12/08 18:55:52 pacho Exp $ - -EAPI="4" - -GCONF_DEBUG="no" - -inherit gnome2 - -DESCRIPTION="Configures programs to be launched when files are selected in Nautilus" -HOMEPAGE="http://www.nautilus-actions.org/" - -LICENSE="GPL-2 FDL-1.3" -SLOT="2" -KEYWORDS="amd64 x86" -IUSE="deprecated" - -RDEPEND=">=dev-libs/glib-2.30:2 - >=dev-libs/libxml2-2.6:2 - dev-libs/libunique:1 - >=gnome-base/libgtop-2.23.1:2 - >=gnome-base/nautilus-2.16 - <gnome-base/nautilus-2.90 - sys-apps/util-linux - x11-libs/gdk-pixbuf:2 - >=x11-libs/gtk+-2.20:2 - x11-libs/libICE - >=x11-libs/libSM-1 - - !gnome-extra/nautilus-actions:3" -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - >=dev-util/intltool-0.35.5 - virtual/pkgconfig" - -pkg_setup() { - G2CONF="${G2CONF} - $(use_enable deprecated) - --disable-gconf - --with-gtk=2" -} - -src_prepare() { - # install docs in /usr/share/doc/${PF}, not ${P} - sed -i -e "s:/doc/@PACKAGE@-@VERSION@:/doc/${PF}:g" \ - Makefile.{am,in} \ - docs/Makefile.{am,in} \ - docs/nact/Makefile.{am,in} || die - gnome2_src_prepare -} - -src_install() { - gnome2_src_install - # Do not install COPYING - rm -v "${ED}usr/share/doc/${PF}"/COPYING* || die -} diff --git a/gnome-extra/nautilus-sendto/ChangeLog b/gnome-extra/nautilus-sendto/ChangeLog index 6b983f3b6121..b9adaa81fe8b 100644 --- a/gnome-extra/nautilus-sendto/ChangeLog +++ b/gnome-extra/nautilus-sendto/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for gnome-extra/nautilus-sendto # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.76 2014/09/25 13:52:11 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/ChangeLog,v 1.77 2014/11/13 12:05:51 pacho Exp $ + + 13 Nov 2014; Pacho Ramos <pacho@gentoo.org> + -files/nautilus-sendto-2.28.4-gseal-enable.patch, + -files/nautilus-sendto-2.28.4-item-focus.patch, + -files/nautilus-sendto-2.28.4-remove-empathy.patch, + -files/nautilus-sendto-2.28.4-remove-old-evo.patch, + -files/nautilus-sendto-2.28.4-shadowed-mounts.patch, + -files/nautilus-sendto-2.28.4-thunderbird-command.patch, + -files/nautilus-sendto-2.28.4-unload-dbus.patch, + -files/nautilus-sendto-2.28.4-unload-init.patch, + -files/nautilus-sendto-2.28.4-unload.patch, + -files/nautilus-sendto-2.28.5-commandline-help.patch, + -files/nautilus-sendto-2.28.5-fix-memleaks.patch, + -nautilus-sendto-2.32.0.ebuild, metadata.xml: + Drop old (#508854) *nautilus-sendto-3.8.2 (25 Sep 2014) diff --git a/gnome-extra/nautilus-sendto/Manifest b/gnome-extra/nautilus-sendto/Manifest index 1469f06b4e1c..b1082d6e98a8 100644 --- a/gnome-extra/nautilus-sendto/Manifest +++ b/gnome-extra/nautilus-sendto/Manifest @@ -1,29 +1,16 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX nautilus-sendto-2.28.4-gseal-enable.patch 1345 SHA256 2e42e5ecf35cfdf348dfa2d77b94400e92dc8c0eb8150788c657f1fc1dc68126 SHA512 662f8407882c83ed0c025b2c5b9b16f399e25409b2868e8af3c2904f03e34c254bc6c7f01250db1e601891e9216b7f8f930de5fefbfa7e317e70ff2a6e8a049f WHIRLPOOL 5e152650367da10159cdff16a60aa8a6ef411aa473b63edeeb9d7d11b56560950d62fde259b2916b9654160b8f2502e69dcc23d64f5c1f7156066b316d2e85c6 -AUX nautilus-sendto-2.28.4-item-focus.patch 1009 SHA256 e145e6a2992090ee1cbedd850121b7a921c8025eadca697a80db0504831adb18 SHA512 bc6621e2d8050faca8e6db061582f1ded3bef8436fb4f4b656cce81ff2d09a2b1d84029760ffc38e6857609f4244c36b75f67d107f183c94d5b662ce024b2d78 WHIRLPOOL 6701409520a5b4bcc1f6688304222a188725cb030f699413281975fbf3581531385133e2c9ca890414478a57587c361b32c595e8fabf26153a1553f6b456e7e8 -AUX nautilus-sendto-2.28.4-remove-empathy.patch 10102 SHA256 74b3680e93bea6a2f5bdd1acc3ee625f88b15efcd00b9c8f3464f005c90a999d SHA512 d241bc3a2e76d3f0cde973604a8677575961deab9524f79cc6a981a2f9e0c0140b90087f6b363dc9e49f8f25361c53ee3a523483c7a2fb4805fdc061835fdafe WHIRLPOOL 5598f2b0f81f755581c07032713ce3147dcc39d60ae71b7e8a4d10757ec491e17611b94bce05dd05343f21bf5e2295b9abe5fc1cd150dcc0376c63f2f373dd8e -AUX nautilus-sendto-2.28.4-remove-old-evo.patch 8821 SHA256 c07ca391ead906a0993543b64b180e74242af0295123a36fc1844b1f19e5813b SHA512 120ad06976acc76f5fce9358175fd3193fefd53ebe3c8a5c0c7671e057bc8e3921947c640755c35f997d71fe2e6e778409a118d1f542f34236fc91958d4861cc WHIRLPOOL e746e892d110b8e10549907ab9cbf4a4e643c51a8e676cd60ce778b4448f2a796ee48f5f706926bbbd60dce2d842b8f612839287147bf4cc82b6bd1ad4babf7d -AUX nautilus-sendto-2.28.4-shadowed-mounts.patch 2407 SHA256 92d339ad9d2d12cede2a766210426ddd5524b2e748d01b2ca8ae5460d35af94e SHA512 d7150059e8d38dddba0c17bb09d8df52f7abc1a97757c6d2ab706124f6093e883b872b926eca12d2b018c61edff2410f65694173db94dde7ed51bb266c9e69c5 WHIRLPOOL b20ef4ad39cd3e06bfe5081059edbf68ef26c647fe46fb14a3ad3e52afe08abe162be453ae814cc81c61612a76b4a854bdabfcdc4856376076a5f6185cd2152f -AUX nautilus-sendto-2.28.4-thunderbird-command.patch 1329 SHA256 bb4c401ae83c40ed3378a75437f4cfed818f8e1074af643be0c0b3ac04d7c3e9 SHA512 24a693961b1ab6f5a2ee58d97ac93dc49872d6bf3084721c689636788aecc6cd6be84e07a30709d270e16645c5102a44adffccb1f3d348384106a11515d8ddcc WHIRLPOOL 678745c407a711c52f39761990d03c14ec2cce1ef023794ca5a3c6fd398685a98be2201e4641751d4c96fd99f232d50e0025c2ab0f5bac976471cbbf20413fe3 -AUX nautilus-sendto-2.28.4-unload-dbus.patch 669 SHA256 1ec5d84b3b2659dae4c7b118b0f059b69bbf27d3e58abcab7893e59bdc912c14 SHA512 a851f9820c1c6726b0d576bb9ced2b5f0795594e483736da7c34127d859f49bf15fa67ef7f7553bd0e2135b94116cf8e63c021f94f5a02f6cde61c9d63dd0a51 WHIRLPOOL 85ac093793f95e97edccc9c291d8dc4785bef80c75c8ea8c3e74b33c23670ef096ec7759960b409813d27ebdbc7945f994a87f20554f1d4616993bc9a472edb6 -AUX nautilus-sendto-2.28.4-unload-init.patch 753 SHA256 bac15fa5ff7838a2b679525f5d1da502d4b22081c7737f1f9e558e0d89f9a35c SHA512 38b6dbec8ea5bde2a3f8854784834abec099d6e24cdc4912de5b8cce9aabcc284a109f62609a1744dee9c21a6f39723a8287236715ad439dceeccc738468909f WHIRLPOOL 51416ea65347dc3c8e8a95eef8335218535cbdb57326e5947b2d8565f273c86807c59a31d5322092e480c8eb788870fd6718c47c0d4987ccea040c54f363a67c -AUX nautilus-sendto-2.28.4-unload.patch 4212 SHA256 630944971f0f2fb3680eb3e336b1639b4e1f767a0ef38d90138dda6b582254d2 SHA512 46e5bb3fbe35ef1388de86754a64241bba8fc81a1dbafef2e2e4f06b674a09fbbb61cd0e93ee39bb469852eddec6f390bfb0a317aeae3348466e448abf2af9aa WHIRLPOOL 7826e5c126ecb10b5f1dbc842aca83461b8d5ba0e52dbdffc22fc5c1b62552feb3545c295b03d74f205ba2cf09709e9cf9f3c3087571bc57e2078a49c4de9856 -AUX nautilus-sendto-2.28.5-commandline-help.patch 1123 SHA256 f5a928cf771d55f5514b73ff5aa509df73ed1dae4d14b418ddebb256c4940e8d SHA512 6555f45709fe4a832c3d8c7df8bf54dcf82f356e31c950621190116413957ebe449debd3e235f0754356441c6028a827d4f57c743f7451b04a8493b2e2e5a84d WHIRLPOOL 5431cf33fdca7b1b6ba6aade5ea4594adcd7ce2236bd477180e5ae0ae94c12f033da1db71041fcebfbbd6eb71d45da34b9889db05435ff6baadf5643172e291e -AUX nautilus-sendto-2.28.5-fix-memleaks.patch 1596 SHA256 dd78e9382bd5e55f262c8609a50b9daf5bfb4c45c8d9d27e732ca74b8a338388 SHA512 5ffd9e41449f934977904cf1403012d1db1faa567a97eb16290b595c09ddb57d171eb5ab4b96b19ce6844fa9ebe9c8a728557c970a68ca2ca181cf88ff809dad WHIRLPOOL 8817fbb809c9e25c5df16258a8ef2aec014687afe89ebe1e2dc49bf76e0218874342acaeede13d435aad255ad8861fa10fd870f26a66cffe78f9b5cfdc4b40ed -DIST nautilus-sendto-2.32.0.tar.bz2 446731 SHA256 890090b24381d91f079610d5454cb786a3ecefc91fa06649b2222be9bb02269a SHA512 4846155d9adf7c8e298b80a5487a7df0ff1e430c82c96b565413f63c015b84629d21a8b104d84ee8355f975044219c521a728d4a6d28862bafb0e871d86277d8 WHIRLPOOL 4a38f5d4533488751e758a82e6a11c496993f2f5c687f55af8638a86b661849f8aae0ac3baf14e7a07b3cb6f04d4fe852f710f5643be9ac271d1bf3952be2ad9 DIST nautilus-sendto-3.8.1.tar.xz 344040 SHA256 03fa46bff271acdbdedab6243b2a84e5ed3daa19c81b69d087b3e852c8fe5dab SHA512 4559bf14604ca553be9ccc4a3961a93917cd643338dd1f86fa2edbde2a7c66c4db35204a19ca6fde27ceef48736d552bdad750c24ab4b26238e478cd88caaf3a WHIRLPOOL aeeb170614cb405f5aa7f923eaa32b33be7961d982d7c7a1a639a387f4002b41a4430864eff1b473006b9136248cfaf7763cacde9d5aecca8788cdcca3c8a049 DIST nautilus-sendto-3.8.2.tar.xz 343032 SHA256 932811e781457b1dbf7b396e930d588f433b9ba756b10bde9f03f6d71d54bdc5 SHA512 51ae4b4a14d21677b043c3023d548c1984808ab3216a14b89988bf6883e8807c8215375026f0558723792aba1552518d53631388b18c1c4346813f6246b8a422 WHIRLPOOL a38dab01ee907a23d36afcd6ce90af8b5c08e064435bbe2a96eae522d6fab568b0e5e8390e7f002ba87ee4c8bd06e1293e25057c7dbf4343ee788e8dbb52418d -EBUILD nautilus-sendto-2.32.0.ebuild 1437 SHA256 b99c065a4c145503a8c2c3cc52b7a0f98692a78804fb3b53ec796d1b9cd49112 SHA512 7655a3767d4d8e88ec4eedb8d27b4f8fbd3bf3600d324e3f039cd35f5914aa399d8117a90148eca811063de51df278061abeb9c1269a20158beca7de2bb18352 WHIRLPOOL 4aa579dc11ae3b6aa3ba6984196e09830f794af8df02589f2c5d1df349b4a62fca5d919bfcf1ebc0b2503b9fbe2cda1e914d1651d1d9786d7d6cdaa657730ede EBUILD nautilus-sendto-3.8.1.ebuild 761 SHA256 c3af6e755b23ffe93034af3ef16cff322ce090160cb309beb54197f546b0cf3b SHA512 af80e700a261e5bb86404bf73cc10d57b34de228d690472da9ee590f8caefa9a5d7a5e523974bc7ad448bdd4ec1aa0cba4885e1f290ecae361f87e736304f671 WHIRLPOOL 399c11d0ece178de0cfce30b0dbab9728f03fa6c762cedec290f309a530111c308a5eb39960581d555b73168b69bfd547a72bcaf10a1230bbba14cf09bda1950 EBUILD nautilus-sendto-3.8.2.ebuild 788 SHA256 ab1eed1a67a7d7f2fb608f5f7d9e725b75bc74d678d81e4b89182468feab5788 SHA512 54cbf31a145fc9f445ed5a1a78f0d64a4e20c5a420fbecbd99bbf162c8645305f2a1a9cab67dd27db1e02d7a0721cdd71850a447b63af372d259e36094340444 WHIRLPOOL 049a6febb73f656663675895e6e3c26ca9b8971ec05aa295fedbe88b26d77833de4fca92055f6b0ec32b59c8bcb299fc0e2ec16778131279811806ed8fe07b7b -MISC ChangeLog 15082 SHA256 32b09e9df56f69138dba44c1fc2eba7181b9adec48e78184b682e98ba4407351 SHA512 8d36d6a66c7f6acac3e4c06aa85105cd99402ce0c5c76fbe7db3bbe206cacf1e6494d92cbe07b6a8934c381261d3731e0cc49e39dd368a97c3c888f073c6bd75 WHIRLPOOL fe1118db94bc878c2b1eb8f441388a9bf6524f295017fccfbdf74e1609d913c500ef14ae37b367db635637c08f47661df9ae97ad1791ee45dccc78cb97ee3ad6 -MISC metadata.xml 429 SHA256 d6ca2ca2610c15e8bcbd18c720ae8ecc99d5fa3408c9490f0cd78ae7edcfdc50 SHA512 9ebf3bb8297509dd76eb7665a8b7b77cc6d2a76ec1c0bf19606b03385527b4f6674a84b95e0633ae193ed5aa404e435468bced75a9e1dea51caed8ac7a29bdcf WHIRLPOOL d4fc1556fa18af058d9fa6759f5529e466922958818cf3759375823b384462ac6bd7facc34aec62e2ff797db63fb4bea0f491483d3e9149923093c75cd6ccac3 +MISC ChangeLog 15778 SHA256 d63a784e8cc0115f4b37d0f6356b0a1f9c4fe358bd4ca6ce6f14edf5cd99e13f SHA512 b5931fc0015cde763ff730406f72facddf868dc19c7618abbb580f59d5a3a1c09ec1cd6a56e0d4834877b928e312d958f63516a319904b7cdaa0b2ea14820add WHIRLPOOL 02cb5c8f934f213f8b0bb25d023c74ef82457dfb2c96a46835a0ef9b2dc5e69148fac68592f718500cfdaaba22fcfa1ea7b270f6c6677576bb5325dcaf295b05 +MISC metadata.xml 160 SHA256 458c663699e281bb9a8803997ef8fc9d4f08af8a60057d98a0bfb8c3a6173beb SHA512 1d58e82201f6df27f61065cba6fb92f92d392dc073167e8f84b4b16d897e9169164276c36982690ed3f34bc1393d4bc1e10a7f45828d9e8494ee0de7b8b193ac WHIRLPOOL 3ba40bfa878809bf3976fec01ced44ed7153d501213ed2299406554bc26be72e8659d7b2bd8397e12ca75a6d302df94f5eb3933cfc159789b59776395da67c5e -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iEYEAREIAAYFAlQkHgwACgkQCaWpQKGI+9QEgACfcldWA/k3/9QUuT7FJzeSD/5d -8yMAn0Owqnvsr52V0MmHHfH0m1C3kUcp -=LqWY +iEYEAREIAAYFAlRknqAACgkQCaWpQKGI+9RaEACeI/JBd9qVP0vC+FfSSXxtZ3JO +i7kAnjteM6ZQSFRFO+K+8DTykjKGaGXG +=AOXA -----END PGP SIGNATURE----- diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-gseal-enable.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-gseal-enable.patch deleted file mode 100644 index 5875fcd902ae..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-gseal-enable.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 6d9294461935516991082e535a09b28d27105abe Mon Sep 17 00:00:00 2001 -From: Andre Klapper <a9016009@gmx.de> -Date: Sat, 29 May 2010 01:42:30 +0000 -Subject: Compile with -DGSEAL_ENABLE. Fixes bug 612493. - ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 094fe62..674d774 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -335,7 +335,7 @@ static void - send_if_no_pack_cb (GtkWidget *widget, NS_ui *ui) - { - if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ui->pack_checkbutton))) { -- if (GTK_WIDGET_IS_SENSITIVE (ui->pack_entry)) { -+ if (gtk_widget_is_sensitive (ui->pack_entry)) { - gtk_widget_grab_focus (ui->pack_entry); - } else { - gtk_widget_grab_focus (ui->pack_checkbutton); -diff --git a/src/plugins/evolution/e-contact-entry.c b/src/plugins/evolution/e-contact-entry.c -index 69ffa3d..e190290 100644 ---- a/src/plugins/evolution/e-contact-entry.c -+++ b/src/plugins/evolution/e-contact-entry.c -@@ -385,7 +385,7 @@ entry_changed_cb (GtkEditable *editable, gpointer user_data) - EContactEntry *entry; - entry = E_CONTACT_ENTRY (editable); - -- if (GTK_ENTRY (editable)->text_length >= entry->priv->lookup_length) { -+ if (gtk_entry_get_text_length (GTK_ENTRY (editable)) >= entry->priv->lookup_length) { - GList *l; - EBookQuery *query; - --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-item-focus.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-item-focus.patch deleted file mode 100644 index c76602ea5271..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-item-focus.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 90859ca39bb877b665bb99da73c47569dc6a55b0 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:13:01 +0000 -Subject: Make the last selected medium's widget grab focus - -https://bugzilla.gnome.org/show_bug.cgi?id=615214 ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 674d774..dd21620 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -429,6 +429,7 @@ set_model_for_options_combobox (NS_ui *ui) - GtkListStore *model; - GtkIconTheme *it; - GtkCellRenderer *renderer; -+ GtkWidget *widget; - GList *aux; - NstPlugin *p; - char *last_used = NULL; -@@ -484,6 +485,10 @@ set_model_for_options_combobox (NS_ui *ui) - - gtk_combo_box_set_active (GTK_COMBO_BOX (ui->options_combobox), option); - -+ /* Grab the focus for the most recently used widget */ -+ widget = g_list_nth_data (ui->contact_widgets, option); -+ gtk_widget_grab_focus (widget); -+ - return last_used_support_dirs; - } - --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-empathy.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-empathy.patch deleted file mode 100644 index b9b330952ff1..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-empathy.patch +++ /dev/null @@ -1,387 +0,0 @@ -From 91aa1610f6ed1d36abe1d7bf1f607616cf8187da Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:39:13 +0000 -Subject: Remove Empathy plugin - -It now lives in Empathy itself. ---- -diff --git a/configure.in b/configure.in -index d7318d9..8781f50 100644 ---- a/configure.in -+++ b/configure.in -@@ -38,8 +38,6 @@ NAUTILUS_EXTENSION=2.13.3 - DBUS_REQUIRED=1.0 - DBUS_GLIB_REQUIRED=0.60 - GUPNP_REQUIRED=0.13 --EMPATHY_REQUIRED=2.27.91 --EMPATHY_GTK_REQUIRED=2.27.91 - - AC_SUBST(GLIB_REQUIRED) - AC_SUBST(GTHREAD_REQUIRED) -@@ -50,8 +48,6 @@ AC_SUBST(NAUTILUS_EXTENSION) - AC_SUBST(BLUETOOTH_REQUIRED) - AC_SUBST(DBUS_REQUIRED) - AC_SUBST(GUPNP_REQUIRED) --AC_SUBST(EMPATHY_REQUIRED) --AC_SUBST(EMPATHY_GTK_REQUIRED) - - PKG_CHECK_MODULES(NAUTILUS_SENDTO,\ - glib-2.0 >= $GLIB_REQUIRED \ -@@ -82,7 +78,7 @@ AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}]) - AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}]) - - # The full list of plugins --allowed_plugins="bluetooth empathy evolution gajim nautilus-burn pidgin removable-devices upnp" -+allowed_plugins="bluetooth evolution gajim nautilus-burn pidgin removable-devices upnp" - - plugin_error_or_ignore() - { -@@ -141,14 +137,6 @@ for plugin in ${used_plugins}; do - add_plugin="0" - fi - ;; -- empathy) -- PKG_CHECK_MODULES(EMPATHY, libempathy >= $EMPATHY_REQUIRED libempathy-gtk >= $EMPATHY_GTK_REQUIRED libempathy-gtk <= 2.29.1 gio-2.0 telepathy-glib, -- enable_empathy=yes, enable_empathy=no) -- if test "${enable_empathy}" != "yes" ; then -- plugin_error_or_ignore "you need libempathy and libempathy-gtk to build the Empathy plugin" -- add_plugin="0" -- fi -- ;; - evolution) - PKG_CHECK_MODULES(NST_EBOOK, libebook-1.2 >= $EBOOK_REQUIRED, - enable_evolution=yes, enable_evolution=no) -@@ -269,7 +257,6 @@ src/Makefile - src/nautilus-sendto.pc - src/plugins/Makefile - src/plugins/bluetooth/Makefile --src/plugins/empathy/Makefile - src/plugins/evolution/Makefile - src/plugins/gajim/Makefile - src/plugins/nautilus-burn/Makefile -diff --git a/src/plugins/empathy/Makefile.am b/src/plugins/empathy/Makefile.am -deleted file mode 100644 -index 4e787d1..0000000 ---- a/src/plugins/empathy/Makefile.am -+++ b/dev/null -@@ -1,19 +0,0 @@ --plugindir = $(libdir)/nautilus-sendto/plugins -- --INCLUDES = \ -- -DDATADIR=\"$(datadir)\" \ -- -DICONDIR=\"$(icondir)\" \ -- -DLOCALEDIR="\"$(datadir)/locale\"" \ -- -I$(top_srcdir)/src \ -- -I$(top_builddir) \ -- $(NAUTILUS_SENDTO_CFLAGS) \ -- $(WARN_CFLAGS) \ -- $(DISABLE_DEPRECATED) \ -- $(EMPATHY_CFLAGS) -- --plugin_LTLIBRARIES = libnstempathy.la -- --libnstempathy_la_SOURCES = empathy.c --libnstempathy_la_LDFLAGS = -module -avoid-version --libnstempathy_la_LIBADD = $(EMPATHY_LIBS) $(NAUTILUS_SENDTO_LIBS) -- -diff --git a/src/plugins/empathy/empathy.c b/src/plugins/empathy/empathy.c -deleted file mode 100644 -index f84f789..0000000 ---- a/src/plugins/empathy/empathy.c -+++ b/dev/null -@@ -1,293 +0,0 @@ --/* -- * Copyright (C) 2008, 2009 Collabora Ltd. -- * -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU General Public License as -- * published by the Free Software Foundation; either version 2 of the -- * License, or (at your option) any later version. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * General Public License for more av. -- * -- * You should have received a copy of the GNU General Public -- * License along with this program; if not, write to the -- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -- * Boston, MA 02110-1301 USA. -- * -- * Authors: Jonny Lamb <jonny.lamb@collabora.co.uk> -- * Cosimo Cecchi <cosimo.cecchi@collabora.co.uk> -- */ -- --#include "config.h" -- --#include <glib.h> --#include <glib/gi18n-lib.h> --#include <gtk/gtk.h> --#include <gio/gio.h> -- --#include <telepathy-glib/enums.h> -- --#include <libempathy/empathy-contact.h> --#include <libempathy/empathy-debug.h> --#include <libempathy/empathy-contact-manager.h> --#include <libempathy/empathy-ft-factory.h> --#include <libempathy/empathy-ft-handler.h> --#include <libempathy/empathy-tp-file.h> --#include <libempathy/empathy-account-manager.h> -- --#include <libempathy-gtk/empathy-contact-selector.h> --#include <libempathy-gtk/empathy-ui-utils.h> -- --#include "nautilus-sendto-plugin.h" -- --static EmpathyAccountManager *acc_manager = NULL; --static EmpathyFTFactory *factory = NULL; --static guint transfers = 0; -- --static gboolean destroy (NstPlugin *plugin); -- --static void --handle_account_manager_ready () --{ -- TpConnectionPresenceType presence; -- -- presence = empathy_account_manager_get_global_presence (acc_manager, -- NULL, NULL); -- -- if (presence < TP_CONNECTION_PRESENCE_TYPE_AVAILABLE) -- return; --} -- --static void --acc_manager_ready_cb (EmpathyAccountManager *am, -- GParamSpec *pspec, -- gpointer _user_data) --{ -- if (!empathy_account_manager_is_ready (am)) -- return; -- -- handle_account_manager_ready (); --} -- --static gboolean --init (NstPlugin *plugin) --{ -- g_print ("Init %s plugin\n", plugin->info->id); -- -- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -- bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -- -- empathy_gtk_init (); -- -- acc_manager = empathy_account_manager_dup_singleton (); -- -- if (empathy_account_manager_is_ready (acc_manager)) -- handle_account_manager_ready (); -- else -- g_signal_connect (acc_manager, "notify::ready", -- G_CALLBACK (acc_manager_ready_cb), NULL); -- -- return TRUE; --} -- --static GtkWidget * --get_contacts_widget (NstPlugin *plugin) --{ -- EmpathyContactManager *manager; -- GtkWidget *selector; -- -- manager = empathy_contact_manager_dup_singleton (); -- selector = empathy_contact_selector_new (EMPATHY_CONTACT_LIST (manager)); -- -- empathy_contact_selector_set_visible (EMPATHY_CONTACT_SELECTOR (selector), -- (EmpathyContactSelectorFilterFunc) empathy_contact_can_send_files, NULL); -- -- g_object_unref (manager); -- -- return selector; --} -- --static EmpathyContact * --get_selected_contact (GtkWidget *contact_widget) --{ -- EmpathyContact *contact; -- GtkTreeModel *model; -- GtkTreeIter iter; -- -- if (!gtk_combo_box_get_active_iter (GTK_COMBO_BOX (contact_widget), &iter)) -- return NULL; -- -- model = gtk_combo_box_get_model (GTK_COMBO_BOX (contact_widget)); -- gtk_tree_model_get (model, &iter, -- EMPATHY_CONTACT_LIST_STORE_COL_CONTACT, &contact, -1); -- -- return contact; --} -- --static gboolean --validate_destination (NstPlugin *plugin, -- GtkWidget *contact_widget, -- gchar **error) --{ -- EmpathyContact *contact = NULL; -- gboolean ret = TRUE; -- -- contact = get_selected_contact (contact_widget); -- -- if (!contact) -- return FALSE; -- -- if (!empathy_contact_can_send_files (contact)) -- { -- *error = g_strdup (_("The contact selected cannot receive files.")); -- ret = FALSE; -- } -- -- if (ret && !empathy_contact_is_online (contact)) -- { -- *error = g_strdup (_("The contact selected is offline.")); -- ret = FALSE; -- } -- -- g_object_unref (contact); -- -- return ret; --} -- --static void --quit (void) --{ -- if (--transfers > 0) -- return; -- -- destroy (NULL); -- gtk_main_quit (); --} -- --static void --transfer_done_cb (EmpathyFTHandler *handler, -- EmpathyTpFile *tp_file, -- NstPlugin *plugin) --{ -- quit (); --} -- --static void --transfer_error_cb (EmpathyFTHandler *handler, -- GError *error, -- NstPlugin *plugin) --{ -- quit (); --} -- --static void --error_dialog_cb (GtkDialog *dialog, -- gint arg, -- gpointer user_data) --{ -- gtk_widget_destroy (GTK_WIDGET (dialog)); -- quit (); --} -- --static void --handler_ready_cb (EmpathyFTFactory *factory, -- EmpathyFTHandler *handler, -- GError *error, -- NstPlugin *plugin) --{ -- if (error != NULL) -- { -- GtkWidget *dialog; -- dialog = gtk_message_dialog_new (NULL, 0, GTK_MESSAGE_ERROR, -- GTK_BUTTONS_CLOSE, "%s", -- error->message ? error->message : _("No error message")); -- -- g_signal_connect (dialog, "response", G_CALLBACK (error_dialog_cb), NULL); -- gtk_widget_show (dialog); -- } -- else -- { -- g_signal_connect (handler, "transfer-done", -- G_CALLBACK (transfer_done_cb), plugin); -- g_signal_connect (handler, "transfer-error", -- G_CALLBACK (transfer_error_cb), plugin); -- -- empathy_ft_handler_start_transfer (handler); -- } --} -- --static gboolean --send_files (NstPlugin *plugin, -- GtkWidget *contact_widget, -- GList *file_list) --{ -- EmpathyContact *contact; -- GList *l; -- -- contact = get_selected_contact (contact_widget); -- -- if (!contact) -- return FALSE; -- -- factory = empathy_ft_factory_dup_singleton (); -- -- g_signal_connect (factory, "new-ft-handler", -- G_CALLBACK (handler_ready_cb), plugin); -- -- for (l = file_list; l; l = l->next) -- { -- gchar *path = l->data; -- GFile *file; -- -- file = g_file_new_for_uri (path); -- -- ++transfers; -- -- empathy_ft_factory_new_transfer_outgoing (factory, -- contact, file); -- -- g_object_unref (file); -- } -- -- g_object_unref (contact); -- -- if (transfers == 0) -- { -- destroy (NULL); -- return TRUE; -- } -- -- return FALSE; --} -- --static gboolean --destroy (NstPlugin *plugin) --{ -- if (acc_manager) -- g_object_unref (acc_manager); -- -- if (factory) -- g_object_unref (factory); -- -- return TRUE; --} -- --static --NstPluginInfo plugin_info = { -- "im", -- "empathy", -- N_("Instant Message (Empathy)"), -- NULL, -- TRUE, -- NAUTILUS_CAPS_NONE, -- init, -- get_contacts_widget, -- validate_destination, -- send_files, -- destroy --}; -- --NST_INIT_PLUGIN (plugin_info) -- --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-old-evo.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-old-evo.patch deleted file mode 100644 index 8ef133aeeaa2..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-remove-old-evo.patch +++ /dev/null @@ -1,273 +0,0 @@ -From 6756a352ce9560a343aa4f31c96ab9247ee20b83 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:36:38 +0000 -Subject: Remove plugin to use sendto from Evolution - -And not the plugin to use evolution-data-server in nautilus-sendto. ---- -diff --git a/Makefile.am b/Makefile.am -index a814bb1..be84bf5 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -1,10 +1,4 @@ --if HAVE_EVOLUTION --EVOLUTION_PLUGIN_DIR=evolution --endif -- --SUBDIRS = src $(EVOLUTION_PLUGIN_DIR) docs po -- --DIST_SUBDIRS = evolution src docs po -+SUBDIRS = src docs po - - DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --with-nautilusdir='$${libdir}/nautilus/extensions-2.0-distcheck' - -diff --git a/configure.in b/configure.in -index 214be7c..d7318d9 100644 ---- a/configure.in -+++ b/configure.in -@@ -81,18 +81,6 @@ fi - AC_MSG_NOTICE([installing nautilus plugin in ${ac_with_nautilusdir}]) - AC_SUBST([NAUTILUS_EXTENSION_DIR],[${ac_with_nautilusdir}]) - --dnl Get details about evolution -- --PKG_CHECK_MODULES(EVOLUTION, evolution-plugin < 2.27.1, -- enable_evo=yes, enable_evo=no) --AM_CONDITIONAL(HAVE_EVOLUTION, test "x$enable_evo" = "xyes") -- --plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin` --AC_SUBST(plugindir) -- --EVO_PLUGIN_RULE=$srcdir/evolution/plugin.mk --AC_SUBST_FILE(EVO_PLUGIN_RULE) -- - # The full list of plugins - allowed_plugins="bluetooth empathy evolution gajim nautilus-burn pidgin removable-devices upnp" - -@@ -291,7 +279,6 @@ src/plugins/upnp/Makefile - docs/Makefile - docs/nautilus-sendto/Makefile - docs/nautilus-sendto/version.xml --evolution/Makefile - po/Makefile.in - ]) - -@@ -315,11 +302,5 @@ else - AC_MSG_NOTICE([ No nautilus-sendto plugins enabled]) - fi - --if test "x$enable_evo" = "xyes"; then -- AC_MSG_NOTICE([** Evolution send-to plugin ( < 2.27.1) enabled]) --else -- AC_MSG_NOTICE([ Evolution send-to plugin ( < 2.27.1) disabled]) --fi -- - echo " " - echo "-------------------------------------------------------" -diff --git a/evolution/Makefile.am b/evolution/Makefile.am -deleted file mode 100644 -index a216ed0..0000000 ---- a/evolution/Makefile.am -+++ b/dev/null -@@ -1,17 +0,0 @@ --INCLUDES = \ -- $(EVOLUTION_CFLAGS) \ -- $(WARN_CFLAGS) -- --@EVO_PLUGIN_RULE@ -- --plugin_DATA = org-gnome-evolution-send-attachments-to.eplug --plugin_LTLIBRARIES = liborg-gnome-evolution-send-attachments-to.la -- --liborg_gnome_evolution_send_attachments_to_la_SOURCES = nautilus-sendto.c --liborg_gnome_evolution_send_attachments_to_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) --liborg_gnome_evolution_send_attachments_to_la_LIBADD = $(EVOLUTION_LIBS) -- --EXTRA_DIST = org-gnome-evolution-send-attachments-to.eplug.xml plugin.mk -- --BUILT_SOURCES = $(plugin_DATA) --CLEANFILES = $(BUILT_SOURCES) -diff --git a/evolution/nautilus-sendto.c b/evolution/nautilus-sendto.c -deleted file mode 100644 -index 01728ae..0000000 ---- a/evolution/nautilus-sendto.c -+++ b/dev/null -@@ -1,112 +0,0 @@ --/* -- * This program is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Lesser General Public -- * License as published by the Free Software Foundation; either -- * version 2 of the License, or (at your option) version 3. -- * -- * This program is distributed in the hope that it will be useful, -- * but WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Lesser General Public License for more details. -- * -- * You should have received a copy of the GNU Lesser General Public -- * License along with the program; if not, see <http://www.gnu.org/licenses/> -- * -- * -- * Authors: -- * Johnny Jacob <johnnyjacob@gmail.com> -- * -- * Copyright (C) 1999-2008 Novell, Inc. (www.novell.com) -- * -- */ -- --#include <config.h> -- --#include <glib.h> --#include <gtk/gtk.h> --#include <glib/gi18n-lib.h> --#include <e-util/e-config.h> --#include <e-util/e-popup.h> --#include <mail/em-popup.h> --#include <mail/em-menu.h> --#include <mail/em-utils.h> --#include <misc/e-attachment.h> -- --static void send_file (EPlugin *ep, EPopupTarget *t, void *data); --void org_gnome_evolution_send_file_attachments (EPlugin *ep, EMPopupTargetAttachments *t); --void org_gnome_evolution_send_file_part (EPlugin *ep, EMPopupTargetPart *t); -- --static void --popup_free (EPopup *ep, GSList *items, void *data) --{ -- g_slist_free (items); --} -- --static EPopupItem popup_attachment_items[] = { -- { E_POPUP_BAR, "25.display.00"}, -- { E_POPUP_ITEM, "25.display.01", N_("_Send to..."), (EPopupActivateFunc)send_file, NULL, "document-send"} --}; -- --void org_gnome_evolution_send_file_attachments (EPlugin *ep, EMPopupTargetAttachments *t) --{ -- GSList *menus = NULL; -- int len = 0; -- -- g_message ("org_gnome_evolution_send_file_attachments called"); -- -- len = g_slist_length(t->attachments); -- -- if (len != 1) -- return; -- -- menus = g_slist_prepend (menus, &popup_attachment_items[0]); -- menus = g_slist_prepend (menus, &popup_attachment_items[1]); -- e_popup_add_items (t->target.popup, menus, GETTEXT_PACKAGE, popup_free, t); --} -- --void org_gnome_evolution_send_file_part (EPlugin *ep, EMPopupTargetPart *t) --{ -- GSList *menus = NULL; -- -- g_message ("org_gnome_evolution_send_file_attachments called"); -- -- menus = g_slist_prepend (menus, &popup_attachment_items[0]); -- menus = g_slist_prepend (menus, &popup_attachment_items[1]); -- e_popup_add_items (t->target.popup, menus, GETTEXT_PACKAGE, popup_free, t); --} -- --static void --send_file (EPlugin *ep, EPopupTarget *t, void *data) --{ -- CamelMimePart *part; -- char *path; -- EPopupTarget *target = (EPopupTarget *) data; -- GPtrArray *argv; -- gboolean ret; -- GError *err = NULL; -- -- if (target->type == EM_POPUP_TARGET_ATTACHMENTS) -- part = ((EAttachment *) ((EMPopupTargetAttachments *) target)->attachments->data)->body; -- else -- part = ((EMPopupTargetPart *) target)->part; -- -- path = em_utils_temp_save_part (NULL, part, FALSE); -- g_message ("saved part as %s", path); -- -- argv = g_ptr_array_new (); -- g_ptr_array_add (argv, "nautilus-sendto"); -- g_ptr_array_add (argv, path); -- g_ptr_array_add (argv, NULL); -- -- ret = g_spawn_async (NULL, (gchar **) argv->pdata, -- NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &err); -- g_ptr_array_free (argv, TRUE); -- -- if (ret == FALSE) { -- g_warning ("Couldn't send the attachment: %s", err->message); -- g_error_free (err); -- } -- -- g_free (path); --} -- -diff --git a/evolution/org-gnome-evolution-send-attachments-to.eplug.xml b/evolution/org-gnome-evolution-send-attachments-to.eplug.xml -deleted file mode 100644 -index b6f7f27..0000000 ---- a/evolution/org-gnome-evolution-send-attachments-to.eplug.xml -+++ b/dev/null -@@ -1,28 +0,0 @@ --<?xml version="1.0"?> --<e-plugin-list> -- <!-- the path to the shared library --> -- <e-plugin -- id="org-gnome-evolution-send-attachments-to" -- type="shlib" -- location="@PLUGINDIR@/liborg-gnome-evolution-send-attachments-to@SOEXT@" -- _name="Send to..." -- domain="@GETTEXT_PACKAGE@"> -- -- <author name="Bastien Nocera" email="hadess@hadess.net"/> -- <_description>Send files to remote devices, or people</_description> -- <!-- Attachment to received e-mail --> -- <hook class="org.gnome.evolution.mail.popup:1.0"> -- <menu id="org.gnome.evolution.mail.formathtmldisplay.popup" target="part" factory="org_gnome_evolution_send_file_part"> -- </menu> -- </hook> -- <hook class="org.gnome.evolution.mail.popup:1.0"> -- <menu id="org.gnome.evolution.mail.attachments.popup" target="attachments" factory="org_gnome_evolution_send_file_attachments"> -- </menu> -- </hook> -- <!-- Right-click in the attachment bar when creating a new mail --> -- <hook class="org.gnome.evolution.mail.popup:1.0"> -- <menu id="org.gnome.evolution.mail.composer.attachmentbar.popup" target="attachments" factory="org_gnome_evolution_send_file_attachments"> -- </menu> -- </hook> -- </e-plugin> --</e-plugin-list> -diff --git a/evolution/plugin.mk b/evolution/plugin.mk -deleted file mode 100644 -index a98aaf6..0000000 ---- a/evolution/plugin.mk -+++ b/dev/null -@@ -1,11 +0,0 @@ --%.eplug: %.eplug.in -- sed -e 's|\@PLUGINDIR\@|$(plugindir)|' \ -- -e 's|\@SOEXT\@|$(SOEXT)|' \ -- -e 's|\@GETTEXT_PACKAGE\@|$(GETTEXT_PACKAGE)|' \ -- -e 's|\@LOCALEDIR\@|$(localedir)|' $< > $@ -- --%.eplug.in: %.eplug.xml -- LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ -- --%.error: %.error.xml -- LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@ -diff --git a/po/POTFILES.in b/po/POTFILES.in -index 69ca4ea..a66fef3 100644 ---- a/po/POTFILES.in -+++ b/po/POTFILES.in -@@ -1,8 +1,6 @@ - # List of source files containing translatable strings. - # Please keep this file sorted alphabetically. - nst.schemas.in --evolution/nautilus-sendto.c --evolution/org-gnome-evolution-send-attachments-to.eplug.xml - src/nautilus-nste.c - src/nautilus-nste.h - src/nautilus-sendto-command.c --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-shadowed-mounts.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-shadowed-mounts.patch deleted file mode 100644 index 7aef494c6238..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-shadowed-mounts.patch +++ /dev/null @@ -1,83 +0,0 @@ -From c4f591ebe5af99c0483dd04a608cebda9bbffe49 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Thu, 10 Jun 2010 17:34:08 +0000 -Subject: Fix handling of shadowed mounts - -Fix duplicate mounts appearing in the "removable device" section -when a mount is shadowed. ---- -diff --git a/src/plugins/removable-devices/removable-devices.c b/src/plugins/removable-devices/removable-devices.c -index 5984ec7..68022c4 100644 ---- a/src/plugins/removable-devices/removable-devices.c -+++ b/src/plugins/removable-devices/removable-devices.c -@@ -43,10 +43,11 @@ cb_mount_removed (GVolumeMonitor *volume_monitor, - { - GtkTreeIter iter; - GtkListStore *store; -- gboolean b; -+ gboolean b, found; - - store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (cb))); - b = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter); -+ found = FALSE; - - while (b) { - GMount *m; -@@ -54,11 +55,21 @@ cb_mount_removed (GVolumeMonitor *volume_monitor, - if (m == mount) { - gtk_list_store_remove (store, &iter); - g_object_unref (m); -+ found = TRUE; - break; - } - g_object_unref (m); - b = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter); - } -+ -+ /* If a mount was removed */ -+ if (found != FALSE) { -+ /* And it was the selected one */ -+ if (gtk_combo_box_get_active (GTK_COMBO_BOX (cb)) == -1) { -+ /* Select the first item in the list */ -+ gtk_combo_box_set_active (GTK_COMBO_BOX (cb), 0); -+ } -+ } - } - - static void -@@ -70,6 +81,11 @@ cb_mount_changed (GVolumeMonitor *volume_monitor, - gboolean b; - GtkListStore *store; - -+ if (g_mount_is_shadowed (mount) != FALSE) { -+ cb_mount_removed (volume_monitor, mount, plugin); -+ return; -+ } -+ - store = GTK_LIST_STORE (gtk_combo_box_get_model (GTK_COMBO_BOX (cb))); - b = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter); - -@@ -104,6 +120,9 @@ cb_mount_added (GVolumeMonitor *volume_monitor, - GtkTreeModel *model; - gboolean select_added; - -+ if (g_mount_is_shadowed (mount) != FALSE) -+ return; -+ - name = g_mount_get_name (mount); - model = gtk_combo_box_get_model (GTK_COMBO_BOX (cb)); - -@@ -152,6 +171,11 @@ get_contacts_widget (NstPlugin *plugin) - for (l = mounts; l != NULL; l = l->next) { - char *name; - -+ if (g_mount_is_shadowed (l->data) != FALSE) { -+ g_object_unref (l->data); -+ continue; -+ } -+ - name = g_mount_get_name (l->data); - - gtk_list_store_append (store, &iter); --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-thunderbird-command.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-thunderbird-command.patch deleted file mode 100644 index b6a0cc6e4d33..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-thunderbird-command.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 52ed3fb5981cddcd84d787912fa548043ff568da Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:29:08 +0000 -Subject: Fix thunderbird's mailto command - -Seeing as it's the only mailer to be such a pain. - -https://bugzilla.gnome.org/show_bug.cgi?id=614222 ---- -diff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c -index a25ade1..8e1dd0c 100644 ---- a/src/plugins/evolution/evolution.c -+++ b/src/plugins/evolution/evolution.c -@@ -99,9 +99,18 @@ init (NstPlugin *plugin) - /* Find what the default mailer is */ - if (strstr (mail_cmd, "balsa")) - type = MAILER_BALSA; -- else if (strstr (mail_cmd, "thunder") || strstr (mail_cmd, "seamonkey")) -+ else if (strstr (mail_cmd, "thunder") || strstr (mail_cmd, "seamonkey")) { -+ char **strv; -+ - type = MAILER_THUNDERBIRD; -- else if (strstr (mail_cmd, "sylpheed") || strstr (mail_cmd, "claws")) -+ -+ /* Thunderbird sucks, see -+ * https://bugzilla.gnome.org/show_bug.cgi?id=614222 */ -+ strv = g_strsplit (mail_cmd, " ", -1); -+ g_free (mail_cmd); -+ mail_cmd = g_strdup_printf ("%s %%s", strv[0]); -+ g_strfreev (strv); -+ } else if (strstr (mail_cmd, "sylpheed") || strstr (mail_cmd, "claws")) - type = MAILER_SYLPHEED; - else if (strstr (mail_cmd, "anjal")) - type = MAILER_EVO; --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-dbus.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-dbus.patch deleted file mode 100644 index f64c27ca3453..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-dbus.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 99a19ae7549b8ad8f874748cbc89cda9b0e4d9a5 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 16:42:19 +0000 -Subject: Never unload plugins that use D-Bus internally - -As the new types will be unloaded, and kaboom! - -https://bugzilla.gnome.org/show_bug.cgi?id=608126 ---- -diff --git a/src/plugins/pidgin/pidgin.c b/src/plugins/pidgin/pidgin.c -index 6cfe98a..319fdbd 100644 ---- a/src/plugins/pidgin/pidgin.c -+++ b/src/plugins/pidgin/pidgin.c -@@ -463,7 +463,7 @@ NstPluginInfo plugin_info = { - "pidgin", - N_("Instant Message (Pidgin)"), - NULL, -- FALSE, -+ TRUE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-init.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-init.patch deleted file mode 100644 index d88907f9a559..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload-init.patch +++ /dev/null @@ -1,23 +0,0 @@ -From c76410275933ff05701cda346944e30498d27b2e Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 17:12:42 +0000 -Subject: Never unload modules once init() has been done - -Because they might register new types, and when they're unloaded, -kaboom! ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index dd21620..92b96bb 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -665,8 +665,6 @@ nautilus_sendto_plugin_dir_process (const char *plugindir) - if (p->info->init(p)) { - plugin_list = g_list_append (plugin_list, p); - } else { -- if (!p->info->never_unload) -- g_module_close (p->module); - g_free (p); - } - } --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload.patch deleted file mode 100644 index ebbdb82ff5e7..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.4-unload.patch +++ /dev/null @@ -1,120 +0,0 @@ -From ff902cb60e1ace5ca4af09f9c9f7d76517c8e5d5 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Wed, 09 Jun 2010 17:18:15 +0000 -Subject: Remove never_unload from the plugin struct - -Seeing as we never want to unload them now. ---- -diff --git a/src/nautilus-sendto-plugin.h b/src/nautilus-sendto-plugin.h -index 216f051..14fb7f5 100644 ---- a/src/nautilus-sendto-plugin.h -+++ b/src/nautilus-sendto-plugin.h -@@ -61,7 +61,6 @@ typedef enum { - * @id: A unique ID representing the plugin - * @description: The label used in the plugin selection drop-down - * @gettext_package: The domain to use to translate the description, %NULL if the plugin is part of nautilus-sendto -- * @never_unload: Whether to unload the plugin on exit. Enable this if your plugin registers a new #GType - * @capabilities: a bitmask of #NstPluginCapabilities - * @init: Check for dependencies, and return %FALSE if dependencies such as programs are missing. - * @get_contacts_widget: Return the contact widget, the widget to select the destination of the files -@@ -71,13 +70,12 @@ typedef enum { - * - * A structure representing a nautilus-sendto plugin. You should also call NST_INIT_PLUGIN() on the plugin structure to export it. - **/ --struct _NstPluginInfo -+struct _NstPluginInfo - { - gchar *icon; - gchar *id; - gchar *description; - gchar *gettext_package; -- gboolean never_unload; - NstPluginCapabilities capabilities; - gboolean (*init) (NstPlugin *plugin); - GtkWidget* (*get_contacts_widget) (NstPlugin *plugin); -diff --git a/src/plugins/bluetooth/bluetooth.c b/src/plugins/bluetooth/bluetooth.c -index f2db2dd..160619d 100644 ---- a/src/plugins/bluetooth/bluetooth.c -+++ b/src/plugins/bluetooth/bluetooth.c -@@ -549,7 +549,6 @@ NstPluginInfo plugin_info = { - "bluetooth", - N_("Bluetooth (OBEX Push)"), - NULL, -- FALSE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/evolution/evolution.c b/src/plugins/evolution/evolution.c -index 8e1dd0c..7feb305 100644 ---- a/src/plugins/evolution/evolution.c -+++ b/src/plugins/evolution/evolution.c -@@ -377,7 +377,6 @@ NstPluginInfo plugin_info = { - "evolution", - N_("Email"), - NULL, -- FALSE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/gajim/gajim.c b/src/plugins/gajim/gajim.c -index 1943b3d..088c69b 100644 ---- a/src/plugins/gajim/gajim.c -+++ b/src/plugins/gajim/gajim.c -@@ -504,7 +504,6 @@ NstPluginInfo plugin_info = { - "gajim", - N_("Instant Message (Gajim)"), - NULL, -- TRUE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/nautilus-burn/nautilus-burn.c b/src/plugins/nautilus-burn/nautilus-burn.c -index bdc80c1..cdaa09e 100644 ---- a/src/plugins/nautilus-burn/nautilus-burn.c -+++ b/src/plugins/nautilus-burn/nautilus-burn.c -@@ -177,7 +177,6 @@ NstPluginInfo plugin_info = { - "nautilus-burn", - N_("CD/DVD Creator"), - NULL, -- FALSE, - NAUTILUS_CAPS_SEND_DIRECTORIES, - init, - get_contacts_widget, -diff --git a/src/plugins/pidgin/pidgin.c b/src/plugins/pidgin/pidgin.c -index 319fdbd..5d9b52e 100644 ---- a/src/plugins/pidgin/pidgin.c -+++ b/src/plugins/pidgin/pidgin.c -@@ -463,7 +463,6 @@ NstPluginInfo plugin_info = { - "pidgin", - N_("Instant Message (Pidgin)"), - NULL, -- TRUE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, -diff --git a/src/plugins/removable-devices/removable-devices.c b/src/plugins/removable-devices/removable-devices.c -index 4a735a3..5984ec7 100644 ---- a/src/plugins/removable-devices/removable-devices.c -+++ b/src/plugins/removable-devices/removable-devices.c -@@ -223,7 +223,6 @@ NstPluginInfo plugin_info = { - "folder-remote", - N_("Removable disks and shares"), - NULL, -- FALSE, - NAUTILUS_CAPS_SEND_DIRECTORIES, - init, - get_contacts_widget, -diff --git a/src/plugins/upnp/upnp.c b/src/plugins/upnp/upnp.c -index da5669e..5d2448e 100644 ---- a/src/plugins/upnp/upnp.c -+++ b/src/plugins/upnp/upnp.c -@@ -308,7 +308,6 @@ NstPluginInfo plugin_info = { - "upnp", - N_("UPnP Media Server"), - NULL, -- FALSE, - NAUTILUS_CAPS_NONE, - init, - get_contacts_widget, --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch deleted file mode 100644 index 0f086522649b..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-commandline-help.patch +++ /dev/null @@ -1,34 +0,0 @@ -From aff367791fdd6535021fd0c95ecf2067363073c2 Mon Sep 17 00:00:00 2001 -From: Matthias Clasen <mclasen@redhat.com> -Date: Tue, 31 Aug 2010 15:49:00 +0000 -Subject: Fix command-line help glitch - -nautilus-sendo --help says - -Usage: -nautilus-sendto [OPTION...] [FILES...] nautilus-sendto - -The second 'nautilus-sendto' here is redundant and confusing. With the -patch below, it says just - -Usage: -nautilus-sendto [OPTION...] [FILES...] -which is the intended output - -https://bugzilla.gnome.org/show_bug.cgi?id=627849 ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 4dcbb1a..722386c 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -804,7 +804,7 @@ int main (int argc, char **argv) - textdomain (GETTEXT_PACKAGE); - - g_thread_init (NULL); -- context = g_option_context_new ("nautilus-sendto"); -+ context = g_option_context_new (""); - g_option_context_add_main_entries (context, entries, GETTEXT_PACKAGE); - g_option_context_add_group (context, gtk_get_option_group (TRUE)); - if (g_option_context_parse (context, &argc, &argv, &error) == FALSE) { --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch b/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch deleted file mode 100644 index 937c7d7ef2e9..000000000000 --- a/gnome-extra/nautilus-sendto/files/nautilus-sendto-2.28.5-fix-memleaks.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 52a1a4433dd5087baed79f948aec96aab409e3d2 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera <hadess@hadess.net> -Date: Mon, 16 Aug 2010 15:21:05 +0000 -Subject: Fix a few memory leaks - -On startup, and when sending packed files - -https://bugzilla.gnome.org/show_bug.cgi?id=626754 ---- -diff --git a/src/nautilus-sendto-command.c b/src/nautilus-sendto-command.c -index 92b96bb..4dcbb1a 100644 ---- a/src/nautilus-sendto-command.c -+++ b/src/nautilus-sendto-command.c -@@ -265,7 +265,7 @@ status_label_clear (gpointer data) - static void - send_button_cb (GtkWidget *widget, NS_ui *ui) - { -- char *f, *error; -+ char *error; - NstPlugin *p; - GtkWidget *w; - -@@ -305,11 +305,14 @@ send_button_cb (GtkWidget *widget, NS_ui *ui) - NAUTILUS_SENDTO_LAST_MEDIUM, p->info->id, NULL); - - if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(ui->pack_checkbutton))){ -+ char *f; -+ - f = pack_files (ui); - if (f != NULL) { - GList *packed_file = NULL; - packed_file = g_list_append (packed_file, f); - if (!p->info->send_files (p, w, packed_file)) { -+ g_free (f); - g_list_free (packed_file); - return; - } -@@ -318,6 +321,7 @@ send_button_cb (GtkWidget *widget, NS_ui *ui) - gtk_widget_set_sensitive (ui->dialog, TRUE); - return; - } -+ g_free (f); - } else { - if (!p->info->send_files (p, w, file_list)) { - g_list_foreach (file_list, (GFunc) g_free, NULL); -@@ -763,6 +767,7 @@ nautilus_sendto_init (void) - - file = g_file_new_for_commandline_arg (filenames[i]); - filename = g_file_get_path (file); -+ g_object_unref (file); - if (filename == NULL) - continue; - --- -cgit v0.8.3.1 diff --git a/gnome-extra/nautilus-sendto/metadata.xml b/gnome-extra/nautilus-sendto/metadata.xml index 8157556b1496..48a8d9232864 100644 --- a/gnome-extra/nautilus-sendto/metadata.xml +++ b/gnome-extra/nautilus-sendto/metadata.xml @@ -2,11 +2,5 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <herd>gnome</herd> - <use> - <flag name='gajim'>Enables support for <pkg>net-im/gajim</pkg></flag> - <flag name='mail'>Enables support for mailto using - <pkg>gnome-extra/evolution-data-server</pkg></flag> - <flag name='pidgin'>Enables support for <pkg>net-im/pidgin</pkg></flag> - </use> </pkgmetadata> diff --git a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild b/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild deleted file mode 100644 index b05019753a7a..000000000000 --- a/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/nautilus-sendto/nautilus-sendto-2.32.0.ebuild,v 1.8 2013/01/13 15:53:49 eva Exp $ - -EAPI="3" -GCONF_DEBUG="yes" - -inherit eutils gnome2 multilib - -DESCRIPTION="A nautilus extension for sending files to locations" -HOMEPAGE="http://www.gnome.org" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 ia64 ppc sparc x86" -IUSE="cdr gajim +mail pidgin upnp-av" - -RDEPEND=">=x11-libs/gtk+-2.18:2 - >=dev-libs/glib-2.25.9:2 - >=gnome-base/nautilus-2.14 - cdr? ( >=app-cdr/brasero-2.26.0[nautilus] ) - gajim? ( - net-im/gajim - >=dev-libs/dbus-glib-0.60 ) - mail? ( >=gnome-extra/evolution-data-server-1.5.3 ) - pidgin? ( - >=net-im/pidgin-2.0.0 - >=dev-libs/dbus-glib-0.60 ) - upnp-av? ( >=net-libs/gupnp-0.13.0 )" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.9 - >=dev-util/intltool-0.35 - sys-devel/gettext - virtual/pkgconfig -" -# Needed for eautoreconf -# >=gnome-base/gnome-common-0.12 - -_use_plugin() { - if use ${1}; then - G2CONF="${G2CONF}${2:-"${1}"}," - fi -} - -pkg_setup() { - DOCS="AUTHORS ChangeLog NEWS README" - G2CONF="${G2CONF} - --with-plugins=removable-devices," - _use_plugin cdr nautilus-burn - _use_plugin mail evolution - _use_plugin pidgin - _use_plugin gajim - _use_plugin upnp-av upnp -} - -src_install() { - gnome2_src_install - find "${ED}" -name "*.la" -delete || die "failed to delete *.la files" -} |