From 3f6f93389d7ef9abb0034ad2cf1b0d6bd34291ac Mon Sep 17 00:00:00 2001 From: Dane Smith Date: Sat, 21 Aug 2010 23:59:47 -0400 Subject: Fixed endavour ebuild? --- app-misc/endeavour/ChangeLog | 11 +++ app-misc/endeavour/Manifest | 7 ++ app-misc/endeavour/endeavour-2.7.3.ebuild | 65 +++++++++++++ .../files/endeavour-2.7.3-amd64-gtk-flags.patch | 55 +++++++++++ .../endeavour/files/endeavour-2.7.3-asneeded.patch | 105 +++++++++++++++++++++ app-misc/endeavour/metadata.xml | 9 ++ 6 files changed, 252 insertions(+) create mode 100644 app-misc/endeavour/ChangeLog create mode 100644 app-misc/endeavour/Manifest create mode 100644 app-misc/endeavour/endeavour-2.7.3.ebuild create mode 100644 app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch create mode 100644 app-misc/endeavour/files/endeavour-2.7.3-asneeded.patch create mode 100644 app-misc/endeavour/metadata.xml diff --git a/app-misc/endeavour/ChangeLog b/app-misc/endeavour/ChangeLog new file mode 100644 index 0000000..319d01c --- /dev/null +++ b/app-misc/endeavour/ChangeLog @@ -0,0 +1,11 @@ +# ChangeLog for app-misc/endeavour +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: $ + +*endeavour-2.7.3 (22 Aug 2010) + + 22 Aug 2010; Dane Smith (c1pher) + +endeavour-2.7.3.ebuild, +files/endeavour-2.7.3-amd64-gtk-flags.patch, + +files/endeavour-2.7.3-asneeded.patch, +metadata.xml: + Updated ebuild for endavour. Fixes LDFLAGS wrt bug 333529 + diff --git a/app-misc/endeavour/Manifest b/app-misc/endeavour/Manifest new file mode 100644 index 0000000..0149f0c --- /dev/null +++ b/app-misc/endeavour/Manifest @@ -0,0 +1,7 @@ +AUX endeavour-2.7.3-amd64-gtk-flags.patch 1755 RMD160 30e7fd08caf9680b7e02edde6cca4e0e16604a14 SHA1 f89bf2793c08ebe4fe374822f49d578c25026a63 SHA256 a8a38c737e2bc2d7e544d78e41ac102eb9762dd6ac80a255bef1e4f9ba06751b +AUX endeavour-2.7.3-asneeded.patch 3016 RMD160 32a33cb640f42ffe5373ea41ce3cdf12ebe1e17c SHA1 a199c8fdcf9b8e717bc9b7e2b6e866173e5ab8db SHA256 0fd8c1d2eefdf96295e3ecefb13e7779e7a9c32f62884d525cb8eb543df1c216 +DIST endeavour-2.7.3.tar.bz2 2734314 RMD160 59ee352a7f390085d2f082ba2891ada83a3489c5 SHA1 9371b325ed57d2b04f3cfecaa57f11d65134bbe7 SHA256 41d030b543273cb9b5902fbdb1de34bcce6e6b5c0f2b0fca84432b98e507d6f6 +DIST endeavour2-mimetypes.tgz 1423 RMD160 45a8c0a04a6b58c377605ee1446c792d32d69939 SHA1 530b86ca1395e08b92971b69dfe2c0bc968f14e4 SHA256 5b341f23635c35fa50758b216e8e8d86f39a05c82da7d152b3f916e995f49a8c +EBUILD endeavour-2.7.3.ebuild 1651 RMD160 2f446376319916248e28d08bf30921494ef21503 SHA1 1333c98941a16b307b0d4e4dc8ae69364641b3a5 SHA256 88ccaaf15a99380bddf63aba8f9467cf66dc49e2de61db6a7fd76a94edd090c8 +MISC ChangeLog 399 RMD160 d5ac3e8c7fcba7110bb74405998ceb5aee5532eb SHA1 ca6866ba37f4c8f165ccb83a5a9b7b223acfbc05 SHA256 050131f56645969f7681a902ebe2ba2a0be800623b25a0b1824ed726dbf0db86 +MISC metadata.xml 314 RMD160 25181cde297628576a9545bea3a76601485bfaf3 SHA1 ac16b621acf5a22b64859e3323d466fb556fc4c8 SHA256 736baab77aea9c4da199c01e3cd6877c271bd02357ff9b41b537a2232c6e96d7 diff --git a/app-misc/endeavour/endeavour-2.7.3.ebuild b/app-misc/endeavour/endeavour-2.7.3.ebuild new file mode 100644 index 0000000..5847688 --- /dev/null +++ b/app-misc/endeavour/endeavour-2.7.3.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/endeavour/endeavour-2.7.3.ebuild,v 1.6 2009/01/18 22:42:04 angelos Exp $ + +inherit eutils + +M=endeavour2-mimetypes +DESCRIPTION="Powerful file and image browser" +HOMEPAGE="http://wolfpack.twu.net/Endeavour2/" +SRC_URI="ftp://wolfpack.twu.net/users/wolfpack/${P}.tar.bz2 + ftp://wolfpack.twu.net/users/wolfpack/${M}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 ppc x86" +IUSE="joystick" + +DEPEND="app-arch/bzip2 + =x11-libs/gtk+-1.2* + >=media-libs/imlib-1.9.14 + x11-libs/libX11 + virtual/opengl + joystick? ( media-libs/libjsw )" + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}/${P}-amd64-gtk-flags.patch" \ + "${FILESDIR}"/${P}-asneeded.patch + + cd endavour2 + sed -i '/Linking modules.../{n;s/$(CPP)/$(CPP) $(LDFLAGS)/}' Makefile || die +} + +src_compile() { + ./configure Linux --prefix=/usr $(use_enable joystick libjsw) || die + emake CC=$(tc-getCC) CPP=$(tc-getCXX) || die "Parallel make failed" +} + +src_install() { + dodoc AUTHORS HACKING README TODO + + cd endeavour2 + dobin endeavour2 || die + bunzip2 endeavour2.1.bz2 + doman endeavour2.1 + + dodir /usr/share/endeavour2 + cp -R data/* "${D}"/usr/share/endeavour2 || die + dodir /usr/share/endeavour2/icons/ + cp -R images/* "${D}"/usr/share/endeavour2/icons/ + + cd images + insinto /usr/share/icons + doins endeavour_48x48.xpm image_browser_48x48.xpm icon_trash_48x48.xpm \ + icon_trash_empty_48x48.xpm + + # install mimetypes + cd "${WORKDIR}"/${M} + mv README README.mimetypes + dodoc README.mimetypes + insinto /usr/share/endeavour2/ + doins mimetypes.ini +} diff --git a/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch b/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch new file mode 100644 index 0000000..9a31276 --- /dev/null +++ b/app-misc/endeavour/files/endeavour-2.7.3-amd64-gtk-flags.patch @@ -0,0 +1,55 @@ +--- endeavour2/lib/Makefile.old 2006-11-06 09:00:00.000000000 +0100 ++++ endeavour2/lib/Makefile 2007-06-04 17:34:50.040582389 +0200 +@@ -4,7 +4,7 @@ + # Compiler flags + # + CFLAGS = -Wall -O2 -g -fPIC \ +- `glib-config --cflags` ++ `glib-config --cflags` `gtk-config --cflags` + CPPFLAGS = -D__cplusplus -Dc_plusplus + + +@@ -42,14 +42,14 @@ + LIB_CFG_BIN = endeavour2-config + LIB_CFG_MAN = endeavour2-config.1.bz2 + LIB = libendeavour2.so +-OBJ_C = $(SRC_C:.c=.o) +-OBJ_CPP = $(SRC_CPP:.cpp=.o) ++OBJ_C = $(SRC_C:.c=.o) $(SRC_C_P:.c=.o) ++OBJ_CPP = $(SRC_CPP:.cpp=.o) $(SRC_CPP_P:.cpp=.o) + .c.o: + @echo "Compiling module $*.o" +- @+$(CC) -c $*.c $(CFLAGS) ++ @+$(CC) -c $*.c $(CFLAGS) -o $*.o + .cpp.o: + @echo "Compiling module $*.o" +- @+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS) ++ @+$(CPP) -c $*.cpp $(CFLAGS) $(CPPFLAGS) -o $*.o + + + # Programs and their flags +@@ -104,6 +104,8 @@ + @-$(LS) $(LSFLAGS) $(LIB) + + prebuild: ++ @echo "Removing $(SRC_C_P:.c=.o) $(SRC_CPP_P:.C=.o) (force recompile with -fPIC)" ++ @${RM} ${RMFLAGS} $(SRC_C_P:.c=.o) $(SRC_CPP_P:.cpp=.o) + @echo "Building library \"$(LIB)\"..." + + postbuild: +--- endeavour2/lib/Makefile.srclist.old 2006-11-06 09:00:00.000000000 +0100 ++++ endeavour2/lib/Makefile.srclist 2007-06-04 17:30:13.000000000 +0200 +@@ -22,11 +22,11 @@ + edv_recycle.c edv_window.c + + # Add source C files from Endeavour 2 +-SRC_C += ../cfg.c ../cfg_fio.c ../edv_interps.c \ ++SRC_C_P = ../cfg.c ../cfg_fio.c ../edv_interps.c \ + ../edv_recbin_index.c ../edv_recbin_stat.c \ + ../edv_recycled_obj.c ../edv_utils.c + + + # Source C++ files +-SRC_CPP = ../disk.cpp ../fio.cpp ../prochandle.cpp \ ++SRC_CPP_P = ../disk.cpp ../fio.cpp ../prochandle.cpp \ + ../string.cpp diff --git a/app-misc/endeavour/files/endeavour-2.7.3-asneeded.patch b/app-misc/endeavour/files/endeavour-2.7.3-asneeded.patch new file mode 100644 index 0000000..f35bf23 --- /dev/null +++ b/app-misc/endeavour/files/endeavour-2.7.3-asneeded.patch @@ -0,0 +1,105 @@ +--- endeavour-2.7.3/endeavour2/utils/Makefile.orig 2006-11-06 09:00:00.000000000 +0100 ++++ endeavour-2.7.3/endeavour2/utils/Makefile 2009-01-18 23:09:11.792880952 +0100 +@@ -73,80 +73,79 @@ + @echo "Compiling confirmation-dialog" + @$(CC) -c $(CFLAGS) `gtk-config --cflags` \ + confirmation-dialog.c +- @$(CPP) `gtk-config --libs` \ ++ @$(CPP) -o confirmation-dialog \ + confirmation-dialog.o \ + ../guiutils.o ../cdialog.o ../string.o \ +- -o confirmation-dialog ++ `gtk-config --libs` + + file-selector: + @echo "Compiling file-selector" + @$(CC) -c $(CFLAGS) `gtk-config --cflags` \ + file-selector.c +- @$(CPP) $(CFLAGS) `gtk-config --libs` \ ++ @$(CPP) $(CFLAGS) -o file-selector \ + file-selector.o ../fb.o \ + ../cdialog.o ../guiutils.o ../fprompt.o ../pulist.o \ +- ../string.o ../disk.o ../fio.o \ +- -o file-selector ++ ../string.o ../disk.o ../fio.o `gtk-config --libs` + + lsmimetypes: + @echo "Compiling lsmimetypes" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- lsmimetypes.c -o lsmimetypes ++ lsmimetypes.c -o lsmimetypes \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + notify: + @echo "Compiling notify" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- notify.c -o notify ++ notify.c -o notify \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + open: + @echo "Compiling open" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- open.c -o open ++ open.c -o open \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + properties: + @echo "Compiling properties" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- properties.c -o properties ++ properties.c -o properties \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + purge: + @echo "Compiling purge" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- purge.c -o purge ++ purge.c -o purge \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + recover: + @echo "Compiling recover" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- recover.c -o recover ++ recover.c -o recover \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + recycle: + @echo "Compiling recycle" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- recycle.c -o recycle ++ recycle.c -o recycle \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + rls: + @echo "Compiling rls" + @$(CC) -Wall -O2 -g \ +- $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) \ +- rls.c -o rls ++ rls.c -o rls \ ++ $(EDV_UTIL_CFLAGS) $(EDV_UTIL_LIBS) + + + style-editor: + @echo "Compiling style-editor" + @$(CC) -c $(CFLAGS) `gtk-config --cflags` \ + style-editor.c +- @$(CPP) `gtk-config --libs` \ ++ @$(CPP) -o style-editor \ + style-editor.o \ + ../guiutils.o ../cdialog.o ../fprompt.o ../pulist.o \ + ../fb.o ../csd.o ../fsd.o ../style_edit.o \ + ../string.o ../fio.o ../disk.o \ +- -o style-editor ++ `gtk-config --libs` + + + # Install diff --git a/app-misc/endeavour/metadata.xml b/app-misc/endeavour/metadata.xml new file mode 100644 index 0000000..b17012b --- /dev/null +++ b/app-misc/endeavour/metadata.xml @@ -0,0 +1,9 @@ + + + + no-herd + + maintainer-needed@gentoo.org + This package lacks a primary herd or maintainer. + + -- cgit v1.2.3-65-gdbad