fix installing files that don't exist

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

4 files changed, 29 insertions, 37 deletions

diff --git a/app-admin/glance/ChangeLog b/app-admin/glance/ChangeLog
index e41cfef578e4..9b1f88bc272a 100644
--- a/app-admin/glance/ChangeLog
+++ b/app-admin/glance/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-admin/glance
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.67 2015/04/30 20:19:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/ChangeLog,v 1.68 2015/05/04 15:49:30 prometheanfire Exp $
+
+  04 May 2015; Matthew Thode <prometheanfire@gentoo.org> glance-2015.1.0.ebuild,
+  glance-2015.1.9999.ebuild:
+  fix installing files that don't exist
 
   30 Apr 2015; Matthew Thode <prometheanfire@gentoo.org> glance-2015.1.0.ebuild:
   adding keywords
diff --git a/app-admin/glance/Manifest b/app-admin/glance/Manifest
index d3a5c4fabe74..01e095729597 100644
--- a/app-admin/glance/Manifest
+++ b/app-admin/glance/Manifest
@@ -9,24 +9,24 @@ DIST glance-2014.2.3.tar.gz 783651 SHA256 e0c4eda2ec6a38a11129b45f6776dc32a763b1
 DIST glance-2015.1.0.tar.gz 1100719 SHA256 0d8be9f28b1686de3d0d1037498eaaf717d39ad9fa85d2a07016131fff470009 SHA512 04f99eaf1043291eb5622c069d2a15d344d7d508740d7b738fce36e1373ec0df26172077b3bdf9f23cd8234d74a34995e3d66ac120430ff17017fe788eb3e9d6 WHIRLPOOL 862b2d89801f3a750434d50fafd75b8f22d031532910b7f63d6b8ca00546a19fa5a07dea1c286e4f5fea9b11614a4c25750a4b2ca5c429a03984a2972f681b40
 EBUILD glance-2014.2.3.ebuild 6038 SHA256 e7ee0d58799a7aa1693dfeb1fef22fde87472ffd9c52971b54b760aa75f5cf4e SHA512 9a8728458833616bea0b31004e2ffc4492837b92972b72d4d4b766def8c892f13c3be5b6ab6a89edf6500604f3899cb34eca3faf07a93b0bf34694b4cc754ebc WHIRLPOOL e128f5beb5143134645bbbd8b54dde48ae3f46ed6e320d7f44157dbc72e5e2c4a9f428dcf6646a3cfb75109be1f43fb58e9eefedea56271f01f8e2c8c18cfef5
 EBUILD glance-2014.2.9999.ebuild 6048 SHA256 a3967e4b9f55d8a6d656bdaa811fca1c56005795598ef4d190e49ef3ecff5359 SHA512 50a27b93d296528974a41c11db2b948d66aab8aa5d4c9cf2480eca5632f67efeb666341b6416d166300e6b76ab380956d51a931011d4ee6d04277b88e976f9a0 WHIRLPOOL 5757379469b4104a5d31453702c7aff0ea5bde32de446114d89fce09bdda971636b195a0ee953615dbd31b137f68c1d7464855f6bf2f73d2564d40e2156c14d9
-EBUILD glance-2015.1.0.ebuild 6846 SHA256 84713571b00b5cd85d824a7603d5eee2fb2375e372cfa2f7ebe9176ebaa32fd6 SHA512 f31a20952545b4a5b196775c6afd5a7731aead99a80e97095f6d25c7f40867b075896fb677f9d47c6f57822e8627b3c02847894b833215b0bfe1516eb78356cf WHIRLPOOL 43517e693cdf9bf0488180b54510fda415665194c3278064f831224d022efa479f03b650c1fc80ac5b507a40744e06a254935b21947e188ff02b6b1f9b75005c
-EBUILD glance-2015.1.9999.ebuild 6856 SHA256 86da2f5c14faa39728d4c2935b440986e5b10dd2a44ad51b6c825c3fd53a5a52 SHA512 89eb1d3ff088e6912a47e19add02c9fc13a719a369031256ef69dafe55c83f488509e6d3998878d2b04942a7414e23e3353dbbb570430284fa6bcd8c14556c2c WHIRLPOOL 6cf03be33fdf9eb8a845f29af9111de6110dc6a521a244356e2ff3404374afb90e812bda6d8989b66f8b1188eb15fbe6a2a3836a9ed77ec2efcff10afe695218
-MISC ChangeLog 13436 SHA256 ff866c681ab3f62ad19431520e1ee37561a09a5a1284c4a4f075a6b272aeb889 SHA512 d643c4f4d95ee13dc07621f0d2c862baebab27b3f64ba8a5cbcbf693094d0adb06c9080bee4b266aaacc2f46d153d289854f5275366c21613cd90a8b4f8f773e WHIRLPOOL bd0d249256139feaf9bd9fe68426bbcf38c0681b7412754298f27ef8dd92c75417c6882b8076587500f645ef87e19868ac3caee3ef985d140a41a26fc689193a
+EBUILD glance-2015.1.0.ebuild 6618 SHA256 d134b8c2da3c1ecb5ed885b35f86fbb88655c0ef47e7001ef6108103050098f6 SHA512 9ae31d85204a89ccb0f54229335b355cd8452998c28943a5a0f7698bfce0224167aa0601b99ad59ffed880ffb2da81661e7b7ea7f619cffd01c763de40109020 WHIRLPOOL caa2ff206d808a83d22012fdb1dd600d95db493d423ceedd7aeec00f53da78761127b379a25de726ed62ebbd4eb4e21ecff04473f11a609830dccd39be111be9
+EBUILD glance-2015.1.9999.ebuild 6628 SHA256 8c3cebd5ca13cde9f11ef658030d77031a2245076cc9f99aca680f138935256f SHA512 ec447d0560462008f2c714c5e847a6f556f594c020570e8519a58fef1d1c643f4dd3d368314eadc1f8b4afd241c6bb8c8f55b711a6b01ea36c1d87d8934b6608 WHIRLPOOL b2b29c4f6bd7eed8adb0f4d68adc237d7da70e8dc68a1b5186fec9299646338de141dd6351c297336738378747f764aabf4826ecc5c20931be1bdec35e631860
+MISC ChangeLog 13587 SHA256 79a4af4f019557cabb4885071f23d41bd230e50d7412d87415c677d4d21dcf7b SHA512 70e88131e85aa2ad5a51e29abfc0ff48309f18b5b3bd8cfb7f153a88f7890cd894312108d80e15ad615cc5b51a97eacd9dac96a2832c0374dd55481107e55968 WHIRLPOOL e9eb520802d9c9426752e444317671ebc69b8a326e26808583bf837f84aa55e0832c3e1cd1e376d3a98b9fbb707af1d96a57c16a2206ceb7220cc05ce1dc41bd
 MISC metadata.xml 607 SHA256 b74d960c096528dbb7c9be6b0da777e10abe32928459f045e7c58b0156e22d95 SHA512 e38e4dd740fe55d73d6d97fd9ffa3aec5466fbb5f8e6484b125560313245ae697a0dcf612fb065125c6737a8254b6218c0703f7de79437bb2799c6c67f386e45 WHIRLPOOL 445bf712fd733fa90c395cc24fd02155bed15b092713d502b54331da9237f397877c2328adbf4049ee64ae163713ce031ebe5048c8826ed1a011d4ebcdbb681d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVQo5+AAoJEGSje+quGaTooTkP/RkTari2uzDqsZ0XY796MUz1
-czx67IlcTXcbhhe27G9JUpHV2r88cEdXSHCBu9ihkBBP9+lcQjMGvT5zi3lA13M7
-eYDydcROCIgS4IWTmAj3HmNg+EPyoFQ56iMr1187GGfqQVrcOshHoHnTdcC5tpU6
-dA1vdLquh5Ncev/A/MR/jJyAKw7nzj6lpZjDHYovpTytn1LPEtSKlXxs14kYi5BJ
-sBSu2E+VY2vVnizOiKsX8Yg3AkCzzu+5WaJJfTJsHa4+R7rbZ2jPrhWVzZd1uZHu
-1G6/UAVwzPHL+7FJrV+FL4NNu5A3qbffaXchXawNVCzv/4ejrQMSdgmREX+mzmdG
-QlKFAckjEOSMz81MwqutbIyE/o6zhHWt4w+IspCjYO5iQF8gJRR/zzNdw3SNw62b
-UTfTEfGMUlq2/LGXYR3A9gf0yFFP+zg6iv4K3DjcjcJUTSAtI5LxWn+61MQIuIjn
-0tqqok6gP0l18KMjftGTFKvGQVVxODT7s5xGcCdDcKxdvklvYtMAbxKEH3a24T9i
-p0zMnOYa5PSPXvxgGacv6AujuseR9B0omnGGnkn+/LfD8mfoVpb9NKGBNEb0bUlC
-juxVwaIXyfaA2ffQmfR0p7ufh/tAiRovdL5bHnde9DRcomem1gn89O6Y7Ga66Znw
-QbVTiBF+abAoEo3riPHF
-=MaRL
+iQIcBAEBCAAGBQJVR5UkAAoJEGSje+quGaTor+wP/jgKOsbBZ8Im5K0PaQUWWmF5
+rrPyURN/OP2HH9jhvsLT5KodvSmbWZWe1VDT8NYugo+GmbuxFIpUQlDmRxZrZdVM
+gQHMJlp6eTTm/fQ+En7gTsfrim2pk20JDQlbOsiZyfmUVieRSjoFBwmSVOqyvGvr
+5BxKQZTkl6lweKTt8tPQtKw5DjJXG232qsYdnzbSOc7h7ZdLh9vo6lRIXx6pZSIk
+nW+bWo2iuagUZ7wnWhDcIybqMbKOCLoEhuq6DrunIwPXiDhrM2wi6WfVlbcO5H0e
+4AB/wciI16VdfmIxQjsHeZljVuET2b9uTRLp+wWiWT+SCux77QaAqa3v2ZPxTQmu
+DJw3graUUBYv2LB1Bu7aLjDqGxd/4FJK7RUAvcX1j5zLla3JPFoN4t/O2xurWdTL
+54/7EMJv2aah6Ts6Rq3CwqHW6FNYjEBOYB4yAXVAtu3az/Yk90uYABLLhOM5oq61
+k3CmMXHyiSUMbHbNmVPCAl811zFc87hmpA23m7uoASmOEvOljO20Txn6L/l9bMca
+3LlXIZS3e3ZodBJ5sCZ0KYlmtxSrzTXrvSozmPwcB2IQi0e2i7BkZwKvzeofcdqC
+ln664lO6yamFQqt8eUkKZryOLw4X8qTw5lyTfRKVaQ5PeMad/mZ29mDAm82SBv3S
+Xx44202lWq8KQkIfCUvV
+=nLfk
 -----END PGP SIGNATURE-----
diff --git a/app-admin/glance/glance-2015.1.0.ebuild b/app-admin/glance/glance-2015.1.0.ebuild
index 583352161bf3..0515b2ab6627 100644
--- a/app-admin/glance/glance-2015.1.0.ebuild
+++ b/app-admin/glance/glance-2015.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.0.ebuild,v 1.2 2015/04/30 20:19:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.0.ebuild,v 1.3 2015/05/04 15:49:30 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -174,15 +174,9 @@ python_install() {
 
 	insinto /etc/glance
 	insopts -m 0640 -o glance -g glance
-	doins "etc/glance-api-paste.ini"
-	doins "etc/glance-api.conf"
-	doins "etc/glance-cache.conf"
-	doins "etc/glance-registry-paste.ini"
-	doins "etc/glance-registry.conf"
-	doins "etc/glance-scrubber.conf"
-	doins "etc/logging.cnf.sample"
-	doins "etc/policy.json"
-	doins "etc/schema-image.json"
+	doins "etc/*.ini"
+	doins "etc/*.conf"
+	doins "etc/*.sample"
 }
 
 python_install_all() {
diff --git a/app-admin/glance/glance-2015.1.9999.ebuild b/app-admin/glance/glance-2015.1.9999.ebuild
index 8e169eaa5daa..e4e23782f7e2 100644
--- a/app-admin/glance/glance-2015.1.9999.ebuild
+++ b/app-admin/glance/glance-2015.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.9999.ebuild,v 1.1 2015/04/30 19:00:26 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/glance/glance-2015.1.9999.ebuild,v 1.2 2015/05/04 15:49:30 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -175,15 +175,9 @@ python_install() {
 
 	insinto /etc/glance
 	insopts -m 0640 -o glance -g glance
-	doins "etc/glance-api-paste.ini"
-	doins "etc/glance-api.conf"
-	doins "etc/glance-cache.conf"
-	doins "etc/glance-registry-paste.ini"
-	doins "etc/glance-registry.conf"
-	doins "etc/glance-scrubber.conf"
-	doins "etc/logging.cnf.sample"
-	doins "etc/policy.json"
-	doins "etc/schema-image.json"
+	doins "etc/*.ini"
+	doins "etc/*.conf"
+	doins "etc/*.sample"
 }
 
 python_install_all() {