Drop 2.4.60, bug 556270.

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x974CA72A

3 files changed, 18 insertions, 79 deletions

diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 8676df20bfd9..973f52619e33 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.288 2015/07/02 00:32:21 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.289 2015/07/30 22:22:56 mattst88 Exp $
+
+  30 Jul 2015; Matt Turner <mattst88@gentoo.org> -libdrm-2.4.60.ebuild:
+  Drop 2.4.60, bug 556270.
 
 *libdrm-2.4.62 (02 Jul 2015)
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 0fa580968d10..d51503bd7fa5 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -13,7 +13,6 @@ DIST libdrm-2.4.54.tar.bz2 644930 SHA256 d94001ebfbe80e1523d1228ee2df57294698d1c
 DIST libdrm-2.4.56.tar.bz2 590856 SHA256 e20fbbe092177a8422913d8884a1255477456ab5b10b07389fa891a4dce54030 SHA512 5ad28ddcfad666c207a7d7c6139140182bd96c0f2c6befafbb03a9f50aa40119366cc8750025626c7c2570416a6e9476ab5102b4075562b52cdca577ded5d64c WHIRLPOOL 5995bb10400bdfaba3db2aee929df63d5be773e30511c58c10bda7360598edba14a0cad45d9f3d783d8a37232d1ab7e07544eb982fc1bfb0172440a12136db19
 DIST libdrm-2.4.58.tar.bz2 573202 SHA256 b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd SHA512 26776b3f93fe173f4e0f94668813ec1a756d9f15385d1cad70c7af8d4d5d503aef00e14081c76f6fcac6e0c606e106e47ddf76038f8601b71fc380306536f937 WHIRLPOOL 36d8915b3189fd0722f96698ce5e7a94188859c7372631c4126b0e09e8fa6dbd4e34de5e9d62e053c36e9f431d84d68d327be307d69caf92e1016893e77cf190
 DIST libdrm-2.4.59.tar.bz2 592722 SHA256 68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b SHA512 b9f61cfd47cf4a02c10e7fe79b0e9c5701383c76425cf4985a9b91d909f905334ca1ace7334aa0a4ab400694ad84a1a3bc1c3f29842d808026702b35fa9f87c3 WHIRLPOOL 6b0e1be70164db86152503e4b72373736f0462ff97ffac2c79a6c1fce83d658e6030d5435be5a61c1f6ca50728db4c7e3a5d8f5e48073fc74169696ff1b7c5be
-DIST libdrm-2.4.60.tar.bz2 581786 SHA256 99575fc6c8e31f59193f5320fd4db7a5478e2641b5266147caab9aa875b59889 SHA512 d0cee293c222e9b45cb12999b45bec1d94f7faf662f011f70252df7efdda95706fb2da6805e0957f4e4c12c79974cf21233f1109a607c67cd27aab5fde27e801 WHIRLPOOL b3d1879ecd0254edec4ea1f8d1d6a4805aef597ebae72e4592d32a9e4fbd0aeb472cbb33a5663935405c599daaf81ba16f3e31b3e028059751e07f9913ad3c22
 DIST libdrm-2.4.62.tar.bz2 637472 SHA256 906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc SHA512 f7e2ef79c80dd0c3a837970052b7e66110e9b99d3e87b3cd278646bb4cb39832a9562144016a7e956a85212d9251b191279f5ba25d7e8bc0bfbfc1a311df3873 WHIRLPOOL e9ca493f01598bcb7e5664c531e48e74570a7ee0c754794ed2247314123821509448d62290b594073389ff545a019e24305d365ba7435f933665cc57d85385dc
 EBUILD libdrm-2.4.20-r1.ebuild 1418 SHA256 a33ee71b007fea79b7bf8fc4753ebc9f99fcd378df7979085a01c96eb693651d SHA512 83349b87166b529d7b36f4dec10e4dde9bc46c22924eb8316872a16f52315cbb26d076440c1365c4df4662ad43b0b0e9344f28a7d4731d85ae2ca5a6812a2af7 WHIRLPOOL 81a3d874733025c5e7b9dbe11c378d97be25f5ac5101d400d43625548f6d669ca5b64b70491c8ec15f5ac0004f53b6910a501020b98d703f92bbb179118c6228
 EBUILD libdrm-2.4.33.ebuild 1555 SHA256 87473a4192eb390218092d65beb4a53906d56a808cbe04cf1695de1fd77b3548 SHA512 22393fcc401d7ecf8c9d9c9e7814ae0529fd7bfdffa283401e487e293001b2161d2afd59a3262222a6eda0392323ecf7cf7e6d1053cb0fb8d23da808df359b5d WHIRLPOOL 920c081aab3043d49356305c3994cade80749170aba1a7e4bdad98f25a08b0a142be36b8491cb52f3a6ebc17d067e204be7429e16fcebc5cb717eb4e971f773b
@@ -25,24 +24,23 @@ EBUILD libdrm-2.4.56.ebuild 1827 SHA256 e0a87e05602a6d1f2f6139bc7a146f574fbff4d1
 EBUILD libdrm-2.4.58.ebuild 1822 SHA256 f3f332d0bebc87b60bfbfa1a4331b7786da90b77beffc9451a6f70274068b4a7 SHA512 c9072169a6dcd96da9166a319739c9a5f471a53dca57bb30431b7bcbe164ae4a0dbb91ed9f0b1f0d5ca28bb742cc2dcb3703f871f4940dc227d0d0b2aca22f74 WHIRLPOOL fe5a73e9d32418b06b9f7aeeecf23c2e3fae0a54715b02edc7b785ce4569cd9727fd44c77db641341ad3de60fc452dd27cd9e969121ae215ad0f3ab170c05ce1
 EBUILD libdrm-2.4.59-r1.ebuild 2106 SHA256 3e78d034f0271a0f6acef2da4e1e6e58b3872fc823b89e419b27de1e79fff346 SHA512 94ae3a4fd223d163caaf9517b33a76039daeba3ef48eddaac500b2f5ad4a920d224d7e50bb4eb6b8daeaa96a79daba7b0c91371bc02052073aa8564aed387044 WHIRLPOOL 142960a87c3a6d66171ba68b27fe59e5a895504385b26fb1d047eac2872f4db8fe84e72876a3faedf2badb3875d648d8cb416ee8dcaeb6acb6a41ae5548c5532
 EBUILD libdrm-2.4.59.ebuild 1863 SHA256 6ef67bea83921025b686f36863473ed4f32c6b28fe7f5e85e6b1b4ae76d7ce1a SHA512 635ad770b8cf5149a77ff5cd0be8f5226432e9ea666727e2cac74cf2d9317e49736601c2bfb07329ee98dc388561964792305ea5666fe7a8fcd580b553cf5ea7 WHIRLPOOL 555827add4e96fa779b81ff58e54e24fa0f4b2cbab74072fe81bf3c3f192bbebd62b3ca2b80d4fa8b457a12d069c8c0b71110243828689c5fe7a02c796f02796
-EBUILD libdrm-2.4.60.ebuild 2016 SHA256 f4e979b4308913f87f85ec1e0455aedb38aa3b014fe3c0f094a13bc1fdd968d7 SHA512 788cdbb55221506faf45c12a970f19034a34c519ae4c9343631db9afe6af97d927407471941b15b55b8d30e104e6a8dca515c11a2ceecc76ea6db764c6315d7e WHIRLPOOL d178aa4d38b14affb7b55110c8f559296a697f68ebf5d22a8eb1b9485674734bfc0c9f324b9e5cc11b585ef0185a06484d654b236f8e5c973eb4a8907cb7b75c
 EBUILD libdrm-2.4.62.ebuild 2006 SHA256 d93ec12c08e283e4766348c999b542927792613d141f501e151a0c51c9675b0e SHA512 8cee616783d72918419bf929a0ec16bf7762e0a2de1f0ed9fb2897168716b66ba7e6c1db8b80e870510da7c52391ca04d605c9ad7e7783157327ec6ddbf95051 WHIRLPOOL 48b0fd26ed20f1125ce00b419b563d227732784e21db17255d0801d57a02cb8973a91e367d99b32833c37879f1d47197e4be3e55522c51a7896716b3980e989e
-MISC ChangeLog 38673 SHA256 62310cf59362946760d3af3db17b76617c2b6dae8a786a68d2a51dd9372f3d11 SHA512 84af396265cb2a80c37cc749771d3d8af85e4ec0c211043254f2e81f81987200ede09f404786d833df3e284429fa417a86034471cbbdb5ca6c20c7fdfa9c25d8 WHIRLPOOL 47b2b2dd52accf13c3a8af41908fad6531cc82bb8bb11c469efafdcb10ed9f07c78a56a0462f3c286baf2bf6abbcc22111972461277092be8594f227a247a397
+MISC ChangeLog 38773 SHA256 cd87b1d64a1a2aada2ed0a242dbf4b62a3af4b0cc1a203b6b078dc118ba8d12b SHA512 63c8986631498686718705509b75f5af6e25604f0336b69688039266e3bd6cce959f7b386081e02004e81cd88f7a41821b277bde235c422b4e60d40ea5d91e6f WHIRLPOOL 23a859dc9ddf9920a90a2e5d700c2d003207e20d6be90cd7f82998f0254370c451827c446564699443e5917228b0d84cd6557e41f8a8613c815fdff331a7252f
 MISC metadata.xml 334 SHA256 9d19c1397f594181749abef539a5ddd1d39fd5b9565a95de5788bc85231b68b2 SHA512 051cb32876b20b1c6d4dbe62dc3b1dabd268a6a26abb1e7b1d72d6fc7e2cb6c25751b1f56833d1c4f0773a563ce59a2cfb32bdfba6aaf75a019ad08a5c041601 WHIRLPOOL 7d9d0977b53fd1c058e9a2ebbed487528c40489b86eab6917ae06cd0c4ed64d14d9964d1ad93d73911e58b31c8a149a2c1c984b1b31012762de9319b6e793c46
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVlIcEAAoJEA/daC2XTKcqh98QAKoShzXdvTVm/I3LJMOqhhVc
-vvR8/iYKEgcbSBJARBGK1ObqGbtP1xuGFMQPwctTh6LpIGTfGcbOBUIcMPQ4gHOx
-hDZhd6d76Cx6P0OBPrnR/QC6erPoYS0K4jbxwvlWvMZJS17+wMomH3jiB2ADxdc1
-UvjH6D9YLxo9vQ27EgTHj+8yiEjWqLd9EBhBgLTTGP2GKBP1CCU8KrTIv4ePj5sE
-un7S7C3nkDMp6UYx9S1m14V8yR58EFPTMyjbRtntuWvGwPDxbfTNHqgNV3TQljt6
-JGkuabaZ7YTAgNAIP+YtD8cVztS3Qo1+hnStTKIHCt15g7ynOaRStwrqKZEIvELt
-NN9XRjs6I91faRJOtyozoiXUdT6IhlFMqCmmgHfGqAaOWQlMIUKPl+ENgf545ikH
-QwrT2cDopD4hIHLThj1Q8nMN8yEtKMn+0LY0kHzlDrh0WyQRK/jYEJPaiOlBH+v3
-EZhjwdzFDc8n71JEP6DicxNGnwr8zboCBeDJj9XsVajmUQT8CJAM12lxX7VC52r2
-8WmdYycvBySiLwHWdBvyUie42QZm717x2afpdFoVBeewoYNkkrU84fv2NacKOcgA
-U0fs6XmH2KQEDQM1hDG479kTf1X66J3b956OAsOqiu6WVCUEseLOGjb13VOoZv5h
-J1JzHRnzRv/Vi6rssIhv
-=6wJ2
+iQIcBAEBCAAGBQJVuqSAAAoJEA/daC2XTKcqYYUQAJnxnKKwSgXGWxzkKD77rki3
+LBP7C2MOtTQd9CB3pdUXdjcHxD27GLzz2jxbxmIkxny5b4sfgEQDucMLLuz0oZyu
+U32ChQac3cZ1kKkRzIjw2/qIa4RZ7ER+hSw1fww9TXP4Hq8wPca4aEM+v3yWotBU
+18+KUeExgRIbBD2DHF8QmZbmiJvVQNYqwnXF0xUZAXmevlmCoZO5c3LaEUDBQet0
+lN8FZNPGLJEKIvqfOowPlOQMUwAyylCIEbd0pse1HQswwVHfx8FF2OJLyHPckKaO
+beGD9VjzO8OgwSHfGk1yO3+vAE2spHlfIGETLZphBW018wT2LAwx+IFyMgwW+4ox
+MYisr2azPu8bQncG3CYEoy116v/y/SUVfv0OhsHjPkCnk+Cbr+y/A5cmGrVmSVBp
+75RGHnWk5pX4z26lOk9EGXIvWwmDidvlhELjNetpU8HWDuMwWhZdm+PPHB13io7Y
+DhNFa/w4GB8AAdWmJ7rzzQYthDrNo3MvBa323TsRXlJEPAWyI2CcG0jxKfhjdZt1
+C1lGhqxS6QRURjmB1m86nlUutqbvmy3sn5maN2oMd3OSTGH5NgxcrhlvNBVs8+rw
+w+AH5By3R90/ZFqkAVj+iNrhwjFpgvibc2JoPEv2AnyfC9vODcDYVuBl0wDH2kRU
+AD8g8Fy5HVw2mmhTCy8v
+=uaM5
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libdrm/libdrm-2.4.60.ebuild b/x11-libs/libdrm/libdrm-2.4.60.ebuild
deleted file mode 100644
index 02196a3ec90e..000000000000
--- a/x11-libs/libdrm/libdrm-2.4.60.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.60.ebuild,v 1.1 2015/03/24 18:32:39 chithanh Exp $
-
-EAPI=5
-
-XORG_MULTILIB=yes
-inherit xorg-2
-
-DESCRIPTION="X.Org libdrm library"
-HOMEPAGE="http://dri.freedesktop.org/"
-if [[ ${PV} = 9999* ]]; then
-	EGIT_REPO_URI="git://anongit.freedesktop.org/git/mesa/drm"
-else
-	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
-fi
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux"
-VIDEO_CARDS="exynos freedreno intel nouveau omap radeon tegra vmware"
-for card in ${VIDEO_CARDS}; do
-	IUSE_VIDEO_CARDS+=" video_cards_${card}"
-done
-
-IUSE="${IUSE_VIDEO_CARDS} libkms valgrind"
-RESTRICT="test" # see bug #236845
-
-RDEPEND=">=dev-libs/libpthread-stubs-0.3-r1:=[${MULTILIB_USEDEP}]
-	video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )
-	abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	valgrind? ( dev-util/valgrind )"
-
-src_prepare() {
-	if [[ ${PV} = 9999* ]]; then
-		# tests are restricted, no point in building them
-		sed -ie 's/tests //' "${S}"/Makefile.am
-	fi
-	xorg-2_src_prepare
-
-	# There is no configure flag for this.
-	sed -i -r \
-		-e "/have_valgrind=/s:=(yes|no):=$(usex valgrind):" \
-		configure || die
-}
-
-src_configure() {
-	XORG_CONFIGURE_OPTIONS=(
-		# Udev is only used by tests now.
-		--disable-udev
-		--disable-cairo-tests
-		$(use_enable video_cards_exynos exynos-experimental-api)
-		$(use_enable video_cards_freedreno freedreno)
-		$(use_enable video_cards_intel intel)
-		$(use_enable video_cards_nouveau nouveau)
-		$(use_enable video_cards_omap omap-experimental-api)
-		$(use_enable video_cards_radeon radeon)
-		$(use_enable video_cards_tegra tegra-experimental-api)
-		$(use_enable video_cards_vmware vmwgfx)
-		$(use_enable libkms)
-	)
-	xorg-2_src_configure
-}