new version + cleanup

9 files changed, 57 insertions, 76 deletions

diff --git a/net-im/imcom/Manifest b/net-im/imcom/Manifest
index b6f5671f51ef..6e6648a52398 100644
--- a/net-im/imcom/Manifest
+++ b/net-im/imcom/Manifest
@@ -1,13 +1,7 @@
-MD5 4602142af66742c4653a50bab4cbf491 imcom-1.31.ebuild 953
+MD5 e2662feaaf51674780aaca0949b47f70 imcom-1.31.ebuild 942
 MD5 2578ccdc7f5c653cd1f0148ee8d66f2e imcom-0.95.ebuild 783
-MD5 079e09ae1f18262ae21630a51e7ed96d imcom-0.92.ebuild 760
-MD5 c49cf91e20e146d374fad55a1d091d68 imcom-1.31.ebuild~ 953
-MD5 179135c4dfea2c78f1eba79b7cbcca2c ChangeLog 1568
-MD5 975fbca199cf694393383ae6def7bc23 imcom-1.30_beta9.ebuild 958
+MD5 728ddda51ab924bb64c91ecd07500502 ChangeLog 1717
 MD5 1cba1b4de0a2f189931b618d764daa74 metadata.xml 404
-MD5 c5f66e11a20c16f238bdc5789758c7a7 imcom-0.93.ebuild 775
-MD5 d44617948b14bd4631cdfcabf6e681ed files/digest-imcom-0.92 62
-MD5 0d82d7b69b39595fb276349ab5302691 files/digest-imcom-0.93 62
+MD5 3034003b5e28e3d66787f708dbc8dec6 files/Makefile-1.31 1308
 MD5 4bdbd49a06fb47cdf5e0b4a5de74da91 files/digest-imcom-0.95 62
 MD5 2728c9cb165a176d49822b58ddd6825b files/digest-imcom-1.31 62
-MD5 f3094a1abc7639effb81e66f10bf8268 files/digest-imcom-1.30_beta9 67
diff --git a/net-im/imcom/files/Makefile-1.31 b/net-im/imcom/files/Makefile-1.31
new file mode 100644
index 000000000000..136ec54388fe
--- /dev/null
+++ b/net-im/imcom/files/Makefile-1.31
@@ -0,0 +1,48 @@
+prefix= ${DESTDIR}/usr
+exec_prefix = ${prefix}
+bindir = ${exec_prefix}/bin
+datadir = ${prefix}/share
+docdir = ${prefix}/share/imcom/docs
+mandir = ${prefix}/man
+
+all:
+	find ./ -type f -exec chmod a-x '{}' ';'
+	chmod +x imcom CLI.py LogHandler.py AccountCreator.py
+
+install: install-bin install-doc
+
+install-bin: install-modules
+	install -d -m 0755 ${bindir}
+	install -m 0755 imcom ${bindir}
+
+install-modules:
+	install -d -m 0755 ${datadir}/imcom
+	install -d -m 0755 ${datadir}/imcom/modules
+	install -m 0644 *.py ${datadir}/imcom
+	install -m 0644 modules/*.py ${datadir}/imcom/modules
+	install -m 0755 CLI.py LogHandler.py AccountCreator.py ${datadir}/imcom
+
+install-doc:
+	install -d -m 0755 ${docdir}
+	install -d -m 0755 ${mandir}/man1
+	install -m 0755 docs/*.html ${docdir}
+	install -m 0755 CONTRIBUTORS LICENSE README README.autostatus TODO WHATSNEW ${docdir}
+	install -m 0755 docs/imcom.1 ${mandir}/man1/imcom.1
+
+
+uninstall:
+	rm -rf ${docdir}
+	rm -rf ${datadir}/imcom
+	rm -f ${bindir}/imcom
+	rm -f ${mandir}/man1/imcom.1
+
+clean:
+	rm -f config.status config.log config.cache *.pyc
+
+distclean: clean
+	rm -rf CVS docs/CVS autom4te.cache
+	rm -f imcom Makefile
+	chmod a-x CLI.py LogHandler.py AccountCreator.py
+	rm -f *~ .#*
+
+.PHONY: distclean clean unstall install all install-modules install-bin install-doc
diff --git a/net-im/imcom/files/digest-imcom-0.92 b/net-im/imcom/files/digest-imcom-0.92
deleted file mode 100644
index 40e84192e5ab..000000000000
--- a/net-im/imcom/files/digest-imcom-0.92
+++ /dev/null
@@ -1 +0,0 @@
-MD5 a2b3147092566211a555966039d743c2 imcom-0.92.tar.gz 224769
diff --git a/net-im/imcom/files/digest-imcom-0.93 b/net-im/imcom/files/digest-imcom-0.93
deleted file mode 100644
index 1742845b5787..000000000000
--- a/net-im/imcom/files/digest-imcom-0.93
+++ /dev/null
@@ -1 +0,0 @@
-MD5 0e63d044c48490cb84a326a64b2760c9 imcom-0.93.tar.gz 367948
diff --git a/net-im/imcom/files/digest-imcom-1.30_beta9 b/net-im/imcom/files/digest-imcom-1.30_beta9
deleted file mode 100644
index 052da8a5670c..000000000000
--- a/net-im/imcom/files/digest-imcom-1.30_beta9
+++ /dev/null
@@ -1 +0,0 @@
-MD5 32110b6e7aca090de38635ecba43b85c imcom-1.30beta9.tar.gz 300274
diff --git a/net-im/imcom/files/digest-imcom-1.31 b/net-im/imcom/files/digest-imcom-1.31
new file mode 100644
index 000000000000..4affa3704e72
--- /dev/null
+++ b/net-im/imcom/files/digest-imcom-1.31
@@ -0,0 +1 @@
+MD5 39e910c77d696ea3b607ec34f113b93b imcom-1.31.tar.gz 280266
diff --git a/net-im/imcom/imcom-0.92.ebuild b/net-im/imcom/imcom-0.92.ebuild
deleted file mode 100644
index a2b74b0da5e8..000000000000
--- a/net-im/imcom/imcom-0.92.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-0.92.ebuild,v 1.5 2003/02/13 14:09:48 vapier Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="http://imcom.floobin.cx/files/${P}.tar.gz"
-HOMEPAGE="http://imcom.floobin.cx"
-DESCRIPTION="Python commandline Jabber Client"
-
-DEPEND=">=dev-lang/python-2.2
-	>=dev-python/PyXML-0.7"
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86"
-
-src_install() {
-	
-	dodir /usr/bin
-	dodir /usr/share/imcom
-	dodoc AutoStatus.API CONTRIBUTORS LICENSE README* TODO WHATSNEW
-	dodoc docs/*
-	cp *.py ${D}/usr/share/imcom
-	mv imcom imcom.orig
-	sed -e 's:/usr/local/share:/usr/share:' imcom.orig | cat > imcom
-	chmod 755 imcom 
-	dobin imcom
-
-}
diff --git a/net-im/imcom/imcom-0.93.ebuild b/net-im/imcom/imcom-0.93.ebuild
deleted file mode 100644
index 684d6c5b7ef8..000000000000
--- a/net-im/imcom/imcom-0.93.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-0.93.ebuild,v 1.2 2003/02/13 14:09:54 vapier Exp $
-
-S=${WORKDIR}/${P}
-SRC_URI="http://imcom.floobin.cx/files/${P}.tar.gz"
-HOMEPAGE="http://imcom.floobin.cx"
-DESCRIPTION="Python commandline Jabber Client"
-
-DEPEND=">=dev-lang/python-2.2
-	>=dev-python/PyXML-0.7"
-RDEPEND=""
-
-SLOT="0"
-LICENSE="as-is"
-KEYWORDS="x86 ppc"
-
-src_install() {
-	
-	dodir /usr/bin
-	dodir /usr/share/imcom
-	dodoc AutoStatus.API CONTRIBUTORS LICENSE README* TODO WHATSNEW
-	dodoc docs/*
-	cp *.py ${D}/usr/share/imcom
-	mv imcom imcom.orig
-	sed -e 's:/usr/local/share:/usr/share:' imcom.orig | cat > imcom
-	chmod 755 imcom 
-	dobin imcom
-
-}
diff --git a/net-im/imcom/imcom-1.30_beta9.ebuild b/net-im/imcom/imcom-1.31.ebuild
index 355f4b0db654..f7411e630aff 100644
--- a/net-im/imcom/imcom-1.30_beta9.ebuild
+++ b/net-im/imcom/imcom-1.31.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-1.30_beta9.ebuild,v 1.2 2003/05/21 05:01:11 lordvan Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/imcom/imcom-1.31.ebuild,v 1.1 2003/08/21 08:21:33 lordvan Exp $
 
-MYVER=1.30beta9
+MYVER=${PV}
 S=${WORKDIR}/${PN}-${MYVER}
-#SRC_URI="http://imcom.floobin.cx/files/${P}.tar.gz"
-SRC_URI="http://nafai.dyndns.org/files/imcom-betas/${PN}-${MYVER}.tar.gz"
+SRC_URI="http://imcom.floobin.cx/files/${P}.tar.gz"
+#SRC_URI="http://nafai.dyndns.org/files/imcom-betas/${PN}-${MYVER}.tar.gz"
 HOMEPAGE="http://imcom.floobin.cx"
 DESCRIPTION="Python commandline Jabber Client"
 
@@ -27,7 +27,7 @@ src_compile() {
     ./configure --prefix=/usr || die "configure failed"
     #make
     # fixing it ..
-#   cp ${FILESDIR}/Makefile-1.30_beta8 ${S}/Makefile
+    cp ${FILESDIR}/Makefile-1.31 ${S}/Makefile
     pwd
     make
 }