part of the problem with the new version is that the sourcefile uses PREFIX so it wants to put config files in /usr/etc of all things. Since this was in stable, I'm moving this revision bump with a sed statement to remove the nonsense in the sourcefile to stable x86. Closes bug #53374 by Joshua Banks <l0f33t@yahoo.com>

8 files changed, 34 insertions, 119 deletions

diff --git a/net-dns/noip-updater/ChangeLog b/net-dns/noip-updater/ChangeLog
index 0b6d8b1773ac..58ef8ff62040 100644
--- a/net-dns/noip-updater/ChangeLog
+++ b/net-dns/noip-updater/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for net-dns/noip-updater
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/noip-updater/ChangeLog,v 1.10 2004/06/06 09:14:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/noip-updater/ChangeLog,v 1.11 2004/06/09 07:50:04 seemant Exp $
+
+*noip-updater-2.1.1-r1 (09 Jun 2004)
+
+  09 Jun 2004; Seemant Kulleen <seemant@gentoo.org> -noip-updater-1.6.ebuild,
+  -noip-updater-2.0.12.ebuild, +noip-updater-2.1.1-r1.ebuild,
+  -noip-updater-2.1.1.ebuild:
+  part of the problem with the new version is that the sourcefile uses PREFIX so
+  it wants to put config files in /usr/etc of all things. Since this was in
+  stable, I'm moving this revision bump with a sed statement to remove the
+  nonsense in the sourcefile to stable x86. Closes bug #53374 by Joshua Banks
+  <l0f33t@yahoo.com>
 
   06 Jun 2004; Daniel Black <dragonheart@gentoo.org>
   noip-updater-2.0.15.ebuild, noip-updater-2.1.1.ebuild:
diff --git a/net-dns/noip-updater/Manifest b/net-dns/noip-updater/Manifest
index 36318accc6e9..502d019f43b4 100644
--- a/net-dns/noip-updater/Manifest
+++ b/net-dns/noip-updater/Manifest
@@ -1,16 +1,16 @@
-MD5 93a5b8e26de6a8922902195f290ae9ab ChangeLog 1746
 MD5 175b403093184bfc8ce1924423567694 noip-updater-1.6.ebuild 1194
 MD5 9f8d940f71490d88f8eaab247b5600d0 noip-updater-2.0.12.ebuild 1211
-MD5 34e9615ea37f3cf8195d6de7e3a7ee08 noip-updater-2.0.15.ebuild 1216
-MD5 387952081fa66aa458d3a3aadaa9b0f5 noip-updater-2.1.1.ebuild 1253
+MD5 490324d1edf3b0a3a1afbec5c2e39580 noip-updater-2.1.1-r1.ebuild 1455
+MD5 93a5b8e26de6a8922902195f290ae9ab ChangeLog 1746
 MD5 59f8f78071065fe63f2115a2f5ec3036 metadata.xml 376
+MD5 34e9615ea37f3cf8195d6de7e3a7ee08 noip-updater-2.0.15.ebuild 1216
 MD5 1f86b2531c8f115fa178f23b095d0140 files/noip-2.1.1.patch 486
-MD5 b6525d36838e7db757ee152a1bbdc8f6 files/digest-noip-updater-1.6 68
+MD5 ced8f9146ce6aaaa6254e329056676da files/noip2.start 786
 MD5 f9e8f8e05086da02238c8224c29234d5 files/digest-noip-updater-2.0.12 62
 MD5 99b1c0cb4c76aad553644c0a5b2dab81 files/digest-noip-updater-2.0.15 62
+MD5 9e3e84c3f86b94767256ba5b41f5b5fa files/digest-noip-updater-2.1.1-r1 61
 MD5 30c80856624fffbea9f30895dbeb411e files/noip-2.0.12.patch 647
-MD5 52f1769a9095b987cf951d77b3bed3ce files/noip-2.0.15.patch 647
-MD5 72fe1de71cd094fa1a00d0e1bc742dcd files/noip.c.patch 234
+MD5 b6525d36838e7db757ee152a1bbdc8f6 files/digest-noip-updater-1.6 68
 MD5 dbba0145cdeb92a600483d7addcd8837 files/noip.start 692
-MD5 ced8f9146ce6aaaa6254e329056676da files/noip2.start 786
-MD5 9e3e84c3f86b94767256ba5b41f5b5fa files/digest-noip-updater-2.1.1 61
+MD5 72fe1de71cd094fa1a00d0e1bc742dcd files/noip.c.patch 234
+MD5 52f1769a9095b987cf951d77b3bed3ce files/noip-2.0.15.patch 647
diff --git a/net-dns/noip-updater/files/digest-noip-updater-1.6 b/net-dns/noip-updater/files/digest-noip-updater-1.6
deleted file mode 100644
index 2f507295abd6..000000000000
--- a/net-dns/noip-updater/files/digest-noip-updater-1.6
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6503e2e7d8ea35c304744a318b400a09 noip_updater_v1.6.tar.gz 42343
diff --git a/net-dns/noip-updater/files/digest-noip-updater-2.0.12 b/net-dns/noip-updater/files/digest-noip-updater-2.0.12
deleted file mode 100644
index c90f36f14fad..000000000000
--- a/net-dns/noip-updater/files/digest-noip-updater-2.0.12
+++ /dev/null
@@ -1 +0,0 @@
-MD5 72053672a5125d39b861a130aa4532f1 noip-2.0.12.tar.gz 68089
diff --git a/net-dns/noip-updater/files/digest-noip-updater-2.1.1 b/net-dns/noip-updater/files/digest-noip-updater-2.1.1-r1
index d30151dbab9f..d30151dbab9f 100644
--- a/net-dns/noip-updater/files/digest-noip-updater-2.1.1
+++ b/net-dns/noip-updater/files/digest-noip-updater-2.1.1-r1
diff --git a/net-dns/noip-updater/noip-updater-1.6.ebuild b/net-dns/noip-updater/noip-updater-1.6.ebuild
deleted file mode 100644
index ff4264650963..000000000000
--- a/net-dns/noip-updater/noip-updater-1.6.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/noip-updater/noip-updater-1.6.ebuild,v 1.4 2004/06/05 16:23:31 kloeri Exp $
-
-IUSE=""
-
-MY_P=${PN/-/_}_v${PV}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="no-ip.com dynamic DNS updater"
-HOMEPAGE="http://www.no-ip.com"
-SRC_URI="http://www.no-ip.com/client/linux/${MY_P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86"
-
-DEPEND="virtual/glibc"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	ebegin "Patching noip.c..."
-		patch noip.c < ${FILESDIR}/noip.c.patch || die
-	eend
-}
-
-pkg_config() {
-	cd /tmp
-	einfo "Answer the following questions."
-	(no-ip.sh && mv no-ip.conf /etc/no-ip.conf) || die
-	ln -s /etc/no-ip.conf /usr/lib/no-ip.conf >& /dev/null
-}
-
-src_compile() {
-	emake || die
-}
-
-src_install() {
-	into /usr
-	dosbin noip
-	dosbin no-ip.sh
-	docinto ${P}
-	dodoc README.FIRST
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/noip.start noip
-	prepalldocs
-}
-
-pkg_postinst() {
-
-	einfo "Configuration can be done manually via:"
-	einfo "/usr/sbin/no-ip.sh; or "
-	einfo "first time you use the /etc/init.d/noip script; or"
-	einfo "by using this ebuild's config option."
-}
diff --git a/net-dns/noip-updater/noip-updater-2.0.12.ebuild b/net-dns/noip-updater/noip-updater-2.0.12.ebuild
deleted file mode 100644
index f48032cc637f..000000000000
--- a/net-dns/noip-updater/noip-updater-2.0.12.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/noip-updater/noip-updater-2.0.12.ebuild,v 1.5 2004/06/05 16:23:31 kloeri Exp $
-
-inherit base
-
-IUSE=""
-
-MY_P=${P/-updater/}
-S=${WORKDIR}/${MY_P}
-DESCRIPTION="no-ip.com dynamic DNS updater"
-HOMEPAGE="http://www.no-ip.com"
-SRC_URI="http://www.no-ip.com/client/linux/${MY_P}.tar.gz"
-PATCHES="${FILESDIR}/${MY_P}.patch"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="x86 ~ppc ~sparc ~alpha ~hppa ~mips ~amd64 ~ia64 ~ppc64"
-
-DEPEND="virtual/glibc"
-
-pkg_config() {
-	cd /tmp
-	einfo "Answer the following questions."
-	noip2 -C || die
-}
-
-src_compile() {
-	emake PREFIX=/usr || die
-}
-
-src_install() {
-	into /usr
-	dosbin noip2
-	dodoc README.FIRST COPYING
-	exeinto /etc/init.d
-	newexe ${FILESDIR}/noip2.start noip
-	prepalldocs
-}
-
-pkg_postinst() {
-
-	einfo "Configuration can be done manually via:"
-	einfo "/usr/sbin/noip2 -C or "
-	einfo "first time you use the /etc/init.d/noip script; or"
-	einfo "by using this ebuild's config option."
-	einfo
-	einfo "You must update the /etc/init.d/noip script, the "
-	einfo "binary name and the command line options have "
-	einfo "changed."
-}
diff --git a/net-dns/noip-updater/noip-updater-2.1.1.ebuild b/net-dns/noip-updater/noip-updater-2.1.1-r1.ebuild
index 8613d90f6e5f..ca141532a904 100644
--- a/net-dns/noip-updater/noip-updater-2.1.1.ebuild
+++ b/net-dns/noip-updater/noip-updater-2.1.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/noip-updater/noip-updater-2.1.1.ebuild,v 1.3 2004/06/06 09:14:03 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/noip-updater/noip-updater-2.1.1-r1.ebuild,v 1.1 2004/06/09 07:50:04 seemant Exp $
 
 inherit eutils
 
@@ -21,8 +21,20 @@ RDEPEND="virtual/glibc"
 
 DEPEND="${RDEPEND} sys-devel/gcc"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	sed -i \
+		-e "s:\(#define CONFIG_FILEPATH\).*:\1 \"/etc\":" \
+		-e "s:\(#define CONFIG_FILENAME\).*:\1 \"/etc/no-ip2.conf\":" \
+		noip2.c
+}
+
 src_compile() {
-	emake PREFIX=/usr || die
+	emake \
+		PREFIX=/usr \
+		CONFDIR=/etc || die
 }
 
 src_install() {