Clean up. Fix man path/filename (again).

Package-Manager: portage-2.2.1/cvs/Linux x86_64
Manifest-Sign-Key: 0xA792A613

4 files changed, 18 insertions, 15 deletions

diff --git a/x11-misc/read-edid/ChangeLog b/x11-misc/read-edid/ChangeLog
index 7a58ba8924d6..0592db93d89e 100644
--- a/x11-misc/read-edid/ChangeLog
+++ b/x11-misc/read-edid/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/read-edid
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/ChangeLog,v 1.27 2013/09/07 15:27:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/ChangeLog,v 1.28 2013/09/07 15:38:48 jer Exp $
+
+  07 Sep 2013; Jeroen Roovers <jer@gentoo.org>
+  files/read-edid-3.0.0-sharedir.patch, read-edid-3.0.0.ebuild:
+  Clean up. Fix man path/filename (again).
 
 *read-edid-3.0.0 (07 Sep 2013)
 
diff --git a/x11-misc/read-edid/Manifest b/x11-misc/read-edid/Manifest
index 75087c8b5233..4b904f7bfc27 100644
--- a/x11-misc/read-edid/Manifest
+++ b/x11-misc/read-edid/Manifest
@@ -2,19 +2,19 @@
 Hash: SHA256
 
 AUX read-edid-3.0.0-include.patch 234 SHA256 51d55675aedb7a0bc6f8850a1277761a6852cebbddf2d7e2d93e6a94701c5864 SHA512 fd3a73bcb526d540fc8807cf1e8862c8aeb71c1b9e9debee308a48895549c2b415ed42e51dbe5e23ada298ff899ad24d663f8dacf3230c8ff1a8c0932cf12da4 WHIRLPOOL df38298687488f450bb411266b8fadc0ed06830c77b6ba18060a3ceca692d27cc974bf3fe66bd37c1480d5e18e1f9217ff33e08818965b8735d2a93c869587a2
-AUX read-edid-3.0.0-sharedir.patch 345 SHA256 e4d761e17c440fddfcff9c0c4e0cdad000d03f763c537fcc2a7ca39453ef3781 SHA512 ef0723f9356b5436963763d4db9d53dacf76eb236a5a4af08b780d5abaeee7b7ccfef99e7f8be241ae5bddc55a2c5284fc7f74de612d605869c0320dfb7d5b04 WHIRLPOOL 432f84241f439129833f2c0557ec0007f9d9ed3bf0e353bf28edfd4f48e812cdc903e9ba4b2ce19dce25720abffb651e72cbb9c4cb150d252d5adc25e4c094c6
+AUX read-edid-3.0.0-sharedir.patch 364 SHA256 ab9dc240622ea09452a51c70c9a4d4a98e52790ad2c673f5e81bbf01d8c15c5e SHA512 35cc27f2156462a03a7674076e92f04a7d8bd482e2826d63f413813eb80a618c75404a29856e83c2e45da94381b59bf1a426b130fe98ba4e2c5c663d4cbd93e7 WHIRLPOOL 6f312f628d92ff5ce61adb3b8671e7286099a3d5f2a2d8aa5c939efb321ae9c4dc155f5aa1b3ca79c3dc5c47dc99460bdef47cada60547d259f54b2541276788
 DIST read-edid-1.4.2.tar.gz 84138 SHA256 c1b5d839fe6349efc183b3a3d33a8be1cd0dfea3c94015a86159d8aaeb6e9dd7 SHA512 b52c763a7713661a542f707d48251257c9540c4b1ad517b7ddbbc051edf919600cf27f93c13e32d5d6d148dd08327dc91f11eecc0b6db82179d044cef5b52550 WHIRLPOOL 8a64748f9976db385ea24a60fae86d55da2434e35b0d2cf46876680e7be6604bf3ab011226697cfd1b871ccf2fc7c1841f1228be54e8a9c55ba9d82bbc2972fa
 DIST read-edid-2.0.0.tar.gz 82282 SHA256 246ec14ec509e09ac26fe6862b120481b2cc881e2f142ba40886d6eec15e77e8 SHA512 3503a9cff0009c407ca3fded9209f08e7f24755b0499c136a41e59a3479141ceef9f94c30a8b6125db1fdca6a47f62a74fd27101ccadaa7c9af337de310cd29f WHIRLPOOL fc2f4a77ff98a43ef2dd99ae88b5de4ff68e3ae1606534b76f02cd10aae57c117a299a7c98ea36c72e1feb8d7e9d5e84b620467e33fe817f137564723cb4a08a
 DIST read-edid-3.0.0.tar.gz 31585 SHA256 447992f49313b407e6161d0a52a382177a9aaa0ee18c72573a0ea747b2fed0c3 SHA512 10d1514f5185b770bcca0e51f0dd134255925e3dab0ccdb7d7aaa1bc6b96b8b9c752630be1542ab0d63070b355806e8e05036b1b37c67038a3150c82c5c37faf WHIRLPOOL f7f25637951467315941f4dc5cd5f693845d8c7e97726c4fcb06b50008cfd0482f35f67377a4ce5808f99b2151dd60c2d3a3eea32127737539510891f3adea1d
 EBUILD read-edid-1.4.2.ebuild 705 SHA256 1591764d8fb0b578bd82eff8f105a4e18c40a036ea3e8ba9b2bc163218d5a353 SHA512 0529de92a7315922b7b79c63196c14c071d60df7de93fa6c5ad15e6d1f770478bd53df67fb3f64471b23020b6b434a650f3f3f603079728d9c13f95ae1c7e181 WHIRLPOOL 71fdfc28f0f71b37230c17efd102fd413b4e85b636867412f3f572104cb6291e3d3793557e45a7790a4c11ee820d6703310b450e5b67a8980495f1eb54e0622f
 EBUILD read-edid-2.0.0-r1.ebuild 854 SHA256 0a24918580a3b37846068519271626bcae3df02606aa6bbca0004dccc4fbd622 SHA512 ea29173ea9ddbe00d746d2f7892d58327c95dd58d767ade6c0b6e57262b87d020b96ce6bae399cf01e3d5f9e7e13a377f67f1b5d65b5161ba27dfd9cd32369fc WHIRLPOOL 78856bff2855bfa0ad8e73acd5fa61712d6265c0be0d8070b4ba8759729cdd056cbb39edd4963a60fe9e454439e6a4bef14196a612f97cc7da41f80eacbae5e1
-EBUILD read-edid-3.0.0.ebuild 736 SHA256 c41f054e07547a1c1d8b8f8393684e33fa896ce2eb52cd030e4a4c2c2702f891 SHA512 eaa11a86d418d09625b3eab53c5db983952c0650672278f005e8fe17927f59e4b801038d1624269b5ff1882f1c3e095faa6ece725201801415de5eb92e3a3841 WHIRLPOOL 5fd58670f297297d99d817a4bb11b48d240d62e648ad578de57981cca076ba2e04201bd11d99140d13aa9a5700aa9e8aa010150c6f70631edd4f31d4afb60638
-MISC ChangeLog 4265 SHA256 bde59cc6f4ee79aecc5734609d8f87e30ef7ae677dda207790e56e112848b6dc SHA512 a4279972869f379cfc95372c64ed55c36c224056466a41679e4c6d89cd7ed25e7e17eb60432c955e82fa00bd532d8632f52b8d636ea1446c5e30a799f4d18456 WHIRLPOOL 87f95e169695025d65589949a6734a8594af4f4d105330bbb3758ae40077404e320ecc6a894095c30a48e3110806a7119850a66f6219b86976a9485a167d3229
+EBUILD read-edid-3.0.0.ebuild 731 SHA256 0cf138696ff34cc99a61a5e1165cc7e49ea84c6a1e96f1521a0d885d82277b25 SHA512 64af39561751bfa67d158019bf29b2245d365be9640d7a69e04c3dad3b72ac5e8bbbf0f0e97d215d8419019ba23242971a5eb79b889fc043735a66213a41d0f7 WHIRLPOOL c19a1c6c9471a1ec4b2a74d4892a1d77546c5a21660cde439c317dad04ddb55572cf12c003e83619326ab5285b1e4140934d87f33edd08f1d940de730fc11902
+MISC ChangeLog 4420 SHA256 8b2b25dbb6542b0e81af66c6f52cb1901caed099818b2faaa7d27ca702bf18ff SHA512 b8de027cec512ef4a61b9915c28fe1991d8c85e67b75295034e92f228711f285c67b6807eb1b34538568e96def6f01c0dc3562b2ac94f5cac12fdcdaa87b72a8 WHIRLPOOL e2ab5482f9de2bf5599b8279203bd74a8f142fca541ce4ec060ab559d1423e9e0b3a1c1a9a5276518a40fe2b3d99f6a8c21a0119d954147b0ea0082609f84398
 MISC metadata.xml 167 SHA256 63163ddb9082af2890999b3c825b2d21df911f59611694e0e077e75a12bf7241 SHA512 381c3c70deed443ca617d0535541542579acffb8dde5f577acf789380f0cdec6d395fa6a45483978648fa2d4e9dab13a441ebdc95664f5f414efbcc812705754 WHIRLPOOL f4a9e5a69adee7e8ee1e5e7ba1b4b860c5060a80db845e0c7f12c96ab44a86dc81adb6aff76c5130b4ab2ffe5ea18f0a5afc9d87a61177d99a8fc9f49d7e9d6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlIrRfwACgkQVWmRsqeSphOPywCfTAAwkirseG7SGpy/c63QZ2Mc
-zkQAn33le4dsqtltFkXjeZfOOdE645b8
-=6PyR
+iEYEAREIAAYFAlIrSIkACgkQVWmRsqeSphOYPgCcDhOgkru0/kOqnxcWUJj+dxJk
+UBgAn2F1mEjIku0/vP/QMz3awVac1XyT
+=OJCH
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/read-edid/files/read-edid-3.0.0-sharedir.patch b/x11-misc/read-edid/files/read-edid-3.0.0-sharedir.patch
index 013361493859..cf5fdb29861c 100644
--- a/x11-misc/read-edid/files/read-edid-3.0.0-sharedir.patch
+++ b/x11-misc/read-edid/files/read-edid-3.0.0-sharedir.patch
@@ -6,5 +6,5 @@
  
 -INSTALL(FILES get-edid.man DESTINATION man)
 -INSTALL(FILES AUTHORS ChangeLog COPYING NEWS README DESTINATION doc)
-+INSTALL(FILES get-edid.man DESTINATION share/man)
-+INSTALL(FILES AUTHORS ChangeLog COPYING NEWS README DESTINATION share/doc)
++INSTALL(FILES get-edid.1 DESTINATION share/man/man1)
++INSTALL(FILES AUTHORS ChangeLog COPYING NEWS README DESTINATION share/doc/read-edid-3.0.0)
diff --git a/x11-misc/read-edid/read-edid-3.0.0.ebuild b/x11-misc/read-edid/read-edid-3.0.0.ebuild
index fd58e3c4c203..70d10d8739e8 100644
--- a/x11-misc/read-edid/read-edid-3.0.0.ebuild
+++ b/x11-misc/read-edid/read-edid-3.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-3.0.0.ebuild,v 1.1 2013/09/07 15:27:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/read-edid/read-edid-3.0.0.ebuild,v 1.2 2013/09/07 15:38:48 jer Exp $
 
 EAPI=5
 inherit cmake-utils
@@ -22,8 +22,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-sharedir.patch
 )
 
-#src_install() {
-#	default
-#	# as per bug #283322
-#	dobin parse-edid/parse-edid
-#}
+src_prepare() {
+	mv get-edid.man get-edid.1 || die
+	cmake-utils_src_prepare
+}