summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka (kensington) <kensington@astralcloak.net>2012-02-05 12:47:53 +0000
committerMichael Palimaka (kensington) <kensington@astralcloak.net>2012-02-05 12:47:53 +0000
commitcf07bc7ed9a76fa095dbe58f9df6704ac94f9489 (patch)
tree8f5be60ce60a88e7f066155f5ae44102be8bdc12 /sys-apps/apparmor
parentsys-libs/libapparmor: Version bump. Add static-libs use flag and refrain from... (diff)
downloadsunrise-cf07bc7ed9a76fa095dbe58f9df6704ac94f9489.tar.gz
sunrise-cf07bc7ed9a76fa095dbe58f9df6704ac94f9489.tar.bz2
sunrise-cf07bc7ed9a76fa095dbe58f9df6704ac94f9489.zip
sys-apps/apparmor: Version bump. Respect LINGUAS. Thanks to mgorny, hasufull, and Tommy[D] for review.
svn path=/sunrise/; revision=12728
Diffstat (limited to 'sys-apps/apparmor')
-rw-r--r--sys-apps/apparmor/ChangeLog10
-rw-r--r--sys-apps/apparmor/Manifest7
-rw-r--r--sys-apps/apparmor/apparmor-2.7.2.ebuild (renamed from sys-apps/apparmor/apparmor-2.7.0.ebuild)18
-rw-r--r--sys-apps/apparmor/files/apparmor-2.7.2-makefile.patch32
4 files changed, 62 insertions, 5 deletions
diff --git a/sys-apps/apparmor/ChangeLog b/sys-apps/apparmor/ChangeLog
index f2b161838..f6f91d7c9 100644
--- a/sys-apps/apparmor/ChangeLog
+++ b/sys-apps/apparmor/ChangeLog
@@ -1,7 +1,15 @@
# ChangeLog for sys-apps/apparmor
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*apparmor-2.7.2 (05 Feb 2012)
+
+ 05 Feb 2012; Michael Palimaka (kensington) <kensington@astralcloak.net>
+ -apparmor-2.7.0.ebuild, +apparmor-2.7.2.ebuild,
+ +files/apparmor-2.7.2-makefile.patch:
+ Version bump. Respect LINGUAS. Thanks to mgorny, hasufull, and Tommy[D] for
+ review.
+
*apparmor-2.7.0 (18 Dec 2011)
18 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index b12a51eff..12e512732 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,7 +1,8 @@
AUX apparmor-2.7.0-makefile.patch 1097 RMD160 d58da71b9e0480872e27925229427ebe27679a16 SHA1 da0be63895c8710c00a0f17dfe1c6810540f2a2d SHA256 eb09bec6245bab5f1431aaf0438ba82edc3051cc030c4f3e980ecd05bc4630e3
+AUX apparmor-2.7.2-makefile.patch 1097 RMD160 d58da71b9e0480872e27925229427ebe27679a16 SHA1 da0be63895c8710c00a0f17dfe1c6810540f2a2d SHA256 eb09bec6245bab5f1431aaf0438ba82edc3051cc030c4f3e980ecd05bc4630e3
AUX apparmor-confd 324 RMD160 4f06f3491dce4c245332a5ee7f351638b9384bba SHA1 224d0ab3b504ceff522d470311dc5e86b51d83c1 SHA256 f6a6fb9897a492d9f53aad447324f006e5242c3e78f534bc55087bd564c287f0
AUX apparmor-init 3902 RMD160 824431971e99b71a197c2069715d08e022fb89ef SHA1 3932106df86ed33bfb396fac6d284eecc567fafa SHA256 aa642aa35d4e861974ba8968397c80230fbd226a6d4d37884d2ca5e8cf7eda54
-DIST apparmor-2.7.0.tar.gz 1399442 RMD160 13e74c631baef1155d664b68465c655bd32f8570 SHA1 9428e466e242b9381ac152dafb58d488c8a01921 SHA256 ff8a2f49f902faa78e502590c65d3850fb9a2a3453bef0dc1f99e947c52fc60f
-EBUILD apparmor-2.7.0.ebuild 961 RMD160 c4e62afeeb7552c6f4babf7168944f6deae9db6c SHA1 a5793509caed03d5c8c8b3ad5c18dd6cc132737c SHA256 2f2bb11b77abf7ed0fa1e563f73905603c7e08b9882d3e31e511aa94eb20b41f
-MISC ChangeLog 1093 RMD160 8301fa0d974ce081882859b501d052072898f270 SHA1 810c4d699a19b58ef70c9254715f4ad71a783cc3 SHA256 0dbc1b00816a69401661e6242f21af3ae4491bc41f5414a65cbc5229341d6089
+DIST apparmor-2.7.2.tar.gz 1403151 RMD160 a51fa3ec0dfa4f3cae77556fa751a414e1bc556b SHA1 0645cc2352f89c41825c59a07dfca9035599d85d SHA256 42deb8cbf4937fac07a48ec8427b90131e92ed2f83b606beee092bdb4fc2a41f
+EBUILD apparmor-2.7.2.ebuild 1348 RMD160 8e40b2cad24cf3f93f8641e1f29783eff9f712d2 SHA1 21fd6dafe0b3ce03a5b5156060abf7e531adf1a1 SHA256 6a82137120925278da2720d7cb26b6dd67d393eb42b1e3c714771a5e2aa8cc8f
+MISC ChangeLog 1377 RMD160 b0dc1275dd538a75043da8b9d70ba5ef4b4ebc7a SHA1 2a2441b319000199c4feae17eadc4e694917d671 SHA256 1ea97612df417546b86bdb63390977958974516b8ca5fa25b99bb0c894f15e0d
MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8
diff --git a/sys-apps/apparmor/apparmor-2.7.0.ebuild b/sys-apps/apparmor/apparmor-2.7.2.ebuild
index 7e9bb74a6..8fdfc4545 100644
--- a/sys-apps/apparmor/apparmor-2.7.0.ebuild
+++ b/sys-apps/apparmor/apparmor-2.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
@@ -15,6 +15,15 @@ SLOT="0"
KEYWORDS="~amd64"
IUSE="doc"
+LANGS="af ar bg bn bs ca cs cy da de el en_GB en_US es et fi fr gl
+ gu he hi hr hu id it ja ka km ko lo lt mk mr nb nl pa pl pt pt_BR ro ru si
+ sk sl sr sv ta th tr uk vi wa xh zh_CN zh_TW zu"
+
+for X in ${LANGS} ; do
+ IUSE+=" linguas_${X}"
+done
+unset X
+
DEPEND="dev-lang/perl
sys-devel/bison
sys-devel/flex
@@ -25,6 +34,13 @@ S=${WORKDIR}/apparmor-${PV}/parser
src_prepare() {
epatch "${FILESDIR}"/${P}-makefile.patch
+
+ local lang
+ for lang in ${LANGS}; do
+ if ! use linguas_${lang}; then
+ rm po/${lang}.po || die "failed to remove nls"
+ fi
+ done
}
src_compile() {
diff --git a/sys-apps/apparmor/files/apparmor-2.7.2-makefile.patch b/sys-apps/apparmor/files/apparmor-2.7.2-makefile.patch
new file mode 100644
index 000000000..9575d00c4
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.7.2-makefile.patch
@@ -0,0 +1,32 @@
+--- Makefile
++++ Makefile
+@@ -31,7 +31,7 @@
+ CONFDIR=/etc/apparmor
+ INSTALL_CONFDIR=${DESTDIR}${CONFDIR}
+ LOCALEDIR=/usr/share/locale
+-MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8 subdomain.conf.5 apparmor.vim.5
++MANPAGES=apparmor.d.5 apparmor.7 apparmor_parser.8
+
+ YACC := /usr/bin/bison
+ YFLAGS := -d
+@@ -152,7 +152,7 @@
+ ln -s `$(CXX) -print-file-name=libstdc++.a`
+
+ apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
+- $(CXX) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
++ $(CXX) $(LDFLAGS) $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
+ ${LEXLIB} $(AAREOBJECTS) $(AARE_LDFLAGS)
+
+ parser_yacc.c parser_yacc.h: parser_yacc.y parser.h
+@@ -284,11 +284,7 @@
+ .PHONY: install-indep
+ install-indep:
+ install -m 755 -d $(INSTALL_CONFDIR)
+- install -m 644 subdomain.conf $(INSTALL_CONFDIR)
+ install -m 644 parser.conf $(INSTALL_CONFDIR)
+- install -m 755 -d ${DESTDIR}/var/lib/apparmor
+- install -m 755 -d $(APPARMOR_BIN_PREFIX)
+- install -m 755 rc.apparmor.functions $(APPARMOR_BIN_PREFIX)
+ $(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
+ $(MAKE) install_manpages DESTDIR=${DESTDIR}
+