From 090ae7ac4adf3ba53762fadc626e5c6841a0b995 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 16 Aug 2011 20:15:51 +0000 Subject: fix compilation with selinux USE flag on, hopefully fixes bug 379309 Package-Manager: portage-2.2.0_alpha37/cvs/Linux x86_64 --- net-nds/389-admin/389-admin-1.1.23.ebuild | 8 ++++---- net-nds/389-admin/ChangeLog | 5 ++++- net-nds/389-admin/Manifest | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) (limited to 'net-nds') diff --git a/net-nds/389-admin/389-admin-1.1.23.ebuild b/net-nds/389-admin/389-admin-1.1.23.ebuild index 799895d6cc1f..4d66516e78da 100644 --- a/net-nds/389-admin/389-admin-1.1.23.ebuild +++ b/net-nds/389-admin/389-admin-1.1.23.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/net-nds/389-admin/389-admin-1.1.23.ebuild,v 1.1 2011/08/14 09:23:45 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/389-admin/389-admin-1.1.23.ebuild,v 1.2 2011/08/16 20:15:51 lxnay Exp $ EAPI="2" @@ -123,11 +123,11 @@ src_install () { if use selinux; then local POLICY_TYPES="targeted" - cd "${S}"/selinux-build - cp /usr/share/selinux/${POLICY_TYPES}/include/Makefile . + cd "${S}"/selinux || die + cp /usr/share/selinux/${POLICY_TYPES}/include/Makefile . || die make || die "selinux policy compile failed" insinto /usr/share/selinux/${POLICY_TYPES} - doins -r "${S}/selinux-build/"*.pp + doins -r "${S}/selinux/"*.pp fi } diff --git a/net-nds/389-admin/ChangeLog b/net-nds/389-admin/ChangeLog index a9d40eae94e4..8400a145924a 100644 --- a/net-nds/389-admin/ChangeLog +++ b/net-nds/389-admin/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-nds/389-admin # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-nds/389-admin/ChangeLog,v 1.8 2011/08/14 09:23:45 lxnay Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-nds/389-admin/ChangeLog,v 1.9 2011/08/16 20:15:51 lxnay Exp $ + + 16 Aug 2011; Fabio Erculiani 389-admin-1.1.23.ebuild: + fix compilation with selinux USE flag on, hopefully fixes bug 379309 *389-admin-1.1.23 (14 Aug 2011) diff --git a/net-nds/389-admin/Manifest b/net-nds/389-admin/Manifest index c000dfdb7951..03ae71ceb9dd 100644 --- a/net-nds/389-admin/Manifest +++ b/net-nds/389-admin/Manifest @@ -13,6 +13,6 @@ AUX stop-ds-admin 152 RMD160 64e8627ceed23664432ced3311442c9088ded19e SHA1 10104 DIST 389-admin-1.1.16.tar.bz2 614438 RMD160 0c7393afcb321213c68eb26640f62efb0c51e346 SHA1 e2facc231d1475b218321b7dbdb04d8f9b6ebacb SHA256 9c942a010f0fb923ff91fb4f65ba65cb1994a787ebf672ff9be6eb2501d65829 DIST 389-admin-1.1.23.tar.bz2 628059 RMD160 613d27b12230b15bb784078ba1f7b69ef9d755fe SHA1 b3013f3ce833f5dae8ec33f881f46a064f4d1d3d SHA256 a081df73dab2918e56660f554eb253f866744a2910b973d4f9b8ae281e6d9d89 EBUILD 389-admin-1.1.16.ebuild 4987 RMD160 82e96305de4bb2448fa5341a30caa70ff60953c7 SHA1 b9837245ca069fb416aca962220460029ef3cbbf SHA256 4ef8a08a08d75c0792f8f2416132d758a1bda91261f973324c7e64e710c91459 -EBUILD 389-admin-1.1.23.ebuild 4987 RMD160 caf80fd8f8eaa5729be04eab33ad42490afd34cc SHA1 3ab9d6494b3fdf0a6323fd0c1644f668c14636ad SHA256 3dee1d038929071200ee99ce8972264a996374d837aad314ef7216621b32ff66 -MISC ChangeLog 2162 RMD160 b2eeccee7e03b9cc7e3caabe19400676aef78c6c SHA1 fd9bbd37ad32bdb2e0744dbf5fdf710b8629cfa0 SHA256 13d94050d04e320c135f45bf5bcd43fd2c21a6bb0624cd01d073b7ad062fba78 +EBUILD 389-admin-1.1.23.ebuild 4989 RMD160 55c9bbe624bad66a4349df3444d0b6b06b1fa2f6 SHA1 c1c91dd5d33410d04039031636b58582aeb59085 SHA256 fc7961ed0cad7dd68b223d9be6e99d9101bc4bc216439b6f2551bf09e8d9d4e3 +MISC ChangeLog 2309 RMD160 7b85a92ac28fd1ac5a7a21c8719457205879334d SHA1 b17ef693a085e8ab270199d2bede6968bdb723a0 SHA256 7a55edb9e68fc34c074a7aabae95423c77aac63ffb721f22da1b0b1b3d6801ca MISC metadata.xml 527 RMD160 f5e5e8933b5d37c85fde74c92266727f7f11b3b9 SHA1 3836ea478456bd04e65d2adc262200b48faf36b9 SHA256 9b67f22fea1b3f65cfaec5ef7d4d1f411436c87c9ffb107c5e6bc604b77cd31a -- cgit v1.2.3-65-gdbad