drop old

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 8 insertions, 239 deletions

diff --git a/gnome-extra/cinnamon/ChangeLog b/gnome-extra/cinnamon/ChangeLog
index 2812ee61d907..5dd1703f68d7 100644
--- a/gnome-extra/cinnamon/ChangeLog
+++ b/gnome-extra/cinnamon/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for gnome-extra/cinnamon
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.49 2014/10/07 11:38:11 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/cinnamon/ChangeLog,v 1.50 2014/11/13 12:56:26 pacho Exp $
+
+  13 Nov 2014; Pacho Ramos <pacho@gentoo.org> -cinnamon-2.2.16-r1.ebuild:
+  drop old
 
 *cinnamon-2.2.16-r2 (07 Oct 2014)
 
diff --git a/gnome-extra/cinnamon/Manifest b/gnome-extra/cinnamon/Manifest
index 30c891ba5e7d..11edbbe4f8b1 100644
--- a/gnome-extra/cinnamon/Manifest
+++ b/gnome-extra/cinnamon/Manifest
@@ -14,14 +14,13 @@ AUX polkit-cinnamon-authentication-agent-1.desktop 252 SHA256 bfdbdc3e2ab360100b
 DIST cinnamon-2.2.14.tar.gz 2656809 SHA256 ffccc44c8b4675ba76510172d8252c3c07a131a9ad7b5ba062740b686a3cb0f9 SHA512 fab14dd7ba7ec0ed0ae8e9eb57befdd9d85239dc0215900192475fb7b256bb7c54df068ccedaa01c97651ce97f6bb2837bf1b2f56189d34eaf5a1d5f2ffad227 WHIRLPOOL 4f19e3bd44fcb63d650d3a8c8748605f55e5e3c8a1796bb88968addcefd277d9572a8192aead9c5e3ceae7f1132ad6d060e56060e6780dc836312f7281c0f655
 DIST cinnamon-2.2.16.tar.gz 2656994 SHA256 1fc0bc1b6dbd071ca61f90c5cac5e41abfddbfa77577bdf3407afd1c1ca04793 SHA512 1e671c02393bb42ffcf20766a4bda005199115f9686784b3baa85828182d630cedce392a589689e639005aaf4ae05a2fb5c9b852cd94691f62ef55ab415a53fa WHIRLPOOL a8f86eb71449fd8281ff85b0e93e92d53fde43c7cf617621d2093b8222b8061ed278a7fe13413fc4f896dfbbdd12f67cb5b20536637ac53d6b06564b76dd918f
 EBUILD cinnamon-2.2.14.ebuild 8086 SHA256 21d6337ca37c0bb716a6fce83489f23477e2371e49b7d6296ecb17768c3fc06c SHA512 99ba24b0f9404d5aaec93ccded5fb101e234f31f00c5dfeb621be0e623b645975b43c48be470930ac53bcf2180461d00058246251c55ec45adcfed7201b14a83 WHIRLPOOL ab8b8af2da5230390b5498b1122c3bf073b7a1e0a182b2802fbaec853c51be1c9b9af143042edd012205d2ba3531cf172de0724b047aa2b4adb2740b18e2b7a8
-EBUILD cinnamon-2.2.16-r1.ebuild 7957 SHA256 a2bdda58e38f5b22adf6099754b0bd1df04cf8fbf68e71a6e0bbdd9dfd7f17d1 SHA512 23a65c3e4946018271d720653412dab603b886f19410eabff6335a6df5bc6b8df9d84d88baeefd9e5e45e831cbe1973f6e4b43a2db356c8d0eb7b14df8da5b24 WHIRLPOOL 14b67746b13c656b21889bbf4e3ea003c812589b97ae35008ec8579d24ddd38381be1ecea069bb3d2722f6852227fbf228dfe5849b834dc38039872a92e7dc8b
 EBUILD cinnamon-2.2.16-r2.ebuild 9330 SHA256 b54a1f1358e9c46fbc6d548ef5e6d142cd761823512d82f9880009d13830124c SHA512 737cef06683d3b9e1d10d423bad73d12079abb849630ebd9723c308c8409a967af5150fdc7ed4d72c87597315e781c42005b06c7649cf7ac8fa2adc252779377 WHIRLPOOL a392f50f79e39ab2333033f948e4326ab291408f007709ac138e9afaf868f7a946186f7abf44fc8a2c76a131bea217fe6fa6bace72315356b9b80d5fb9e3de38
-MISC ChangeLog 11824 SHA256 31df2f52adf81a65580fd3f2f18796c6a4da4ed8277976412f4989844d0b28e6 SHA512 3954074ad18fa9363e4a0f0bf9096eb145199947e87025042ad114319c69714b2aa44875adfc10c966e3b2a9b9994ec94f335a8f49cb63568718717fe8b1f054 WHIRLPOOL 887f794e385ba8171b2ed030dec104823574401b2cdfe78730dea702ee240e59ee2acd18eba8a25e724bdcd654484df1cd39faaaa5c252396676d3bf449d123e
+MISC ChangeLog 11910 SHA256 7f362898a8669ce8481461b77f66e4a884e9fa021f515db82f85cb53a607ee1b SHA512 2d037627bc288771276e5154acedea57645a6b8294d92c0eeee85031a88654ec344a7a6715ff40c81db12cc7a2f060103834427f4f2625a99b2cb100c413d873 WHIRLPOOL d52ae2c282c72e02772b6289926c8e140133497983d22117758d85859bc8e02f3c2defb7e81a4ef8a1ac326c376f80e4712dc8d56e6c7f633ae670110be86d0c
 MISC metadata.xml 277 SHA256 6786a8b1c9403816c51e1d0148d688b84c4af397d5e9d1339c6b744145599b05 SHA512 57f61828a2c1bc24fa0ee0d83fac6e8aa1c6bf6baae9f291e649dac3a08bb8d49ab299f3b64a384f0dbb436ce210ac74cd1fc230079416d894ffb49717cd401a WHIRLPOOL f6d039a872e0b23097060a856262638e4d092dd407a0b332ce419216663b7d08269c8291fcf493300b4d55d0ac6f2cd8a771ed7bfcca2a329ffcba8f6ad4ab75
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlQz0KQACgkQCaWpQKGI+9Tg2gCfXmqQuo0QNWSgOUZZAiJKc2Gf
-5M0AoIC2QBPC/sM+2TMCZ3AYLCqrh0gS
-=6+dC
+iEYEAREIAAYFAlRkqnsACgkQCaWpQKGI+9SQWACfRNmsg0j9AKDzBB8fAgwurZZm
+7K0An0NY9TEMQoawb9syLZMAnNJ6L7Cj
+=vP4l
 -----END PGP SIGNATURE-----
diff --git a/gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild b/gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild
deleted file mode 100644
index 71b447b954d5..000000000000
--- a/gnome-extra/cinnamon/cinnamon-2.2.16-r1.ebuild
+++ /dev/null
@@ -1,233 +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/cinnamon/cinnamon-2.2.16-r1.ebuild,v 1.1 2014/10/02 10:18:05 pacho Exp $
-
-EAPI="5"
-GCONF_DEBUG="no"
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="xml"
-
-inherit autotools eutils gnome2 multilib pax-utils python-single-r1
-
-DESCRIPTION="A fork of GNOME Shell with layout similar to GNOME 2"
-HOMEPAGE="http://cinnamon.linuxmint.com/"
-
-MY_PV="${PV/_p/-UP}"
-MY_P="${PN}-${MY_PV}"
-
-SRC_URI="https://github.com/linuxmint/Cinnamon/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-# bluetooth support dropped due bug #511648
-IUSE="+l10n +networkmanager" #+bluetooth
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-KEYWORDS="~amd64 ~x86"
-
-COMMON_DEPEND="
-	app-misc/ca-certificates
-	dev-libs/dbus-glib
-	>=dev-libs/glib-2.29.10:2
-	>=dev-libs/gobject-introspection-0.10.1
-	>=dev-libs/json-glib-0.13.2
-	>=dev-libs/libcroco-0.6.2:0.6
-	dev-libs/libxml2:2
-	gnome-base/gconf:2[introspection]
-	gnome-base/librsvg
-	>=gnome-extra/cinnamon-desktop-1.0:0=[introspection]
-	gnome-extra/cinnamon-menus[introspection]
-	>=gnome-extra/cjs-1.9.0
-	>=media-libs/clutter-1.7.5:1.0[introspection]
-	media-libs/cogl:1.0=[introspection]
-	>=gnome-base/gsettings-desktop-schemas-2.91.91
-	media-libs/gstreamer:1.0
-	media-libs/gst-plugins-base:1.0
-	media-libs/libcanberra
-	media-sound/pulseaudio:0=[glib]
-	net-libs/libsoup:2.4[introspection]
-	>=sys-auth/polkit-0.100[introspection]
-	x11-libs/gdk-pixbuf:2[introspection]
-	>=x11-libs/gtk+-3.0.0:3[introspection]
-	x11-libs/pango[introspection]
-	>=x11-libs/startup-notification-0.11
-	x11-libs/libX11
-	>=x11-libs/libXfixes-5.0
-	>=x11-wm/muffin-1.9.1[introspection]
-	${PYTHON_DEPS}
-	networkmanager? (
-		gnome-base/libgnome-keyring
-		>=net-misc/networkmanager-0.8.999[introspection] )
-"
-#bluetooth? ( >=net-wireless/gnome-bluetooth-3.1:=[introspection] )
-
-# Runtime-only deps are probably incomplete and approximate.
-# Each block:
-# 2. Introspection stuff + dconf needed via imports.gi.*
-# 3. gnome-session is needed for gnome-session-quit
-# 4. Control shell settings
-# 5. accountsservice is needed for GdmUserManager (0.6.14 needed for fast
-#    user switching with gdm-3.1.x)
-# 6. caribou needed for on-screen keyboard
-# 7. xdg-utils needed for xdg-open, used by extension tool
-# 8. gconf-python, imaging, lxml needed for cinnamon-settings
-# 9. gnome-icon-theme-symbolic needed for various icons
-# 10. pygobject needed for menu editor
-# 11. nemo - default file manager, tightly integrated with cinnamon
-# TODO(lxnay): fix error: libgnome-desktop/gnome-rr-labeler.h: No such file or directory
-# note: needs gksu, not gksu-polkit, due to extensive use of --message/-m arg
-RDEPEND="${COMMON_DEPEND}
-	>=gnome-base/dconf-0.4.1
-	>=gnome-base/libgnomekbd-2.91.4[introspection]
-	|| ( sys-power/upower[introspection] sys-power/upower-pm-utils[introspection] )
-
-	gnome-extra/cinnamon-session
-
-	gnome-extra/cinnamon-settings-daemon
-
-	>=sys-apps/accountsservice-0.6.14[introspection]
-
-	>=app-accessibility/caribou-0.3
-
-	x11-libs/gksu
-	x11-misc/xdg-utils
-
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python:2
-	dev-python/lxml[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	dev-python/pycairo[${PYTHON_USEDEP}]
-	dev-python/pygobject:3[${PYTHON_USEDEP}]
-	dev-python/pyinotify[${PYTHON_USEDEP}]
-	dev-python/pypam[${PYTHON_USEDEP}]
-	virtual/python-imaging[${PYTHON_USEDEP}]
-
-	x11-themes/gnome-themes-standard[gtk]
-	x11-themes/gnome-icon-theme-symbolic
-
-	gnome-extra/nemo
-	gnome-extra/cinnamon-control-center
-	gnome-extra/cinnamon-screensaver
-
-	l10n? ( >=gnome-extra/cinnamon-translations-2.2 )
-	networkmanager? (
-		gnome-extra/nm-applet
-		net-misc/mobile-broadband-provider-info
-		sys-libs/timezone-data )
-"
-#bluetooth? ( net-wireless/cinnamon-bluetooth )
-
-DEPEND="${COMMON_DEPEND}
-	dev-python/polib[${PYTHON_USEDEP}]
-	>=sys-devel/gettext-0.17
-	virtual/pkgconfig
-	>=dev-util/intltool-0.40
-	gnome-base/gnome-common
-	!!=dev-lang/spidermonkey-1.8.2*
-"
-# libmozjs.so is picked up from /usr/lib while compiling, so block at build-time
-# https://bugs.gentoo.org/show_bug.cgi?id=360413
-
-S="${WORKDIR}/Cinnamon-${PV}"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fix GNOME 3.8 support
-	epatch "${FILESDIR}/background.patch"
-
-	# Fix automagic gnome-bluetooth dep, bug #398145
-	epatch "${FILESDIR}/${PN}-2.2.6-automagic-gnome-bluetooth.patch"
-
-	# Optional NetworkManager, bug #488684
-	epatch "${FILESDIR}/${PN}-2.2.6-optional-networkmanager.patch"
-
-	# Fix lspci path, https://github.com/linuxmint/Cinnamon/issues/3548
-	epatch "${FILESDIR}/${PN}-2.2.16-sbin-lspci.patch"
-
-	# Gentoo uses /usr/$(get_libdir), not /usr/lib even for python
-	sed -e "s:/usr/lib/:/usr/$(get_libdir)/:" \
-		-e 's:"/usr/lib":"/usr/'"$(get_libdir)"'":' \
-		-i files/usr/share/polkit-1/actions/org.cinnamon.settings-users.policy \
-		-i files/usr/lib/cinnamon-settings-users/cinnamon-settings-users.py \
-		-i files/usr/lib/cinnamon-screensaver-lock-dialog/cinnamon-screensaver-lock-dialog.py \
-		-i files/usr/lib/cinnamon-settings/cinnamon-settings.py \
-		-i files/usr/lib/cinnamon-settings/modules/cs_backgrounds.py \
-		-i files/usr/lib/cinnamon-settings/data/spices/applet-detail.html \
-		-i files/usr/lib/cinnamon-settings/bin/*.py \
-		-i files/usr/lib/cinnamon-desktop-editor/cinnamon-desktop-editor.py \
-		-i files/usr/lib/cinnamon-menu-editor/cme/*.py \
-		-i files/usr/bin/* || die "sed failed"
-	if [[ "$(get_libdir)" != lib ]]; then
-		mv files/usr/lib "files/usr/$(get_libdir)" || die "mv failed"
-	fi
-
-	if ! use networkmanager; then
-		rm -rv files/usr/share/cinnamon/applets/network@cinnamon.org || die
-	fi
-
-	python_fix_shebang .
-
-	eautoreconf
-	gnome2_src_prepare
-}
-
-src_configure() {
-	# Don't error out on warnings
-	gnome2_src_configure \
-		--disable-jhbuild-wrapper-script \
-		$(use_enable networkmanager) \
-		--with-ca-certificates="${EPREFIX}/etc/ssl/certs/ca-certificates.crt" \
-		BROWSER_PLUGIN_DIR="${EPREFIX}/usr/$(get_libdir)/nsbrowser/plugins" \
-		--without-bluetooth
-		#$(use_with bluetooth)
-}
-
-src_install() {
-	gnome2_src_install
-	python_optimize "${ED}usr/$(get_libdir)/cinnamon-"{desktop-editor,json-makepot,launcher,looking-glass,menu-editor,screensaver-lock-dialog,settings,settings-users}
-
-	# Required for gnome-shell on hardened/PaX, bug #398941
-	pax-mark mr "${ED}usr/bin/cinnamon"
-
-	# Doesn't exist on Gentoo, causing this to be a dead symlink
-	rm -f "${ED}etc/xdg/menus/cinnamon-applications-merged" || die
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-
-	if ! has_version 'media-libs/gst-plugins-good:1.0' || \
-	   ! has_version 'media-plugins/gst-plugins-vpx:1.0'; then
-		ewarn "To make use of Cinnamon's built-in screen recording utility,"
-		ewarn "you need to either install media-libs/gst-plugins-good:1.0"
-		ewarn "and media-plugins/gst-plugins-vpx:1.0, or use dconf-editor to change"
-		ewarn "org.cinnamon.recorder/pipeline to what you want to use."
-	fi
-
-	if ! has_version ">=x11-base/xorg-server-1.11"; then
-		ewarn "If you use multiple screens, it is highly recommended that you"
-		ewarn "upgrade to >=x11-base/xorg-server-1.11 to be able to make use of"
-		ewarn "pointer barriers which will make it easier to use hot corners."
-	fi
-
-	if has_version "<x11-drivers/ati-drivers-12"; then
-		ewarn "Cinnamon has been reported to show graphical corruption under"
-		ewarn "x11-drivers/ati-drivers-11.*; you may want to switch to"
-		ewarn "open-source drivers."
-	fi
-
-	if has_version "media-libs/mesa[video_cards_radeon]" ||
-	   has_version "media-libs/mesa[video_cards_r300]" ||
-	   has_version "media-libs/mesa[video_cards_r600]"; then
-		elog "Cinnamon is unstable under classic-mode r300/r600 mesa drivers."
-		elog "Make sure that gallium architecture for r300 and r600 drivers is"
-		elog "selected using 'eselect mesa'."
-		if ! has_version "media-libs/mesa[gallium]"; then
-			ewarn "You will need to emerge media-libs/mesa with USE=gallium."
-		fi
-	fi
-}