sys-apps/apparmor: Version bump. Thanks to Tommy[D] for review.

svn path=/sunrise/; revision=12580

5 files changed, 46 insertions, 93 deletions

diff --git a/sys-apps/apparmor/ChangeLog b/sys-apps/apparmor/ChangeLog
index 2eec5b85b..f2b161838 100644
--- a/sys-apps/apparmor/ChangeLog
+++ b/sys-apps/apparmor/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*apparmor-2.7.0 (18 Dec 2011)
+
+  18 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
+  -apparmor-2.6.1.ebuild, -files/apparmor-2.6.1-makefile.patch,
+  +apparmor-2.7.0.ebuild, +files/apparmor-2.7.0-makefile.patch:
+  Version bump. Thanks to Tommy[D] for review.
+
   03 Dec 2011; Michael Palimaka (kensington) <kensington@astralcloak.net>
   files/apparmor-init:
   Explicitly state printf format. Thanks to mgorny for the report and fix, and
diff --git a/sys-apps/apparmor/Manifest b/sys-apps/apparmor/Manifest
index 443925a5f..b12a51eff 100644
--- a/sys-apps/apparmor/Manifest
+++ b/sys-apps/apparmor/Manifest
@@ -1,7 +1,7 @@
-AUX apparmor-2.6.1-makefile.patch 2556 RMD160 614eab68a68a847325ef43b1d92330d41ef7eb55 SHA1 95efd84a6b675f78d4a8bb982c331a57f8f186b5 SHA256 ff98a5a9e3593e959e578d07b89956476f79a1a0e139f4e12a2ae1e665b02881
+AUX apparmor-2.7.0-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.6.1.tar.gz 1612637 RMD160 241f0ba363b7f7c2d7e25cba4f6d7f6eb2c6f3f9 SHA1 c8837b1e0c4bd90858579cb9758af203122889aa SHA256 9cb015d8c1023d7549621d1caeea0cd92a33c48dba0762d75385f9ff7a11e2f4
-EBUILD apparmor-2.6.1.ebuild 1003 RMD160 dfcbd71afb56902dd956fa72d0f6d17d029b3670 SHA1 9b81fd3103a9b5cac044c883c233ed7651183de1 SHA256 cd2ec215bf6b6876074aea94bf2939d9212005add15061d5317e81b0ef19fb15
-MISC ChangeLog 812 RMD160 dee45491a0cbedb66840f93405d570946cb13ecb SHA1 e788b433603b4ff5ee852610955af07d20349d6e SHA256 4499c1e948881c2329b7e7f95f69a0b52748b8a7b2956969bc34bff1a45d7d10
+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
 MISC metadata.xml 209 RMD160 184537d7a401571abe0e5cbf9258ba3947d19382 SHA1 f2ea13baedca19e24be6ed7c3e6b765f7ff67cba SHA256 b0f0595f625235a62d9d40753827ae160e42156371fd9568bd2779042517f5e8
diff --git a/sys-apps/apparmor/apparmor-2.6.1.ebuild b/sys-apps/apparmor/apparmor-2.7.0.ebuild
index 9aaad91d1..7e9bb74a6 100644
--- a/sys-apps/apparmor/apparmor-2.6.1.ebuild
+++ b/sys-apps/apparmor/apparmor-2.7.0.ebuild
@@ -21,21 +21,19 @@ DEPEND="dev-lang/perl
 	doc? ( dev-tex/latex2html )"
 RDEPEND=""
 
-RESTRICT="test"
-
 S=${WORKDIR}/apparmor-${PV}/parser
 
 src_prepare() {
-	epatch "${FILESDIR}"/apparmor-2.6.1-makefile.patch
+	epatch "${FILESDIR}"/${P}-makefile.patch
 }
 
 src_compile()  {
-	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" main manpages
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" arch manpages
 	use doc && emake pdf
 }
 
 src_install() {
-	emake DISTRO=unknown DESTDIR="${D}" main manpages install
+	emake DESTDIR="${D}" arch manpages install
 
 	dodir /etc/apparmor.d
 
diff --git a/sys-apps/apparmor/files/apparmor-2.6.1-makefile.patch b/sys-apps/apparmor/files/apparmor-2.6.1-makefile.patch
deleted file mode 100644
index c6bddc2c2..000000000
--- a/sys-apps/apparmor/files/apparmor-2.6.1-makefile.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- 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
-@@ -113,7 +113,7 @@
- export Q VERBOSE BUILD_OUTPUT
- 
- po/${NAME}.pot: ${SRCS} ${HDRS}
--	make -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}"
-+	$(MAKE) -C po ${NAME}.pot NAME=${NAME} SOURCES="${SRCS} ${HDRS}"
- 
- techdoc.pdf: techdoc.tex
- 	while pdflatex $< ${BUILD_OUTPUT} || exit 1 ; \
-@@ -129,7 +129,7 @@
- # targets arranged this way so that people who don't want full docs can
- # pick specific targets they want.
- main: 	$(TOOLS)
--	$(Q)make -C po all
-+	$(MAKE) -C po all
- 
- manpages:	$(MANPAGES)
- 
-@@ -144,7 +144,7 @@
- apparmor_parser: $(OBJECTS) $(AAREOBJECTS)
- 	rm -f ./libstdc++.a
- 	ln -s `g++ -print-file-name=libstdc++.a`
--	g++ $(EXTRA_CFLAGS) -o $@ $(OBJECTS) $(LIBS) \
-+	$(CXX) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ $(OBJECTS) $(LIBS) \
- 	      ${LEXLIB}  $(AAREOBJECTS) -static-libgcc -L.
- 
- parser_yacc.c parser_yacc.h: parser_yacc.y parser.h
-@@ -227,7 +227,7 @@
- .SILENT: tests
- tests: ${TESTS}
- 	sh -e -c 'for test in ${TESTS} ; do echo "*** running $${test}" && ./$${test} $(BUILD_OUTPUT) ; done'
--	$(Q)make -s -C tst tests
-+	$(MAKE) -s -C tst tests
- 
- .SILENT: check
- check: tests
-@@ -236,7 +236,7 @@
- .SILENT: $(AAREOBJECTS)
- .PHONY: $(AAREOBJECTS)
- $(AAREOBJECTS):
--	make -C $(AAREDIR) CFLAGS="$(EXTRA_CXXFLAGS)"
-+	$(MAKE) -C $(AAREDIR) CFLAGS="$(EXTRA_CXXFLAGS)"
- 
- .PHONY: install-rhel4
- install-rhel4: install-redhat
-@@ -280,12 +280,8 @@
- 	install -m 755 -d $(DESTDIR)/sbin
- 	install -m 755 ${TOOLS} $(DESTDIR)/sbin
- 	install -m 755 -d $(INSTALL_CONFDIR)
--	install -m 644 subdomain.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}
-+	$(MAKE) -C po install NAME=${NAME} DESTDIR=${DESTDIR}
-+	$(MAKE) install_manpages DESTDIR=${DESTDIR}
- 
- .SILENT: clean
- .PHONY: clean
-@@ -300,9 +296,9 @@
- 	rm -f af_names.h
- 	rm -f cap_names.h
- 	rm -rf techdoc.aux techdoc.log techdoc.pdf techdoc.toc techdor.txt techdoc/
--	make -s -C $(AAREDIR) clean
--	make -s -C po clean
--	make -s -C tst clean
-+	$(MAKE) -s -C $(AAREDIR) clean
-+	$(MAKE) -s -C po clean
-+	$(MAKE) -s -C tst clean
- 
- .SILENT: dist_clean
- dist_clean:
diff --git a/sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch b/sys-apps/apparmor/files/apparmor-2.7.0-makefile.patch
new file mode 100644
index 000000000..9575d00c4
--- /dev/null
+++ b/sys-apps/apparmor/files/apparmor-2.7.0-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}
+