1.7.2 version bump, remove old ebuilds. Note that this does not fix the SANE problem.

Package-Manager: portage-2.1.1-r2

6 files changed, 12 insertions, 291 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index babf36e4d7cd..2a377e8757d3 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,10 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-AUX hplip-1.7.1-1.patch 457 RMD160 83d5eb414adb7c33ec4edac8bed41a2c7049cc96 SHA1 39a2eed44cfdd7317be45dc07f14e6083b7e4977 SHA256 4801178b9c0a236d899363cf5df2d070c76b1770d8299c7e6cc3434154d123f7
-MD5 9e800cb75303808426b9bf148bc15e55 files/hplip-1.7.1-1.patch 457
-RMD160 83d5eb414adb7c33ec4edac8bed41a2c7049cc96 files/hplip-1.7.1-1.patch 457
-SHA256 4801178b9c0a236d899363cf5df2d070c76b1770d8299c7e6cc3434154d123f7 files/hplip-1.7.1-1.patch 457
 AUX hplip.init.d 948 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c SHA1 bc9c9a8767c5f253cd9c0dd40bb7e4248cd13b0b SHA256 9dad79022ced93da207a50f8d49d93acfc19f36b89e2b3d77f6b809ee81abd95
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
 RMD160 3908cd5b42175416cc4ac6fc36f0006f7c65588c files/hplip.init.d 948
@@ -14,8 +7,7 @@ DIST foomatic-db-hpijs-20060720.tar.gz 98252 RMD160 0c2c09f3cea6fc2a8e5da216bd99
 DIST hplip-0.9.7-2.patch 25718 RMD160 1b29ff9ffe77dd95f6202302e5c26fd18593af24 SHA1 825a134734cee1fc9a06c8de60cfe1825d47fa54 SHA256 7d406c7d77aa4825d4401c3d5c52b6564d49854fc8cf34ba84ce291b5429eb4c
 DIST hplip-0.9.7.tar.gz 9705231 RMD160 5c742564fa42a99fddf0f46ea177a28c22fe7cf6 SHA1 b354a6cf8f5b81f9242c3978c2ab22c752e4f77d SHA256 1aaa494d4297c598dfd85632d55e0942995b44011b580166e5c30df82a749ff6
 DIST hplip-1.6.10.tar.gz 10561620 RMD160 3608757fca36865528565c0c40571d91a936fd3f SHA1 7c877cac132fc8695c693800c7e34322bdc8d858 SHA256 45f4eafd4568a06889bf4b996a3c75ef571a157b921f56b027b567766d8e239f
-DIST hplip-1.6.12.tar.gz 10679971 RMD160 eec181a1edbbb9087118b4f4c9447b042e202814 SHA1 934da62dddfa1c2dbdb38b6b25adf94619e9b55b SHA256 dd7d992c9d79c3ee7b2949a0c68034411e98f16f2a19aecb120f8d03bc5f8b24
-DIST hplip-1.7.1.tar.gz 10874573 RMD160 a6fb08542256408c29fc08974442c89308a7a0a7 SHA1 738f2fbf60d0b6d91e0f813f4a825b464844f166 SHA256 155bddb595466a8008665fb1bbef6ab2a84addfc0cb3e60fa63592dc4525eac8
+DIST hplip-1.7.2.tar.gz 11092344 RMD160 04a9c60c76d61e8e425346811df664d04d375acd SHA1 3cdefdb49e5cacad6939dbd59ba9e2998fcdd19e SHA256 f303d304483cff1d4939b2dafdf5d6625101444bc51362c10b2743e5179b02d3
 EBUILD hplip-0.9.7-r3.ebuild 3346 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c SHA1 ab473af0d48815e1d42116cd2c0030b6bf43661a SHA256 eab9867749f733fcc0ddce4480b4029f1158fc21d15561a6cb758288763ed1d5
 MD5 fb6b1a96f35c7cbdda733461183b38a3 hplip-0.9.7-r3.ebuild 3346
 RMD160 7042a54389c67ac9e36dbae12f5982efbdccf46c hplip-0.9.7-r3.ebuild 3346
@@ -24,18 +16,14 @@ EBUILD hplip-1.6.10.ebuild 3668 RMD160 ee5e398e2b7456771ea1b25a8ab065b272bf2719
 MD5 e3d41520f8279ebeeca3b3baea622010 hplip-1.6.10.ebuild 3668
 RMD160 ee5e398e2b7456771ea1b25a8ab065b272bf2719 hplip-1.6.10.ebuild 3668
 SHA256 57e4cfb57dda84f7c4783bdc40176ac6b9087c9b47b308470f1a61e56fed6f92 hplip-1.6.10.ebuild 3668
-EBUILD hplip-1.6.12.ebuild 3206 RMD160 da78f7e364da3fd8da9568d06dad9c0ed713cb40 SHA1 f0d881832645444b6c0ef3c3bcfc72b4586c8c55 SHA256 59beca135049fefc0fe4ccb3916880483c017313e2392b3ab2627f15dbf32703
-MD5 2785394a0cc45f621ff02b35c9d94999 hplip-1.6.12.ebuild 3206
-RMD160 da78f7e364da3fd8da9568d06dad9c0ed713cb40 hplip-1.6.12.ebuild 3206
-SHA256 59beca135049fefc0fe4ccb3916880483c017313e2392b3ab2627f15dbf32703 hplip-1.6.12.ebuild 3206
-EBUILD hplip-1.7.1.ebuild 3245 RMD160 e11ab4e33130d54888879fecd91751ad840b8ea4 SHA1 03694a370da3a1937f9aa807e2ac9acbb874fdaf SHA256 ad6bd1c10352360a6f86911af70a0cc0d56341a670bf740d13c735325685d271
-MD5 3ad93886963bc1bd98ff22081fdeae43 hplip-1.7.1.ebuild 3245
-RMD160 e11ab4e33130d54888879fecd91751ad840b8ea4 hplip-1.7.1.ebuild 3245
-SHA256 ad6bd1c10352360a6f86911af70a0cc0d56341a670bf740d13c735325685d271 hplip-1.7.1.ebuild 3245
-MISC ChangeLog 9023 RMD160 e3347a1ac19449b8f6daf2ce95f9fe0a60073d5d SHA1 36e321370dcdb77a3b60561bec43953a697b6b19 SHA256 b09261432a6fb273fda4f22aa68c1dc503f504c7cba7e31330918c9f876877c0
-MD5 5bd4b819740dca1f92757c53cab58d52 ChangeLog 9023
-RMD160 e3347a1ac19449b8f6daf2ce95f9fe0a60073d5d ChangeLog 9023
-SHA256 b09261432a6fb273fda4f22aa68c1dc503f504c7cba7e31330918c9f876877c0 ChangeLog 9023
+EBUILD hplip-1.7.2.ebuild 3208 RMD160 47f824f73225aa877c4d32727ea7d5b21354429e SHA1 c253680d731493b28842b8af8586d44f91653ce3 SHA256 d4896f85a67e0e1dc4609b3501f23f041657cce73270872de6f4c0e7a50fc9c6
+MD5 84d5482719a7978476ed297ee207fd31 hplip-1.7.2.ebuild 3208
+RMD160 47f824f73225aa877c4d32727ea7d5b21354429e hplip-1.7.2.ebuild 3208
+SHA256 d4896f85a67e0e1dc4609b3501f23f041657cce73270872de6f4c0e7a50fc9c6 hplip-1.7.2.ebuild 3208
+MISC ChangeLog 9295 RMD160 7c7039809218da2b41c30bb2ee151548e32cefe6 SHA1 dff366d9a94f9eea696eff674da0e77b37fc65e8 SHA256 6878e4711b45d15b93f8aa686ce297ff2c13006e5b4dcb9761751c6ecb4ac1aa
+MD5 6e8b7f769fbbc324acf3e659902fd97c ChangeLog 9295
+RMD160 7c7039809218da2b41c30bb2ee151548e32cefe6 ChangeLog 9295
+SHA256 6878e4711b45d15b93f8aa686ce297ff2c13006e5b4dcb9761751c6ecb4ac1aa ChangeLog 9295
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 metadata.xml 161
@@ -46,16 +34,6 @@ SHA256 e04252a3484d93417d9e32f27158e97819517e2b0f7408abf49247a7f78b5387 files/di
 MD5 2bbef9d8400c26b5a2bc15636d0db05b files/digest-hplip-1.6.10 521
 RMD160 fdbb47f4de10565f30fc32fcaa11d63def826a41 files/digest-hplip-1.6.10 521
 SHA256 a6a40ef739f13c2b5baf4d46161d709d65d1770a0bef40d472cd3161562c92ef files/digest-hplip-1.6.10 521
-MD5 25709caf12f71ccff6338308fda25d91 files/digest-hplip-1.6.12 521
-RMD160 e367642fb5c3875b48eba53c30ff237bdef297df files/digest-hplip-1.6.12 521
-SHA256 2a2ae331805179cb84ed4a7b4443a5e461f87544e8411127ea2f539180c06f86 files/digest-hplip-1.6.12 521
-MD5 4a96c1785e157ed4d9748528ae5eee67 files/digest-hplip-1.7.1 518
-RMD160 332e1945753918e84a23a91c0b6646d2cbc66a57 files/digest-hplip-1.7.1 518
-SHA256 23a17862b356504005764189abe03f10a1cbb5e140f91c942c827bce5db59a3d files/digest-hplip-1.7.1 518
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFF4s+lNQqtfCuFneMRAtZGAJwIltU0Vf4p2cUF/ObVAaROHu1gSQCcCRrR
-q5ZKEv/69CGh4L88KsBr24s=
-=g4IN
------END PGP SIGNATURE-----
+MD5 cbdb59f4e22268c37ad7cf9d0886362a files/digest-hplip-1.7.2 518
+RMD160 279e796718a15309ac604ed880b673c3cc9e7aec files/digest-hplip-1.7.2 518
+SHA256 a1281b7e2c89692a165c0e1d34961ed502b34f6d428ff425f5cd582b354e8219 files/digest-hplip-1.7.2 518
diff --git a/net-print/hplip/files/digest-hplip-1.6.12 b/net-print/hplip/files/digest-hplip-1.6.12
deleted file mode 100644
index ae62527870b2..000000000000
--- a/net-print/hplip/files/digest-hplip-1.6.12
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
-RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
-SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
-MD5 8adcb93703f6e90510f51b3cf96567c9 hplip-1.6.12.tar.gz 10679971
-RMD160 eec181a1edbbb9087118b4f4c9447b042e202814 hplip-1.6.12.tar.gz 10679971
-SHA256 dd7d992c9d79c3ee7b2949a0c68034411e98f16f2a19aecb120f8d03bc5f8b24 hplip-1.6.12.tar.gz 10679971
diff --git a/net-print/hplip/files/digest-hplip-1.7.1 b/net-print/hplip/files/digest-hplip-1.7.1
deleted file mode 100644
index 9c5196847453..000000000000
--- a/net-print/hplip/files/digest-hplip-1.7.1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 1c4b65222333d048450d37082d521b1e foomatic-db-hpijs-20060720.tar.gz 98252
-RMD160 0c2c09f3cea6fc2a8e5da216bd9996b96d91613d foomatic-db-hpijs-20060720.tar.gz 98252
-SHA256 1e50f603b46b1d07980212b2e5dfc5d72d07c889259e79ecbf09469fef5ad20e foomatic-db-hpijs-20060720.tar.gz 98252
-MD5 1732a8544413ba8557c8b71929d848fa hplip-1.7.1.tar.gz 10874573
-RMD160 a6fb08542256408c29fc08974442c89308a7a0a7 hplip-1.7.1.tar.gz 10874573
-SHA256 155bddb595466a8008665fb1bbef6ab2a84addfc0cb3e60fa63592dc4525eac8 hplip-1.7.1.tar.gz 10874573
diff --git a/net-print/hplip/files/hplip-1.7.1-1.patch b/net-print/hplip/files/hplip-1.7.1-1.patch
deleted file mode 100644
index f5c4f61f41fe..000000000000
--- a/net-print/hplip/files/hplip-1.7.1-1.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -uNr hplip-1.7.1_old/prnt/hpijs/dj3320.cpp hplip-1.7.1_new/prnt/hpijs/dj3320.cpp
---- hplip-1.7.1_old/prnt/hpijs/dj3320.cpp	2007-01-24 15:42:03.000000000 -0800
-+++ hplip-1.7.1_new/prnt/hpijs/dj3320.cpp	2007-01-31 13:33:42.000000000 -0800
-@@ -3066,7 +3066,7 @@
-     }
- 
-     // Send Sync packet
--    err = pPrinterXBow->Send (pbySync, (DWORD) sizeof (pbySync));
-+    err = pPrinterXBow->Send (pbySync, SYNCSIZE);
-     if(err)
-     {
-         return err;
diff --git a/net-print/hplip/hplip-1.6.12.ebuild b/net-print/hplip/hplip-1.6.12.ebuild
deleted file mode 100644
index a63474774315..000000000000
--- a/net-print/hplip/hplip-1.6.12.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.6.12.ebuild,v 1.1 2007/01/07 10:00:03 genstef Exp $
-
-inherit eutils
-
-DB_V=20060720
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hplip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-	foomaticdb? (
-		http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz
-		http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt3 ppds scanner"
-
-DEPEND=">=dev-lang/python-2.2.0
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		|| (
-			X? ( >=media-gfx/xsane-0.89 )
-			>=media-gfx/sane-frontends-1.0.9
-		)
-	)
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug-base
-	net-print/cups
-	foomaticdb? ( net-print/foomatic-db-engine )
-	>=net-print/foomatic-filters-3.0.2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# avoid collisions with cups-1.2 compat symlinks
-	if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
-		rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable snmp network-build) \
-		$(use_enable cups cups-install) \
-		$(use_enable ppds foomatic-install) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		emake || die "emake failed"
-	fi
-}
-
-
-src_install() {
-	# cups-1.2 installation paths, make sure that the .desktop is installed
-	sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
-		-e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
-		-e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
-		Makefile
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/hplip.init.d hplip
-
-	if use scanner; then
-		dodir /usr/$(get_libdir)/sane
-		for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
-			dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
-	else
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
-		rm -f "${D}"/etc/sane.d/dll.conf
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,toolbox}
-		rm -f "${D}"/usr/share/applications/hplip.desktop
-		rm -f "${D}"/usr/lib/menu/hplip
-	fi
-
-	rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-}
-
-pkg_preinst() {
-	if use scanner; then
-		insinto /etc/sane.d
-		[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
-		[ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
-		grep -q hpaio dll.conf || echo hpaio >> dll.conf
-		doins dll.conf
-	fi
-}
diff --git a/net-print/hplip/hplip-1.7.1.ebuild b/net-print/hplip/hplip-1.7.1.ebuild
deleted file mode 100644
index 47ccdbb8562f..000000000000
--- a/net-print/hplip/hplip-1.7.1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-1.7.1.ebuild,v 1.1 2007/02/19 22:49:58 genstef Exp $
-
-inherit eutils
-
-DB_V=20060720
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hplip.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-	foomaticdb? (
-		http://gentooexperimental.org/~genstef/dist/foomatic-db-hpijs-${DB_V}.tar.gz
-		http://www.linuxprinting.org/download/foomatic/foomatic-db-hpijs-${DB_V}.tar.gz
-	)"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="foomaticdb snmp X qt3 ppds scanner"
-
-DEPEND=">=dev-lang/python-2.2.0
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj
-	virtual/ghostscript
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		|| (
-			X? ( >=media-gfx/xsane-0.89 )
-			>=media-gfx/sane-frontends-1.0.9
-		)
-	)
-	qt3? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	>=dev-libs/libusb-0.1.10a
-	sys-apps/hotplug-base
-	net-print/cups
-	foomaticdb? ( net-print/foomatic-db-engine )
-	>=net-print/foomatic-filters-3.0.2"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
-	# avoid collisions with cups-1.2 compat symlinks
-	if [ -e ${ROOT}/usr/lib/cups/backend/hp ] && [ -e ${ROOT}/usr/libexec/cups/backend/hp ]; then
-		rm -f ${ROOT}/usr/libexec/cups/backend/hp{,fax};
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch ${FILESDIR}/hplip-1.7.1-1.patch
-
-	# bug 98428
-	sed -i -e "s:/usr/bin/env python:/usr/bin/python:g" \
-		hpssd.py
-}
-src_compile() {
-	econf \
-		$(use_enable snmp network-build) \
-		$(use_enable cups cups-install) \
-		$(use_enable ppds foomatic-install) \
-		|| die "econf failed"
-	emake || die "emake failed"
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		emake || die "emake failed"
-	fi
-}
-
-
-src_install() {
-	# cups-1.2 installation paths, make sure that the .desktop is installed
-	sed -i -e "s:/usr/lib/cups:$(cups-config --serverbin):" \
-		-e 's:\(ICON_FILE = \).*:\1hplip.desktop:' \
-		-e 's:\(ICON_PATH = \).*:\1/usr/share/applications:' \
-		Makefile
-
-	emake -j1 DESTDIR="${D}" install || die "emake install failed"
-
-	newinitd "${FILESDIR}"/hplip.init.d hplip
-
-	if use scanner; then
-		dodir /usr/$(get_libdir)/sane
-		for i in libsane-hpaio.{la,so{,.1{,.0.0}}}; do
-			dosym /usr/$(get_libdir)/${i} /usr/$(get_libdir)/sane/${i}; done
-	else
-		rm -f "${D}"/usr/$(get_libdir)/libsane-hpaio.{la,so{,.1{,.0.0}}}
-		rm -f "${D}"/etc/sane.d/dll.conf
-	fi
-
-	# bug 106035
-	if ! use qt3 ; then
-		rm -f "${D}"/usr/{bin/hp-,share/hplip/}{print,toolbox}
-		rm -f "${D}"/usr/share/applications/hplip.desktop
-		rm -f "${D}"/usr/lib/menu/hplip
-	fi
-
-	rm -rf ${D}/$(cups-config --serverbin)/filter ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		emake DESTDIR="${D}" install || die "emake install failed"
-	fi
-}
-
-pkg_preinst() {
-	if use scanner; then
-		insinto /etc/sane.d
-		[ -e /etc/sane.d/dll.conf ] && cp /etc/sane.d/dll.conf .
-		[ -e ${ROOT}/etc/sane.d/dll.conf ] && cp ${ROOT}/etc/sane.d/dll.conf .
-		grep -q hpaio dll.conf || echo hpaio >> dll.conf
-		doins dll.conf
-	fi
-}