Fixed symlink creation, fixed version in 0.52.2.

(Portage version: 2.1.3.9)

4 files changed, 14 insertions, 60 deletions

diff --git a/dev-libs/newt/ChangeLog b/dev-libs/newt/ChangeLog
index 9c120b40f5ea..cbc064a852e2 100644
--- a/dev-libs/newt/ChangeLog
+++ b/dev-libs/newt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/newt
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.33 2008/01/18 14:59:05 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/ChangeLog,v 1.34 2008/01/18 15:16:12 xmerlin Exp $
+
+  18 Jan 2008; Christian Zoffoli <xmerlin@gentoo.org>
+  -files/newt-0.52.7-DESTDIR.patch, newt-0.52.2.ebuild, newt-0.52.7.ebuild:
+  Fixed symlink creation, fixed version in 0.52.2.
 
   18 Jan 2008; Christian Zoffoli <xmerlin@gentoo.org> newt-0.52.2.ebuild,
   newt-0.52.7.ebuild:
diff --git a/dev-libs/newt/files/newt-0.52.7-DESTDIR.patch b/dev-libs/newt/files/newt-0.52.7-DESTDIR.patch
deleted file mode 100644
index 6fd268871ef2..000000000000
--- a/dev-libs/newt/files/newt-0.52.7-DESTDIR.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-diff -uNr newt-0.52.7.orig/Makefile.in newt-0.52.7/Makefile.in
---- newt-0.52.7.orig/Makefile.in	2008-01-15 17:04:32.000000000 +0100
-+++ newt-0.52.7/Makefile.in	2008-01-15 17:04:58.000000000 +0100
-@@ -107,25 +107,25 @@
- 	$(CC) $(SHCFLAGS) -c $(CFLAGS) $(CPPFLAGS) -o $@ $<
- 
- install: $(LIBNEWT) install-sh whiptail
--	[ -d $(instroot)/$(bindir) ] || install -m 755 -d $(instroot)/$(bindir)
--	[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
--	[ -d $(instroot)/$(includedir) ] || install -m 755 -d $(instroot)/$(includedir)
--	[ -d $(instroot)/$(man1dir) ] || install -m 755 -d $(instroot)/$(man1dir)
--	install -m 644 newt.h $(instroot)/$(includedir)
--	install -m 644 $(LIBNEWT) $(instroot)/$(libdir)
--	install -m 755 whiptail $(instroot)/$(bindir)
--	install -m 644 whiptail.1 $(instroot)/$(man1dir)
--	make -C po datadir=$(instroot)/$(datadir) install
-+	[ -d $(DESTDIR)/$(bindir) ] || install -m 755 -d $(DESTDIR)/$(bindir)
-+	[ -d $(DESTDIR)/$(libdir) ] || install -m 755 -d $(DESTDIR)/$(libdir)
-+	[ -d $(DESTDIR)/$(includedir) ] || install -m 755 -d $(DESTDIR)/$(includedir)
-+	[ -d $(DESTDIR)/$(man1dir) ] || install -m 755 -d $(DESTDIR)/$(man1dir)
-+	install -m 644 newt.h $(DESTDIR)/$(includedir)
-+	install -m 644 $(LIBNEWT) $(DESTDIR)/$(libdir)
-+	install -m 755 whiptail $(DESTDIR)/$(bindir)
-+	install -m 644 whiptail.1 $(DESTDIR)/$(man1dir)
-+	make -C po datadir=$(DESTDIR)/$(datadir) install
- 
- install-sh: sharedlib _snackmodule.so
--	[ -d $(instroot)/$(libdir) ] || install -m 755 -d $(instroot)/$(libdir)
--	install -m 755 $(LIBNEWTSH) $(instroot)/$(libdir)
--	ln -sf $(LIBNEWTSONAME) $(instroot)/$(libdir)/libnewt.so
--	ln -sf $(LIBNEWTSH) $(instroot)/$(libdir)/$(LIBNEWTSONAME)
-+	[ -d $(DESTDIR)/$(libdir) ] || install -m 755 -d $(DESTDIR)/$(libdir)
-+	install -m 755 $(LIBNEWTSH) $(DESTDIR)/$(libdir)
-+	ln -sf $(LIBNEWTSONAME) $(DESTDIR)/$(libdir)/libnewt.so
-+	ln -sf $(LIBNEWTSH) $(DESTDIR)/$(libdir)/$(LIBNEWTSONAME)
- 	for ver in $(PYTHONVERS) ; do \
--	   [ -d $(instroot)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(instroot)/$(libdir)/$$ver/site-packages ;\
--	   install -m 755 $$ver/_snackmodule.so $(instroot)/$(libdir)/$$ver/site-packages ;\
--	   install -m 644 snack.py $(instroot)/$(libdir)/$$ver/site-packages ;\
-+	   [ -d $(DESTDIR)/$(libdir)/$$ver/site-packages ] || install -m 755 -d $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
-+	   install -m 755 $$ver/_snackmodule.so $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
-+	   install -m 644 snack.py $(DESTDIR)/$(libdir)/$$ver/site-packages ;\
- 	done
- 
- configure:  configure.ac newt.spec
diff --git a/dev-libs/newt/newt-0.52.2.ebuild b/dev-libs/newt/newt-0.52.2.ebuild
index 8b31995d72ff..980251de1033 100644
--- a/dev-libs/newt/newt-0.52.2.ebuild
+++ b/dev-libs/newt/newt-0.52.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.2.ebuild,v 1.6 2008/01/18 14:59:05 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.2.ebuild,v 1.7 2008/01/18 15:16:12 xmerlin Exp $
 
 inherit python toolchain-funcs eutils rpm
 
@@ -45,8 +45,10 @@ src_unpack() {
 
 	# bug 73850
 	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' ${S}/Makefile.in
+		sed -i -e 's:-lslang:-lslang -lncurses:g' "${S}"/Makefile.in
 	fi
+
+	sed -i -e 's:0.52.1:0.52.2:g' "${S}"/configure || die
 }
 
 src_compile() {
@@ -77,5 +79,5 @@ src_install () {
 	doman whiptail.1
 
 	# Don't know if it's needed but it was here before so leaving /peper
-	dosym libnewt.so.0.52.1 /usr/$(get_libdir)/libnewt.so.0.52
+	dosym libnewt.so.0.52.2 /usr/$(get_libdir)/libnewt.so.0.52
 }
diff --git a/dev-libs/newt/newt-0.52.7.ebuild b/dev-libs/newt/newt-0.52.7.ebuild
index 33093a4ea587..db23bcaa72bd 100644
--- a/dev-libs/newt/newt-0.52.7.ebuild
+++ b/dev-libs/newt/newt-0.52.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.7.ebuild,v 1.3 2008/01/18 14:59:05 xmerlin Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/newt/newt-0.52.7.ebuild,v 1.4 2008/01/18 15:16:12 xmerlin Exp $
 
 inherit python toolchain-funcs eutils rpm
 
@@ -26,21 +26,16 @@ src_unpack() {
 	rpm_src_unpack
 	cd "${S}"
 
-	# bug 73850
-	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' ${S}/Makefile.in
-	fi
-
 	if ! use tcl; then
 		epatch "${FILESDIR}"/${P}-notcl.patch || die
 	fi
 
-	epatch "${FILESDIR}"/${P}-DESTDIR.patch || die
-
 	# bug 73850
 	if use elibc_uclibc; then
-		sed -i -e 's:-lslang:-lslang -lncurses:g' ${S}/Makefile.in
+		sed -i -e 's:-lslang:-lslang -lncurses:g' "${S}"/Makefile.in
 	fi
+
+	sed -i -e 's:instroot:DESTDIR:g' "${S}"/Makefile.in || die
 }
 
 src_compile() {
@@ -71,6 +66,4 @@ src_install () {
 	dodoc peanuts.py popcorn.py tutorial.sgml
 	doman whiptail.1
 
-	# Don't know if it's needed but it was here before so leaving /peper
-	dosym libnewt.so.0.52.1 /usr/$(get_libdir)/libnewt.so.0.52
 }