Honour user settings and fix --as-needed, bug #199536. Use DESTDIR and more clean up.

(Portage version: 2.1.3.19)

4 files changed, 134 insertions, 1 deletions

diff --git a/x11-misc/stripclub/ChangeLog b/x11-misc/stripclub/ChangeLog
index 0205fc59af35..c8901f64578b 100644
--- a/x11-misc/stripclub/ChangeLog
+++ b/x11-misc/stripclub/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for x11-misc/stripclub
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/ChangeLog,v 1.7 2007/08/23 17:56:30 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/ChangeLog,v 1.8 2007/12/01 20:57:19 coldwind Exp $
+
+*stripclub-0.9.1.2-r1 (01 Dec 2007)
+
+  01 Dec 2007; Santiago M. Mola <coldwind@gentoo.org>
+  +files/stripclub-0.9.1.2-Makefile-fixes.patch,
+  +stripclub-0.9.1.2-r1.ebuild:
+  Honour user settings and fix --as-needed, bug #199536. Use DESTDIR and more
+  clean up.
 
   23 Aug 2007; Jeroen Roovers <jer@gentoo.org> stripclub-0.9.1.2.ebuild:
   Marked ~hppa too.
diff --git a/x11-misc/stripclub/files/digest-stripclub-0.9.1.2-r1 b/x11-misc/stripclub/files/digest-stripclub-0.9.1.2-r1
new file mode 100644
index 000000000000..ebcb8ad0bf7b
--- /dev/null
+++ b/x11-misc/stripclub/files/digest-stripclub-0.9.1.2-r1
@@ -0,0 +1,3 @@
+MD5 02fddede6805831d03b9f43c39d2c84f stripclub_0.9.1.2.tar.gz 49248
+RMD160 2045ce83ae9bc16eccf1abee3f3a14cb2c3e03ca stripclub_0.9.1.2.tar.gz 49248
+SHA256 cfb41284ec0f818841d87ae6e71e6c19b09e3b9253b51a33f9a3accce7e1bdf6 stripclub_0.9.1.2.tar.gz 49248
diff --git a/x11-misc/stripclub/files/stripclub-0.9.1.2-Makefile-fixes.patch b/x11-misc/stripclub/files/stripclub-0.9.1.2-Makefile-fixes.patch
new file mode 100644
index 000000000000..e87c73ec4b59
--- /dev/null
+++ b/x11-misc/stripclub/files/stripclub-0.9.1.2-Makefile-fixes.patch
@@ -0,0 +1,79 @@
+diff -ur stripclub-0.9.1.2.orig/configure stripclub-0.9.1.2/configure
+--- stripclub-0.9.1.2.orig/configure	2007-12-01 21:44:41.000000000 +0100
++++ stripclub-0.9.1.2/configure	2007-12-01 21:48:36.000000000 +0100
+@@ -77,12 +77,17 @@
+ 		else echo "success" ; \
+ 	fi
+ fi
+-	
++
++fltk_ldflags=`fltk-config --ldflags`
++fltk_cflags=`fltk-config --cflags`
++
+ echo "Writing Makefile.inc..."
+ sed \
+ -e "s%@prefix@%$prefix%" -e "s%@mandir@%$mandir%" \
+ -e "s%@bindir@%$bindir%" -e "s%@docdir@%$docdir%" \
+ -e "s%@browser@%$browser%" \
++-e "s%@fltk_ldflags@%$fltk_ldflags%" \
++-e "s%@fltk_cflags@%$fltk_cflags%" \
+ Makefile.inc.in >Makefile.inc
+ 
+ echo "Success! Run 'make' to compile."
+diff -ur stripclub-0.9.1.2.orig/Makefile.inc.in stripclub-0.9.1.2/Makefile.inc.in
+--- stripclub-0.9.1.2.orig/Makefile.inc.in	2007-12-01 21:44:41.000000000 +0100
++++ stripclub-0.9.1.2/Makefile.inc.in	2007-12-01 21:46:14.000000000 +0100
+@@ -3,4 +3,5 @@
+ MANDIR=@mandir@
+ DOCDIR=@docdir@
+ BROWSER=@browser@
+-
++FLTK_LDFLAGS=@fltk_ldflags@
++FLTK_CFLAGS=@fltk_cflags@
+diff -ur stripclub-0.9.1.2.orig/Makefile.linux stripclub-0.9.1.2/Makefile.linux
+--- stripclub-0.9.1.2.orig/Makefile.linux	2007-12-01 21:44:41.000000000 +0100
++++ stripclub-0.9.1.2/Makefile.linux	2007-12-01 21:45:58.000000000 +0100
+@@ -1,11 +1,11 @@
+-CC = gcc
+-CXX = g++
++CC ?= gcc
++CXX ?= g++
+ RM = rm -f
+ TARGET = stripclub
+ SOURCES = $(wildcard *.cpp)
+ OBJECTS = $(SOURCES:.cpp=.o) util.o
+-LDFLAGS = -Wall -L/usr/X11R6/lib -lfltk -lfltk_images -lpcre -lXpm
+-CFLAGS = -g -Wall -I.
++LDFLAGS += -Wall -L/usr/X11R6/lib $(FLTK_LDFLAGS) -lfltk -lfltk_images -lpcre -lXpm
++CFLAGS += -g -Wall -I. $(FLTK_CFLAGS)
+ 
+ all:	interface.h depend $(TARGET)
+ 
+@@ -28,7 +28,7 @@
+ CXXFLAGS = $(CFLAGS)
+ 
+ $(TARGET): $(OBJECTS)
+-	$(CXX) $(LDFLAGS) $(OBJECTS) -o $(TARGET)
++	$(CXX) $(OBJECTS) $(LDFLAGS) -o $(TARGET)
+ 
+ interface.cpp: interface.fl
+ 	fluid -c interface.fl
+@@ -40,12 +40,12 @@
+ 	$(RM) $(TARGET) $(OBJECTS) interface.cpp interface.h depend Makefile.inc
+ 
+ install: all
+-	strip $(TARGET)
+-	install -D -c -m 755 $(TARGET) $(BINDIR)/$(TARGET)
+-	install -D -c -m 644 $(TARGET).1 $(MANDIR)/man1/$(TARGET).1
+-	install -D -c -m 644 readme.txt FAQ $(DOCDIR)/
+-	gzip -9 $(MANDIR)/man1/$(TARGET).1
+-	gzip -9 $(DOCDIR)/readme.txt
++	install -D -c -m 755 $(TARGET) $(DESTDIR)/$(BINDIR)/$(TARGET)
++	install -D -c -m 644 $(TARGET).1 $(DESTDIR)/$(MANDIR)/man1/$(TARGET).1
++	install -D -c -m 644 readme.txt $(DESTDIR)/$(DOCDIR)/readme.txt
++	install -D -c -m 644 FAQ $(DESTDIR)/$(DOCDIR)/FAQ
++	gzip -9 $(DESTDIR)/$(MANDIR)/man1/$(TARGET).1
++	gzip -9 $(DESTDIR)/$(DOCDIR)/readme.txt
+ 
+ uninstall:
+ 	rm -f $(BINDIR)/$(TARGET)
diff --git a/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild b/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild
new file mode 100644
index 000000000000..9e5c2459fe61
--- /dev/null
+++ b/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild,v 1.1 2007/12/01 20:57:19 coldwind Exp $
+
+inherit eutils
+
+MY_P="${PN}_${PV}"
+
+DESCRIPTION="A webcomic reader."
+HOMEPAGE="http://stripclub.sourceforge.net/"
+SRC_URI="mirror://sourceforge/stripclub/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86"
+IUSE=""
+
+DEPEND=">=x11-libs/fltk-1.1.4
+		>=dev-libs/libpcre-5.0
+		>=media-libs/libpng-1.2.8
+		>=media-libs/jpeg-6b-r4
+		x11-libs/libXpm"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-Makefile-fixes.patch
+}
+
+src_compile() {
+	# No standard configure script.
+	./configure \
+		--prefix=/usr \
+		--bindir=/usr/bin \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PN} \
+		--skip-tests || die "./configure failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+}