7 files changed, 11 insertions, 2 deletions
diff --git a/sys-apps/systemd-units/Manifest b/sys-apps/systemd-units/Manifest
index ad57d3a..d452c5e 100644
--- a/sys-apps/systemd-units/Manifest
+++ b/sys-apps/systemd-units/Manifest
@@ -2,11 +2,15 @@ AUX services-basic/atd.service 239 RMD160 bdd814328e6ed7a8b47ff4b1969a296dd87e0a
 AUX services-basic/metalog.service 118 RMD160 b2c8936cb4e3fdb9428b784e2e829d24a6c0e375 SHA1 c963db4f06c2da98c4de3eba9518491014f68c1e SHA256 160a01a618a0c218fe1b56d74c24b6042a22c82a96c11711019600f0ab557939
 AUX services-basic/syslog-ng.service 150 RMD160 322a68be82f21735248f02cedf67021b718d2234 SHA1 f493b9c0af849671fccafbb6ee3fd23a2259064a SHA256 8e936cee3ffb7941c46b418b3208246e46948404ac0f062a0ef2f3f94d8ecc83
 AUX services-basic/vixie-cron.service 158 RMD160 5135b058277a8c68e89fad06ac5096c8f95acaf9 SHA1 ec4cd323d1404ac10f72819d56cf565e75eff084 SHA256 54c27aef74a98ad7a2c74456b4e8aa933ae13aa9ee7ac2dbffabc449a7c95b3d
+AUX services-desktop/gdm_at.service 249 RMD160 518e692742336f7f2d2bd4b0d2f73fd0aa4c7bd2 SHA1 dba2a5b1e6c4e2b3e9e8879bc0926a28f5ee6eba SHA256 fbc77d9aa6e0dd1631244d3fe4663e09f4078cad2ab71c0c12b7077e67f7fd91
 AUX services-desktop/hald.service 209 RMD160 a82a68ec5406835e77124428e5f9bb624b458e86 SHA1 02d507bf0102c72553fea7e95e7763a5e7e629e9 SHA256 9cc914dedf756c9ca173ea86e89de36b7945ff3572b206a86bc53ba2a6dd75b8
 AUX services-desktop/iptables.service 478 RMD160 c95eebf8e1ba7ee1dce7400700bed232630e20f8 SHA1 b8eb5762a16785ead4d3d6e7dd1da59c99b50b78 SHA256 0f382f4145cd082c9f617bdeac279dc9ad4b89d8c5def414611cc16e53f04fc5
+AUX services-desktop/kdm_at.service 284 RMD160 14edb6e7f3d75df223a5035ceffd66b861cc220d SHA1 b9e9f0624ac5f24ef75f090fc82a70daddc2bf95 SHA256 99c8e775549497607e5e41a0fe9cbc11b46acfc1ac5aeca0370f45605ec01fa2
 AUX services-desktop/mpd.service 168 RMD160 5a4e58c6379510547591af015b4e595e64e4dfe6 SHA1 8c0baaf57e70e429b9fd1583acc2ac7192aa5b31 SHA256 87c9c059915c1704d37a15ec81d1feaec9259920c910662214091ee177877798
+AUX services-desktop/openvpn_at.service 156 RMD160 41159cdeb729454e89e1fa3a477b9b747cf7e110 SHA1 b059b087261acead7a7d548a5cec3be25d2d3d87 SHA256 dc57bf10e4f77845014ab20f29d73c024fa91efc5fea8e4af2a3cffb6ad8d68b
 AUX services-desktop/policykit-daemon.service 173 RMD160 c333d90e4cf3dd0ec87f1293953d5c595596aa3a SHA1 7f5a877ff6eac535e23b3f068fdd4aa1976eca84 SHA256 7da5a8d0f19c9ce47cdc13244cb224d31e360c935d72974b49616c3251cb9106
 AUX services-desktop/powernowd.service 133 RMD160 ce0e641d57957a18aaed44e9a60488c24fb341d9 SHA1 e289c3b39371efc282bf2324a4681a37848572f6 SHA256 e203268119c306bf205a3bf4de1a5ff3d4cb79700f445426ed38fa389c2a8e4b
+AUX services-desktop/slim_at.service 218 RMD160 f531662caf0f367b2674f57d255e934192be1872 SHA1 8473be6763b35d2f04b1865795b73c368960de60 SHA256 5c3a659dcba84a34c2270f6d59ad54718bb2e5bdf2497675fcb1005628b690b5
 AUX services-server/apache2.service 518 RMD160 7bc76c75cae15a59300f8264f2c644c59ff332ab SHA1 e3d42b5fe06f2e47bc595d69c6d6cf37c5437a42 SHA256 701d72c63cdaf4d7c01d0e57126d5f4448d0254e2b7090be7c0344b2d2561ac8
 AUX services-server/courier-authdaemond.service 376 RMD160 9ecbbc85640491b863be197e3e23efb7e5be9f9f SHA1 80a6a89e45c4412ccb13ceaf582ebc0ffc054850 SHA256 a275d29b61029b92e7ce76c1d16f9ec943a6cd0e2199821811253fabb6801370
 AUX services-server/courier-imapd.service 265 RMD160 ceec2bb55689fcf9e32a5639952b2f21bf051baf SHA1 8b81099ced7e0326fc2c1a04431dad43c033c989 SHA256 48c43249df0b0a2ff18372fca67d36da290f73bc1f9b453365015554985ca38e
@@ -24,6 +28,7 @@ AUX services-server/teamspeak3.service 424 RMD160 6e1867840730430acc14be8991eba9
 AUX services-server/uptimed.service 318 RMD160 ec151b5044e5530f609e67ae15cd268219fc4b18 SHA1 d2c457f6d41e371d897938ca4b705dfe2804152d SHA256 e20530d7b0a408ce4d32420e532a6c75c04a9e6f306570d71cdde9f52afe423f
 AUX services-server/vsftpd.service 210 RMD160 5c900ed1811cf6d2f9a47abd23e3a433d4f1e3a0 SHA1 0a66aecf94fe6e239fc700662322ea7a5e2b1044 SHA256 78ccea56242fc20f89a07120d61cd87e4b80378418c1bc120f58b65617144b70
 AUX services-server/vsftpd.socket 104 RMD160 527beec3b8fcf303aa74bd01864f03dc208f6bb8 SHA1 5b7a7a1e0c04acfcc2dba1346557f1193b9905ba SHA256 9fdbfd2ec0207170371ca3cf2b0ddca2dc2fe3d062e5792e0d3e51474c3198c9
+AUX services-server/vsftpd_at.service 170 RMD160 9944cd0f24974a1b9931c7862b8629d4fcf059e7 SHA1 7fba3189cdb0bf7ef301a3edf13ea2e62cf3848e SHA256 30007fc92d2a09e34962e6bfdeff8e1b865d1c22bf86a60780cd55ef32113a3c
 AUX tmpfiles-server/mysqld.conf 107 RMD160 bae9d6739af31d3f29573cd3982c48c0da5168bc SHA1 e64ab7ba5b0c25828e996d03e56a5b66e997f2b0 SHA256 190cba2f96a2d25ee9391c0005900d11bcbaf12122f15c06591188e25aaca180
-EBUILD systemd-units-9999.ebuild 802 RMD160 fb53f06408a15505500a9ca8c0e91847d8dc36f2 SHA1 8317a2ce624246be4d566b0e34163b59bc2e644e SHA256 edd011deddc16fec70e626258bf39bdf95ed4b6782c480455692f9f9a2076166
+EBUILD systemd-units-9999.ebuild 987 RMD160 df360295ec9018d16b4375dd799aa3ab378785b8 SHA1 97d382eecaec93699a1588818bea2f3c18462ceb SHA256 37e7e1cd129640121a13212d6d2d06db9704d44d129aec02f4f6278bc1379b46
 MISC metadata.xml 602 RMD160 512aa6adb816a3d4a7d3e6393131f5909899876f SHA1 37a5b8608c766081fd11fbc7fc98f2af0c6bfc77 SHA256 823bda585e1b5e1ca3c42c9c1c3b6759174dd44b536bce4011d5aeaa8670787e
diff --git a/sys-apps/systemd-units/files/services-desktop/gdm@.service b/sys-apps/systemd-units/files/services-desktop/gdm_at.service
index ce9e789..ce9e789 100644
--- a/sys-apps/systemd-units/files/services-desktop/gdm@.service
+++ b/sys-apps/systemd-units/files/services-desktop/gdm_at.service
diff --git a/sys-apps/systemd-units/files/services-desktop/kdm@.service b/sys-apps/systemd-units/files/services-desktop/kdm_at.service
index bc8431e..bc8431e 100644
--- a/sys-apps/systemd-units/files/services-desktop/kdm@.service
+++ b/sys-apps/systemd-units/files/services-desktop/kdm_at.service
diff --git a/sys-apps/systemd-units/files/services-desktop/openvpn@.service b/sys-apps/systemd-units/files/services-desktop/openvpn_at.service
index 9fdcc5f..9fdcc5f 100644
--- a/sys-apps/systemd-units/files/services-desktop/openvpn@.service
+++ b/sys-apps/systemd-units/files/services-desktop/openvpn_at.service
diff --git a/sys-apps/systemd-units/files/services-desktop/slim@.service b/sys-apps/systemd-units/files/services-desktop/slim_at.service
index 698a105..698a105 100644
--- a/sys-apps/systemd-units/files/services-desktop/slim@.service
+++ b/sys-apps/systemd-units/files/services-desktop/slim_at.service
diff --git a/sys-apps/systemd-units/files/services-server/vsftpd@.service b/sys-apps/systemd-units/files/services-server/vsftpd_at.service
index 402f9ce..1d89cca 100644
--- a/sys-apps/systemd-units/files/services-server/vsftpd@.service
+++ b/sys-apps/systemd-units/files/services-server/vsftpd_at.service
@@ -1,5 +1,5 @@
 [Unit]
-Description=Very Secure FTP Daemon 
+Description=Very Secure FTP Daemon
 
 [Service]
 ExecStart=/usr/sbin/vsftpd /etc/vsftpd/vsftpd.conf -obackground=NO -olisten=NO -olisten_ipv6=NO
diff --git a/sys-apps/systemd-units/systemd-units-9999.ebuild b/sys-apps/systemd-units/systemd-units-9999.ebuild
index e1651c8..9f4d0e5 100644
--- a/sys-apps/systemd-units/systemd-units-9999.ebuild
+++ b/sys-apps/systemd-units/systemd-units-9999.ebuild
@@ -34,4 +34,8 @@ src_install() {
 			rm -f "${D}/$(systemd_get_unitdir)"/gdm@.service
 		fi
 	fi
+
+	# Files in portage cannot contain a literal '@' character. Therfore,
+	# convert the code string "_at" into an '@' before installing.
+	rename '_at' '@' "${D}/$(systemd_get_unitdir)"/*
 }