Port irssi module FiSH (still needs some work)

bdrewery · Apr 7, 2007 · 3466135 · 3466135
1 parent 0249297
commit 3466135
Show file tree

Hide file tree

Showing 4 changed files with 77 additions and 104 deletions.
diff --git a/net-irc/irssi-mod-fish/Manifest b/net-irc/irssi-mod-fish/Manifest
@@ -1,8 +1,17 @@
 DIST FiSH-irssi.v0.99-source.zip 43491 RMD160 d4a042a0ca28dfe2839f13a46a18d009df769bce SHA1 4af337be9b985f134c0e84bb652aad63e28c46be SHA256 fe5ec748886620494c51e568093ff226b663a3a7ee7716ab06c24e29bf828e3c
-EBUILD irssi-mod-fish-0.99.ebuild 4891 RMD160 03b9d61e4f4ecec2bdd11d8d8f5d5416e9a7e570 SHA1 f2d6ef4afc1f453ef07875b8bff1e6348fd9d09d SHA256 8c0e384dc591aea1cf8ad6066ecd9ac017424651dfb439287a764ab083d34379
-MD5 5166eef16cb4fa3ecdcac97daaaaceb4 irssi-mod-fish-0.99.ebuild 4891
-RMD160 03b9d61e4f4ecec2bdd11d8d8f5d5416e9a7e570 irssi-mod-fish-0.99.ebuild 4891
-SHA256 8c0e384dc591aea1cf8ad6066ecd9ac017424651dfb439287a764ab083d34379 irssi-mod-fish-0.99.ebuild 4891
-MD5 3f15b40ef74e5c27641d8187d1f2c6aa files/digest-irssi-mod-fish-0.99 259
-RMD160 a8b51176634b083993c7fb0d8dc6475f263cf45e files/digest-irssi-mod-fish-0.99 259
-SHA256 ac11113d485f28d6e8f7513e6d6ddc0cd02c32a7d3917035f714f2109bdfa2a1 files/digest-irssi-mod-fish-0.99 259
+DIST irssi-0.8.9.tar.bz2 816465 RMD160 7a0a2a639c041802bfddd458c35bccaec8084013 SHA1 57799a1e99ac5f6694eb6fd049d39a4e2e51f576 SHA256 230ffa21a97f930000e0004f18cf5b709d5da5408d297e1567538a53cf91c32c
+EBUILD irssi-mod-fish-0.99.ebuild 2072 RMD160 390a90eb980f121776ab7ef5d5e85ef92c4ab1b6 SHA1 f6e9128797748b2326b83b54640d093d81791c7d SHA256 205e490b6a06033714254b5af6e5707a44cc945d667943bdd7367532482a17e4
+MD5 5df49e55b56e4159e419e424c6e6f982 irssi-mod-fish-0.99.ebuild 2072
+RMD160 390a90eb980f121776ab7ef5d5e85ef92c4ab1b6 irssi-mod-fish-0.99.ebuild 2072
+SHA256 205e490b6a06033714254b5af6e5707a44cc945d667943bdd7367532482a17e4 irssi-mod-fish-0.99.ebuild 2072
+MISC ChangeLog 232 RMD160 de15613e74d9ac10cf78f840e01878347694ae39 SHA1 23c9987d0427142c93734c14f6b7472a4244495a SHA256 857e93d97b03a8987118e0696822b22e2eef21eb17508b5f8f19115a66275e03
+MD5 b729d92f58c0bd464f228ba3fe64a123 ChangeLog 232
+RMD160 de15613e74d9ac10cf78f840e01878347694ae39 ChangeLog 232
+SHA256 857e93d97b03a8987118e0696822b22e2eef21eb17508b5f8f19115a66275e03 ChangeLog 232
+MISC metadata.xml 675 RMD160 52b320d34a0869e1720f25803333a16b2ee3fd51 SHA1 24c03c6b9b67bf2f4d58b5bc9d99a7fb91ddf77a SHA256 91b527bfcc36a40f43cfe9b48eee964335aa6af2b045f2eb9c43a5153e9f55ad
+MD5 cd8eb2086a313541db52430d64ce68cc metadata.xml 675
+RMD160 52b320d34a0869e1720f25803333a16b2ee3fd51 metadata.xml 675
+SHA256 91b527bfcc36a40f43cfe9b48eee964335aa6af2b045f2eb9c43a5153e9f55ad metadata.xml 675
+MD5 95b53ca7680fe1089ed4cf47715c5d9f files/digest-irssi-mod-fish-0.99 497
+RMD160 2b1a0f0d434eca79e3c57c9e98644bd5885aff54 files/digest-irssi-mod-fish-0.99 497
+SHA256 70972d245f74f6cfe16004405179cf3c7202783345022e387affe30ddcd2097f files/digest-irssi-mod-fish-0.99 497
diff --git a/net-irc/irssi-mod-fish/files/digest-irssi-mod-fish-0.99 b/net-irc/irssi-mod-fish/files/digest-irssi-mod-fish-0.99
@@ -1,3 +1,6 @@
 MD5 15d60f1f1f9af12d5b1db7d7e8a95543 FiSH-irssi.v0.99-source.zip 43491
 RMD160 d4a042a0ca28dfe2839f13a46a18d009df769bce FiSH-irssi.v0.99-source.zip 43491
 SHA256 fe5ec748886620494c51e568093ff226b663a3a7ee7716ab06c24e29bf828e3c FiSH-irssi.v0.99-source.zip 43491
+MD5 6610ee0e27922f447e40828cf7dee507 irssi-0.8.9.tar.bz2 816465
+RMD160 7a0a2a639c041802bfddd458c35bccaec8084013 irssi-0.8.9.tar.bz2 816465
+SHA256 230ffa21a97f930000e0004f18cf5b709d5da5408d297e1567538a53cf91c32c irssi-0.8.9.tar.bz2 816465
diff --git a/net-irc/irssi-mod-fish/irssi-mod-fish-0.99.ebuild b/net-irc/irssi-mod-fish/irssi-mod-fish-0.99.ebuild
@@ -1,57 +1,32 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
+inherit eutils toolchain-funcs
+
+IRSSI_PV="0.8.9"
 
-# NOTE: The comments in this file are for instruction and documentation.
-# They're not meant to appear with your final, production ebuild.  Please
-# remember to remove them before submitting or committing your ebuild.  That
-# doesn't mean you can't add your own comments though.
-
-# The 'Header' on the third line should just be left alone.  When your ebuild
-# will be committed to cvs, the details on that line will be automatically
-# generated to contain the correct data.
-
-# inherit lists eclasses to inherit functions from. Almost all ebuilds should
-# inherit eutils, as a large amount of important functionality has been
-# moved there. For example, the $(get_libdir) mentioned below wont work
-# without the following line:
-inherit eutils
-# A well-used example of an eclass function that needs eutils is epatch. If
-# your source needs patches applied, it's suggested to put your patch in the
-# 'files' directory and use:
-#
-#   epatch ${FILESDIR}/patch-name-here
-#
-# eclasses tend to list descriptions of how to use their functions properly.
-# take a look at /usr/portage/eclasses/ for more examples.
-
-# Short one-line description of this package.
 DESCRIPTION="FiSH irssi module"
 
 # Homepage, not used by Portage directly but handy for developer reference
 HOMEPAGE="http://www.shatow.net/gentoo/"
 
 # Point to any required sources; these will be automatically downloaded by
 # Portage.
-SRC_URI="http://fish.sekure.us/irssi/FiSH-irssi.v${PV}-source.zip"
+SRC_URI="http://irssi.org/files/irssi-${IRSSI_PV}.tar.bz2
+	http://fish.sekure.us/irssi/FiSH-irssi.v${PV}-source.zip"
 
 LICENSE="as-is"
 SLOT="0"
-KEYWORDS="~x86"
+KEYWORDS="x86"
+
+RESTRICT="mirror"
 
 IUSE=""
+DEPEND="
+	>=dev-libs/glib-2.2.1
+	dev-libs/miracl
+"
 
-# Build-time dependencies, such as
-#    ssl? ( >=dev-libs/openssl-0.9.6b )
-#    >=dev-lang/perl-5.6.1-r1
-# It is advisable to use the >= syntax show above, to reflect what you
-# had installed on your system when you tested the package.  Then
-# other users hopefully won't be caught without the right version of
-# a dependency.
-DEPEND=""
-
-# Run-time dependencies. Must be defined to whatever this depends on to run.
-# The below is valid if the same run-time depends are required to compile.
 RDEPEND="
 	>=net-irc/irssi-0.8.9
 	${DEPEND}"
@@ -60,64 +35,42 @@ RDEPEND="
 # unpacked) inside ${WORKDIR}.  The default value for S is ${WORKDIR}/${P}
 # If you don't need to change it, leave the S= line out of the ebuild
 # to keep it tidy.
-#S="${WORKDIR}/${P}"
+S="${WORKDIR}/FiSH-irssi.v${PV}-source"
+
+S_IRSSI="${S}/../irssi-${IRSSI_PV}"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	#lame .zip unpacking forces dos2unix
+	find ${S} -type f -exec sed -i 's/\r$//' {} \; || die "Failed to dos2unix files"
+
+	sed -i \
+		-e "s:-O2:${CFLAGS}:" \
+		-e "s:gcc:$(tc-getCC):" \
+		-e "s:-shared:-shared -fPIC -DPIC:" \
+		-e "s:\#glib_dir = /usr/local/include/glib-1\.2:glib_include_dir = $(get_ml_incdir)/glib-2.0:" \
+		-e "s:\$(HOME)/irssi-0\.8\.9:${S_IRSSI}:" \
+		-e "s:\$(HOME)/glib-1\.2\.10:/usr/$(get_libdir)/glib-2.0/include:" \
+		-e "s:miracl\.a:/usr/$(get_libdir)/miracl.a:" \
+		-e "s:-I\$(glib_dir) -I\$(glib_dir)/include -I\$(glib_dir)/glib:-I\$(glib_dir) -I\$(glib_include_dir) -I\$(glib_include_dir)/glib:" \
+		-e 's:\@echo "Press ENTER to continue or CTRL+C to abort\.\.\."\; read junk::' \
+		Makefile || die "Failed to update Makefile"
+}
 
 src_compile() {
-	# Most open-source packages use GNU autoconf for configuration.
-	# The quickest (and preferred) way of running configure is:
-	econf || die "econf failed"
-	#
-	# You could use something similar to the following lines to
-	# configure your package before compilation.  The "|| die" portion
-	# at the end will stop the build process if the command fails.
-	# You should use this at the end of critical commands in the build
-	# process.  (Hint: Most commands are critical, that is, the build
-	# process should abort if they aren't successful.)
-	#./configure \
-	#	--host=${CHOST} \
-	#	--prefix=/usr \
-	#	--infodir=/usr/share/info \
-	#	--mandir=/usr/share/man || die "./configure failed"
-	# Note the use of --infodir and --mandir, above. This is to make
-	# this package FHS 2.2-compliant.  For more information, see
-	#   http://www.pathname.com/fhs/
-
-	# emake (previously known as pmake) is a script that calls the
-	# standard GNU make with parallel building options for speedier
-	# builds (especially on SMP systems).  Try emake first.  It might
-	# not work for some packages, because some makefiles have bugs
-	# related to parallelism, in these cases, use emake -j1 to limit
-	# make to a single process.  The -j1 is a visual clue to others
-	# that the makefiles have bugs that have been worked around.
+	cd ${S_IRSSI}
+	econf || die "Irssi configure failed"
+
+	cd ${S}
 	emake || die "emake failed"
 }
 
 src_install() {
-	# You must *personally verify* that this trick doesn't install
-	# anything outside of DESTDIR; do this by reading and
-	# understanding the install part of the Makefiles.
-	# This is the preferred way to install.
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	# When you hit a failure with emake, do not just use make. It is
-	# better to fix the Makefiles to allow proper parallelization.
-	# If you fail with that, use "emake -j1", it's still better than make.
-
-	# For Makefiles that don't make proper use of DESTDIR, setting
-	# prefix is often an alternative.  However if you do this, then
-	# you also need to specify mandir and infodir, since they were
-	# passed to ./configure as absolute paths (overriding the prefix
-	# setting).
-	#emake \
-	#	prefix="${D}"/usr \
-	#	mandir="${D}"/usr/share/man \
-	#	infodir="${D}"/usr/share/info \
-	#	libdir="${D}"/usr/$(get_libdir) \
-	#	install || die "emake install failed"
-	# Again, verify the Makefiles!  We don't want anything falling
-	# outside of ${D}.
-
-	# The portage shortcut to the above command is simply:
-	#
-	#einstall || die "einstall failed"
+	insopts -m 644
+	insinto /usr/$(get_libdir)/irssi/modules
+	doins libfish.so
+
+	dodoc FiSH-irssi.txt FiSH-irssi_History.txt blow.ini-EXAMPLE
 }
diff --git a/net-irc/irssi-mod-fish/metadata.xml b/net-irc/irssi-mod-fish/metadata.xml
@@ -1,10 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-    <herd>no-herd</herd>
-    <maintainer>
-        <email>bryan@shatow.net</email>
-        <name>Bryan Drewery</name>
-    </maintainer>
-</pkgmetadata>
+<herd>no-herd</herd>
+<maintainer>
+  <email>bryan@shatow.net</email>
+  <description>FiSH blowfish encryption module for irssi</description>
+</maintainer>
+<longdescription>
+This is an encryption plugin for irssi, it is based on blowfish and is fully
+compatible to original 'blowcrypt' script. It supports private chat and channel
+encryption. A secure key-exchange system is included as well. Please read the
+file FiSH-irssi.txt, especially the 'Installation' section, before installing
+it!
 
+WWW: http://fish.sekure.us/
+</longdescription>
+</pkgmetadata>