From: Justin Lecher Date: Sat, 21 Mar 2015 21:47:04 +0000 (+0000) Subject: use dosbin instead of exeinto /usr/sbin/ && doexe X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6895a1cb4c2c08b846c44fef70222851916033aa;p=gentoo.git use dosbin instead of exeinto /usr/sbin/ && doexe Package-Manager: portage-2.2.18/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/net-misc/ser/ChangeLog b/net-misc/ser/ChangeLog index 457f8848e911..8cf9257f8255 100644 --- a/net-misc/ser/ChangeLog +++ b/net-misc/ser/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-misc/ser -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.38 2014/12/28 16:42:12 titanofold Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ChangeLog,v 1.39 2015/03/21 21:46:58 jlec Exp $ + + 21 Mar 2015; Justin Lecher ser-0.9.7-r1.ebuild: + use dosbin instead of exeinto /usr/sbin/ && doexe 28 Dec 2014; Aaron W. Swenson ser-0.9.7-r1.ebuild: Rename virtual/postgresql to dev-db/postgresql diff --git a/net-misc/ser/Manifest b/net-misc/ser/Manifest index 54487b2efc58..3c45c4e14d7d 100644 --- a/net-misc/ser/Manifest +++ b/net-misc/ser/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX ethz-1.0-ser-0.9.0.diff 378 SHA256 232a7853be7d7c01170e75472ef671c30963b9651238ca06455233c49b4d04a7 SHA512 492089e31158770cdb91cb7780d890b62d2c29b1025779acc905637f0288e667c3c2c7c5fae913ccbb2b26c4a4d1e703f7c8dba1caf46d2286d495682dea2e00 WHIRLPOOL 2135a79d88601b91f4fd6cbc336b46c5915eb2fc2f3ffeb9ae25639a53ebdcd5cf4d44bf853b9929a88398804e3b069a063925b7e8bfe500804881d4ef0ed6af AUX ldap-1.0-ser-0.9.0.diff 301 SHA256 fdf2367d1497f8954872730e79814d5f1d82639ab89573a86515a617c965fa76 SHA512 9a80caf9f32965638d33d61aee048c2e59f77140e282c902deede6772ab30ac200828dd53cd0992396042e5d68f168d14da059bc23ec0647a91688233cec353a WHIRLPOOL b54e5c016da6f07836a69cb7bc0a6d0b3de38ee5d3cf0b461a0e41df669db790782662b758269e2d9bce3d68f61b70cf4cedebde031666c19bfca70e93742681 @@ -16,13 +16,25 @@ DIST ldap-1.0-ser-0.9.0.tar.gz 5069 SHA256 244817715cf26411820a45c5197346fe4d394 DIST ldaps-1.0-ser-0.9.0.tar.gz 5051 SHA256 83e8e54423969dc72a71c71a22c59d4a1e4fe29aa1b886e68acf98d45a8c5126 SHA512 a5bcfcf293b4301afd5ab6f4f9fd4c030dbc4e2c496fda83bdb1851c6ad737b81d825729e0faf82005551e04ccb691aeea6ef7d683d125dd154b4496142efcb0 WHIRLPOOL b7e6de57fe0dd7c66fffadfb2ddb1f5eae73bad4cf7ac39bdd776a9065982420143ac0771b61a338dc468399b0db426f33530a95ee7a443f0be51a113f19747b DIST ser-0.9.7_src.tar.gz 1888122 SHA256 0fbbfd70d3e4b48665f7ae3ca0045a1421d3e1255ef8fc04b8fbe8168fb4e56f SHA512 45c084987c00722ca63a6eef1fe5c9051bff751123494d1add4003aab46c470be1ff31a7d3c420acf5d9868e69a0d94e13abdd145d75488ed41aa70d1c7d895f WHIRLPOOL e6e9d26a77d9434816161bb9c57963b8a4a8fdb740d60bb4f392468376390788738c04b5ccc280dfec06e244ab6909032ba35d1363396e0d15a0df0b4f4622eb DIST silomail-1.0-ser-0.9.0.tar.gz 4762 SHA256 18d60d987246d4b188e8c2b78d721a43e61eb8c50402b19352edada2d2f98826 SHA512 e23a71b0bcfe6be541b51ec92cdcd446cc32a281924f41041762ff6851001379dbd9b948a0370f3d855dfeb64adc2d14348012f9dbc6790831b9b4eb2c8110ac WHIRLPOOL 8a42bdc307c9110f606ea605ada56065b71ff488944e6db57831440ad3f8fa9542835c02087cac6c544f1f8492b046d90f605222d6e5c23e5e121bf11d426cdb -EBUILD ser-0.9.7-r1.ebuild 4372 SHA256 056c2523310c9819be9a06bfb7c9f547eafff8ff5c46f449edb7241f14bc161e SHA512 b2b65f89e24e391639be5177392bc79b5bad0b8c108dbfdc9e070bdd7968717b2fb0640c34920b3f884002b560a8dee372d7f95693d4bbdd17e9edceb4606397 WHIRLPOOL d289f1f407175f33e84f55547d98bb6ec0c0ef095f290a15864184681fa16e7df3ae88f7b95f37f9aca3f79a9ae950322ecd634bba3b744967d1ad1b1f8a8be5 -MISC ChangeLog 6046 SHA256 29110421daa4e7c7429dbc17b65bd2687a1dec8b0fef05731f9ee336bc9fdae4 SHA512 4a4524fcc2f0aa44e3b17934a55eded2201ad08a0fbeb9de25f66df621b78c6a39057f5f6e9fb0c8afdc01b5801f93d56f170f56bb51f6cf736015069c7202ee WHIRLPOOL 049639653f538d5689f132f37348cb0df3d35dc651f43f935acf04c8b5771f565f84ba7b51a391a67f3efb2f1995815eff5dc3552f9cf6d4b9c9ec6673f6166c +EBUILD ser-0.9.7-r1.ebuild 4345 SHA256 2de68b97541c1ae7897b919a8027295adeb39a1c80bd6761faa16326d3377d70 SHA512 43f54c7ffe3f2e532b725a81691f2ee2c79ad838a704bad6a10477d304ee9c8cdc7afca1a55601d712dba1ee8e15c8e94c2d135cf0511cd0b896833efa7f6abb WHIRLPOOL f74ae80f15bfd413598a16361e1f57b54e5c104429850700f17d87aef70abeb29e1f0d30bdb05c93c2609739e80497eb5d27aecb30e452e67c6d0ed211d44676 +MISC ChangeLog 6161 SHA256 4d298b3b8c176a29a94e7ace0eeac57733ec6ffcb00eec9794bfda680b11428b SHA512 4c1e161021e8581929423774b52ed0f3a9d6b58833aa901ff9f6ace4ba495576eb6b79cc4de9e4db72efc7741cdfb14bc1f0e3a579266481b27ee5fdd312205e WHIRLPOOL ab33f0ce715b6543297693dffb3d57889a1c7a6850e9e61113fef14f68c1e0a5b4e4f00090878428a56a5929c72474f71222bc20dd7d5dead98f790c68eae74e MISC metadata.xml 208 SHA256 98f8aa3fb70533eeab6b09d5bc30bd8f649ec13d9b04363490082fb87bb6032e SHA512 d5a7f3cb2fe57f8d7783ba358068648b122d9f5de81a17bff61ce600e42b6487e6f7e2a62c8be95cc7021cb3ea88716824b1ad0565da922ea753bea2417b3d3d WHIRLPOOL e38a6cdef2acb3efdc182efde482593790f773ab3bb9b66cced3af47e4ab39368757e17c4352c6cacaefa338341db88c3bcc3ffcd32aabd7984c5b19051a7bb7 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2 +Version: GnuPG v2.0 -iF4EAREIAAYFAlSgMuUACgkQVxOqA9G7/aBRvQD/ThZj3R5uBwq6A4oDAH5gUNXt -hncIh91XGYPLkApvf5EA/R9lWjuRAtQ8fceYpFLJ3jZyCG6E0wVBzgB5vVHTxLfL -=ceI4 +iQJ8BAEBCgBmBQJVDebYXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirAgwP/iJGP1vYMzvILRcR4PvrJRzf +DiRrZpkVzoZJJgeUAhtKtuNTNE/LK1bSe9Pu07FTzgeyzPNCHkkte01CjoXp/WNl +HTwClHh/o2YNJlwMC2p0eAAy3wAVHIVx5V08SpQmCpM6oov3aC6D9Wufxc2nJ8xs +SkJCI6Zd3X9p1SGw7izcRiII2TKZ70Wxf4w6KbiSKlZwI+oC81p3LWwXGrF3NvkY +fLVJOreaCWczdIk+R0YymO6CJR6JXQ+gpd3kQdWxdZi/coJUn+CRNnR2V2ihL4HF +N//F5HQmmfyTCrjtGkgw8m6LM2GFdZep3h6zzXUHf5jzQ9bLy/aQbbCEYuLrSkEA +J0XDvqwNKwL41E1UGjb8nDUaIjAcu+XP5DXwKTSGKwjj9r6fLKUov5gNcMfZB5Gq +5z+GSTFd62ggDJguLquvnmbGvoUSbkMMhSjlqBqrEjs/EGLid/PBS6zG34i3gC4g +XbKBX5oPeZEkYf9yyUuWkrUUHhGbXspl9Otl8sROQIe+sbC6hKnxSEfWOVlJJ2sM +JKE/5iyCmbVqQ+m92u15eJHjm9xa6VkGSoP/MUoMhYNn2F694LPR4NvHY0LuIsCu +HadR0bZhLqyNUtzH0dgt6V+geU4zEy6gM98pq786zIuyBmBEN2mDjapRhYC4lidV +LMDoMFIrtCNR7oJczdbn +=Lq1D -----END PGP SIGNATURE----- diff --git a/net-misc/ser/ser-0.9.7-r1.ebuild b/net-misc/ser/ser-0.9.7-r1.ebuild index 34c30ea0ee3a..e9eee2344fbc 100644 --- a/net-misc/ser/ser-0.9.7-r1.ebuild +++ b/net-misc/ser/ser-0.9.7-r1.ebuild @@ -1,12 +1,10 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.7-r1.ebuild,v 1.2 2014/12/28 16:42:12 titanofold Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ser/ser-0.9.7-r1.ebuild,v 1.3 2015/03/21 21:46:58 jlec Exp $ EAPI=5 -inherit eutils flag-o-matic toolchain-funcs multilib user - -IUSE="ipv6 mysql radius postgres jabber ldap ssl" +inherit eutils flag-o-matic multilib toolchain-funcs user ETHZ_PV="1.0" LDAP_PV="1.0" @@ -16,24 +14,28 @@ MODULES_PV="0.9.0" DESCRIPTION="SIP Express Router" HOMEPAGE="http://www.iptel.org/ser" -SRC_URI="http://ftp.iptel.org/pub/ser/${PV}/src/${P}_src.tar.gz +SRC_URI=" + http://ftp.iptel.org/pub/ser/${PV}/src/${P}_src.tar.gz mirror://gentoo/silomail-${SILOMAIL_PV}-${PN}-${MODULES_PV}.tar.gz mirror://gentoo/ethz-${ETHZ_PV}-${PN}-${MODULES_PV}.tar.gz - ldap? ( mirror://gentoo/ldap-${LDAP_PV}-${PN}-${MODULES_PV}.tar.gz - mirror://gentoo/ldaps-${LDAPS_PV}-${PN}-${MODULES_PV}.tar.gz )" + ldap? ( + mirror://gentoo/ldap-${LDAP_PV}-${PN}-${MODULES_PV}.tar.gz + mirror://gentoo/ldaps-${LDAPS_PV}-${PN}-${MODULES_PV}.tar.gz + )" SLOT="0" LICENSE="GPL-2" KEYWORDS="~amd64 ~ppc ~sparc x86" +IUSE="ipv6 mysql radius postgres jabber ldap ssl" RDEPEND=" mysql? ( virtual/mysql ) radius? ( >=net-dialup/radiusclient-ng-0.5.0 ) - postgres? ( dev-db/postgresql[server] ) + postgres? ( dev-db/postgresql:=[server] ) jabber? ( dev-libs/expat ) ldap? ( net-nds/openldap - ssl? ( dev-libs/openssl ) + ssl? ( dev-libs/openssl:0= ) )" DEPEND="${RDEPEND} @@ -91,8 +93,8 @@ src_prepare() { for x in ${extmodules}; do MY_A=$(eval echo ${x}-\${$(echo ${x} | tr "[:lower:]" "[:upper:]")_PV}-${PN}-${MODULES_PV}) MY_PATCH_A="${P}-extmod-${x}" - mkdir -p "${S}"/modules/${x} - cd "${S}"/modules/${x} + mkdir -p "${S}"/modules/${x} || die + cd "${S}"/modules/${x} || die unpack ${MY_A}.tar.gz # fix makefiles if [[ -f "${FILESDIR}"/${MY_A}.diff ]]; then @@ -125,7 +127,7 @@ src_compile() { CC="`tc-getCC`" \ CFLAGS="${CFLAGS}" \ cfg-prefix=/ \ - cfg-target=/etc/ser/ || die "emake failed" + cfg-target=/etc/ser/ } src_install () { @@ -142,18 +144,17 @@ src_install () { man-prefix="${D}"/usr/share/man \ man-dir="" \ doc-prefix="${D}"/usr/share/doc \ - doc-dir="${P}" || die "emake install failed" + doc-dir="${P}" newinitd "${FILESDIR}"/ser.rc6 ser newconfd "${FILESDIR}"/ser.confd ser - exeinto /usr/sbin - newexe scripts/harv_ser.sh harv_ser.sh - newexe scripts/sc serctl - newexe scripts/ser_mysql.sh ser_mysql.sh - - chown -R root:ser "${D}"/etc/ser - chmod 750 "${D}"/etc/ser - chmod 640 "${D}"/etc/ser/* + newsbin scripts/harv_ser.sh harv_ser.sh + newsbin scripts/sc serctl + newsbin scripts/ser_mysql.sh ser_mysql.sh + + chown -R root:ser "${D}"/etc/ser || die + chmod 750 "${D}"/etc/ser || die + chmod 640 "${D}"/etc/ser/* || die # fix manpages sed -i -e "s:^.B /ser-${PV}AUTHORS:.B /usr/share/doc/${PF}/AUTHORS:" \