3 files changed, 26 insertions, 20 deletions
diff --git a/app-i18n/man-pages-de/ChangeLog b/app-i18n/man-pages-de/ChangeLog
index dc174058178a..4ba8fcfaace7 100644
--- a/app-i18n/man-pages-de/ChangeLog
+++ b/app-i18n/man-pages-de/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for app-i18n/man-pages-de
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/ChangeLog,v 1.20 2012/03/30 12:02:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/ChangeLog,v 1.21 2012/03/31 11:13:06 ulm Exp $
+
+  31 Mar 2012; Ulrich Müller <ulm@gentoo.org> man-pages-de-0.12.ebuild:
+  Fix collision with sys-apps/shadow, bug 410283. Install documentation.
 
 *man-pages-de-0.12 (30 Mar 2012)
 
diff --git a/app-i18n/man-pages-de/Manifest b/app-i18n/man-pages-de/Manifest
index d74aca65a438..334366b76b42 100644
--- a/app-i18n/man-pages-de/Manifest
+++ b/app-i18n/man-pages-de/Manifest
@@ -3,24 +3,24 @@ Hash: SHA1
 
 DIST manpages-de-0.12.tar.bz2 530398 RMD160 ce4932a40f727cffde22f4f0e3b14343d7025bca SHA1 e6b38725d615fe177c7a11d9ec2101e71f6729cc SHA256 81ee3cb852ba3dfb9b16a926c1d24a0aafea699a42a02b3a0ac2386f971417ed
 DIST manpages-de-0.8.tar.bz2 475407 RMD160 f1bdd967e31d85492a72c4c955cf67e8545f08e1 SHA1 d1f2537489022d72158e98fe2f70664e2135d96a SHA256 c40468b87ac1029af0df8e37d36dff6da38e5d823db932c4cd774f1a1bb9f15e
-EBUILD man-pages-de-0.12.ebuild 786 RMD160 e46f63c2d684430e62034b26363d37d356ad21ec SHA1 bc3066926e23be929fedd6d4d1f4bff1d84879e7 SHA256 fe3cb42860fd2c028d7a15ee1cf1a1200fff22da2897e58d864031dcbaf1253c
+EBUILD man-pages-de-0.12.ebuild 884 RMD160 408ad5ff5f63e38c81d911728f3c3eb8dd866f66 SHA1 1a450bfa79e34c163da06e0d40360064344cc80a SHA256 ba02adc2a3291bf86b1c1746f9135e9e42ef97ec8d3001ed5d8434c0f7e0d6d8
 EBUILD man-pages-de-0.8.ebuild 1131 RMD160 f715692f7b94ddeeb16e9279d4768d3730e4ae5b SHA1 677b378c49b63df7f926da92fb37079672bdc88c SHA256 1c7ecb6492b10df38b449050590da9501f9e8079cb3841456ededeb2690de3a0
-MISC ChangeLog 3573 RMD160 829473768c9813214a5b3762d14190cd357fd434 SHA1 8659ad74761160c570407e5a8d233d5d20684049 SHA256 b6f49af3393494a2ef8596df2ee4d84f44461d0a8223bfd25b11f4862b5b8248
+MISC ChangeLog 3714 RMD160 cba56b23dac198ba04007feb40831f8fe6203123 SHA1 7c840a49d029c0a2d83aaf98574bb4b863ddeacd SHA256 f418158bb8854acb4af517193329a81d122f42a92c5e01a2986f1c863339e106
 MISC metadata.xml 292 RMD160 354d84d97415a69afafccaae6cd627760a95475f SHA1 6266efbae4646d6658dacb480b8f3a78e5c4735f SHA256 ed31222caf411bbd2101fd43f6b711048213b7ecf27ce7f1643eff0f0ed5f2b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBAgAGBQJPdaEKAAoJEOSiRoyO7jvot+wQAIAecz8T4M9eQ/zhDusBQdsi
-MGjrUY+xvYaR/gZZfrNCqOSRwvopnYHwGxLetK0tIVttocxHlJ5fKaAimI4JTkgi
-z0NXhh3jE8pKPSjp3JSeK8A14AfuwLfK6SajbbfN3GfBfNOBj36CLScHug9fTUZN
-IBJJzVBXswriTx4smuSZDiEqt+t8kMalK3Q+aYNm9F6AS1H0XGf5sBG8pPCiouVm
-xN2xJ+MLHmtLHvDUrOOZzCbTvYpn5m06o9g1C1af3oyU7ubgONjDAv8OzuU4+o8d
-1CCvOkOiTR/oGGVNTGlCKwDlDnio4ibgPl+cD/Ou7q5UvKl2ouNDvu86MusTQxLL
-K/K0FsH59z6bswSNA50y5x/yYN++oSyp9f6tKDOrslwcWX5lopV0Cyjk8RNwN310
-KLXLa+nWfvP7zouPledO1kD/HSVFmiuaM8IW9l4xwcGrp4msUjN4gvst1dfpdVQY
-0fqcFENNOVJjH6KvNjsZtRp5FhNpbv2Z6rzcL5kf+QBxY9mxQ1t40nl4PoTqSVbu
-4Rg7RDxB8/G5OaqbefmbaygYmlXnfUHXEtvytGaJTvKRp54LXXYAmY/S6vepVajj
-V6KpMy/scatm+amwSbuakvBHCI3vQAtvzE76wq9yB0PpLZmCGrR6/QHv7QUyOBoZ
-+BNmmPFPcG2AszXSS5W7
-=vVlP
+iQIcBAEBAgAGBQJPdueNAAoJEDxpGckxwJCBO2MP/1FfCfLgJUqkgix6L+J+zUI/
+LbGlbXFRMG39X4GvNPVh3cL+P0q9z9ZrOQDAZCK5Sl5c0gtHRAxnU4fEsWk8ib9s
+pDf2ObCsos7wexd95SBqvcZDZwnNfX1jyp1gxfPR9fcyLbVXt3lt4oE84/2q7i6R
+zHxpldbKGUIUOs4O7tt+qkoUyIdaBMd4ZRYWNKATbG9og7D875MU2No7uWVktW7s
+yu8WBNONjOpCrRcl2ofS48qMwrv4slrChgsGjrz2Rtn9srHaVrXJHWa5nsRNRjS5
+f5Xp4qQEGq77cs2+8q0na4h6PSZTMRgFvicdYf8XdLzMHEAlA2McZUbTNWJ1hF2M
+QCHPkfdBYErr+0tLsXkFUlItOLguiOrqPRqhNCTuGb657JRaCeI1ihnwIFqB7CFp
+bBnS0MNfHPLWhJLaHLSCDrdXObDjChpou+53zJbdviko73VS2xVbx2RpYu3JBC8U
+OS+LH29zFwB56hwPWDM3KLbEHO6VGWn3sLMpbUmyie4LcxJPEX1cIhCI7bOXoi5h
++htzVcZyARJeX8cfImojo94K7caa0sS2F+GsTPWZHgIT5YRam4hBrClKz53Oruq4
+GT9pzS8jSho4MUG0pjuFlP5jLGw6NryI8WQ/QwN+AeaTc6bq8T/zbkqeLLGnsFiR
+a+HCEIEOewd3sPd8+3Ei
+=nk4s
 -----END PGP SIGNATURE-----
diff --git a/app-i18n/man-pages-de/man-pages-de-0.12.ebuild b/app-i18n/man-pages-de/man-pages-de-0.12.ebuild
index 794be772be56..8ddd27c7af3d 100644
--- a/app-i18n/man-pages-de/man-pages-de-0.12.ebuild
+++ b/app-i18n/man-pages-de/man-pages-de-0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-0.12.ebuild,v 1.1 2012/03/30 12:02:40 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-i18n/man-pages-de/man-pages-de-0.12.ebuild,v 1.2 2012/03/31 11:13:06 ulm Exp $
 
 EAPI=4
 
@@ -20,10 +20,13 @@ RDEPEND="virtual/man"
 
 S=${WORKDIR}/${MY_P}
 
-DOCS="CHANGES README"
-
 src_compile() { :; }
 
 src_install() {
 	emake MANDIR="${ED}"/usr/share/man/de install
+	dodoc CHANGES README
+
+	# Remove man pages provided by other packages
+	#  - shadow
+	rm "${ED}"/usr/share/man/de/man1/groups.1*
 }