drop the no ctf patch now that its not needed anymore.

Package-Manager: portage-2.2.0_alpha196/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 11 insertions, 37 deletions

diff --git a/sys-freebsd/freebsd-sources/ChangeLog b/sys-freebsd/freebsd-sources/ChangeLog
index fc9da22047fd..98c83fef75ec 100644
--- a/sys-freebsd/freebsd-sources/ChangeLog
+++ b/sys-freebsd/freebsd-sources/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-freebsd/freebsd-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.94 2013/08/11 19:14:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/ChangeLog,v 1.95 2013/08/11 21:23:03 aballier Exp $
+
+  11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
+  freebsd-sources-9.2_rc1.ebuild, -files/freebsd-sources-9.2-no_ctf.patch:
+  drop the no ctf patch now that its not needed anymore.
 
   11 Aug 2013; Alexis Ballier <aballier@gentoo.org>
   freebsd-sources-9.2_rc1.ebuild, metadata.xml:
diff --git a/sys-freebsd/freebsd-sources/Manifest b/sys-freebsd/freebsd-sources/Manifest
index df3d6e70fda3..cb5317cd1612 100644
--- a/sys-freebsd/freebsd-sources/Manifest
+++ b/sys-freebsd/freebsd-sources/Manifest
@@ -20,20 +20,19 @@ AUX freebsd-sources-9.1-mmap.patch 676 SHA256 4adee0a45d519d93d4bd3554c6b685becb
 AUX freebsd-sources-9.1-nfsserver.patch 650 SHA256 b288a29155fbce8ac58460a3f64ce77b644c32ee54814e35086700d2fae3610a SHA512 e1d505440371d35722b3520212ded13acf5ccb433c18988aea08d8035881f633c04dedb912931684334154303731ad21ca849c02831f6b9122b54486fb5ab8fe WHIRLPOOL b4469dfb52ca87e95539bd63dcc36ba34c9a29b812b887ad9656c2adea7acee5ae6a14850d2f4733aff7248fb9d6d6107ea38f06365efba18f8f025506675de9
 AUX freebsd-sources-9.2-gentoo-gcc.patch 506 SHA256 7457421478066b686dabc9a072ea1a30da8878014d0799220557820fd3a4bbe8 SHA512 cf553ad66b5a55dd2383a55c9a3c5c852985c4842244569aef91596a98481ca12c6189dfdd5fb2badcbe7901a87c81a3e0432cbf10add66dfb481ddcf38ebdcf WHIRLPOOL 42be74cafdad3e43815f638144b3ef8e89a7a95d791a312899a24387bf6a9cbc08acb0b30855d45fed607c6b73a3632afe1a44fb2bcd5738f76a7cf444b39218
 AUX freebsd-sources-9.2-gentoo.patch 716 SHA256 9a196adef145f57bf960b936f69065f6793df55420ef010c04f76578eb5d1e23 SHA512 3f6d9c4e2e3ee34058bc44ffae87c1de82e70f03d31635f27e477437f3ad4e003d2f3d6c4ab393d18dfc8eeab4cbc0af4a25227ca5d48bcd579dc07bbe3bd7f1 WHIRLPOOL 4b0207d4ffffda9daa88663b638b542acb2f567284ef4456cd18fe74770793666bb5e9de34f02b1dbf29fa79d8bae9305ad84d5cf378510004b926beacb7250d
-AUX freebsd-sources-9.2-no_ctf.patch 1076 SHA256 35a1263b10208dc1e1e241bec4724009d809d270a54c06cfc77bfe5316b30d8b SHA512 aa2b71da3aabe89646f4f5006498223242b7d7e34dcf95a6334cd1deda57c5513a74847199f7bdfe575d86797c3c33a73af09a88b537d931d14881e76d8105fc WHIRLPOOL 3d4943cb6fdc8bc81713d6efed836fe8d61ece0a214cf76d516f7ca472a2bec5f0b38d7626aae7e3865871beea100d4082c050e38b1cc147f618c42bcb10a0af
 AUX freebsd-sources-cve-2012-0217.patch 856 SHA256 9b752e65a29b2b9a4a1412765d69d00310c05508af1cfa6d8d3c16d545bb3ffe SHA512 b1ac18cae23b81fd5ab2fcb44bb9f9808d6eb80f52b8572b81296fdd0b18edee62460520bc753848283d67e13367bf99775a2a5c6cf0272def9cdff6ec6fa4d9 WHIRLPOOL 27e4d0647c5275b77123bef6b866ac841af4b1b547fc663f776da82a7889995eba21b930adeabf2a71b3fbe053d2af5583cbdb6e8fd16a0379d10214d24b9121
 DIST freebsd-sys-8.2.tar.bz2 25835329 SHA256 0c6c7b61aae94db2931f985d5899f3bca78fc8ffab6b598fbaa158142d676f16 SHA512 6ea4516a5c52e25c4f993f7acb875463a5caea93dbdf250c5d48eee95fff226956e9f030cab7e341b5e6a132325bc3dbf93dcb4b1185acb011918e50b1a22be3 WHIRLPOOL 870deeff877c6b9fc812a4260e4fdbb6715a5dc2065cab3bfbf2a42d876f6654703ccb124275a4e2c410cef48f3db02b63cc76059eccf9cf90244826f35b7a15
 DIST freebsd-sys-9.1.tar.bz2 32588103 SHA256 b93a7ac8334ac16cc9f60665048e5ef812c0a6c62f10d0b0a674aec3f56516a8 SHA512 7dc9d9e00dde8f592bb171f4386d02b655b73cb4f153fe5ec063d010a148ef0639eae0dcdb3eeb09ecd1e3653c69e49a2d261329fa6d0381d2ddabe258ddde6d WHIRLPOOL c8348344dfb14bad64bd3a78ee615ddd29203175b292233254f8ba175e7a3fb7218af6f95f7b4dbf394c0354bafe9d8bb0c21cdf0ceaeb697214964b280469b3
 DIST freebsd-sys-9.2_rc1.tar.bz2 34377450 SHA256 0db609374f4922e026779331a3299cfe542049014e9bdc4de0990aba539b7518 SHA512 ab7e6301180560934da38a3ef1de3623f0e42c6ee5ba2695754784c5af80ab8367b5d5412bbee51e8ba963b7f5835be9c3789b66b33be338bb9194a9de15b2eb WHIRLPOOL 7afbf758f0a02ea0337b58dd8f12876b8b58dbf73d8a3c237e1bfe2c77b72f319080d91a52ef2918e2c133af5924b302712fcc76ebe2cb334c561f18511698b1
 EBUILD freebsd-sources-8.2-r2.ebuild 3801 SHA256 1766a68e4f3191690a805d89280250a549fdbe0ef08ca9962c0aa46256ff0762 SHA512 85b3793d6042a4db9409dd42e90e37e67d880d5ff5996834b467662c60febab7a63d9f13176b549fa93a8aa4ae212f80e42e0742c16de910e5f3c85b06ef3059 WHIRLPOOL 91deb75cdfb47e561cbf842a2ca70be4ea4af4216c1a97e598f6bdc3b9c796d822c7ba5cba8edced1a6a43a2a9bd15e7d31e8d9b292965d24792bc88a557ac15
 EBUILD freebsd-sources-9.1-r3.ebuild 2648 SHA256 40075f5d40a1f1d1cb53cce9fba58a45cfdf3fc358b379ff5f502bda21e7c010 SHA512 f51c6eb2d56f8207ecf77ccd7630e5fa3c78db6d30bf21dc84d0c602643a68e0b10e67824c161b198a8d1311ad34543ec5ec1c71008c86c21b71c9e05a417272 WHIRLPOOL 9c5f574e177e52cca80466f51a27fa6341c29db4970a70e0d9ab26a76e66328fac70c0ce99df63d2ed8ee26f6153da9f1a4a94c76f1a0aa792094e19e3524e00
-EBUILD freebsd-sources-9.2_rc1.ebuild 3011 SHA256 7b9cb1d7607b82002d740b87d5629d20a33ae1feba1d91ad4db47752ff7e4705 SHA512 c2308b4191c42d03b3e2621d66160cd3f900006a94279048d00ebc18f32ec81cafe87714a22d5245f0bd4f639c1d2fffc31a12ed0452afd2fdeeacc25e1f7f79 WHIRLPOOL e02c005ac11528c174bbe3afc735d59ab23096364c6a70086587b1ddb2c2c3b63669cdef18f7a3d74710f5aae29296861a663ab1a98f354b7aac7185b0cd9c03
-MISC ChangeLog 24196 SHA256 aea5e0285496e9dfa6011b80aec57aaf56c63bb322a7b87285e2a050444082b7 SHA512 266a2a53779ae67d09b75d92a74e709ec84960719999725dd6a12d9f2474eaa9a59b5b7d1404627cf696bee364b93ffc92a80ad1bb5c4d0028744ef7c6c2cc44 WHIRLPOOL 17dd449987a3b4788001090dced3aeac46ef8137f3c3c1ee1f193a0a6d2268b5a35099ddcc22b0fb060fc63ace834ae725d13850dd8da24ba0faf09f05f2b372
+EBUILD freebsd-sources-9.2_rc1.ebuild 2973 SHA256 cfc9f5e0f45d47ed7e64311a1e6bfb9731520d41de2be5c1de2c606d3fff2fd7 SHA512 76b1f908f979ae0d1cfab3ef28b12a0c5f0e894553298491c45a05625c27cc3d26801dc1b463361511eec9f3fc1f2a542f56b5f3d1f098e2ebc49dc66f719a5a WHIRLPOOL f8283804664b0cab359b9bdd537a6434911b90f442b9ccdec54ce163fc06fdb67b0ff2c61fb385a4911c35a04ee0ca3a26fbd129ea6e8ecfa7db4db37dbe4ea9
+MISC ChangeLog 24381 SHA256 82d685ec41d51a7fbed06115826e6d469c0a8dfa780caa79f78b81fc1edd9672 SHA512 a0755f0cf205c62c0043251637462ff1866cf8e4d1a85513f8567645112f9651e48f880ac7098eb8b25b6854e29a1b797299729e512e8eee326de9a3bc9d9bb9 WHIRLPOOL fece90406032e98e5541d23ff1c44d26d50e383174d2fd03559bb022d62ed2dce1add92a9d2e5c8d8a15d12228e7ab41abcfbfa5259d3391287b40d6c3b003a2
 MISC metadata.xml 261 SHA256 f2a21c21a5bdd227265679eafeaf6758923723ee562e79618f548cdc77472c88 SHA512 845e7613a39fad782c5cd33dd0ddc7b42132f3a0027ae9538f75cc729d613bdf032f623aadf5ec0ab8d08bff7b58c0d7edbf05819cbbccddb2dbf054a16f9c1f WHIRLPOOL 6a798d4dcabfa29cc603a191cdc30c07c8fc850116558b5e71b59393138ff1491d46a1496af356d4fb5077746ca48cb9c76dc0b9c37d0b57b8768c85d37a1a10
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIH4rMACgkQvFcC4BYPU0qSAwCfe8fPTrLwVfF1M70ruaWdsBEy
-KCMAn33zg7aQ5R1i8DnEOHaHmpNRvmkv
-=sbyI
+iEYEAREIAAYFAlIIALgACgkQvFcC4BYPU0qt7QCgtmsj8zG2T8G//Yov/uv8/gmm
+b/QAoLZkQPdgjlwbVWNo1SRPeKNTSg3H
+=jOv/
 -----END PGP SIGNATURE-----
diff --git a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch b/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch
deleted file mode 100644
index a3fe93f88177..000000000000
--- a/sys-freebsd/freebsd-sources/files/freebsd-sources-9.2-no_ctf.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC
-index 20d0c3f..3f5bf52 100644
---- a/sys/amd64/conf/GENERIC
-+++ b/sys/amd64/conf/GENERIC
-@@ -22,7 +22,8 @@ cpu		HAMMER
- ident		GENERIC
- 
- makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
--makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+nomakeoptions	WITH_CTF		# Disabled on Gentoo/FreeBSD
- 
- options 	SCHED_ULE		# ULE scheduler
- options 	PREEMPTION		# Enable kernel thread preemption
-diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC
-index f77b0fc..1f67a3a 100644
---- a/sys/i386/conf/GENERIC
-+++ b/sys/i386/conf/GENERIC
-@@ -24,7 +24,8 @@ cpu		I686_CPU
- ident		GENERIC
- 
- makeoptions	DEBUG=-g		# Build kernel with gdb(1) debug symbols
--makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+#makeoptions	WITH_CTF=1		# Run ctfconvert(1) for DTrace support
-+nomakeoptions	WITH_CTF		# Disabled on Gentoo/FreeBSD
- 
- options 	SCHED_ULE		# ULE scheduler
- options 	PREEMPTION		# Enable kernel thread preemption
diff --git a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
index d306eb28d161..c2708d0187e1 100644
--- a/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
+++ b/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.4 2013/08/11 19:14:57 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-sources/freebsd-sources-9.2_rc1.ebuild,v 1.5 2013/08/11 21:23:03 aballier Exp $
 
 EAPI=5
 
@@ -37,7 +37,6 @@ PATCHES=( "${FILESDIR}/${PN}-9.0-disable-optimization.patch"
 	"${FILESDIR}/${PN}-8.0-subnet-route-pr40133.patch"
 	"${FILESDIR}/${PN}-7.1-includes.patch"
 	"${FILESDIR}/${PN}-9.0-sysctluint.patch"
-	"${FILESDIR}/${PN}-9.2-no_ctf.patch"
 	"${FILESDIR}/${PN}-9.2-gentoo-gcc.patch"
 	"${FILESDIR}/${PN}-7.0-tmpfs_whiteout_stub.patch" )