diff options
author | Santiago M. Mola <coldwind@gentoo.org> | 2007-12-01 20:57:20 +0000 |
---|---|---|
committer | Santiago M. Mola <coldwind@gentoo.org> | 2007-12-01 20:57:20 +0000 |
commit | 44cee1ecc066dc164f5bd3fec0c74ccb3f3644c5 (patch) | |
tree | 1cc8fd7592ca35af9633a095eed4af734d3bc71d /x11-misc/stripclub | |
parent | old (diff) | |
download | historical-44cee1ecc066dc164f5bd3fec0c74ccb3f3644c5.tar.gz historical-44cee1ecc066dc164f5bd3fec0c74ccb3f3644c5.tar.bz2 historical-44cee1ecc066dc164f5bd3fec0c74ccb3f3644c5.zip |
Honour user settings and fix --as-needed, bug #199536. Use DESTDIR and more clean up.
Package-Manager: portage-2.1.3.19
Diffstat (limited to 'x11-misc/stripclub')
-rw-r--r-- | x11-misc/stripclub/ChangeLog | 10 | ||||
-rw-r--r-- | x11-misc/stripclub/Manifest | 19 | ||||
-rw-r--r-- | x11-misc/stripclub/files/digest-stripclub-0.9.1.2-r1 | 3 | ||||
-rw-r--r-- | x11-misc/stripclub/files/stripclub-0.9.1.2-Makefile-fixes.patch | 79 | ||||
-rw-r--r-- | x11-misc/stripclub/stripclub-0.9.1.2-r1.ebuild | 43 |
5 files changed, 149 insertions, 5 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/Manifest b/x11-misc/stripclub/Manifest index 0644763fb7af..e9279c35e6f3 100644 --- a/x11-misc/stripclub/Manifest +++ b/x11-misc/stripclub/Manifest @@ -1,16 +1,24 @@ +AUX stripclub-0.9.1.2-Makefile-fixes.patch 2637 RMD160 30413c38a7ec09af52113f2589300c7116a20e55 SHA1 394bd13c46edac645912bb441fe37a1dd64ad4b6 SHA256 cae8bceb2cfaf984818d538832ff5e0b08cdb333fe535a58b7994e45e6ea4b15 +MD5 2d0a485f867b0b9bb613e0310ae3eed6 files/stripclub-0.9.1.2-Makefile-fixes.patch 2637 +RMD160 30413c38a7ec09af52113f2589300c7116a20e55 files/stripclub-0.9.1.2-Makefile-fixes.patch 2637 +SHA256 cae8bceb2cfaf984818d538832ff5e0b08cdb333fe535a58b7994e45e6ea4b15 files/stripclub-0.9.1.2-Makefile-fixes.patch 2637 AUX stripclub-0.9.1.2-Makefile.linux.patch 863 RMD160 c6b50e20a7a15fba213648603892f485ee25a4c4 SHA1 d66efd9b516b92ad061936d6c025dbdfd9410a97 SHA256 f3ac9fd7eff12298bf3c9f2e92bc02407bcef5dc8eee8e8f67452fe542cea66f MD5 c4c077c1aae2d8c62d82fa7abc9f3216 files/stripclub-0.9.1.2-Makefile.linux.patch 863 RMD160 c6b50e20a7a15fba213648603892f485ee25a4c4 files/stripclub-0.9.1.2-Makefile.linux.patch 863 SHA256 f3ac9fd7eff12298bf3c9f2e92bc02407bcef5dc8eee8e8f67452fe542cea66f files/stripclub-0.9.1.2-Makefile.linux.patch 863 DIST stripclub_0.9.1.2.tar.gz 49248 RMD160 2045ce83ae9bc16eccf1abee3f3a14cb2c3e03ca SHA1 f66a5ec7dd1c7b4822ba141140f7014155f10e5a SHA256 cfb41284ec0f818841d87ae6e71e6c19b09e3b9253b51a33f9a3accce7e1bdf6 +EBUILD stripclub-0.9.1.2-r1.ebuild 1008 RMD160 d0cefd7678ed27741b80d75bb7ef3bffde74954f SHA1 9478c27f01e8ac7753ac36db4893d31f440f465e SHA256 96bc4c864b5416233367a6d32198b769e12f039977ed644531a4228a12885931 +MD5 b1b5f7e6e61a08b367c7abdecba80b1f stripclub-0.9.1.2-r1.ebuild 1008 +RMD160 d0cefd7678ed27741b80d75bb7ef3bffde74954f stripclub-0.9.1.2-r1.ebuild 1008 +SHA256 96bc4c864b5416233367a6d32198b769e12f039977ed644531a4228a12885931 stripclub-0.9.1.2-r1.ebuild 1008 EBUILD stripclub-0.9.1.2.ebuild 915 RMD160 b91c389c5a51bd71e78d0db512fe01a8ba39321f SHA1 d878d67236be25329b41470336207680ef4d7883 SHA256 844fb056a1da156a73689a25117571672bf82e6579bc9d7df3ccd95491cee4c9 MD5 737c92b87a982931c5b91ccecdc4e7cb stripclub-0.9.1.2.ebuild 915 RMD160 b91c389c5a51bd71e78d0db512fe01a8ba39321f stripclub-0.9.1.2.ebuild 915 SHA256 844fb056a1da156a73689a25117571672bf82e6579bc9d7df3ccd95491cee4c9 stripclub-0.9.1.2.ebuild 915 -MISC ChangeLog 1066 RMD160 2650c700e75399a8323f4450c916d5ce671374ba SHA1 bf74d2037da7adc406a833637ca01ab880b58302 SHA256 0f5ad37a98b5233867e2afe44f0cde6559c24c461659b0b10f029ca959c9f215 -MD5 23909e6a653b69f7aaff8e5339051ef7 ChangeLog 1066 -RMD160 2650c700e75399a8323f4450c916d5ce671374ba ChangeLog 1066 -SHA256 0f5ad37a98b5233867e2afe44f0cde6559c24c461659b0b10f029ca959c9f215 ChangeLog 1066 +MISC ChangeLog 1334 RMD160 02cf4fca17a71f632842eb153138e22a9a1e96b8 SHA1 dd9874db2e4cc0998ca95555548a52469ee5cb6a SHA256 ebefab665c45949733ec1f93f51c530d107c6a1cbd40ac09271dd3bf46948eec +MD5 c308edc11586e02d2fce87e6bf8bb90f ChangeLog 1334 +RMD160 02cf4fca17a71f632842eb153138e22a9a1e96b8 ChangeLog 1334 +SHA256 ebefab665c45949733ec1f93f51c530d107c6a1cbd40ac09271dd3bf46948eec ChangeLog 1334 MISC metadata.xml 279 RMD160 d0861fe8458cad1accbdc998f29fe5d2c32a842f SHA1 7c915bad78d8f01b416e5c3ef7df1ef169c1f955 SHA256 817bd78be3679f754ba3c287aaeb151fc5da11849dfb524d24391480edcd6efe MD5 93f02cf17e28c71ad2a43ecc2399b56f metadata.xml 279 RMD160 d0861fe8458cad1accbdc998f29fe5d2c32a842f metadata.xml 279 @@ -18,3 +26,6 @@ SHA256 817bd78be3679f754ba3c287aaeb151fc5da11849dfb524d24391480edcd6efe metadata MD5 d2f52fb81d1f7dfddea14781caca61c3 files/digest-stripclub-0.9.1.2 250 RMD160 1cf511f37be248b2cb23d348d2029b24f71613f5 files/digest-stripclub-0.9.1.2 250 SHA256 f41a4a1be9e3ba68e6f882572d9a7a5392b91df88d4384776f825815de7ed9c4 files/digest-stripclub-0.9.1.2 250 +MD5 d2f52fb81d1f7dfddea14781caca61c3 files/digest-stripclub-0.9.1.2-r1 250 +RMD160 1cf511f37be248b2cb23d348d2029b24f71613f5 files/digest-stripclub-0.9.1.2-r1 250 +SHA256 f41a4a1be9e3ba68e6f882572d9a7a5392b91df88d4384776f825815de7ed9c4 files/digest-stripclub-0.9.1.2-r1 250 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" +} |