Do not use the blank file in the filesdir.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 35 insertions, 12 deletions

diff --git a/media-radio/ax25-apps/ChangeLog b/media-radio/ax25-apps/ChangeLog
index 7d206f236c50..30264b540879 100644
--- a/media-radio/ax25-apps/ChangeLog
+++ b/media-radio/ax25-apps/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-radio/ax25-apps
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ChangeLog,v 1.16 2011/01/08 17:01:47 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ChangeLog,v 1.17 2011/09/22 12:30:19 scarabeus Exp $
+
+  22 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org>
+  ax25-apps-0.0.8_rc2.ebuild:
+  Do not use the blank file in the filesdir.
 
   08 Jan 2011; Thomas Beierlein <tomjbe@gentoo.org> ax25-apps-0.0.6-r1.ebuild,
   ax25-apps-0.0.8_rc2.ebuild:
diff --git a/media-radio/ax25-apps/Manifest b/media-radio/ax25-apps/Manifest
index 225671962543..fa872d663136 100644
--- a/media-radio/ax25-apps/Manifest
+++ b/media-radio/ax25-apps/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX ax25ipd.rc 493 RMD160 bad3ae33f218b9a433b7bd2b6860f78ca31095ff SHA1 11c81a0c35409a48ffc7065ccf6687d7c99b0606 SHA256 f3fcc66e2620575651fc6b39dbc0e2247839b79713bb94fcc0b4b2cae75d40e8
 AUX ax25mond.rc 498 RMD160 7da4c136f1065429480f55c71ad941728aeccbe4 SHA1 58c7f5913ac8b526ed287681bc57453667819efb SHA256 9d6704bbc6bbe255fe6bacd825369e354b6766172cb73a6e12829999cd4dbe2d
 AUX ax25rtd.blank 0 RMD160 9c1185a5c5e9fc54612808977ee8f548b2258d31 SHA1 da39a3ee5e6b4b0d3255bfef95601890afd80709 SHA256 e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
@@ -5,6 +8,23 @@ AUX ax25rtd.rc 493 RMD160 2a6994171209fa9f7a967cd03b725baa238f3181 SHA1 4ffd13d9
 DIST ax25-apps-0.0.6.tar.gz 273846 RMD160 19ebfc7f4fc82cc8a4e166f7444a18d200b37714 SHA1 34b804924ce77521d9e3defc9b9057c0a9dfa451 SHA256 5a2b34227bf4dd0775990ee9564c2674d37241f0e61e1d258134a03cfd79e51e
 DIST ax25-apps-0.0.8-rc2.tar.gz 430456 RMD160 8cf7e6b03ed2a6f99cda7614deeef6a13d4de0db SHA1 5425c3a3dd8a109a7f4a9c817951fdc9d1363176 SHA256 16413c199dec243520ba2df7d0b915102263943e4249a542781ae410e217e3e3
 EBUILD ax25-apps-0.0.6-r1.ebuild 1213 RMD160 0e2ecac01b478fd2be6ab576519b10d7343a3ebf SHA1 f27b7afc16d51c56302ee7eef8204f40a3bf36df SHA256 8b449a626b69858eac5192489b58c4973239cdde01f879f870db2cb40a981303
-EBUILD ax25-apps-0.0.8_rc2.ebuild 1124 RMD160 4eabf3e400db9ea062d76f02e4108e8aff2ba8e5 SHA1 722d9947b6fbea0f904088a80e9a6e4a0a443454 SHA256 bd8cde461a8822460e7d6b599e0ada440abaf23db266d4e450197e7a1983f038
-MISC ChangeLog 2050 RMD160 ed059b86a12b339558feacc114cbae60b81b92d1 SHA1 80644e2b182183bc627aabec42276e42b9941ef0 SHA256 44dca05e9d65fbfc118d86599e6f2ac457c07e3fbf8a2e8278cb81ebf9368c2c
+EBUILD ax25-apps-0.0.8_rc2.ebuild 1034 RMD160 efc353188c7a02b8770583663dc936900bb34f93 SHA1 341cf3268895348d090da2d538a2ddd06cabac10 SHA256 567c7167e1569a86707359ea138accac787cf4708865bb211f90619d9e6cf024
+MISC ChangeLog 2184 RMD160 40aa30f6890b4ffc3956c9a88e0e473a9064bebd SHA1 8c37cd7c5aa04bdf7165c6dd1d9b05c551750ea9 SHA256 4df8b27b85958246f4b4693ad231183da1f29eeff2f9ac3131b0bf374823d87e
 MISC metadata.xml 264 RMD160 3347909d39517a43603c61b9903951a36968a250 SHA1 ddce9a485621dfc794b8a7efee8fc506e63ec2ee SHA256 507ca35b42b1c0b8d9ce6438335ae3a7fc53406d6f2747cf0ae40ff2c5141495
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.18 (GNU/Linux)
+
+iQIcBAEBAgAGBQJOeyo6AAoJEOSiRoyO7jvoZdEQAInKby7ks0QXnzCqNRppt9Dv
+BrXUfXyv2ownBPGqFuqRrWc4yUQeVZMnBoq/Jy5gMKtYeJcKClin5xfUHowhz6DY
+wab6x4BbsyAcjuszD5QtgH7ruKnZ6eBpRyo1LjpQsGhxThKJO3QVEHn1/vC2V/Qy
+Dh6KbnEy3A/REGMXiVMfmrJDKKYEoOKXUH7ziuiUSOvBmoGVQp6fykmZb3z00RGF
+NqT2b+RWyoP7ScVYb+uV95qMmYN25IgtHl47aA2HupmOoWeQNA6qn/7eSelZz/1/
+BXNsjf/tMEKANNs8VUnMdOIhEWaZrpA+YnCtmLUpdlZHKoVZOMdeidZ30mSB7pqb
+Er05ZHhOMGaxq4ROdQygOJFEkecBMOGq7K11BvQIVKi0jdMrIXjdVWF6YG8lSRS+
+PhgEkTzOWfjBRbfD5FCx6bniFT7Vd/W8acEDTPdcZz0vweEiIZhw++eiCOvxKMFN
+yIRReb2l/5HDWGUGSB2RSDpl+8SaHkSR+ieGD0syY/MbnWjdR5ML2kOS4t+xrtFA
+X0Vuu8NO3BH53Ty1DGdtpWwOymuwl+00fh2G/s/LVIH7sjisGkjiuDjBHGhnz+wc
+7pY97Z3sTJ19JJkhOTtCDufSCOw+vSZRsZiY+9JfUg5/HAH+UXgmVuE0BgmjHmML
+TBPkdkpGjTmEnVEkUQv+
+=pJ8d
+-----END PGP SIGNATURE-----
diff --git a/media-radio/ax25-apps/ax25-apps-0.0.8_rc2.ebuild b/media-radio/ax25-apps/ax25-apps-0.0.8_rc2.ebuild
index 67daf418f6aa..c475029347a7 100644
--- a/media-radio/ax25-apps/ax25-apps-0.0.8_rc2.ebuild
+++ b/media-radio/ax25-apps/ax25-apps-0.0.8_rc2.ebuild
@@ -1,11 +1,10 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ax25-apps-0.0.8_rc2.ebuild,v 1.2 2011/01/08 17:01:47 tomjbe Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-radio/ax25-apps/ax25-apps-0.0.8_rc2.ebuild,v 1.3 2011/09/22 12:30:19 scarabeus Exp $
 
-EAPI=2
-inherit versionator
+EAPI=4
 
-MY_P=${PN}-$(replace_version_separator 3 '-')
+MY_P=${P/_/-}
 
 DESCRIPTION="Basic AX.25 (Amateur Radio) user tools, additional daemons"
 HOMEPAGE="http://www.linux-ax25.org"
@@ -23,18 +22,18 @@ RDEPEND=${DEPEND}
 S=${WORKDIR}/${MY_P}
 
 src_install() {
-	emake DESTDIR="${D}" install installconf || die
+	default
 
 	newinitd "${FILESDIR}"/ax25ipd.rc ax25ipd
 	newinitd "${FILESDIR}"/ax25mond.rc ax25mond
 	newinitd "${FILESDIR}"/ax25rtd.rc ax25rtd
 
-	rm -rf "${D}"/usr/share/doc/ax25-apps
+	rm -rf "${ED}"/usr/share/doc/ax25-apps
 
 	dodoc AUTHORS ChangeLog NEWS README ax25ipd/README.ax25ipd \
 		ax25rtd/README.ax25rtd ax25ipd/HISTORY.ax25ipd ax25rtd/TODO.ax25rtd
 
-	insinto /var/lib/ax25/ax25rtd
-	newins "${FILESDIR}"/ax25rtd.blank ax25_route
-	newins "${FILESDIR}"/ax25rtd.blank ip_route
+	dodir /var/lib/ax25/ax25rtd
+	touch "${ED}"/var/lib/ax25/ax25rtd/ax25_route
+	touch "${ED}"/var/lib/ax25/ax25rtd/ip_route
 }