D net-im/pyicq-t/files/pyicq-t-0.7a.initd D net-im/pyicq-t/files/digest-pyicq-t-0.7a M net-im/pyicq-t/Manifest D net-im/pyicq-t/pyicq-t-0.7a.ebuild M net-im/pyicq-t/pyicq-t-0.7b.ebuild D net-im/pyicq-t-svn/files/pyicq-t-svn-0.8.initd M net-im/pyicq-t-svn/Manifest M net-im/pymsn-t-svn/Manifest M net-im/pymsn-t-svn/pymsn-t-svn-0.12.ebuild M eclass/pytransport.eclass * Added some configuration vars
Lars Strojny

Lars Strojny commited on 2006-12-31 03:22:05
Zeige 10 geänderte Dateien mit 22 Einfügungen und 227 Löschungen.

... ...
@@ -8,6 +8,9 @@
8 8
 # family
9 9
 #
10 10
 
11
+
12
+PYTRANSPORT_LIB_DIR=${PYTRANSPORT_LIB_DIR:=tools data src}
13
+
11 14
 inherit eutils python
12 15
 
13 16
 ECLASS="pytransport"
... ...
@@ -36,7 +39,7 @@ pytransport_is_subversion && S=${WORKDIR}/${PN}
36 39
 
37 40
 if pytransport_is_subversion; then
38 41
 	inherit subversion
39
-	ESVN_REPO_URI="svn://svn.blathersource.org/${MY_PN}/trunk"
42
+	[ -z "${ESVN_REPO_URI}" ] && ESVN_REPO_URI="svn://svn.blathersource.org/${MY_PN}/trunk"
40 43
 	SRC_URI=""
41 44
 else
42 45
 	SRC_URI="http://www.blathersource.org/download.php/${PN}/${MY_P}.tar.gz"
... ...
@@ -93,10 +96,13 @@ pytransport_get_python_version() {
93 96
 	echo "${PYVER}"
94 97
 }
95 98
 
99
+einfo $PYTRANSPORT_LIB_DIR
100
+
101
+
96 102
 pytransport_install_libs() {
97 103
 	insinto /usr/lib/python$(pytransport_get_python_version)/site-packages/${PN}/
98
-	doins -r tools data src || \
99
-		die "Could not install data, tools, src"
104
+	doins -r ${PYTRANSPORT_LIB_DIR} || \
105
+		die "Could not install library"
100 106
 	newins $(pytransport_get_script_name) ${PN}.py || \
101 107
 		die "Could not find initial .py-scripts"
102 108
 	return 0
... ...
@@ -1,7 +1,3 @@
1
-AUX pyicq-t-svn-0.8.initd 651 RMD160 6fa9a9205c490770d888f69af9c1e64bde55ecbf SHA1 abb8589351737389ae7dbc2f23b482fd547c2ebc SHA256 fef146a0edcc0150b49bc1a97bfd6dc95aeabfbfc6b4b95096dae90146b7dd75
2
-MD5 e6a1d659fe2e1733a18653294735f12f files/pyicq-t-svn-0.8.initd 651
3
-RMD160 6fa9a9205c490770d888f69af9c1e64bde55ecbf files/pyicq-t-svn-0.8.initd 651
4
-SHA256 fef146a0edcc0150b49bc1a97bfd6dc95aeabfbfc6b4b95096dae90146b7dd75 files/pyicq-t-svn-0.8.initd 651
5 1
 EBUILD pyicq-t-svn-0.8.ebuild 246 RMD160 c19e675a3227133f5a21196bacd393519f5ed3a4 SHA1 cf450f441a7f57ea734c6dcc22d900d7fe7f169d SHA256 cbd7ca3e028d97f27d7e9912d9a535917280f381c2e35e8a9e1fe25d34c5e458
6 2
 MD5 4685b3949c658382868c6095ba795735 pyicq-t-svn-0.8.ebuild 246
7 3
 RMD160 c19e675a3227133f5a21196bacd393519f5ed3a4 pyicq-t-svn-0.8.ebuild 246
... ...
@@ -1,25 +0,0 @@
1
-#!/sbin/runscript
2
-# Copyright 1999-2006 BreakMyGentoo.net
3
-# Distributed under the terms of the GNU General Public License v2
4
-# $Header: $
5
-
6
-depend() {
7
-	need net
8
-	use jabber-server
9
-}
10
-
11
-start() {
12
-	ebegin "Starting ICQ Jabber Transport (SVN)"
13
-	start-stop-daemon --start --quiet --background --name "pyicq-t-svn" --chuid jabber:jabber \
14
-		--exec /usr/bin/python /usr/lib/PATH/site-packages/pyicq-t-svn/pyicq-t-svn.py -- \
15
-		-c /etc/jabber/pyicq-t-svn.xml \
16
-		-l /var/log/jabber/pyicq-t-svn.log
17
-	eend $?
18
-}
19
-
20
-stop() {
21
-	ebegin "Stopping ICQ Jabber Transport (SVN)"
22
-	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t-svn.pid
23
-	sleep 3
24
-	eend $?
25
-}
... ...
@@ -1,17 +1,8 @@
1
-AUX pyicq-t-0.7a.initd 615 RMD160 b5a7832ff3e25934b63c3d18279df63223edd6f1 SHA1 1bf81ffd65ead3758e80075397ac35edda4a0325 SHA256 1720adf29e1e087590fa566ffd3dcb34c3cbfa374d6a27089464a027ec49f0b6
2
-MD5 2101c5b4b392bb31c87b97cd442be2a9 files/pyicq-t-0.7a.initd 615
3
-RMD160 b5a7832ff3e25934b63c3d18279df63223edd6f1 files/pyicq-t-0.7a.initd 615
4
-SHA256 1720adf29e1e087590fa566ffd3dcb34c3cbfa374d6a27089464a027ec49f0b6 files/pyicq-t-0.7a.initd 615
5
-DIST pyicq-t-0.7a.tar.gz 140340
6 1
 DIST pyicq-t-0.7b.tar.gz 139959 RMD160 a20db2f92130bd0630301a4cabb104e77cc956ab SHA1 a41be6d1918a462e8c5939cf63721accad1a1720 SHA256 abb0827d4711d361fdbba64181e21ceb2325d336ce95c5c67e3b1b5bec3b4dd2
7
-EBUILD pyicq-t-0.7a.ebuild 1520 RMD160 4a51b4d4cfab09fad187a72f96e90951693ee7a6 SHA1 475a03c1716189a27280e6ee016b04dda944708b SHA256 422d3eb95a3f1adc41061dc67d59990d368a70d836ad9413f347e7e1806b703c
8
-MD5 8ae20cb190b878daa95b0b211e698173 pyicq-t-0.7a.ebuild 1520
9
-RMD160 4a51b4d4cfab09fad187a72f96e90951693ee7a6 pyicq-t-0.7a.ebuild 1520
10
-SHA256 422d3eb95a3f1adc41061dc67d59990d368a70d836ad9413f347e7e1806b703c pyicq-t-0.7a.ebuild 1520
11
-EBUILD pyicq-t-0.7b.ebuild 1535 RMD160 e6856fd7bc7c7dc995821b07bb6e521a35d742de SHA1 06ae43c43ee24a33b384090df15ec115b4778e8c SHA256 2785341a48179767546396b512765a54748c7ba9d3e24b1b4c492532b975266f
12
-MD5 bdb111ecac05dbbc8a50055b6082c849 pyicq-t-0.7b.ebuild 1535
13
-RMD160 e6856fd7bc7c7dc995821b07bb6e521a35d742de pyicq-t-0.7b.ebuild 1535
14
-SHA256 2785341a48179767546396b512765a54748c7ba9d3e24b1b4c492532b975266f pyicq-t-0.7b.ebuild 1535
2
+EBUILD pyicq-t-0.7b.ebuild 245 RMD160 c43eca2ac689e29d2ebbdad5112e9bd212d2fb3e SHA1 87bbe42443fcf49a29433dcd1bd03036d1365121 SHA256 86c6ab3c8694b880b43cbecc607f60fd737c90f92227491b1808af46e465e13c
3
+MD5 7ef988032d514c64ad01651ad3e619ff pyicq-t-0.7b.ebuild 245
4
+RMD160 c43eca2ac689e29d2ebbdad5112e9bd212d2fb3e pyicq-t-0.7b.ebuild 245
5
+SHA256 86c6ab3c8694b880b43cbecc607f60fd737c90f92227491b1808af46e465e13c pyicq-t-0.7b.ebuild 245
15 6
 MISC ChangeLog 445 RMD160 e8b6858c237af6fa561d8cee9c2e7e9aa5c6de7f SHA1 f48a6bc03024b2a54bc50dd65317db3dcda6a597 SHA256 61eb783cdefa9b2c24a855879a35b3e1b6661a69a9152add1c924e30c117125f
16 7
 MD5 aad8d76d25a0d8f5604ec25fb1f063ff ChangeLog 445
17 8
 RMD160 e8b6858c237af6fa561d8cee9c2e7e9aa5c6de7f ChangeLog 445
... ...
@@ -20,9 +11,6 @@ MISC metadata.xml 298 RMD160 666d6893bdcfaaaf8f5bab8f0675c2d070b8de58 SHA1 01a81
20 11
 MD5 508ad196f8fa94f919bf37b68d2f3a74 metadata.xml 298
21 12
 RMD160 666d6893bdcfaaaf8f5bab8f0675c2d070b8de58 metadata.xml 298
22 13
 SHA256 31355dfddbcb89e8082ed7f17be6b7f49215228385223470e3ed5ea59cb84640 metadata.xml 298
23
-MD5 57701b02196486d34a6738509cc95f14 files/digest-pyicq-t-0.7a 64
24
-RMD160 1fc063724087b15e5c726de1ff2c7e983430d839 files/digest-pyicq-t-0.7a 64
25
-SHA256 e6913c8bc69a732202b96a3b3eed66a7532c541de0f32da483e898c01034f460 files/digest-pyicq-t-0.7a 64
26 14
 MD5 d0eabdbe02340dbd85c0f981aba907d7 files/digest-pyicq-t-0.7b 238
27 15
 RMD160 4468dbb82f3e1c73e967b211dec96a36a96731e1 files/digest-pyicq-t-0.7b 238
28 16
 SHA256 640243c5345761d0ace881f6741c37dc03351d289308be93a29b8230bbfbea83 files/digest-pyicq-t-0.7b 238
... ...
@@ -1 +0,0 @@
1
-MD5 3a712b152b80e9b2d060548292f56274 pyicq-t-0.7a.tar.gz 140340
... ...
@@ -1,25 +0,0 @@
1
-#!/sbin/runscript
2
-# Copyright 1999-2006 BreakMyGentoo.net
3
-# Distributed under the terms of the GNU General Public License v2
4
-# $Header: $
5
-
6
-depend() {
7
-	need net
8
-	use jabber-server
9
-}
10
-
11
-start() {
12
-	ebegin "Starting ICQ Jabber Transport"
13
-	start-stop-daemon --start --quiet --background --name "pyicq-t" --chuid jabber:jabber \
14
-		--exec /usr/bin/python /usr/lib/PATH/site-packages/pyicq-t/pyicq-t.py -- \
15
-		-c /etc/jabber/pyicq-t.xml \
16
-		-l /var/log/jabber/pyicq-t.log
17
-	eend $?
18
-}
19
-
20
-stop() {
21
-	ebegin "Stopping ICQ Jabber Transport"
22
-	start-stop-daemon --stop --quiet --pidfile /var/run/jabber/pyicq-t.pid
23
-	sleep 3
24
-	eend $?
25
-}
... ...
@@ -1,52 +0,0 @@
1
-# Copyright 1999-2006 BreakMyGentoo.net
2
-# Distributed under the terms of the GNU General Public License v2
3
-# $Header: $
4
-
5
-inherit eutils python
6
-
7
-DESCRIPTION="New Python based jabber transport for ICQ"
8
-HOMEPAGE="http://pyicq-t.blathersource.org/"
9
-SRC_URI="http://www.blathersource.org/download.php/${PN}/${P}.tar.gz"
10
-LICENSE="GPL-2"
11
-SLOT="0"
12
-KEYWORDS="~x86"
13
-
14
-DEPEND=">=net-im/jabber-base-0.0
15
-	>=dev-lang/python-2.3"
16
-	
17
-RDEPEND=">=dev-python/twisted-1.3.0
18
-	>=dev-python/twisted-words-0.1.0
19
-	>=dev-python/twisted-xish-0.1.0
20
-	>=dev-python/twisted-web-0.5.0
21
-	>=dev-python/nevow-0.4.1
22
-	>=dev-python/imaging-1.1"
23
-IUSE=""
24
-
25
-src_install() {
26
-	python_version
27
-	insinto /usr/lib/python${PYVER}/site-packages/${PN}/
28
-	doins -r tools data src
29
-	newins PyICQt.py ${PN}.py
30
-
31
-	insinto /etc/jabber
32
-	newins config_example.xml ${PN}.xml
33
-	fperms 600 /etc/jabber/${PN}.xml
34
-	fowners jabber:jabber /etc/jabber/${PN}.xml
35
-	dosed \
36
-		"s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber/</spooldir>:" \
37
-		/etc/jabber/${PN}.xml
38
-	dosed \
39
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
40
-		/etc/jabber/${PN}.xml
41
-
42
-	exeinto /etc/init.d
43
-	newexe ${FILESDIR}/${P}.initd ${PN}
44
-	dosed "s/PATH/python${PYVER}/" /etc/init.d/${PN}
45
-}
46
-
47
-pkg_postinst() {
48
-	einfo "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
49
-	einfo "Please edit it, and the configuration of you Jabber server to match."
50
-	einfo "You also need to create a directory icq.yourjabberhostname.tld in"
51
-	einfo "/var/spool/jabber and chown it to jabber:jabber."
52
-}
... ...
@@ -2,51 +2,8 @@
2 2
 # Distributed under the terms of the GNU General Public License v2
3 3
 # $Header: $
4 4
 
5
-inherit eutils python
5
+inherit pytransport
6 6
 
7 7
 DESCRIPTION="New Python based jabber transport for ICQ"
8
-HOMEPAGE="http://pyicq-t.blathersource.org/"
9
-SRC_URI="http://www.blathersource.org/download.php/${PN}/${P}.tar.gz"
10 8
 LICENSE="GPL-2"
11
-SLOT="0"
12 9
 KEYWORDS="-* ~x86 ~ppc ~amd64"
13
-
14
-DEPEND=">=net-im/jabber-base-0.0
15
-	>=dev-lang/python-2.3"
16
-	
17
-RDEPEND=">=dev-python/twisted-1.3.0
18
-	>=dev-python/twisted-words-0.1.0
19
-	>=dev-python/twisted-xish-0.1.0
20
-	>=dev-python/twisted-web-0.5.0
21
-	>=dev-python/nevow-0.4.1
22
-	>=dev-python/imaging-1.1"
23
-IUSE=""
24
-
25
-src_install() {
26
-	python_version
27
-	insinto /usr/lib/python${PYVER}/site-packages/${PN}/
28
-	doins -r tools data src
29
-	newins PyICQt.py ${PN}.py
30
-
31
-	insinto /etc/jabber
32
-	newins config_example.xml ${PN}.xml
33
-	fperms 600 /etc/jabber/${PN}.xml
34
-	fowners jabber:jabber /etc/jabber/${PN}.xml
35
-	dosed \
36
-		"s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber/</spooldir>:" \
37
-		/etc/jabber/${PN}.xml
38
-	dosed \
39
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
40
-		/etc/jabber/${PN}.xml
41
-
42
-	exeinto /etc/init.d
43
-	newexe ${FILESDIR}/${P}.initd ${PN}
44
-	dosed "s/PATH/python${PYVER}/" /etc/init.d/${PN}
45
-}
46
-
47
-pkg_postinst() {
48
-	einfo "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
49
-	einfo "Please edit it, and the configuration of you Jabber server to match."
50
-	einfo "You also need to create a directory icq.yourjabberhostname.tld in"
51
-	einfo "/var/spool/jabber and chown it to jabber:jabber."
52
-}
... ...
@@ -2,10 +2,10 @@ AUX pymsn-t-svn.initd 733 RMD160 2e8d6ea418b4f2c2319d3c479b8755a2fa607b99 SHA1 a
2 2
 MD5 b35c0259d4a9a9f5723f7040d2aff780 files/pymsn-t-svn.initd 733
3 3
 RMD160 2e8d6ea418b4f2c2319d3c479b8755a2fa607b99 files/pymsn-t-svn.initd 733
4 4
 SHA256 0062c6adc17633d238b638d25946a4fed7a829eae24eeb99f460f6702f87b859 files/pymsn-t-svn.initd 733
5
-EBUILD pymsn-t-svn-0.12.ebuild 1850 RMD160 3b64f4d160ac6a2bdbdfcdf5b5b76e2e32d622a6 SHA1 877c6e8672fc78c8f5d5712bcfb72f3e4e753cf4 SHA256 4e1415a90600a1344f853effbb0ac3fe7d0e31c3d93fc72c55f4ae84b0efc87e
6
-MD5 a0016848fd52dfbde0c6d11cbae9a973 pymsn-t-svn-0.12.ebuild 1850
7
-RMD160 3b64f4d160ac6a2bdbdfcdf5b5b76e2e32d622a6 pymsn-t-svn-0.12.ebuild 1850
8
-SHA256 4e1415a90600a1344f853effbb0ac3fe7d0e31c3d93fc72c55f4ae84b0efc87e pymsn-t-svn-0.12.ebuild 1850
5
+EBUILD pymsn-t-svn-0.12.ebuild 418 RMD160 916267778ba059ac4df51175a88c814e514a7fdd SHA1 edad4d4780fbd44807a12143dc4be8e00c9e4db0 SHA256 5dd890e35a01896f58e4c401f966065d742591eb1619abd9edef3dcfcba3adae
6
+MD5 cfda78d1cf0a77aba10a54bcfdbc0472 pymsn-t-svn-0.12.ebuild 418
7
+RMD160 916267778ba059ac4df51175a88c814e514a7fdd pymsn-t-svn-0.12.ebuild 418
8
+SHA256 5dd890e35a01896f58e4c401f966065d742591eb1619abd9edef3dcfcba3adae pymsn-t-svn-0.12.ebuild 418
9 9
 MD5 68b329da9893e34099c7d8ad5cb9c940 files/digest-pymsn-t-svn-0.12 1
10 10
 RMD160 c0da025038ed83c687ddc430da9846ecb97f3998 files/digest-pymsn-t-svn-0.12 1
11 11
 SHA256 01ba4719c80b6fe911b091a7c05124b64eeece964e09c058ef8f9805daca546b files/digest-pymsn-t-svn-0.12 1
... ...
@@ -2,62 +2,13 @@
2 2
 # Distributed under the terms of the GNU General Public License v2
3 3
 # $Header: /var/cvsroot/gentoo-x86/net-im/pymsn-t/pymsn-t-0.11a-r4.ebuild,v 1.3 2006/04/06 19:53:18 swegener Exp $
4 4
 
5
-inherit eutils python subversion
6 5
 
7
-ESVN_REPO_URI="http://delx.cjb.net/svn/pymsnt/trunk"
6
+inherit pytransport
7
+
8
+ESVN_REPO_URI=http://delx.cjb.net/svn/pymsnt/trunk
9
+PYTRANSPORT_LIB_DIRS="data src"
8 10
 
9 11
 
10
-MY_PN="pymsnt"
11
-S=${WORKDIR}/${MY_PN}-${PV/a/}
12 12
 DESCRIPTION="New Python based jabber transport for MSN"
13
-HOMEPAGE="http://msn-transport.jabberstudio.org/"
14
-LICENSE="GPL-2"
15 13
 SLOT="0"
16 14
 KEYWORDS="~amd64 ~x86"
17
-
18
-DEPEND=">=net-im/jabber-base-0.0
19
-	>=dev-lang/python-2.3"
20
-
21
-RDEPEND=">=dev-python/twisted-1.3.0
22
-	>=dev-python/twisted-words-0.1.0
23
-	>=dev-python/twisted-xish-0.1.0
24
-	>=dev-python/twisted-web-0.5.0
25
-	>=dev-python/nevow-0.4.1
26
-	>=dev-python/imaging-1.1"
27
-IUSE=""
28
-
29
-src_install() {
30
-	python_version
31
-	einfo ${PWD}
32
-	insinto /usr/lib/python${PYVER}/site-packages/${PN}
33
-	doins -r data src
34
-	newins PyMSNt.py ${PN}.py
35
-
36
-	insinto /etc/jabber
37
-	newins config-example.xml ${PN}.xml
38
-	fperms 600 /etc/jabber/${PN}.xml
39
-	fowners jabber:jabber /etc/jabber/${PN}.xml
40
-	dosed \
41
-		"s:<spooldir>[^\<]*</spooldir>:<spooldir>/var/spool/jabber/</spooldir>:" \
42
-		/etc/jabber/${PN}.xml
43
-	dosed \
44
-		"s:<pid>[^\<]*</pid>:<pid>/var/run/jabber/${PN}.pid</pid>:" \
45
-		/etc/jabber/${PN}.xml
46
-	dosed \
47
-		"s:<host>[^\<]*</host>:<host>example.org</host>:" \
48
-		/etc/jabber/${PN}.xml
49
-	dosed \
50
-		"s:<jid>[^\<]*</jid>:<jid>msn.example.org</jid>:" \
51
-		/etc/jabber/${PN}.xml
52
-
53
-	exeinto /etc/init.d
54
-	newexe ${FILESDIR}/${PN}.initd ${PN}
55
-	dosed "s/PATH/python${PYVER}/" /etc/init.d/${PN}
56
-}
57
-
58
-pkg_postinst() {
59
-	einfo "A sample configuration file has been installed in /etc/jabber/${PN}.xml."
60
-	einfo "Please edit it, and the configuration of you Jabber server to match."
61
-	einfo "You also need to create a directory msn.yourdomain.com in"
62
-	einfo "/var/spool/jabber/ and chown it to jabber:jabber."
63
-}
64 15