Placing binaries in dev.g.o instead of files/ location (huge patches for policycoreutils)

4 files changed, 20 insertions, 20 deletions

diff --git a/sys-apps/policycoreutils/ChangeLog b/sys-apps/policycoreutils/ChangeLog
index 075856dfdb7b..bbc9930cfdbe 100644
--- a/sys-apps/policycoreutils/ChangeLog
+++ b/sys-apps/policycoreutils/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/policycoreutils
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.89 2011/08/12 18:46:59 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/ChangeLog,v 1.90 2011/09/02 19:31:05 swift Exp $
+
+  02 Sep 2011; <swift@gentoo.org> policycoreutils-2.0.85.ebuild,
+  policycoreutils-2.1.0.ebuild:
+  Update patch locations to dev.g.o instead of files/ folder
 
   12 Aug 2011; Anthony G. Basile <blueness@gentoo.org>
   -policycoreutils-2.0.55.ebuild, -policycoreutils-2.0.69.ebuild,
diff --git a/sys-apps/policycoreutils/Manifest b/sys-apps/policycoreutils/Manifest
index b08e7ae3db39..00514359e412 100644
--- a/sys-apps/policycoreutils/Manifest
+++ b/sys-apps/policycoreutils/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz 8962 RMD160 4175ac56c5c72ba37b3bd94009cbe17345444445 SHA1 f9a3b6d64f7b6632b8740cc4f07d8db029039e7c SHA256 2dc16bc7489d626a91d93356d80651795eb757a25fd807fbbf93c772f392b50f
 AUX policycoreutils-2.0.85-sesandbox.patch.gz 4551 RMD160 28ea43ae81418e0d1da95904276b8cc7423ee1e1 SHA1 dfcbc87fecfbd335b51f1c020ca0f642245b6417 SHA256 9854b390e1283194b76335dcacc0b8f7d45d8fb025592e4e9b701122c925d1e1
 DIST policycoreutils-2.0.82.tar.gz 834447 RMD160 b8ff1b968e77b2554fb485a1c9bbe7069522bd21 SHA1 1abea421581e1ec3384e15752be0222514134757 SHA256 72bbf62bbe4f01657f4884c4601732f8dcb9c43c49a68f8a2985c2b5bc3d8cea
+DIST policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz 8962 RMD160 4175ac56c5c72ba37b3bd94009cbe17345444445 SHA1 f9a3b6d64f7b6632b8740cc4f07d8db029039e7c SHA256 2dc16bc7489d626a91d93356d80651795eb757a25fd807fbbf93c772f392b50f
 DIST policycoreutils-2.0.85-python3.tar.gz 19750 RMD160 ae5daef8bf9083964e37b101a6168dc6ce5b8bb2 SHA1 61c058cb39ef9f13dd54af844a033ac724de743c SHA256 4bc78bfd39ce43a010c4e1de3d7f4ff45fcfc7bac4bc70e28c9bdb681053fe4e
+DIST policycoreutils-2.0.85-sesandbox.patch.gz 4551 RMD160 28ea43ae81418e0d1da95904276b8cc7423ee1e1 SHA1 dfcbc87fecfbd335b51f1c020ca0f642245b6417 SHA256 9854b390e1283194b76335dcacc0b8f7d45d8fb025592e4e9b701122c925d1e1
 DIST policycoreutils-2.0.85.tar.gz 885929 RMD160 b9dea38eaa2ec7f2eabd49f7634eb6a47008aeff SHA1 f004048a32f3954a2ac420e34d4ec190905e805f SHA256 cb45e63332be948f8dff17c1bdd4b9810a7d4fa84916f49b4c9388c7948b0507
 DIST policycoreutils-2.1.0.tar.gz 885913 RMD160 267829f78bc154dc96bc66678e82c5d07b522de5 SHA1 dae3e6d547a81e4be4ef7ab2a184256c6ad721ac SHA256 6199b07fd4280e455ea05933cee510b5e09ad3f60b0544382231fe05b787d3f3
 DIST policycoreutils-extra-1.20.tar.bz2 18532 RMD160 f2f837b6759036581453bb51683d3ee9ca7de01b SHA1 44a1eb06a21217da5c4dcdbdb7204771abe81d4e SHA256 2965e81dd39b0c4b0bb29439c0c8e816e0445ec42699b8a78c3361e988c54cc0
 DIST policycoreutils-extra-1.21.tar.bz2 12864 RMD160 28e5d0f52a69e0cb9c0d2e8088e828cbac951732 SHA1 7866b24ddab5a48c95fd51b88ad1eb4af0d9572e SHA256 c2d3627e2a10f83f5de997e9db75c40830e7f3520b558807346c9bd9c49769bb
 EBUILD policycoreutils-2.0.82-r1.ebuild 2942 RMD160 1cfce90dabb327055b07bb5a16cb0a1e037d5574 SHA1 73fc250f3fc8afffc9e21b3aa0da276c1136f913 SHA256 c5296af03152194212caeae3186db3e80d1419a8ad4385dc257abc4e423571df
 EBUILD policycoreutils-2.0.82.ebuild 2633 RMD160 b8077adda572a73ed616526ec0ca97cc6038e6a2 SHA1 7d40d7119a01fa4e7fcbd3d68fc9aa43f8d97704 SHA256 852d23bfa05fce1e25a0c65c726309b2316051ced113c2b6d444c39ed19ffe94
-EBUILD policycoreutils-2.0.85.ebuild 4308 RMD160 5eeae4b104c7f801d3d3582837d6e40ec1d85639 SHA1 1880f9fa1d4d5498a03927d39b078608945ba52a SHA256 f0e37a61d23c8a92110873cb031359c982e6b051e17592629586cf6ef6f40b98
-EBUILD policycoreutils-2.1.0.ebuild 4229 RMD160 b6f2433aa395fd027e4f42956990f869dd74cfe4 SHA1 0806735255db40a53ef3bd5110d1239e0afffdab SHA256 86d20041fef2c5a56e78700553fbbb655a50155b0ab929b6b3ca24fe55ed39be
-MISC ChangeLog 14280 RMD160 ffbc33a0e61b51b40b1137146bfd495f703e12ad SHA1 7bb8551190490b825b110d2063b81127925fffef SHA256 d7e82f63d2bf2c4e895ed0b544c1d5eb01518085dd589e81df2ee228d9f61896
+EBUILD policycoreutils-2.0.85.ebuild 4507 RMD160 49488d1729ad51d9955020b07870ce059ec58ede SHA1 77eff4d6c6e9738a65e52166e127ad5d8105eab0 SHA256 da29c491e03dcdfa837ad5c0ffffa58eb1e81f21b20a4b13b3ac5b3c75c2763f
+EBUILD policycoreutils-2.1.0.ebuild 4428 RMD160 e7acba080cd3e432fa309d335f38dc535b8de3f7 SHA1 2a9ed7a2a1da8186b3d7dc76e5defb5953f100b9 SHA256 e1b10af5128e10f58aad17ae5f348154ba64c07556e8464a66fb9fdc0d81ca09
+MISC ChangeLog 14439 RMD160 032b72f231e56f2cf378e73ca9369f3fc1f9476e SHA1 71087abcb0158b00482d2eb5d0925f0ea6368dcf SHA256 423c82f7eeed0858e27ea14c0ae5c901a42d4cb73c0314cdb70b5e0943085a08
 MISC metadata.xml 717 RMD160 0fc1c3cf181bfbe5d0e2c31e7c0db5f7a837cd91 SHA1 2ee21a2645c4e8e96e4714ba12ad0037631e83b9 SHA256 0c06ffad8c7c95b22992240c5fe0516a3e29a65ebe8da43e184fc2c8b08a1971
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREIAAYFAk5FdSwACgkQl5yvQNBFVTUj/ACfS0UGopny1tBcfKant95nhrJ1
-YCkAmQG9iOKSiLn0zwZ4/9/Bd9xnKOYm
-=gl7X
------END PGP SIGNATURE-----
diff --git a/sys-apps/policycoreutils/policycoreutils-2.0.85.ebuild b/sys-apps/policycoreutils/policycoreutils-2.0.85.ebuild
index 9d2917cd588d..29990e0989d6 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.0.85.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.0.85.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.85.ebuild,v 1.1 2011/07/15 23:29:30 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.0.85.ebuild,v 1.2 2011/09/02 19:31:05 swift Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -20,6 +20,8 @@ IUSE=""
 DESCRIPTION="SELinux core utilities"
 HOMEPAGE="http://userspace.selinuxproject.org"
 SRC_URI="http://userspace.selinuxproject.org/releases/20101221/devel/${P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/policycoreutils/policycoreutils-2.0.85-sesandbox.patch.gz
+	http://dev.gentoo.org/~swift/patches/policycoreutils/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2
 	mirror://gentoo/policycoreutils-2.0.85-python3.tar.gz"
 
@@ -57,11 +59,11 @@ src_prepare() {
 	# vulnerability (bug #374897) might go by unnoticed if we ignore it now.
 	# As such, we will
 	# - prepare support for switching name from "sandbox" to "sesandbox"
-	epatch "${FILESDIR}/policycoreutils-2.0.85-sesandbox.patch.gz"
+	epatch "${DISTDIR}/policycoreutils-2.0.85-sesandbox.patch.gz"
 	# - patch the sandbox and seunshare code to fix the vulnerability
 	#   (uses, with permission, extract from
 	#   http://pkgs.fedoraproject.org/gitweb/?p=policycoreutils.git;a=blob_plain;f=policycoreutils-rhat.patch;hb=HEAD)
-	epatch "${FILESDIR}/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz"
+	epatch "${DISTDIR}/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz"
 	# But for now, disable building sandbox code
 	sed -i -e 's/sandbox //' "${S}/Makefile" || die "failed removing sandbox"
 	# Overwrite gl.po, id.po and et.po with valid PO file
diff --git a/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild b/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild
index 981bca7cd916..562e54d01337 100644
--- a/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild
+++ b/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild,v 1.1 2011/08/03 10:18:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/policycoreutils/policycoreutils-2.1.0.ebuild,v 1.2 2011/09/02 19:31:05 swift Exp $
 
 EAPI="3"
 PYTHON_DEPEND="*"
@@ -20,6 +20,8 @@ IUSE=""
 DESCRIPTION="SELinux core utilities"
 HOMEPAGE="http://userspace.selinuxproject.org"
 SRC_URI="http://userspace.selinuxproject.org/releases/20110727/devel/${P}.tar.gz
+	http://dev.gentoo.org/~swift/patches/policycoreutils/policycoreutils-2.0.85-sesandbox.patch.gz
+	http://dev.gentoo.org/~swift/patches/policycoreutils/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz
 	mirror://gentoo/policycoreutils-extra-${EXTRAS_VER}.tar.bz2
 	mirror://gentoo/policycoreutils-2.0.85-python3.tar.gz"
 
@@ -57,11 +59,11 @@ src_prepare() {
 	# vulnerability (bug #374897) might go by unnoticed if we ignore it now.
 	# As such, we will
 	# - prepare support for switching name from "sandbox" to "sesandbox"
-	epatch "${FILESDIR}/policycoreutils-2.0.85-sesandbox.patch.gz"
+	epatch "${DISTDIR}/policycoreutils-2.0.85-sesandbox.patch.gz"
 	# - patch the sandbox and seunshare code to fix the vulnerability
 	#   (uses, with permission, extract from
 	#   http://pkgs.fedoraproject.org/gitweb/?p=policycoreutils.git;a=blob_plain;f=policycoreutils-rhat.patch;hb=HEAD)
-	epatch "${FILESDIR}/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz"
+	epatch "${DISTDIR}/policycoreutils-2.0.85-fix-seunshare-vuln.patch.gz"
 	# But for now, disable building sandbox code
 	sed -i -e 's/sandbox //' "${S}/Makefile" || die "failed removing sandbox"
 	# Overwrite gl.po, id.po and et.po with valid PO file