Add /etc/cups/ssl, thanks to Philipp Rosenberger <philipp@iluminat23.org> and Joe Kappus <joecool1029@gmail.com> in bug 137444, ebuild cleanups

(Portage version: 2.1.1_pre1-r1)
 (Unsigned Manifest commit)

2 files changed, 24 insertions, 44 deletions

diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index f6f04f17c211..832bd12c2b2b 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -14,6 +14,10 @@ AUX cups-1.2.0-bindnow.patch 2178 RMD160 cdf51a6734c7a38fab33f270c7c374445a93432
 MD5 17610ba395fa28cc46fe4be7d45c0a44 files/cups-1.2.0-bindnow.patch 2178
 RMD160 cdf51a6734c7a38fab33f270c7c374445a934321 files/cups-1.2.0-bindnow.patch 2178
 SHA256 0fffd86557fdfbf85e32781d1b77f9696e5f0ed7eb30a78fb57ca82cfafdc190 files/cups-1.2.0-bindnow.patch 2178
+AUX cups-1.2.1-ssldir.patch 509 RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71 SHA1 f846dfaf10426129918b1de7b42a5fcf2c7516db SHA256 e536ae455fdbee0fdea6bae2a800060c81c66ff7ab007ecd317b99b8b9552be7
+MD5 4cfb62e82b82ffc2291f3bdfcc21e600 files/cups-1.2.1-ssldir.patch 509
+RMD160 bc0f4927e4260b57bb898f55d5f4215489d94a71 files/cups-1.2.1-ssldir.patch 509
+SHA256 e536ae455fdbee0fdea6bae2a800060c81c66ff7ab007ecd317b99b8b9552be7 files/cups-1.2.1-ssldir.patch 509
 AUX cups-gcc4-amd64.patch 566 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b SHA1 9e23ed973685c279edfee76fc0a7a9c6fd94a103 SHA256 e5d7cfb3a96731362008ff7e103cb3156059b0b86031564cc0a3e4bf9ea334fa
 MD5 7888ddf6a0c4cfb38b8882651e22d66c files/cups-gcc4-amd64.patch 566
 RMD160 12372ca22d689df7f3129d43ba1b7e6c9161868b files/cups-gcc4-amd64.patch 566
@@ -38,10 +42,10 @@ AUX cupsaddsmb.patch 1790 RMD160 7053477570fb95c703a17d1e37b7fa875ff99cf7 SHA1 e
 MD5 cdcb941ffd27a1f5ce7fb758cbd40968 files/cupsaddsmb.patch 1790
 RMD160 7053477570fb95c703a17d1e37b7fa875ff99cf7 files/cupsaddsmb.patch 1790
 SHA256 dc44e6643a8d4b697b9d376761bcd5f5d3a975bd52141b1c7fed698291d550a1 files/cupsaddsmb.patch 1790
-AUX cupsd.rc6 515 RMD160 f9dcfa9ec7fbe0d89ad52ce95baaf7212d1b478a SHA1 4222c1f8a6dbaee31a3f36d2cadcf34bcb5144c5 SHA256 0b722b0fc8fedc9a2f1b29ecfd2616597dec91352a099a7b0503c5b76490c9c7
-MD5 0720c522b5c2bcef05d42cd4977f8702 files/cupsd.rc6 515
-RMD160 f9dcfa9ec7fbe0d89ad52ce95baaf7212d1b478a files/cupsd.rc6 515
-SHA256 0b722b0fc8fedc9a2f1b29ecfd2616597dec91352a099a7b0503c5b76490c9c7 files/cupsd.rc6 515
+AUX cupsd.init 302 RMD160 f2a3141373df5d9bf10c86f34b2b8bbc08307629 SHA1 1e6d5b014d60113a5ead55b7afd0c54a0b6712a2 SHA256 1eba893a86352b57261e366920ebd16ece1b8c1b50fc25713bd83cfe0b3290f6
+MD5 8cbb5e72bf97533250b02a4e174ef596 files/cupsd.init 302
+RMD160 f2a3141373df5d9bf10c86f34b2b8bbc08307629 files/cupsd.init 302
+SHA256 1eba893a86352b57261e366920ebd16ece1b8c1b50fc25713bd83cfe0b3290f6 files/cupsd.init 302
 AUX disable-strip.patch 422 RMD160 981a3cfc11f856a6bd49685933f27883552f77a3 SHA1 700356ea98e020bb1b985d8c48572e28986939b9 SHA256 78a7cd0c41b8e6c50301bfe8739faa775f14e8e63dfcc45ec0821f870220001a
 MD5 7bce495a238ee9dbebb61496f3b3ae51 files/disable-strip.patch 422
 RMD160 981a3cfc11f856a6bd49685933f27883552f77a3 files/disable-strip.patch 422
@@ -60,22 +64,22 @@ RMD160 c53bec6987551228fc3b03958a1fe7c79a4d087a files/xpdf-pl3.patch 348
 SHA256 19a90dde4d5e5e619866d8a61bec7507a308901d6d54fe49b8bc982f5ca01f0b files/xpdf-pl3.patch 348
 DIST cups-1.1.23-source.tar.bz2 8705521 RMD160 255ec4c22422b14f2367d69f3ec7e590dc46bea5 SHA1 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c SHA256 87da0f7b1e03236e183045f1e787957132658ead56c4b0f80ac7f86c1574a85e
 DIST cups-1.2.1-source.tar.bz2 3475342 RMD160 84040c5ac65d4a3d13d813fb91f90cbccb211c25 SHA1 308dec4039153e62d4206c30d6b1f25469ee868f SHA256 10fb273b8118858fdce795608065860865432b2d9f1016b53fff1eb340385e45
-EBUILD cups-1.1.23-r1.ebuild 4131 RMD160 50c044eee7737f58c3295046b322f31de2381c40 SHA1 161766465673c7c79342364f81b35cb76ab0b77a SHA256 c453d2a4a55e45886c091551c45ef794ccbeeb26ac25591d8e9261720a7e8a74
-MD5 f19354dc15d37020af9a107b96b04f56 cups-1.1.23-r1.ebuild 4131
-RMD160 50c044eee7737f58c3295046b322f31de2381c40 cups-1.1.23-r1.ebuild 4131
-SHA256 c453d2a4a55e45886c091551c45ef794ccbeeb26ac25591d8e9261720a7e8a74 cups-1.1.23-r1.ebuild 4131
-EBUILD cups-1.1.23-r7.ebuild 4653 RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a489 SHA1 9c81b953682af70f53b6b89448fc4ef6816b324c SHA256 09cf15f1ea38a706c673454d6b932aff09d2af8c260b15fc303151f09735f7bc
-MD5 09c9a9dc9a485404b7828210068bcf0f cups-1.1.23-r7.ebuild 4653
-RMD160 3e0eda3b93c9626b3f81dcb1a77c4a6d6e70a489 cups-1.1.23-r7.ebuild 4653
-SHA256 09cf15f1ea38a706c673454d6b932aff09d2af8c260b15fc303151f09735f7bc cups-1.1.23-r7.ebuild 4653
-EBUILD cups-1.2.1-r1.ebuild 5004 RMD160 742491259bb15a59499cc6632b10a4a8c158d0d0 SHA1 61988b3a12d205f4550ae8c1fc92caae78842355 SHA256 71c5c6a23ad4d4c6e2220806246f5c360b588c7dc11a0512569c4cea1730e0b3
-MD5 011161114046949becef98328688b0c1 cups-1.2.1-r1.ebuild 5004
-RMD160 742491259bb15a59499cc6632b10a4a8c158d0d0 cups-1.2.1-r1.ebuild 5004
-SHA256 71c5c6a23ad4d4c6e2220806246f5c360b588c7dc11a0512569c4cea1730e0b3 cups-1.2.1-r1.ebuild 5004
-MISC ChangeLog 24828 RMD160 46674d1350d469bb703ea7e86877c703dbb02aa2 SHA1 0731e53d70180d3aaf75a7915d2653ccfd840464 SHA256 b33c70eabd5367bc4ff689723ad9b16eb050d615a17042c3f870f22df1ed2959
-MD5 835209d00df3b82bfb6a0a9d96effb85 ChangeLog 24828
-RMD160 46674d1350d469bb703ea7e86877c703dbb02aa2 ChangeLog 24828
-SHA256 b33c70eabd5367bc4ff689723ad9b16eb050d615a17042c3f870f22df1ed2959 ChangeLog 24828
+EBUILD cups-1.1.23-r1.ebuild 4132 RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac SHA1 3958abd83fa55d34622b647f111086d92351965c SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b
+MD5 b1e18a006a467d2c94dd37e0f469db56 cups-1.1.23-r1.ebuild 4132
+RMD160 dfe8efd29d266f6a3b3efcdeb81cd00d946763ac cups-1.1.23-r1.ebuild 4132
+SHA256 616fea430e4e3295a36de1d2855f3c9cd114b2c936ad9b106a71eba62b1b188b cups-1.1.23-r1.ebuild 4132
+EBUILD cups-1.1.23-r7.ebuild 4654 RMD160 3b50b26d2519c60d5f86274dc1d998af69bee783 SHA1 b56adde67e5e618de012d1a118fb60764986585a SHA256 71115c06cf8608d96b56fb3ba4cab0dd725648938a3e28e0a8af6c294585db39
+MD5 28058673f2f754db6b5c8ea6ad9490ac cups-1.1.23-r7.ebuild 4654
+RMD160 3b50b26d2519c60d5f86274dc1d998af69bee783 cups-1.1.23-r7.ebuild 4654
+SHA256 71115c06cf8608d96b56fb3ba4cab0dd725648938a3e28e0a8af6c294585db39 cups-1.1.23-r7.ebuild 4654
+EBUILD cups-1.2.1-r1.ebuild 5023 RMD160 2a7ee2a3fda098cd52078090b5ad301127ff2e54 SHA1 2f7afa66acc4e05765bc8563fcf33d12a62dbed8 SHA256 4bdc0dedd265df38bcf45ab33a54fdf546c34ba0b6b4fb27effcc68663a27044
+MD5 6236d3a12e8295c8f851fcb948a2cc94 cups-1.2.1-r1.ebuild 5023
+RMD160 2a7ee2a3fda098cd52078090b5ad301127ff2e54 cups-1.2.1-r1.ebuild 5023
+SHA256 4bdc0dedd265df38bcf45ab33a54fdf546c34ba0b6b4fb27effcc68663a27044 cups-1.2.1-r1.ebuild 5023
+MISC ChangeLog 25171 RMD160 f2e51ea5521adb3a9f39f58df046db02212005c7 SHA1 9994b242a4573d56b9911cc7ab4aeaa38da52e57 SHA256 5007f3733713997fba982f48506bed58e0300892eebc50449d9c859974cd0cb8
+MD5 12330a417694c6214d6cb7ddde2abeb3 ChangeLog 25171
+RMD160 f2e51ea5521adb3a9f39f58df046db02212005c7 ChangeLog 25171
+SHA256 5007f3733713997fba982f48506bed58e0300892eebc50449d9c859974cd0cb8 ChangeLog 25171
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
diff --git a/net-print/cups/files/cupsd.rc6 b/net-print/cups/files/cupsd.rc6
deleted file mode 100644
index 7e5d85c3690e..000000000000
--- a/net-print/cups/files/cupsd.rc6
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/files/cupsd.rc6,v 1.19 2005/05/14 14:20:33 lanius Exp $
-
-depend() {
-	use net
-	after logger
-	before nfs
-	use hotplug
-	after vmware
-}
-
-start() {
-	ebegin "Starting cupsd"
-	start-stop-daemon --start --quiet --exec /usr/sbin/cupsd
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping cupsd"
-	start-stop-daemon --stop --quiet --exec /usr/sbin/cupsd
-	eend $?
-}