Remove legacy libfe_silc.so symlink to prevent signed messages from appearing twice. Old versions cleanup. Variable quoting fixed.

Package-Manager: portage-2.1.3.18

12 files changed, 150 insertions, 473 deletions

diff --git a/net-im/silc-plugin/ChangeLog b/net-im/silc-plugin/ChangeLog
index 576111d26512..5a5a9a30d8e0 100644
--- a/net-im/silc-plugin/ChangeLog
+++ b/net-im/silc-plugin/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/silc-plugin
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.27 2007/10/01 20:19:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/ChangeLog,v 1.28 2007/12/09 13:08:07 ticho Exp $
+
+*silc-plugin-1.1.2-r1 (09 Dec 2007)
+
+  09 Dec 2007; Andrej Kacian <ticho@gentoo.org> silc-plugin-1.0.1-r4.ebuild,
+  -silc-plugin-1.0.1-r5.ebuild, -silc-plugin-1.0.3.ebuild,
+  -silc-plugin-1.0.4.1.ebuild, silc-plugin-1.1.2.ebuild,
+  +silc-plugin-1.1.2-r1.ebuild:
+  Remove legacy libfe_silc.so symlink to prevent signed messages from
+  appearing twice. Old versions cleanup. Variable quoting fixed.
 
   01 Oct 2007; Sven Wegener <swegener@gentoo.org> silc-plugin-1.1.2.ebuild:
   Use full atoms for built_with_use.
diff --git a/net-im/silc-plugin/Manifest b/net-im/silc-plugin/Manifest
index 78257da9f776..0252a69b6983 100644
--- a/net-im/silc-plugin/Manifest
+++ b/net-im/silc-plugin/Manifest
@@ -9,39 +9,26 @@ AUX 1.0.1-gcc34.patch 471 RMD160 549d08e8ffa80a2ac2bb945b0a81a6b7d4cdb0ad SHA1 7
 MD5 1acb3335a10232ac14f179305e20477f files/1.0.1-gcc34.patch 471
 RMD160 549d08e8ffa80a2ac2bb945b0a81a6b7d4cdb0ad files/1.0.1-gcc34.patch 471
 SHA256 6111df03ff5cb884bdce3566e3add9719c17894443644d40daee7967eaa3abe2 files/1.0.1-gcc34.patch 471
-DIST irssi-0.8.10a.tar.bz2 759953 RMD160 02ea076da7100bd81ce2ff66188ff81854b7bcba SHA1 c27c3aa19f7e54e4295c9e78f522194b296e9f7f SHA256 728101061a8b561bad2d516c7b8d1d696dc78b85b25208da6000c9a9b3927db4
 DIST irssi-0.8.9.tar.bz2 816465 RMD160 7a0a2a639c041802bfddd458c35bccaec8084013 SHA1 57799a1e99ac5f6694eb6fd049d39a4e2e51f576 SHA256 230ffa21a97f930000e0004f18cf5b709d5da5408d297e1567538a53cf91c32c
 DIST silc-client-1.0.1.tar.gz 1862493 RMD160 007ff291d9d7481a646b24161b75be3a963a27b2 SHA1 d41ccb47dfe1a415da7dc15010ef8b52e1b129f8 SHA256 e53961ac6b79d150e0d3a1fa3e0e6220831402c9c50d699add00d82309682426
-DIST silc-client-1.0.3.tar.gz 1948733 RMD160 12ecfc6a71f0fa20d4f3c845e3c9af9443123259 SHA1 88446fe391be40c718a51d983ac9f58331528dd9 SHA256 43740be0d26b506460dd11eb3c323ddcdf45c13c556a6e51883d25fb625b838b
-DIST silc-client-1.0.4.1.tar.gz 1973143 RMD160 b94f0fe3a6fb42907b7accc2ff8161a89f082d8a SHA1 2f2ced79882f5f12e4a4e3ea1f8daa21e5609dd6 SHA256 2569f756008ec48df7b38300ac1bf03cb2891ef2b0b11b67b762b2190957bf69
 DIST silc-client-1.1.2.tar.bz2 1622496 RMD160 ac08152f7d49a0e14c2b900c3983d5e97992f29a SHA1 b529a48f8e21752e690c43e869ca7ff8ed3906ce SHA256 6c03bf28c87eef31c2058acfa132542cc088ae819f2233d520b042eb916d89f4
 DIST silc-plugin-1.0.1.tar.gz 24789 RMD160 da196e12573032adcd22ed89de65e1f160a43ef3 SHA1 7a6f4999c5f2dceccf6fa351f416238133550fdd SHA256 af32e6bcd2b72dc2fb09c691c2be98f6c107845d45f47b34ac465b5d0ca7238f
-DIST silc-plugin-1.0.3.tar.gz 25661 RMD160 c127f2a1f039cd4418cf3482c67e8c429ec93b00 SHA1 aa6cb1cba0f0f201e02ed2e1b622f168115e92ba SHA256 d596f416ba1fad93cd75ce8b5ae4e335b2f1ae75d1cebc5fd6b07793a7eff37f
-DIST silc-plugin-1.0.4.1.tar.gz 26771 RMD160 6f01f96ccbb828521a357c03f9cdb4e890f42493 SHA1 4e203a0b242522d118781465b9d59fc4a2f338b3 SHA256 9b0d10f91cde9c7b0401e892e4b43253df792d315ba56f18e732e42c19112708
-EBUILD silc-plugin-1.0.1-r4.ebuild 3521 RMD160 ad0db878b54a4fc58bc1c21f53610fdfd54d8480 SHA1 fdd57a500223a713b37b7b28aca587887cc1606f SHA256 fe4eaeda4c39ce31a0344f81e1cf8c2927aede0095d4c9dd7a282dc879e87a96
-MD5 60ebb683a8dfce096866c3ba3c9a035d silc-plugin-1.0.1-r4.ebuild 3521
-RMD160 ad0db878b54a4fc58bc1c21f53610fdfd54d8480 silc-plugin-1.0.1-r4.ebuild 3521
-SHA256 fe4eaeda4c39ce31a0344f81e1cf8c2927aede0095d4c9dd7a282dc879e87a96 silc-plugin-1.0.1-r4.ebuild 3521
-EBUILD silc-plugin-1.0.1-r5.ebuild 3683 RMD160 deed77c01a2c1aed1051ddb7464c9564a6143363 SHA1 9074b756f8760e363d186e8d7d2c3897c3db582f SHA256 31954b3ae35fdc98553f8ff3b3443e3181be7a75f11c6afb659ad2c296962cb3
-MD5 e1d5ffa205c2cf45f322123e2a7d6cf3 silc-plugin-1.0.1-r5.ebuild 3683
-RMD160 deed77c01a2c1aed1051ddb7464c9564a6143363 silc-plugin-1.0.1-r5.ebuild 3683
-SHA256 31954b3ae35fdc98553f8ff3b3443e3181be7a75f11c6afb659ad2c296962cb3 silc-plugin-1.0.1-r5.ebuild 3683
-EBUILD silc-plugin-1.0.3.ebuild 3660 RMD160 fc46e97045d29e1624f15565e0fa4f822bbe560e SHA1 f5e3725761b59c48d5a7426d5ac8978e4a3159ba SHA256 b35757e5df57c351df4aa6fff2730308c03c1aa219ab3f423d3e2d3f5b6e6eb6
-MD5 f3ece7a3226eaf94c9622ec7c1c58095 silc-plugin-1.0.3.ebuild 3660
-RMD160 fc46e97045d29e1624f15565e0fa4f822bbe560e silc-plugin-1.0.3.ebuild 3660
-SHA256 b35757e5df57c351df4aa6fff2730308c03c1aa219ab3f423d3e2d3f5b6e6eb6 silc-plugin-1.0.3.ebuild 3660
-EBUILD silc-plugin-1.0.4.1.ebuild 3666 RMD160 c932f758de47a369275cd6a570c83de48c32127e SHA1 9c16c354a0cffade03779c5ad938863b5d1dae2f SHA256 ecf1a82bc0ba28e97b4d406e08c9a6808644feae369d5687ef59466f8efb78ca
-MD5 1ec379da5cd05c1e987b646367bcaea2 silc-plugin-1.0.4.1.ebuild 3666
-RMD160 c932f758de47a369275cd6a570c83de48c32127e silc-plugin-1.0.4.1.ebuild 3666
-SHA256 ecf1a82bc0ba28e97b4d406e08c9a6808644feae369d5687ef59466f8efb78ca silc-plugin-1.0.4.1.ebuild 3666
-EBUILD silc-plugin-1.1.2.ebuild 2372 RMD160 712f96b5487c7ff9eb74099e8d2524f0a8c839c2 SHA1 19efe5e8f2417d5901a4846becfb760a6b58b161 SHA256 01f818af23507343727cf5950ae4af850886903ebba73cae728efaba9cceffc5
-MD5 d580f1c4f58c320ce77f43426d283775 silc-plugin-1.1.2.ebuild 2372
-RMD160 712f96b5487c7ff9eb74099e8d2524f0a8c839c2 silc-plugin-1.1.2.ebuild 2372
-SHA256 01f818af23507343727cf5950ae4af850886903ebba73cae728efaba9cceffc5 silc-plugin-1.1.2.ebuild 2372
-MISC ChangeLog 5089 RMD160 3b0439e2f0f64f9fb7ccf787933eadd108e9f094 SHA1 f5f4b8339eb6b91541580728497e85371e3dee9d SHA256 e2722b7bd7501614a9d2c6275fdc402b4bda40f74e7523b464cb768432905186
-MD5 f39e3a668c6ce195a7eb0b819b211e6f ChangeLog 5089
-RMD160 3b0439e2f0f64f9fb7ccf787933eadd108e9f094 ChangeLog 5089
-SHA256 e2722b7bd7501614a9d2c6275fdc402b4bda40f74e7523b464cb768432905186 ChangeLog 5089
+EBUILD silc-plugin-1.0.1-r4.ebuild 3541 RMD160 1c02bfe2370529525377fda8cd2593be007af995 SHA1 b351a49ee2d4e750a94b6b4c32f93fe4d9f04d41 SHA256 8a49b846e31a875d5fd98689e3a303ea690625dc39ded24a573894ecc3e84ee5
+MD5 39aa315ade402c7b175a68c32b5d9b62 silc-plugin-1.0.1-r4.ebuild 3541
+RMD160 1c02bfe2370529525377fda8cd2593be007af995 silc-plugin-1.0.1-r4.ebuild 3541
+SHA256 8a49b846e31a875d5fd98689e3a303ea690625dc39ded24a573894ecc3e84ee5 silc-plugin-1.0.1-r4.ebuild 3541
+EBUILD silc-plugin-1.1.2-r1.ebuild 2426 RMD160 1b036752313e858ec2ff1a9b1a08bc06adf7efcf SHA1 ccef98ab95841de265d6aed91561854dbba27e58 SHA256 209c5f2d7e22ecb30202683afda23d95be8b6c7b90d7a320dcc9a212b3cad749
+MD5 9e66eeb7203ad2c52c220a8e2cc3b66d silc-plugin-1.1.2-r1.ebuild 2426
+RMD160 1b036752313e858ec2ff1a9b1a08bc06adf7efcf silc-plugin-1.1.2-r1.ebuild 2426
+SHA256 209c5f2d7e22ecb30202683afda23d95be8b6c7b90d7a320dcc9a212b3cad749 silc-plugin-1.1.2-r1.ebuild 2426
+EBUILD silc-plugin-1.1.2.ebuild 2375 RMD160 920328d08e41bf28bd1b46b44e362d5370a052d7 SHA1 75326678a77bb8fd5581f427f660b31c7daa6789 SHA256 b9cbbd1420e589391c299d362c738c7352f8be03f4bae7a16df19a39a2dee82c
+MD5 955941ef321d87558163e65658f23807 silc-plugin-1.1.2.ebuild 2375
+RMD160 920328d08e41bf28bd1b46b44e362d5370a052d7 silc-plugin-1.1.2.ebuild 2375
+SHA256 b9cbbd1420e589391c299d362c738c7352f8be03f4bae7a16df19a39a2dee82c silc-plugin-1.1.2.ebuild 2375
+MISC ChangeLog 5484 RMD160 bfabc7e02c949486bc5b89d4f8aeccba80dec094 SHA1 d8683b7971da945d5e923d99bb69c95e0933e43a SHA256 75dc9933be66ce64eef8557d4923c8cae1fe5ab1cb0efcd49526834af58f62c4
+MD5 3d4ca22d0b9c6461e9eb90a04f41eacf ChangeLog 5484
+RMD160 bfabc7e02c949486bc5b89d4f8aeccba80dec094 ChangeLog 5484
+SHA256 75dc9933be66ce64eef8557d4923c8cae1fe5ab1cb0efcd49526834af58f62c4 ChangeLog 5484
 MISC metadata.xml 271 RMD160 5216a9aae0f65dab3a1be84a9e6091b201a76f3a SHA1 7ab9da31b572fef3a3bda3de8783e2bbdae73f3e SHA256 f5a363461f7e4e9d8d8a9ea60872d6ee71ab8914d303c62d3f529e0e972c24ca
 MD5 3d21d1bc81cfd81bfd0b0b3b2123b71c metadata.xml 271
 RMD160 5216a9aae0f65dab3a1be84a9e6091b201a76f3a metadata.xml 271
@@ -49,22 +36,16 @@ SHA256 f5a363461f7e4e9d8d8a9ea60872d6ee71ab8914d303c62d3f529e0e972c24ca metadata
 MD5 c2e9f3744d81f9a3cb38bb3c3ef16846 files/digest-silc-plugin-1.0.1-r4 744
 RMD160 04b946b3e3c5828238c77df1cf52d665265e6961 files/digest-silc-plugin-1.0.1-r4 744
 SHA256 3669b3f44283bdbe79892374c636430efe3176f8a1893e7a95814346289c487e files/digest-silc-plugin-1.0.1-r4 744
-MD5 c2e9f3744d81f9a3cb38bb3c3ef16846 files/digest-silc-plugin-1.0.1-r5 744
-RMD160 04b946b3e3c5828238c77df1cf52d665265e6961 files/digest-silc-plugin-1.0.1-r5 744
-SHA256 3669b3f44283bdbe79892374c636430efe3176f8a1893e7a95814346289c487e files/digest-silc-plugin-1.0.1-r5 744
-MD5 2d358baa8b901e5def4ff38a9665667c files/digest-silc-plugin-1.0.3 750
-RMD160 b1496d3c7031e50138448c22efd83b57287f7819 files/digest-silc-plugin-1.0.3 750
-SHA256 0558a4afd93a088c73116ad23d45975de1dcb4346ccf3f0041e992c9f3f7d5bc files/digest-silc-plugin-1.0.3 750
-MD5 7df325de369af0f83c6ba3e534d6e7ab files/digest-silc-plugin-1.0.4.1 762
-RMD160 6d977425a0bff9cf349c60ecf03802d25e77273f files/digest-silc-plugin-1.0.4.1 762
-SHA256 02851a998479edcc8b8699471da52044c3aaad1043cce31f77e262c7d16b28d6 files/digest-silc-plugin-1.0.4.1 762
 MD5 6ff5409c4e16d3ed9e15a2718461263c files/digest-silc-plugin-1.1.2 259
 RMD160 e62f957dd74816c9c3d9f0209cf16c6c7f96cbd5 files/digest-silc-plugin-1.1.2 259
 SHA256 0de24f6e72bbe9a23b1ebc79fe09274c9c6262cbf57d3e34cf9779b84ee8f966 files/digest-silc-plugin-1.1.2 259
+MD5 6ff5409c4e16d3ed9e15a2718461263c files/digest-silc-plugin-1.1.2-r1 259
+RMD160 e62f957dd74816c9c3d9f0209cf16c6c7f96cbd5 files/digest-silc-plugin-1.1.2-r1 259
+SHA256 0de24f6e72bbe9a23b1ebc79fe09274c9c6262cbf57d3e34cf9779b84ee8f966 files/digest-silc-plugin-1.1.2-r1 259
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHAVZVI1lqEGTUzyQRAp98AJ4xhydOsUXiIGTnBnWGS2Qt5Fb8WQCgj5ae
-1MS1EJ6O3sbaES/HskNYbS4=
-=k102
+iD8DBQFHW+i+QlM6RnzZP+IRAgkUAKCFBBQpyH1k2iebprWoI+HKL1kTygCfS8nz
+DZWuMkBDZGKu2nx4xPTCSs4=
+=lL+n
 -----END PGP SIGNATURE-----
diff --git a/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r5 b/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r5
deleted file mode 100644
index 76730a407704..000000000000
--- a/net-im/silc-plugin/files/digest-silc-plugin-1.0.1-r5
+++ /dev/null
@@ -1,9 +0,0 @@
-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
-MD5 6e086ddb21dc18e706750f43412f6b93 silc-client-1.0.1.tar.gz 1862493
-RMD160 007ff291d9d7481a646b24161b75be3a963a27b2 silc-client-1.0.1.tar.gz 1862493
-SHA256 e53961ac6b79d150e0d3a1fa3e0e6220831402c9c50d699add00d82309682426 silc-client-1.0.1.tar.gz 1862493
-MD5 986c750f2dac66838e3db505341923df silc-plugin-1.0.1.tar.gz 24789
-RMD160 da196e12573032adcd22ed89de65e1f160a43ef3 silc-plugin-1.0.1.tar.gz 24789
-SHA256 af32e6bcd2b72dc2fb09c691c2be98f6c107845d45f47b34ac465b5d0ca7238f silc-plugin-1.0.1.tar.gz 24789
diff --git a/net-im/silc-plugin/files/digest-silc-plugin-1.0.3 b/net-im/silc-plugin/files/digest-silc-plugin-1.0.3
deleted file mode 100644
index 0af0f565a220..000000000000
--- a/net-im/silc-plugin/files/digest-silc-plugin-1.0.3
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 38e616bccb6a34ff6d91690317c2fa19 irssi-0.8.10a.tar.bz2 759953
-RMD160 02ea076da7100bd81ce2ff66188ff81854b7bcba irssi-0.8.10a.tar.bz2 759953
-SHA256 728101061a8b561bad2d516c7b8d1d696dc78b85b25208da6000c9a9b3927db4 irssi-0.8.10a.tar.bz2 759953
-MD5 82c3ea6bf1dd64a27af39a05d35b3f16 silc-client-1.0.3.tar.gz 1948733
-RMD160 12ecfc6a71f0fa20d4f3c845e3c9af9443123259 silc-client-1.0.3.tar.gz 1948733
-SHA256 43740be0d26b506460dd11eb3c323ddcdf45c13c556a6e51883d25fb625b838b silc-client-1.0.3.tar.gz 1948733
-MD5 6c2956fe92b1c7fa3f096cf96e2fb439 silc-plugin-1.0.3.tar.gz 25661
-RMD160 c127f2a1f039cd4418cf3482c67e8c429ec93b00 silc-plugin-1.0.3.tar.gz 25661
-SHA256 d596f416ba1fad93cd75ce8b5ae4e335b2f1ae75d1cebc5fd6b07793a7eff37f silc-plugin-1.0.3.tar.gz 25661
diff --git a/net-im/silc-plugin/files/digest-silc-plugin-1.0.4.1 b/net-im/silc-plugin/files/digest-silc-plugin-1.0.4.1
deleted file mode 100644
index 06371743d6db..000000000000
--- a/net-im/silc-plugin/files/digest-silc-plugin-1.0.4.1
+++ /dev/null
@@ -1,9 +0,0 @@
-MD5 38e616bccb6a34ff6d91690317c2fa19 irssi-0.8.10a.tar.bz2 759953
-RMD160 02ea076da7100bd81ce2ff66188ff81854b7bcba irssi-0.8.10a.tar.bz2 759953
-SHA256 728101061a8b561bad2d516c7b8d1d696dc78b85b25208da6000c9a9b3927db4 irssi-0.8.10a.tar.bz2 759953
-MD5 315492b403ed3b1bd000b8165e5ae0d2 silc-client-1.0.4.1.tar.gz 1973143
-RMD160 b94f0fe3a6fb42907b7accc2ff8161a89f082d8a silc-client-1.0.4.1.tar.gz 1973143
-SHA256 2569f756008ec48df7b38300ac1bf03cb2891ef2b0b11b67b762b2190957bf69 silc-client-1.0.4.1.tar.gz 1973143
-MD5 cdba5df4e367e11cc05674550f1a8284 silc-plugin-1.0.4.1.tar.gz 26771
-RMD160 6f01f96ccbb828521a357c03f9cdb4e890f42493 silc-plugin-1.0.4.1.tar.gz 26771
-SHA256 9b0d10f91cde9c7b0401e892e4b43253df792d315ba56f18e732e42c19112708 silc-plugin-1.0.4.1.tar.gz 26771
diff --git a/net-im/silc-plugin/files/digest-silc-plugin-1.1.2-r1 b/net-im/silc-plugin/files/digest-silc-plugin-1.1.2-r1
new file mode 100644
index 000000000000..2dc6fff038d5
--- /dev/null
+++ b/net-im/silc-plugin/files/digest-silc-plugin-1.1.2-r1
@@ -0,0 +1,3 @@
+MD5 6e440bbfd9a746cf33c020c31ab95a30 silc-client-1.1.2.tar.bz2 1622496
+RMD160 ac08152f7d49a0e14c2b900c3983d5e97992f29a silc-client-1.1.2.tar.bz2 1622496
+SHA256 6c03bf28c87eef31c2058acfa132542cc088ae819f2233d520b042eb916d89f4 silc-client-1.1.2.tar.bz2 1622496
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild
index 2bcb23dff1ba..5a2c095209c8 100644
--- a/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild,v 1.5 2006/10/26 19:47:24 ticho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r4.ebuild,v 1.6 2007/12/09 13:08:07 ticho Exp $
 
 inherit eutils perl-module
 
@@ -33,14 +33,14 @@ src_compile() {
 
 	echo
 	einfo "Preparing silc-client\n"
-	cd ${S_SILC}
+	cd "${S_SILC}"
 	if has_version ">=net-irc/irssi-0.8.10_rc1" ; then
 		sed -i -e "s:\"term_type\":\"term_charset\":" \
 			irssi/src/silc/core/silc-servers.c
 		sed -i -e "s:\"term_type\":\"term_charset\":" \
 			irssi/src/fe-text/term.c
 	fi
-	econf --with-helpdir=${D}/usr/share/irssi/help/silc/ \
+	econf --with-helpdir="${D}"/usr/share/irssi/help/silc/ \
 		--without-libtoolfix \
 		--enable-static \
 		`use_enable debug` || die "silc-client configure failed"
@@ -48,14 +48,14 @@ src_compile() {
 
 	echo
 	einfo "Patching irssi source for silc-plugin\n"
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-branch-update.patch || die "${PV}-branch-update.patch failed"
-	emake patch IRSSI=${S_IRSSI} SILC=${S_SILC} || die "patching irssi sources failed"
+	cd "${S}"
+	epatch "${FILESDIR}"/${PV}-branch-update.patch || die "${PV}-branch-update.patch failed"
+	emake patch IRSSI="${S_IRSSI}" SILC="${S_SILC}" || die "patching irssi sources failed"
 
-	cd ${S_IRSSI}
+	cd "${S_IRSSI}"
 
 	# this tiny patch fixes a compile-time error (bug #67255)  - ticho
-	epatch ${FILESDIR}/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
+	epatch "${FILESDIR}"/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
 
 	echo
 	einfo "Configuring irssi\n"
@@ -68,22 +68,22 @@ src_compile() {
 }
 
 src_install() {
-	cd ${S_IRSSI}
-	make -C src/perl/silc DESTDIR=${D} install || die "irssi's src/perl/silc installation failed"
-	make -C src/fe-common/silc DESTDIR=${D} install || die "irssi's src/fe-common/silc installation failed"
-	make -C src/silc/core install DESTDIR=${D} install ||  die "irssi's src/silc/core installation failed"
+	cd "${S_IRSSI}"
+	make -C src/perl/silc DESTDIR="${D}" install || die "irssi's src/perl/silc installation failed"
+	make -C src/fe-common/silc DESTDIR="${D}" install || die "irssi's src/fe-common/silc installation failed"
+	make -C src/silc/core install DESTDIR="${D}" install ||  die "irssi's src/silc/core installation failed"
 
-	cd ${S_SILC}
+	cd "${S_SILC}"
 	make -C irssi/docs/help install || die "silc-client's helpfiles installation failed"
 
-	cd ${S}
+	cd "${S}"
 	insinto /usr/share/irssi/scripts
 	doins scripts/*
 
 	insinto /usr/share/irssi
 	doins default.theme
 
-	dodoc AUTHORS COPYING README USAGE
+	dodoc AUTHORS README USAGE
 
 	fixlocalpod
 }
diff --git a/net-im/silc-plugin/silc-plugin-1.0.1-r5.ebuild b/net-im/silc-plugin/silc-plugin-1.0.1-r5.ebuild
deleted file mode 100644
index 36574646a52e..000000000000
--- a/net-im/silc-plugin/silc-plugin-1.0.1-r5.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2006 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.1-r5.ebuild,v 1.4 2006/10/26 19:47:24 ticho Exp $
-
-inherit eutils perl-module
-
-IRSSI_PV=0.8.9
-
-DESCRIPTION="A SILC plugin for Irssi"
-HOMEPAGE="http://penguin-breeder.org/silc/"
-SRC_URI="http://irssi.org/files/irssi-${IRSSI_PV}.tar.bz2
-	http://silcnet.org/download/client/sources/silc-client-${PV}.tar.gz
-	http://penguin-breeder.org/silc/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug"
-
-# All necessary dependencies are pulled in by irssi.
-DEPEND="virtual/libc
-	=dev-libs/glib-1.2*
-	www-client/lynx"    # this is for .html -> .txt docs convert
-RDEPEND=">=net-irc/irssi-${IRSSI_PV}
-	>=dev-perl/MIME-tools-5.413
-	dev-perl/File-MMagic
-	dev-perl/MailTools"
-
-S_SILC="${S}/../silc-client-${PV}"
-S_IRSSI="${S}/../irssi-${IRSSI_PV}"
-
-src_compile() {
-
-	echo
-	einfo "Preparing silc-client\n"
-	cd ${S_SILC}
-	if has_version ">=net-irc/irssi-0.8.10_rc1" ; then
-		sed -i -e "s:\"term_type\":\"term_charset\":" \
-			irssi/src/silc/core/silc-servers.c
-		sed -i -e "s:\"term_type\":\"term_charset\":" \
-			irssi/src/fe-text/term.c
-	fi
-
-	local myconf
-
-	myconf="--without-libtoolfix --enable-static \
-		--with-helpdir=${D}/usr/share/irssi/help/silc/"
-
-	if use debug ; then
-		myconf="${myconf} --enable-debug"
-	else
-		myconf="${myconf} --disable-debug"
-	fi
-
-	if use amd64; then
-		myconf="${myconf} --with-pic"
-	fi
-
-	econf ${myconf} || die "configure failed"
-
-	( MAKEOPTS="" emake -C lib ) || die "silc-client's lib compilation failed"
-
-	echo
-	einfo "Patching irssi source for silc-plugin\n"
-	cd ${S}
-	epatch ${FILESDIR}/${PV}-branch-update.patch || die "${PV}-branch-update.patch failed"
-	emake patch IRSSI=${S_IRSSI} SILC=${S_SILC} || die "patching irssi sources failed"
-
-	cd ${S_IRSSI}
-
-	# this tiny patch fixes a compile-time error (bug #67255)  - ticho
-	epatch ${FILESDIR}/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
-
-	echo
-	einfo "Configuring irssi\n"
-	econf --sysconfdir=/etc || die "irssi configure failed"
-	echo
-	einfo "Compiling silc-plugin\n"
-	emake -C src/perl || die "irssi's src/perl compilation failed"
-	emake -C src/fe-common/silc || die "irssi's src/fe-common/silc compilation failed"
-	emake -C src/silc/core || die "irssi's src/silc/core compilation failed"
-}
-
-src_install() {
-	cd ${S_IRSSI}
-	make -C src/perl/silc DESTDIR=${D} install || die "irssi's src/perl/silc installation failed"
-	make -C src/fe-common/silc DESTDIR=${D} install || die "irssi's src/fe-common/silc installation failed"
-	make -C src/silc/core install DESTDIR=${D} install ||  die "irssi's src/silc/core installation failed"
-
-	cd ${S_SILC}
-	make -C irssi/docs/help install || die "silc-client's helpfiles installation failed"
-
-	cd ${S}
-	insinto /usr/share/irssi/scripts
-	doins scripts/*
-
-	insinto /usr/share/irssi
-	doins default.theme
-
-	dodoc AUTHORS COPYING README USAGE
-
-	fixlocalpod
-}
-
-pkg_postinst() {
-	einfo "You can load the plugin with following command in Irssi:"
-	einfo
-	einfo "\t/LOAD silc"
-	einfo
-	einfo "It will automatically generate a new key pair for you. You will be asked to"
-	einfo "enter a passphrase for this keypair twice. If you leave the passphrase"
-	einfo "empty, your key will not be stored encrypted."
-	einfo
-	einfo "To make full use of silc-plugin, you should load the following perl scripts"
-	einfo "into irssi:"
-	einfo
-	einfo "\t/SCRIPT LOAD silc"
-	einfo "\t/SCRIPT LOAD silc-mime"
-	einfo
-	einfo "To connect to the SILCNet, you can use following command in Irssi:"
-	einfo
-	einfo "\t/CONNECT -silcnet SILCNet silc.silcnet.org"
-	einfo
-	einfo "Have fun."
-}
diff --git a/net-im/silc-plugin/silc-plugin-1.0.3.ebuild b/net-im/silc-plugin/silc-plugin-1.0.3.ebuild
deleted file mode 100644
index 2d16bf9a32c5..000000000000
--- a/net-im/silc-plugin/silc-plugin-1.0.3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.3.ebuild,v 1.3 2007/08/22 06:48:08 ticho Exp $
-
-inherit eutils perl-module
-
-IRSSI_PV="0.8.10a"
-
-DESCRIPTION="A SILC plugin for Irssi"
-HOMEPAGE="http://penguin-breeder.org/silc/"
-SRC_URI="http://www.irssi.org/files/irssi-${IRSSI_PV}.tar.bz2
-	http://silcnet.org/download/client/sources/silc-client-${PV}.tar.gz
-	http://penguin-breeder.org/silc/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug"
-
-# All necessary dependencies are pulled in by irssi.
-DEPEND="=dev-libs/glib-1.2*
-	www-client/lynx"	# this is for .html -> .txt docs convert
-RDEPEND=">=net-irc/irssi-${IRSSI_PV%a}
-	>=dev-perl/MIME-tools-5.413
-	dev-perl/File-MMagic
-	dev-perl/MailTools"
-
-S_SILC="${S}/../silc-client-${PV}"
-S_IRSSI="${S}/../irssi-${IRSSI_PV%a}"
-
-src_compile() {
-
-	echo
-	einfo "Preparing silc-client\n"
-	cd ${S_SILC}
-
-	local myconf
-
-	myconf="--without-libtoolfix \
-		--enable-static \
-		--with-helpdir=${D}/usr/share/irssi/help/silc/\
-		--without-silc-libs \
-		--with-pthreads=no"
-
-	if use debug ; then
-		myconf="${myconf} --enable-debug"
-	else
-		myconf="${myconf} --disable-debug"
-	fi
-
-	if use amd64; then
-		myconf="${myconf} --with-pic"
-	fi
-
-	econf ${myconf} || die "configure failed"
-
-	( MAKEOPTS="-j1" emake -C lib ) || die "silc-client's lib compilation failed"
-
-	echo
-	einfo "Patching irssi source for silc-plugin\n"
-	cd ${S}
-	emake patch IRSSI=${S_IRSSI} SILC=${S_SILC} || die "patching irssi sources failed"
-
-	cd ${S_IRSSI}
-
-	# this tiny patch fixes a compile-time error (bug #67255)  - ticho
-	#epatch ${FILESDIR}/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
-
-	echo
-	einfo "Configuring irssi\n"
-	econf --sysconfdir=/etc || die "irssi configure failed"
-	echo
-	einfo "Compiling silc-plugin\n"
-	emake -C src/perl || die "irssi's src/perl compilation failed"
-	emake -C src/fe-common/silc || die "irssi's src/fe-common/silc compilation failed"
-	emake -C src/silc/core || die "irssi's src/silc/core compilation failed"
-}
-
-src_install() {
-	cd ${S_IRSSI}
-	make -C src/perl/silc DESTDIR=${D} install || die "irssi's src/perl/silc installation failed"
-	make -C src/fe-common/silc DESTDIR=${D} install || die "irssi's src/fe-common/silc installation failed"
-	make -C src/silc/core install DESTDIR=${D} install ||  die "irssi's src/silc/core installation failed"
-
-	cd ${S_SILC}
-	make -C apps/irssi/docs/help install || die "silc-client's helpfiles installation failed"
-
-	cd ${S}
-	insinto /usr/share/irssi/scripts
-	doins scripts/*
-
-	insinto /usr/share/irssi
-	doins default.theme
-
-	dodoc AUTHORS COPYING README USAGE
-
-	# to fix segfault on connect with
-	if has_version '<net-irc/irssi-0.8.11'; then
-		cd ${D}/usr/$(get_libdir)/irssi/modules
-		mv libfe_common_silc.a libfe_silc.a
-		mv libfe_common_silc.la libfe_silc.a
-		mv libfe_common_silc.so libfe_silc.so
-		cd ${S}
-	fi
-
-	fixlocalpod
-}
-
-pkg_postinst() {
-	elog "You can load the plugin with following command in Irssi:"
-	elog
-	elog "\t/LOAD silc"
-	elog
-	elog "It will automatically generate a new key pair for you. You will be asked to"
-	elog "enter a passphrase for this keypair twice. If you leave the passphrase"
-	elog "empty, your key will not be stored encrypted."
-	elog
-	elog "To make full use of silc-plugin, you should load the following perl scripts"
-	elog "into irssi:"
-	elog
-	elog "\t/SCRIPT LOAD silc"
-	elog "\t/SCRIPT LOAD silc-mime"
-	elog
-	elog "To connect to the SILCNet, you can use following command in Irssi:"
-	elog
-	elog "\t/CONNECT -silcnet SILCNet silc.silcnet.org"
-	elog
-	elog "Have fun."
-}
diff --git a/net-im/silc-plugin/silc-plugin-1.0.4.1.ebuild b/net-im/silc-plugin/silc-plugin-1.0.4.1.ebuild
deleted file mode 100644
index e3a38741a8a2..000000000000
--- a/net-im/silc-plugin/silc-plugin-1.0.4.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.0.4.1.ebuild,v 1.2 2007/06/26 02:26:04 mr_bones_ Exp $
-
-inherit eutils perl-module
-
-IRSSI_PV="0.8.10a"
-
-DESCRIPTION="A SILC plugin for Irssi"
-HOMEPAGE="http://penguin-breeder.org/silc/"
-SRC_URI="http://www.irssi.org/files/irssi-${IRSSI_PV}.tar.bz2
-	http://silcnet.org/download/client/sources/silc-client-${PV}.tar.gz
-	http://penguin-breeder.org/silc/download/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-IUSE="debug"
-
-# All necessary dependencies are pulled in by irssi.
-DEPEND="=dev-libs/glib-1.2*
-	www-client/lynx"	# this is for .html -> .txt docs convert
-RDEPEND=">=net-irc/irssi-${IRSSI_PV%a}
-	>=dev-perl/MIME-tools-5.413
-	dev-perl/File-MMagic
-	dev-perl/MailTools"
-
-S_SILC="${S}/../silc-client-${PV}"
-S_IRSSI="${S}/../irssi-${IRSSI_PV%a}"
-
-src_compile() {
-
-	echo
-	einfo "Preparing silc-client\n"
-	cd ${S_SILC}
-
-	local myconf
-
-	myconf="--without-libtoolfix \
-		--enable-static \
-		--with-helpdir=${D}/usr/share/irssi/help/silc/\
-		--without-silc-libs \
-		--with-pthreads=no"
-
-	if use debug ; then
-		myconf="${myconf} --enable-debug"
-	else
-		myconf="${myconf} --disable-debug"
-	fi
-
-	if use amd64; then
-		myconf="${myconf} --with-pic"
-	fi
-
-	econf ${myconf} || die "configure failed"
-
-	( MAKEOPTS="-j1" emake -C lib ) || die "silc-client's lib compilation failed"
-
-	echo
-	einfo "Patching irssi source for silc-plugin\n"
-	cd ${S}
-	emake patch IRSSI=${S_IRSSI} SILC=${S_SILC} || die "patching irssi sources failed"
-
-	cd ${S_IRSSI}
-
-	# this tiny patch fixes a compile-time error (bug #67255)  - ticho
-	#epatch ${FILESDIR}/${PV}-gcc34.patch || die "${PV}-gcc34.patch failed"
-
-	echo
-	einfo "Configuring irssi\n"
-	econf --sysconfdir=/etc || die "irssi configure failed"
-	echo
-	einfo "Compiling silc-plugin\n"
-	emake -C src/perl || die "irssi's src/perl compilation failed"
-	emake -C src/fe-common/silc || die "irssi's src/fe-common/silc compilation failed"
-	emake -C src/silc/core || die "irssi's src/silc/core compilation failed"
-}
-
-src_install() {
-	cd ${S_IRSSI}
-	make -C src/perl/silc DESTDIR=${D} install || die "irssi's src/perl/silc installation failed"
-	make -C src/fe-common/silc DESTDIR=${D} install || die "irssi's src/fe-common/silc installation failed"
-	make -C src/silc/core install DESTDIR=${D} install ||  die "irssi's src/silc/core installation failed"
-
-	cd ${S_SILC}
-	make -C apps/irssi/docs/help install || die "silc-client's helpfiles installation failed"
-
-	cd ${S}
-	insinto /usr/share/irssi/scripts
-	doins scripts/*
-
-	insinto /usr/share/irssi
-	doins default.theme
-
-	dodoc AUTHORS COPYING README USAGE
-
-	# to fix segfault on connect with
-	if has_version '<net-irc/irssi-0.8.11'; then
-		cd ${D}/usr/$(get_libdir)/irssi/modules
-		mv libfe_common_silc.a libfe_silc.a
-		mv libfe_common_silc.la libfe_silc.a
-		mv libfe_common_silc.so libfe_silc.so
-		cd ${S}
-	fi
-
-	fixlocalpod
-}
-
-pkg_postinst() {
-	elog "You can load the plugin with following command in Irssi:"
-	elog
-	elog "\t/LOAD silc"
-	elog
-	elog "It will automatically generate a new key pair for you. You will be asked to"
-	elog "enter a passphrase for this keypair twice. If you leave the passphrase"
-	elog "empty, your key will not be stored encrypted."
-	elog
-	elog "To make full use of silc-plugin, you should load the following perl scripts"
-	elog "into irssi:"
-	elog
-	elog "\t/SCRIPT LOAD silc"
-	elog "\t/SCRIPT LOAD silc-mime"
-	elog
-	elog "To connect to the SILCNet, you can use following command in Irssi:"
-	elog
-	elog "\t/CONNECT -silcnet SILCNet silc.silcnet.org"
-	elog
-	elog "Have fun."
-}
diff --git a/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild b/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild
new file mode 100644
index 000000000000..008ee6296437
--- /dev/null
+++ b/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.1.2-r1.ebuild,v 1.1 2007/12/09 13:08:07 ticho Exp $
+
+inherit eutils perl-module
+
+IRSSI_PV="0.8.10a"
+
+DESCRIPTION="A SILC plugin for Irssi"
+HOMEPAGE="http://penguin-breeder.org/silc/"
+SRC_URI="http://www.silcnet.org/download/client/sources/silc-client-${PV}.tar.bz2"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+# All necessary dependencies are pulled in by irssi.
+DEPEND="=dev-libs/glib-1.2*
+	www-client/lynx"	# this is for .html -> .txt docs convert
+RDEPEND=">=net-irc/irssi-${IRSSI_PV%a}
+	>=dev-perl/MIME-tools-5.413
+	dev-perl/File-MMagic
+	dev-perl/MailTools"
+
+S="${WORKDIR}/silc-client-${PV}"
+
+pkg_setup() {
+	if ! built_with_use net-irc/irssi perl ; then
+		die "Irssi was built without perl support, building a perl plugin makes no sense."
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	sed -i -e "s:-g -O2:${CFLAGS}:g" configure
+	use amd64 && sed -i -e 's:felf\([^6]\):felf64\1:g' configure
+}
+
+src_compile() {
+
+	econf \
+			${myflags} \
+			--with-silc-plugin \
+			--without-silc-includes \
+			--with-pic \
+			|| die
+
+	emake || die
+}
+
+src_install() {
+	local myflags
+
+	R1="s/installsitearch='//"
+	R2="s/';//"
+	perl_sitearch="`perl -V:installsitearch | sed -e ${R1} -e ${R2}`"
+	myflags="${myflags} INSTALLPRIVLIB=/usr/$(get_libdir)"
+	myflags="${myflags} INSTALLARCHLIB=${perl_sitearch}"
+	myflags="${myflags} INSTALLSITELIB=${perl_sitearch}"
+	myflags="${myflags} INSTALLSITEARCH=${perl_sitearch}"
+
+	make DESTDIR="${D}" ${myflags} install || die
+
+	dodoc "${D}"/usr/share/doc/silc-client/*
+	rm -rf "${D}"/usr/share/doc/silc-client
+
+	rm "${D}"/usr/lib/irssi/modules/libfe_silc.so
+
+	fixlocalpod
+}
+
+pkg_postinst() {
+	elog "You can load the plugin with following command in Irssi:"
+	elog
+	elog "\t/LOAD silc"
+	elog
+	elog "It will automatically generate a new key pair for you. You will be asked to"
+	elog "enter a passphrase for this keypair twice. If you leave the passphrase"
+	elog "empty, your key will not be stored encrypted."
+	elog
+	elog "To make full use of silc-plugin, you should load the following perl script"
+	elog "into Irssi:"
+	elog
+	elog "\t/SCRIPT LOAD silc"
+	elog
+	elog "To connect to the SILCNet, you can use following command:"
+	elog
+	elog "\t/CONNECT -silcnet SILCNet silc.silcnet.org"
+	elog
+	elog "Have fun."
+}
diff --git a/net-im/silc-plugin/silc-plugin-1.1.2.ebuild b/net-im/silc-plugin/silc-plugin-1.1.2.ebuild
index f08afbcaab95..87414cd03666 100644
--- a/net-im/silc-plugin/silc-plugin-1.1.2.ebuild
+++ b/net-im/silc-plugin/silc-plugin-1.1.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.1.2.ebuild,v 1.4 2007/10/01 20:19:27 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/silc-plugin/silc-plugin-1.1.2.ebuild,v 1.5 2007/12/09 13:08:07 ticho Exp $
 
 inherit eutils perl-module
 
@@ -33,7 +33,7 @@ pkg_setup() {
 
 src_unpack() {
 	unpack ${A}
-	cd ${S}
+	cd "${S}"
 
 	sed -i -e "s:-g -O2:${CFLAGS}:g" configure
 	use amd64 && sed -i -e 's:felf\([^6]\):felf64\1:g' configure
@@ -64,8 +64,8 @@ src_install() {
 
 	make DESTDIR="${D}" ${myflags} install || die
 
-	dodoc ${D}/usr/share/doc/silc-client/*
-	rm -rf ${D}/usr/share/doc/silc-client
+	dodoc "${D}"/usr/share/doc/silc-client/*
+	rm -rf "${D}"/usr/share/doc/silc-client
 
 	fixlocalpod
 }