Use newinitd instead of exeinto, newexe.

(Portage version: 2.0.54)

5 files changed, 8 insertions, 106 deletions

diff --git a/net-print/hplip/ChangeLog b/net-print/hplip/ChangeLog
index 8fae81781a38..108c91dded2f 100644
--- a/net-print/hplip/ChangeLog
+++ b/net-print/hplip/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-print/hplip
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.17 2006/01/21 14:44:17 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.18 2006/01/24 23:40:27 vanquirius Exp $
+
+  24 Jan 2006; Marcelo Goes <vanquirius@gentoo.org> -hplip-0.9.5.ebuild,
+  hplip-0.9.7-r3.ebuild:
+  Use newinitd instead of exeinto, newexe.
 
   21 Jan 2006; Lars Weiler <pylon@gentoo.org> hplip-0.9.7-r3.ebuild:
   Stable on ppc; Bug #112425.
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 19430c1b48c5..5e54116edeb1 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,7 +1,5 @@
 MD5 6175d5b6755ce30eff8c7fe3991873c1 ChangeLog 2962
-MD5 cbf1b3a3716e0de9faef1b950ad93b9d files/digest-hplip-0.9.5 145
 MD5 68a5b9bc1ecb54c47e0aec2ea66b457a files/digest-hplip-0.9.7-r3 208
 MD5 dcda3bf144b5f2cd4bebd1719383dd31 files/hplip.init.d 948
-MD5 b8797d3c934c32f6ad30b83ac842356b hplip-0.9.5.ebuild 2709
-MD5 4015ed4519eddf08d2cbf1b185dbfb4b hplip-0.9.7-r3.ebuild 3197
+MD5 8e74ec33903f1df147d89cf86cfa7003 hplip-0.9.7-r3.ebuild 3178
 MD5 26b4b081d538c195dc39bcb2ec8e6f3a metadata.xml 161
diff --git a/net-print/hplip/files/digest-hplip-0.9.5 b/net-print/hplip/files/digest-hplip-0.9.5
deleted file mode 100644
index f41659a681d2..000000000000
--- a/net-print/hplip/files/digest-hplip-0.9.5
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 cb71d665ff935129029c78148b2b0c23 hplip-0.9.5.tar.gz 9390140
-MD5 434aa5ed2a6cc197ac2bc0d71cc9db2c foomatic-db-hpijs-1.5-20050925.tar.gz 87735
diff --git a/net-print/hplip/hplip-0.9.5.ebuild b/net-print/hplip/hplip-0.9.5.ebuild
deleted file mode 100644
index 101b895d1fe4..000000000000
--- a/net-print/hplip/hplip-0.9.5.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.5.ebuild,v 1.3 2005/11/16 09:25:05 lu_zero Exp $
-
-inherit eutils
-
-DB_V=1.5-20050925
-DESCRIPTION="HP Linux Imaging and Printing System. Includes net-print/hpijs, scanner drivers and service tools."
-HOMEPAGE="http://hpinkjet.sourceforge.net/"
-SRC_URI="mirror://sourceforge/hpinkjet/${P}.tar.gz
-	foomaticdb? ( 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 qt ppds scanner cups usb"
-
-DEPEND="dev-lang/python
-	snmp? ( >=net-analyzer/net-snmp-5.0.9 )
-	!net-print/hpijs
-	!net-print/hpoj"
-
-RDEPEND="virtual/ghostscript
-	>=dev-lang/python-2.2.0
-	scanner? (
-		>=media-gfx/sane-backends-1.0.9
-		|| (
-			X? ( >=media-gfx/xsane-0.89 )
-			>=media-gfx/sane-frontends-1.0.9
-		)
-	)
-	qt? ( >=dev-python/PyQt-3.11 =x11-libs/qt-3* )
-	usb? ( >=dev-libs/libusb-0.1.10a sys-apps/hotplug )
-	foomaticdb? ( net-print/foomatic )
-	cups? ( net-print/cups )
-	${DEPEND}"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:(uint32_t)0xff000000) >> 24))):(uint32_t)0xff000000) >> 24):" \
-		${S}/scan/sane/mfpdtf.h
-}
-src_compile() {
-	myconf="${myconf} --disable-cups-install --disable-foomatic-install"
-
-	use snmp || myconf="${myconf} --disable-network-build"
-
-	econf ${myconf} || die "Error: econf failed!"
-	emake || die "Error: emake failed!"
-}
-
-
-src_install() {
-	make DESTDIR=${D} install
-
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/hplip.init.d hplip
-
-	if use scanner; then
-		insinto /etc/sane.d
-		echo "hpaio" > dll.conf
-		doins dll.conf
-
-		dodir /usr/lib/sane
-		dosym /usr/lib/libsane-hpaio.la /usr/lib/sane/libsane-hpaio.la
-		dosym /usr/lib/libsane-hpaio.so /usr/lib/sane/libsane-hpaio.so
-		dosym /usr/lib/libsane-hpaio.so.1 /usr/lib/sane/libsane-hpaio.so.1
-		dosym /usr/lib/libsane-hpaio.so.1.0.0 /usr/lib/sane/libsane-hpaio.so.1.0.0
-	else
-		rm -f ${D}/usr/lib/libsane-hpaio.la
-		rm -f ${D}/usr/lib/libsane-hpaio.so
-		rm -f ${D}/usr/lib/libsane-hpaio.so.1
-		rm -f ${D}/usr/lib/libsane-hpaio.so.1.0.0
-	fi
-
-	if use ppds; then
-		dodir /usr/share
-		mv ${S}/prnt/hpijs/ppd ${D}/usr/share
-	fi
-
-	if use cups && use ppds ; then
-		dodir /usr/share/cups/model
-		dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds
-	fi
-
-	[ -e /usr/bin/foomatic-rip ] && rm -f ${D}/usr/bin/foomatic-rip
-
-	if use foomaticdb ; then
-		cd ../foomatic-db-hpijs-${DB_V}
-		econf || die "econf failed"
-		rm -fR data-generators/hpijs-rss
-		make || die
-		make DESTDIR=${D} install || die
-	fi
-
-	dodir /usr/share/applications
-	mv ${D}/usr/share/hplip/data/hplip.desktop ${D}/usr/share/applications
-}
diff --git a/net-print/hplip/hplip-0.9.7-r3.ebuild b/net-print/hplip/hplip-0.9.7-r3.ebuild
index e572033da46a..cf10de7fdc1f 100644
--- a/net-print/hplip/hplip-0.9.7-r3.ebuild
+++ b/net-print/hplip/hplip-0.9.7-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.2 2006/01/21 14:44:17 pylon Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-0.9.7-r3.ebuild,v 1.3 2006/01/24 23:40:27 vanquirius Exp $
 
 inherit eutils
 
@@ -65,8 +65,7 @@ src_compile() {
 src_install() {
 	make DESTDIR="${D}" install
 
-	exeinto /etc/init.d
-	newexe "${FILESDIR}"/hplip.init.d hplip
+	newinitd "${FILESDIR}"/hplip.init.d hplip
 
 	if use scanner; then
 		insinto /etc/sane.d